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 9297c2e7ef92af2de24807806cd3cb3f276b5b44..daea875a629bd12ee51897e7a098929ebfcd2f80 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -55,4 +55,4 @@ clean:
        rm -rf $(BUILD_BASE)
        $(MAKE) -C jni clean
 
-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 0d0ad977027406787fbe195b3f5ba9fe7b56b71b..033f17b990a67a4adecf3eb28f2aac0af1418260 100644 (file)
--- a/cnf/unstable.bnd
+++ b/cnf/unstable.bnd
@@ -1,4 +1,6 @@
-version.released=2.3.5
+MAJOR=2
+MINOR=3
+MICRO=5
 qualifier=.next
 
 category=org.argeo.commons

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..d06873f
--- /dev/null
+++ b/sdk/argeo-build
@@ -0,0 +1 @@
+Subproject commit d06873f3a5c4ef1e59eb16d33053931474b32453