From 3ac99d863f83a4a6f36e10fc3375b66e8b68442d Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 26 Feb 2022 11:39:24 +0100 Subject: [PATCH] Use centralised build scripts --- .gitmodules | 4 +++ Makefile | 2 +- cnf/build.bnd | 4 +-- cnf/unstable.bnd | 4 ++- sdk/argeo-build | 1 + sdk/deb.mk | 34 ------------------------ sdk/ecj.args | 4 --- sdk/excludes.txt | 8 ------ sdk/osgi.mk | 68 ------------------------------------------------ 9 files changed, 11 insertions(+), 118 deletions(-) create mode 100644 .gitmodules create mode 160000 sdk/argeo-build delete mode 100644 sdk/deb.mk delete mode 100644 sdk/ecj.args delete mode 100644 sdk/excludes.txt delete mode 100644 sdk/osgi.mk diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..07b10cacb --- /dev/null +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule "sdk/argeo-build"] + path = sdk/argeo-build + url = http://git.argeo.org/cc0/argeo-build.git + branch = unstable diff --git a/Makefile b/Makefile index 8ebc748b9..eec35df13 100644 --- a/Makefile +++ b/Makefile @@ -43,4 +43,4 @@ A2_BASE = $(A2_OUTPUT) VPATH = .:ext DEP_CATEGORIES = org.argeo.tp org.argeo.tp.apache org.argeo.tp.sdk org.argeo.tp.jcr -include $(SDK_SRC_BASE)/sdk/osgi.mk \ No newline at end of file +include $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk \ No newline at end of file diff --git a/cnf/build.bnd b/cnf/build.bnd index 38f5f286a..f6e8be272 100644 --- a/cnf/build.bnd +++ b/cnf/build.bnd @@ -1,3 +1,3 @@ -include: \ -${workspace}/cnf/argeo.bnd, \ -${workspace}/cnf/unstable.bnd +${workspace}/cnf/unstable.bnd, \ +${workspace}/sdk/argeo-build/argeo.bnd, \ diff --git a/cnf/unstable.bnd b/cnf/unstable.bnd index dc952c9c3..671f5bef9 100644 --- a/cnf/unstable.bnd +++ b/cnf/unstable.bnd @@ -1,4 +1,6 @@ -version.released=2.3.1 +MAJOR=2 +MINOR=3 +MICRO=1 qualifier=.next category=org.argeo.slc diff --git a/sdk/argeo-build b/sdk/argeo-build new file mode 160000 index 000000000..086f45007 --- /dev/null +++ b/sdk/argeo-build @@ -0,0 +1 @@ +Subproject commit 086f450078ec980aa1fa616f21fa5289c35212b0 diff --git a/sdk/deb.mk b/sdk/deb.mk deleted file mode 100644 index 8a0f4e19e..000000000 --- a/sdk/deb.mk +++ /dev/null @@ -1,34 +0,0 @@ -DIST_PKGS = \ -argeo-tp-base \ -argeo-tp-equinox \ -argeo-tp-jetty \ -argeo-tp-rap \ -argeo-tp-jcr \ -argeo-tp-sdk \ - -DEB_DIRS = $(DIST_PKGS:%=$(SDK_BUILD_BASE)/build/deb/%) -DEB_PKGS = $(DIST_PKGS:%=$(SDK_BUILD_BASE)/deb/%.deb) - - -deb: $(DEB_PKGS) - cd $(SDK_BUILD_BASE)/deb && dpkg-scanpackages . | gzip > Packages.gz - -$(SDK_BUILD_BASE)/deb/%.deb : $(SDK_BUILD_BASE)/build/deb/%/DEBIAN/control - echo Build $@ - -$(SDK_BUILD_BASE)/build/deb/%/DEBIAN/control : $(SDK_SRC_BASE)/sdk/deb/%.control prepare-deb - cp $< $@ - dpkg-deb --build --root-owner-group $(dir $@)/.. $(SDK_BUILD_BASE)/deb - -prepare-deb: - mkdir -p $(foreach deb_dir, $(DEB_DIRS), $(deb_dir)/DEBIAN) - mkdir -p $(foreach deb_dir, $(DEB_DIRS), $(deb_dir)/usr/share/a2) - rsync -av $(SDK_BUILD_BASE)/a2/org.argeo.tp $(SDK_BUILD_BASE)/build/deb/argeo-tp-base/usr/share/a2 - rsync -av $(SDK_BUILD_BASE)/a2/org.argeo.tp.apache $(SDK_BUILD_BASE)/build/deb/argeo-tp-base/usr/share/a2 - rsync -av $(SDK_BUILD_BASE)/a2/org.argeo.tp.eclipse.equinox $(SDK_BUILD_BASE)/build/deb/argeo-tp-equinox/usr/share/a2 - rsync -av $(SDK_BUILD_BASE)/a2/org.argeo.tp.jetty $(SDK_BUILD_BASE)/build/deb/argeo-tp-jetty/usr/share/a2 - rsync -av $(SDK_BUILD_BASE)/a2/org.argeo.tp.eclipse.rap $(SDK_BUILD_BASE)/build/deb/argeo-tp-rap/usr/share/a2 - rsync -av $(SDK_BUILD_BASE)/a2/org.argeo.tp.jcr $(SDK_BUILD_BASE)/build/deb/argeo-tp-jcr/usr/share/a2 - rsync -av $(SDK_BUILD_BASE)/a2/org.argeo.tp.sdk $(SDK_BUILD_BASE)/build/deb/argeo-tp-sdk/usr/share/a2 - - diff --git a/sdk/ecj.args b/sdk/ecj.args deleted file mode 100644 index 852a33d4a..000000000 --- a/sdk/ecj.args +++ /dev/null @@ -1,4 +0,0 @@ --source 17 --target 11 --nowarn --time \ No newline at end of file diff --git a/sdk/excludes.txt b/sdk/excludes.txt deleted file mode 100644 index 3f5b4e501..000000000 --- a/sdk/excludes.txt +++ /dev/null @@ -1,8 +0,0 @@ -src -target -.* -bnd.bnd -pom.xml -build.properties -bin -generated \ No newline at end of file diff --git a/sdk/osgi.mk b/sdk/osgi.mk deleted file mode 100644 index bf578ef14..000000000 --- a/sdk/osgi.mk +++ /dev/null @@ -1,68 +0,0 @@ - - -# -# GENERIC -# -JVM := $(JAVA_HOME)/bin/java -JAVADOC := $(JAVA_HOME)/bin/javadoc -ECJ_JAR := $(A2_BASE)/org.argeo.tp.sdk/org.eclipse.jdt.core.compiler.batch.3.28.jar -BND_TOOL := /usr/bin/bnd - -BUILD_BASE = $(SDK_BUILD_BASE)/$(A2_CATEGORY) - -WORKSPACE_BNDS := $(shell cd $(SDK_SRC_BASE) && find cnf -name '*.bnd') -BUILD_WORKSPACE_BNDS := $(WORKSPACE_BNDS:%=$(BUILD_BASE)/%) - -A2_JARS = $(foreach category, $(DEP_CATEGORIES), $(shell find $(A2_BASE)/$(category) -name '*.jar')) -A2_CLASSPATH = $(subst $(space),$(pathsep),$(strip $(A2_JARS))) - -A2_BUNDLES = $(foreach bundle, $(BUNDLES),$(A2_OUTPUT)/$(A2_CATEGORY)/$(shell basename $(bundle)).$(MAJOR).$(MINOR).jar) - -JAVA_SRCS = $(foreach bundle, $(BUNDLES), $(shell find $(bundle) -name '*.java')) -BNDS = $(foreach bundle, $(BUNDLES), $(BUILD_BASE)/$(shell basename $(bundle))/bnd.bnd) -ECJ_SRCS = $(foreach bundle, $(BUNDLES), $(bundle)/src[-d $(BUILD_BASE)/$(shell basename $(bundle))/bin]) - -JAVADOC_SRCS = $(foreach bundle, $(JAVADOC_BUNDLES),$(bundle)/src) - -osgi: $(BUILD_WORKSPACE_BNDS) $(A2_BUNDLES) - -javadoc: $(BUILD_BASE)/java-compiled - $(JAVADOC) -d $(BUILD_BASE)/api --source-path $(subst $(space),$(pathsep),$(strip $(JAVADOC_SRCS))) -subpackages $(JAVADOC_PACKAGES) - - -# SDK level -$(BUILD_BASE)/cnf/%.bnd: cnf/%.bnd - mkdir -p $(dir $@) - cp $< $@ - -$(A2_OUTPUT)/$(A2_CATEGORY)/%.$(MAJOR).$(MINOR).jar : $(BUILD_BASE)/%.jar - mkdir -p $(dir $@) - cp $< $@ - -$(BUILD_BASE)/%.jar: $(BUILD_BASE)/jars-built - mv $(basename $@)/generated/*.jar $(basename $@).jar - -# Build level -$(BUILD_BASE)/jars-built: $(BNDS) - cd $(BUILD_BASE) && $(BND_TOOL) build - touch $@ - -$(BUILD_BASE)/%/bnd.bnd : %/bnd.bnd $(BUILD_BASE)/java-compiled - mkdir -p $(dir $@)bin - rsync -r --exclude "*.java" $(dir $<)src/ $(dir $@)bin - rsync -r --exclude-from $(SDK_SRC_BASE)/sdk/excludes.txt $(dir $<) $(dir $@)bin - if [ -d "$(dir $<)OSGI-INF" ]; then rsync -r $(dir $<)OSGI-INF/ $(dir $@)/OSGI-INF; fi - cp $< $@ - echo "\n-sourcepath:$(SDK_SRC_BASE)/$(dir $<)src\n" >> $@ - -$(BUILD_BASE)/java-compiled : $(JAVA_SRCS) - $(JVM) -jar $(ECJ_JAR) @$(SDK_SRC_BASE)/sdk/ecj.args -cp $(A2_CLASSPATH) $(ECJ_SRCS) - touch $@ - -# Local manifests -manifests : osgi - $(foreach bundle, $(BUNDLES), cp -v $(BUILD_BASE)/$(shell basename $(bundle))/META-INF/MANIFEST.MF $(bundle)/META-INF/MANIFEST.MF;) - -null := -space := $(null) # -pathsep := : -- 2.30.2