X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=Makefile-rcp.mk;h=43956314738d5a198234eba70e0c2bacc29aacf4;hb=HEAD;hp=717ef5a22c25d0230d02c4d2bbebbb490561ed0e;hpb=3716c0d3e3fdd5bb7813d9e736edcfc28fa94da6;p=gpl%2Fargeo-slc.git

diff --git a/Makefile-rcp.mk b/Makefile-rcp.mk
index 717ef5a22..439563147 100644
--- a/Makefile-rcp.mk
+++ b/Makefile-rcp.mk
@@ -6,33 +6,35 @@ all: osgi
 A2_CATEGORY = org.argeo.slc
 
 BUNDLES = \
+swt/rcp/org.argeo.cms.e4.rcp \
+swt/rcp/org.argeo.tool.rcp.cli \
 swt/rcp/org.argeo.tool.desktop \
 
-VPATH = .:cms:swt/rcp
-
-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.osgi \
+osgi/equinox/org.argeo.tp.eclipse \
 swt/rcp/org.argeo.tp.swt \
 lib/linux/x86_64/swt/rcp/org.argeo.tp.swt \
 swt/rcp/org.argeo.tp.swt.workbench \
 org.argeo.cms \
-org.argeo.cms.eclipse.rcp \
+swt/org.argeo.cms \
+swt/rcp/org.argeo.cms \
+$(A2_CATEGORY) \
+swt/$(A2_CATEGORY) \
+swt/rcp/$(A2_CATEGORY) \
+
+clean:
+	rm -rf $(BUILD_BASE)
 
 GRAALVM_HOME = /opt/graalvm-ce
 A2_BUNDLES_CLASSPATH = $(subst $(space),$(pathsep),$(strip $(A2_BUNDLES)))
 
-tool-desktop:
+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-desktop: 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 \
@@ -40,6 +42,8 @@ tool-desktop:
 		--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 \
+		--trace-object-instantiation=java.lang.Thread \
+		-H:+ReportExceptionStackTraces \
 		--no-fallback \
 		 org.argeo.tool.desktop.ArgeoDesktop \
 		 argeo-desktop