From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 18 Jul 2022 11:10:30 +0000 (+0200)
Subject: Adapt build to changes in Argeo TP structure
X-Git-Tag: v2.3.10~112
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=7b40f4a109786e0f18ecf0155d883f0bb7a8c45f;p=lgpl%2Fargeo-commons.git

Adapt build to changes in Argeo TP structure
---

diff --git a/Makefile b/Makefile
index 125205d57..5c14dc8b1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,21 @@
 include sdk.mk
-.PHONY: clean all osgi jni
+.PHONY: clean all osgi jni move-swt move-rap
 
 all: osgi jni move-rap
 	$(MAKE) -f Makefile-rcp.mk
 
-move-swt: osgi
-	mkdir -p $(A2_OUTPUT)/swt/$(A2_CATEGORY)
-	mv -v $(A2_OUTPUT)/$(A2_CATEGORY)/org.argeo.swt.minidesktop.$(MAJOR).$(MINOR).jar $(A2_OUTPUT)/swt/$(A2_CATEGORY)
-	mv -v $(A2_OUTPUT)/$(A2_CATEGORY)/org.argeo.cms.swt.$(MAJOR).$(MINOR).jar $(A2_OUTPUT)/swt/$(A2_CATEGORY)
-	mv -v $(A2_OUTPUT)/$(A2_CATEGORY)/org.argeo.cms.e4.$(MAJOR).$(MINOR).jar $(A2_OUTPUT)/swt/$(A2_CATEGORY)
-
 move-rap: move-swt
 	mkdir -p $(A2_OUTPUT)/swt/rap/$(A2_CATEGORY)
 	mv -v $(A2_OUTPUT)/$(A2_CATEGORY)/*.rap.$(MAJOR).$(MINOR).jar $(A2_OUTPUT)/swt/rap/$(A2_CATEGORY)
 	mv -v $(A2_OUTPUT)/$(A2_CATEGORY)/*.rap.cli.$(MAJOR).$(MINOR).jar $(A2_OUTPUT)/swt/rap/$(A2_CATEGORY)
 	touch $(BUILD_BASE)/*.rap/bnd.bnd
 
+move-swt: osgi
+	mkdir -p $(A2_OUTPUT)/swt/$(A2_CATEGORY)
+	mv -v $(A2_OUTPUT)/$(A2_CATEGORY)/org.argeo.swt.minidesktop.$(MAJOR).$(MINOR).jar $(A2_OUTPUT)/swt/$(A2_CATEGORY)
+	mv -v $(A2_OUTPUT)/$(A2_CATEGORY)/org.argeo.cms.swt.$(MAJOR).$(MINOR).jar $(A2_OUTPUT)/swt/$(A2_CATEGORY)
+	mv -v $(A2_OUTPUT)/$(A2_CATEGORY)/org.argeo.cms.e4.$(MAJOR).$(MINOR).jar $(A2_OUTPUT)/swt/$(A2_CATEGORY)
+
 A2_CATEGORY = org.argeo.cms
 
 BUNDLES = \