From c0b17b772af41e1fd7b729695ad9d350c4db0a55 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 22 Jul 2022 11:03:33 +0200 Subject: [PATCH] Work on native image compilation --- Makefile | 2 +- Makefile-rcp.mk | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 08c9b8220..74fb23f18 100644 --- a/Makefile +++ b/Makefile @@ -25,8 +25,8 @@ 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 \ diff --git a/Makefile-rcp.mk b/Makefile-rcp.mk index 717ef5a22..ce8900199 100644 --- a/Makefile-rcp.mk +++ b/Makefile-rcp.mk @@ -27,12 +27,17 @@ 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 \ 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 +45,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 -- 2.30.2