Adapt to changes in build system

diff --git a/Makefile b/Makefile
index fa16c39e26d5f998fef37650509447ada4af9dd8..35a3916dd82077a4708cd39551e0f76f3da5a3e6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,7 @@
 include sdk.mk
 include sdk.mk

-.PHONY: clean all osgi move-swt
+.PHONY: clean all osgi

 
 

-all: move-swt
-
-move-swt: osgi
-       mkdir -p $(A2_OUTPUT)/swt/$(A2_CATEGORY)
-       mv -v $(A2_OUTPUT)/$(A2_CATEGORY)/org.argeo.app*.ui.$(MAJOR).$(MINOR).jar $(A2_OUTPUT)/swt/$(A2_CATEGORY)
+all: osgi

 
 A2_CATEGORY = org.argeo.suite
 
 
 A2_CATEGORY = org.argeo.suite
 

diff --git a/branch.mk b/branch.mk
index a6f848887ccc40bb5bdd3db46d37140d94f544eb..afde0f838e8e39e2e2b5abe863169d7891a97131 100644 (file)
--- a/branch.mk
+++ b/branch.mk
@@ -1 +1 @@
-include $(SDK_SRC_BASE)/cnf/unstable.bnd
+BRANCH=unstable
\ No newline at end of file

diff --git a/cnf/build.bnd b/cnf/build.bnd
deleted file mode 100644 (file)
index f6e8be2..0000000
--- a/cnf/build.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
--include: \
-${workspace}/cnf/unstable.bnd, \
-${workspace}/sdk/argeo-build/argeo.bnd, \

diff --git a/cnf/unstable.bnd b/cnf/unstable.bnd
deleted file mode 100644 (file)
index 0d5caec..0000000
--- a/cnf/unstable.bnd
+++ /dev/null
@@ -1,10 +0,0 @@
-MAJOR=2
-MINOR=3
-MICRO=7
-qualifier=.next
-
-category=org.argeo.suite
-Bundle-RequiredExecutionEnvironment=JavaSE-11
-
-argeo.rpm.stagingRepository=/srv/rpmfactory/unstable/argeo-osgi-2/argeo
-argeo.rpm.suffix=-unstable

diff --git a/configure b/configure
index 47f7d96251de657313915790cff5aaf0d8ba8878..9f4921508d34b49520dafd39942a6d05ddf1ab7f 100755 (executable)
--- a/configure
+++ b/configure
@@ -4,4 +4,4 @@
 SDK_SRC_BASE="$(cd "$(dirname "$0")"; pwd -P)"
 
 # Source the configure script
 SDK_SRC_BASE="$(cd "$(dirname "$0")"; pwd -P)"
 
 # Source the configure script

-. $SDK_SRC_BASE/sdk/argeo-build/configure
+. $SDK_SRC_BASE/sdk/argeo-build/configure
\ No newline at end of file

diff --git a/sdk/argeo-build b/sdk/argeo-build
index 872f63170bb639abab6e64d6e3d6a13318d38e32..a261043de5f9d90373bb1e7f395e3371ba9e67ef 160000 (submodule)
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit 872f63170bb639abab6e64d6e3d6a13318d38e32
+Subproject commit a261043de5f9d90373bb1e7f395e3371ba9e67ef

diff --git a/sdk/branches/unstable.bnd b/sdk/branches/unstable.bnd
new file mode 100644 (file)
index 0000000..e590c4c
--- /dev/null
+++ b/sdk/branches/unstable.bnd
@@ -0,0 +1,4 @@
+major=2
+minor=3
+micro=7
+qualifier=.next
\ No newline at end of file