From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 26 Feb 2022 10:25:05 +0000 (+0100)
Subject: Use centralised build scripts
X-Git-Tag: v2.3.6~7
X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=15e62aed1f347d4fb13718cd088e93de310d2147

Use centralised build scripts
---

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 9297c2e7e..daea875a6 100644
--- 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
index 7a7e579b7..000000000
--- a/branch.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-MAJOR=2
-MINOR=3
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 0d0ad9770..033f17b99 100644
--- 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 da5dffbd1..2a391b8b3 100644
--- 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
index 000000000..d06873f3a
--- /dev/null
+++ b/sdk/argeo-build
@@ -0,0 +1 @@
+Subproject commit d06873f3a5c4ef1e59eb16d33053931474b32453