X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=Makefile;h=f3c2fcd6e8c68c00c5ca64fa5c54944ee17e5095;hb=5431b1a1fe79d909cb8a5869f0a7c4335f3d6f8e;hp=d3fab4a46e1b07b0871650501663bcb9f6c56cd3;hpb=3716c0d3e3fdd5bb7813d9e736edcfc28fa94da6;p=gpl%2Fargeo-slc.git

diff --git a/Makefile b/Makefile
index d3fab4a46..f3c2fcd6e 100644
--- a/Makefile
+++ b/Makefile
@@ -9,31 +9,30 @@ 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/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.jetty \
-org.argeo.tp.eclipse \
 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.eclipse.rap \
+org.argeo.cms.jcr \
+swt/rap/org.argeo.cms \
 
 GRAALVM_HOME = /opt/graalvm-ce
 A2_BUNDLES_CLASSPATH = $(subst $(space),$(pathsep),$(strip $(A2_BUNDLES)))
@@ -46,11 +45,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