X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=Makefile;h=74fb23f18d9196ba1c85b17a3a45bdad8ef958cc;hb=c0b17b772af41e1fd7b729695ad9d350c4db0a55;hp=04638f6aa752f662d76cbcac99581fdd75553ec5;hpb=94d4dce8cfff86edca95494ab75604963f31bbcc;p=gpl%2Fargeo-slc.git

diff --git a/Makefile b/Makefile
index 04638f6aa..74fb23f18 100644
--- a/Makefile
+++ b/Makefile
@@ -10,9 +10,9 @@ org.argeo.slc.api \
 org.argeo.slc.factory \
 org.argeo.slc.runtime \
 cms/org.argeo.slc.cms \
-suite/org.argeo.slc.tool \
+swt/rap/org.argeo.tool.server \
 
-VPATH = .:cms:suite
+VPATH = .:cms:swt/rap
 
 clean:
 	rm -rf $(BUILD_BASE)
@@ -25,26 +25,34 @@ 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 \
-swt/rcp/org.argeo.tp.swt \
-lib/linux/x86_64/swt/rcp/org.argeo.tp.swt \
-swt/rcp/org.argeo.tp.swt.workbench \
+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.rcp \
+swt/rap/org.argeo.cms \
 
+GRAALVM_HOME = /opt/graalvm-ce
 A2_BUNDLES_CLASSPATH = $(subst $(space),$(pathsep),$(strip $(A2_BUNDLES)))
 
-native-image:
+graalvm-custom:
+	$(GRAALVM_HOME)/bin/java -jar $(ECJ_JAR) @$(SDK_SRC_BASE)/sdk/argeo-build/ecj.args -cp $(A2_CLASSPATH) \
+		graalvm/org.argeo.slc.graalvm/src[-d $(SDK_BUILD_BASE)/$(A2_CATEGORY)/graalvm/bin]
+
+tool-server: osgi graalvm-custom
 	mkdir -p $(A2_OUTPUT)/libexec/$(A2_CATEGORY)
-	cd $(A2_OUTPUT)/libexec/$(A2_CATEGORY) && /opt/graalvm-ce/bin/native-image \
-		-cp $(A2_CLASSPATH):$(A2_BUNDLES_CLASSPATH) org.argeo.slc.tool.Main \
-		--enable-url-protocols=http,https -H:AdditionalSecurityProviders=sun.security.jgss.SunProvider \
+	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 \
 		--initialize-at-build-time=org.argeo.init.logging.ThinLogging,org.slf4j.LoggerFactory \
-		--no-fallback 
- 
+		--no-fallback \
+		 org.argeo.tool.server.ArgeoServer \
+		 argeo
+
 
 include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
\ No newline at end of file