Merge remote-tracking branch 'origin/unstable' into testing

[lgpl/argeo-commons.git] / Makefile

diff --git a/Makefile b/Makefile
index 6d947e312f9d7b50bc5f6bbcee5057eee1cdeda5..8c15c13072eab1e3b7760e395d3e2335a28fae0e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 include sdk.mk
-.PHONY: clean all osgi jni
+.PHONY: clean all osgi
 
 all: osgi
        $(MAKE) -f Makefile-rcp.mk all
@@ -8,8 +8,8 @@ A2_CATEGORY = org.argeo.cms
 
 BUNDLES = \
 org.argeo.init \
-org.argeo.util \
 org.argeo.api.uuid \
+org.argeo.api.register \
 org.argeo.api.acr \
 org.argeo.api.cli \
 org.argeo.api.cms \
@@ -17,10 +17,10 @@ org.argeo.cms \
 org.argeo.cms.ux \
 org.argeo.cms.ee \
 org.argeo.cms.lib.jetty \
-org.argeo.cms.lib.equinox \
+org.argeo.cms.lib.dbus \
 org.argeo.cms.lib.sshd \
-org.argeo.cms.lib.pgsql \
 org.argeo.cms.cli \
+osgi/equinox/org.argeo.cms.lib.equinox \
 swt/org.argeo.swt.minidesktop \
 swt/org.argeo.cms.swt \
 swt/org.argeo.cms.e4 \
@@ -30,7 +30,7 @@ swt/rap/org.argeo.cms.e4.rap \
 
 DEP_CATEGORIES = \
 org.argeo.tp \
-org.argeo.tp.apache \
+org.argeo.tp.crypto \
 org.argeo.tp.jetty \
 osgi/api/org.argeo.tp.osgi \
 osgi/equinox/org.argeo.tp.eclipse \
@@ -45,28 +45,10 @@ org.argeo.api.uuid \
 org.argeo.api.acr \
 org.argeo.api.cms
 
-jni:
-       $(MAKE) -C jni
-
 clean:
        rm -rf $(BUILD_BASE)
-       $(MAKE) -C jni clean
        $(MAKE) -f Makefile-rcp.mk clean
 
 A2_BUNDLES_CLASSPATH = $(subst $(space),$(pathsep),$(strip $(A2_BUNDLES)))
 
-native-image:
-       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.eclipse.ui.jetty.CmsRapCli \
-               --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 
-       cd $(A2_OUTPUT)/libexec/$(A2_CATEGORY) && /opt/graalvm-ce/bin/native-image \
-               -cp $(A2_CLASSPATH):$(A2_BUNDLES_CLASSPATH) org.argeo.cms.ux.cli.FileSync \
-               --initialize-at-build-time=org.argeo.init.logging.ThinLogging,org.slf4j.LoggerFactory \
-               --no-fallback 
-
-
 include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
\ No newline at end of file