Use centralised build scripts

diff --git a/.gitmodules b/.gitmodules
new file mode 100644 (file)
index 0000000..07b10ca
--- /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 1a4f1019fbf179428122987ee156c33386ab346a..10b73819a82235585eae51bf5f66cc7006bc3736 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -30,4 +30,4 @@ org.argeo.cms.eclipse.rap \
 clean:
        rm -rf $(BUILD_BASE)
 
-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/branch.properties b/branch.properties
deleted file mode 100644 (file)
index 7a7e579..0000000
--- a/branch.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-MAJOR=2
-MINOR=3

diff --git a/cnf/build.bnd b/cnf/build.bnd
index 38f5f286a6df0d08f9ac5298e4ee84bfbf7642ea..f6e8be27226265627e5d7817893fdd08eb4d901e 100644 (file)
--- 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 3e4d3681b388938badb2f1bf42dbfc67b4de3275..3e878ea6ac0177ef1c68013e4ca8bc631281a00e 100644 (file)
--- a/cnf/unstable.bnd
+++ b/cnf/unstable.bnd
@@ -1,4 +1,6 @@
-version.released=2.3.3
+MAJOR=2
+MINOR=3
+MICRO=3
 qualifier=.next
 
 category=org.argeo.suite

diff --git a/configure b/configure
index da5dffbd145f01926ae75f61d4ec5b10c0a83dce..2a391b8b3d500856e678fd0683a98f9d23854896 100644 (file)
--- a/configure
+++ b/configure
@@ -42,7 +42,7 @@ SDK_SRC_BASE := $SDK_SRC_BASE
 SDK_BUILD_BASE := $SDK_BUILD_BASE
 JAVA_HOME := $JAVA_HOME
 
-include \$(SDK_SRC_BASE)/branch.properties
+#include \$(SDK_SRC_BASE)/cnf/testing.bnd
 EOF
 
 

diff --git a/sdk/argeo-build b/sdk/argeo-build
new file mode 160000 (submodule)
index 0000000..086f450
--- /dev/null
+++ b/sdk/argeo-build
@@ -0,0 +1 @@
+Subproject commit 086f450078ec980aa1fa616f21fa5289c35212b0

diff --git a/sdk/ecj.args b/sdk/ecj.args
deleted file mode 100644 (file)
index 852a33d..0000000
--- 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 (file)
index 3f5b4e5..0000000
--- 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 (file)
index bf578ef..0000000
--- 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 := :