projects
/
lgpl
/
argeo-commons.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7c7dc7d
)
Better integrate RCP build
author
Mathieu Baudier <mbaudier@argeo.org>
Sat, 12 Mar 2022 11:01:13 +0000
(12:01 +0100)
committer
Mathieu Baudier <mbaudier@argeo.org>
Sat, 12 Mar 2022 11:01:13 +0000
(12:01 +0100)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index daea875a629bd12ee51897e7a098929ebfcd2f80..49a995426246cbd9dbb053f8b6283a523f5876da 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,7
+1,10
@@
include sdk.mk
.PHONY: clean all osgi jni
include sdk.mk
.PHONY: clean all osgi jni
-all: osgi jni
+all: osgi jni move-rap
+ $(MAKE) -f Makefile-rcp.mk
+
+move-rap:
mkdir -p $(A2_OUTPUT)/$(A2_CATEGORY).eclipse.rap
mv -v $(A2_OUTPUT)/$(A2_CATEGORY)/*.rap.$(MAJOR).$(MINOR).jar $(A2_OUTPUT)/$(A2_CATEGORY).eclipse.rap
touch $(BUILD_BASE)/*.rap/bnd.bnd
mkdir -p $(A2_OUTPUT)/$(A2_CATEGORY).eclipse.rap
mv -v $(A2_OUTPUT)/$(A2_CATEGORY)/*.rap.$(MAJOR).$(MINOR).jar $(A2_OUTPUT)/$(A2_CATEGORY).eclipse.rap
touch $(BUILD_BASE)/*.rap/bnd.bnd
@@
-54,5
+57,6
@@
jni:
clean:
rm -rf $(BUILD_BASE)
$(MAKE) -C jni clean
clean:
rm -rf $(BUILD_BASE)
$(MAKE) -C jni clean
+ $(MAKE) -f Makefile-rcp.mk clean
include $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
\ No newline at end of file
include $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
\ No newline at end of file