X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=Makefile;h=125c81eb3097315d020decdf6d7593c6e12d9bf3;hb=1bf38659afa8ace4a22e6a31d534bce3f5c9d737;hp=74fb23f18d9196ba1c85b17a3a45bdad8ef958cc;hpb=c0b17b772af41e1fd7b729695ad9d350c4db0a55;p=gpl%2Fargeo-slc.git

diff --git a/Makefile b/Makefile
index 74fb23f18..125c81eb3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,11 @@
 include sdk.mk
-.PHONY: clean all osgi
+.PHONY: clean all osgi jni
 
-all: osgi
+all: osgi jni
+	$(MAKE) -f Makefile-rcp.mk all
+
+jni:
+	$(MAKE) -C jni
 
 A2_CATEGORY = org.argeo.slc
 
@@ -9,32 +13,39 @@ BUNDLES = \
 org.argeo.slc.api \
 org.argeo.slc.factory \
 org.argeo.slc.runtime \
-cms/org.argeo.slc.cms \
+org.argeo.slc.cms \
+org.argeo.slc.repo \
+org.argeo.slc.rpmfactory \
+org.argeo.slc.jcr \
+swt/org.argeo.tool.swt \
+swt/org.argeo.tool.devops.e4 \
+swt/rap/org.argeo.tool.rap.cli \
 swt/rap/org.argeo.tool.server \
 
-VPATH = .:cms:swt/rap
-
-clean:
-	rm -rf $(BUILD_BASE)
-
-A2_OUTPUT = $(SDK_BUILD_BASE)/a2
-A2_BASE = $(A2_OUTPUT)
-
 DEP_CATEGORIES = \
 org.argeo.tp \
 org.argeo.tp.sdk \
-org.argeo.tp.apache \
+org.argeo.tp.crypto \
 org.argeo.tp.jetty \
+org.argeo.tp.sql \
+org.argeo.tp.utils \
+org.argeo.tp.jcr \
+org.argeo.tp.gis \
 osgi/api/org.argeo.tp.osgi \
 osgi/equinox/org.argeo.tp.eclipse \
 swt/rap/org.argeo.tp.swt \
 swt/rap/org.argeo.tp.swt.workbench \
-org.argeo.tp.jcr \
-org.argeo.tp.formats \
-org.argeo.tp.gis \
 org.argeo.cms \
+org.argeo.cms.jcr \
+swt/org.argeo.cms \
+swt/org.argeo.cms.jcr \
 swt/rap/org.argeo.cms \
 
+clean:
+	rm -rf $(BUILD_BASE)
+	$(MAKE) -C jni clean
+	$(MAKE) -f Makefile-rcp.mk clean
+
 GRAALVM_HOME = /opt/graalvm-ce
 A2_BUNDLES_CLASSPATH = $(subst $(space),$(pathsep),$(strip $(A2_BUNDLES)))
 
@@ -46,11 +57,11 @@ tool-server: osgi graalvm-custom
 	mkdir -p $(A2_OUTPUT)/libexec/$(A2_CATEGORY)
 	cd $(A2_OUTPUT)/libexec/$(A2_CATEGORY) && $(GRAALVM_HOME)/bin/native-image \
 		-cp $(A2_CLASSPATH):$(A2_BUNDLES_CLASSPATH):$(SDK_BUILD_BASE)/$(A2_CATEGORY)/graalvm/bin \
-		--features=org.argeo.slc.graalvm.feature.ArgeoToolFeature \
 		--enable-url-protocols=http,https \
-		-H:AdditionalSecurityProviders=sun.security.jgss.SunProvider,org.bouncycastle.jce.provider.BouncyCastleProvider,net.i2p.crypto.eddsa.EdDSASecurityProvider \
+		-H:AdditionalSecurityProviders=sun.security.jgss.SunProvider \
 		--initialize-at-build-time=org.argeo.init.logging.ThinLogging,org.slf4j.LoggerFactory \
 		--no-fallback \
+		-Dargeo.logging.synchronous=true \
 		 org.argeo.tool.server.ArgeoServer \
 		 argeo