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

diff --git a/Makefile b/Makefile
index 8ebc748b9..74fb23f18 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 include sdk.mk
 .PHONY: clean all osgi
 
-all: osgi move-ext
+all: osgi
 
 A2_CATEGORY = org.argeo.slc
 
@@ -9,38 +9,50 @@ BUNDLES = \
 org.argeo.slc.api \
 org.argeo.slc.factory \
 org.argeo.slc.runtime \
-ext/org.argeo.ext.slf4j \
-
-BOOTSTRAP_BASE=$(SDK_BUILD_BASE)/bootstrap
-
-distribution: bootstrap
-	$(JVM) -cp \
-	 $(BOOTSTRAP_BASE)/bndlib.jar:$(BOOTSTRAP_BASE)/slf4j-api.jar:$(BOOTSTRAP_BASE)/org.argeo.slc.api/bin:$(BOOTSTRAP_BASE)/org.argeo.slc.factory/bin \
-	 tp/Make.java $(A2_OUTPUT)
-	
-bootstrap :
-	mkdir -p $(SDK_BUILD_BASE)/bootstrap
-	wget -c -O $(BOOTSTRAP_BASE)/ecj.jar https://repo1.maven.org/maven2/org/eclipse/jdt/ecj/3.28.0/ecj-3.28.0.jar
-	wget -c -O $(BOOTSTRAP_BASE)/slf4j-api.jar https://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.28/slf4j-api-1.7.28.jar
-	wget -c -O $(BOOTSTRAP_BASE)/bndlib.jar https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/5.3.0/biz.aQute.bndlib-5.3.0.jar
-	$(JVM) -cp $(BOOTSTRAP_BASE)/ecj.jar org.eclipse.jdt.internal.compiler.batch.Main -11 -nowarn -time -cp \
-	 $(BOOTSTRAP_BASE)/bndlib.jar:$(BOOTSTRAP_BASE)/slf4j.jar \
-	 org.argeo.slc.api/src[-d $(BOOTSTRAP_BASE)/org.argeo.slc.api/bin] \
-	 org.argeo.slc.factory/src[-d $(BOOTSTRAP_BASE)/org.argeo.slc.factory/bin] \
-
-move-ext: osgi
-	mkdir -p $(SDK_BUILD_BASE)/a2/org.argeo.tp
-	cp $(SDK_BUILD_BASE)/a2/$(A2_CATEGORY)/org.argeo.ext.slf4j.$(MAJOR).$(MINOR).jar $(SDK_BUILD_BASE)/a2/org.argeo.tp
-#	mv $(SDK_BUILD_BASE)/a2/$(A2_CATEGORY)/org.argeo.ext.equinox.jetty.$(MAJOR).$(MINOR).jar $(SDK_BUILD_BASE)/a2/org.argeo.tp.eclipse.equinox
+cms/org.argeo.slc.cms \
+swt/rap/org.argeo.tool.server \
+
+VPATH = .:cms:swt/rap
 
 clean:
 	rm -rf $(BUILD_BASE)
-	rm -rf $(BOOTSTRAP_BASE)
 
 A2_OUTPUT = $(SDK_BUILD_BASE)/a2
 A2_BASE = $(A2_OUTPUT)
 
-VPATH = .:ext
-DEP_CATEGORIES = org.argeo.tp org.argeo.tp.apache org.argeo.tp.sdk org.argeo.tp.jcr
-
-include  $(SDK_SRC_BASE)/sdk/osgi.mk
\ No newline at end of file
+DEP_CATEGORIES = \
+org.argeo.tp \
+org.argeo.tp.sdk \
+org.argeo.tp.apache \
+org.argeo.tp.jetty \
+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 \
+swt/rap/org.argeo.cms \
+
+GRAALVM_HOME = /opt/graalvm-ce
+A2_BUNDLES_CLASSPATH = $(subst $(space),$(pathsep),$(strip $(A2_BUNDLES)))
+
+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) && $(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 \
+		 org.argeo.tool.server.ArgeoServer \
+		 argeo
+
+
+include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
\ No newline at end of file