Prepare next development cycle

[gpl/argeo-slc.git] / Makefile

diff --git a/Makefile b/Makefile
index 3a7dc5d6129134dc6e79fc6bd06f5feea331eba0..562eba3bef7bb15f8a7fea4e44453fdb345bd536 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,25 +1,25 @@
 include sdk.mk
 .PHONY: clean all osgi jni
 
-all: osgi jni
+all: osgi-all
        $(MAKE) -f Makefile-rcp.mk all
+       
+install: osgi-install
 
-jni:
-       $(MAKE) -C jni
+uninstall: osgi-uninstall
+
+#jni:
+#      $(MAKE) -C jni
 
 A2_CATEGORY = org.argeo.slc
 
 BUNDLES = \
-org.argeo.slc.api \
+org.argeo.api.slc \
 org.argeo.slc.runtime \
 org.argeo.slc.cms \
-org.argeo.slc.repo \
-org.argeo.slc.rpmfactory \
-org.argeo.slc.jcr \
+org.argeo.rt.cms \
 lib/linux/org.argeo.slc.systemd \
-swt/org.argeo.tool.swt \
 swt/org.argeo.cms.e4 \
-swt/org.argeo.tool.devops.e4 \
 swt/rap/org.argeo.cms.e4.rap \
 swt/rap/org.argeo.tool.rap.cli \
 swt/rap/org.argeo.tool.server \
@@ -28,44 +28,26 @@ DEP_CATEGORIES = \
 crypto/fips/org.argeo.tp.crypto \
 log/syslogger/org.argeo.tp \
 org.argeo.tp \
-org.argeo.tp.build \
-org.argeo.tp.sdk \
 org.argeo.tp.httpd \
-org.argeo.tp.utils \
-org.argeo.tp.jcr \
-osgi/api/org.argeo.tp.osgi \
+org.argeo.tp.sys \
+osgi/equinox/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.cms \
-org.argeo.cms.jcr \
 swt/org.argeo.cms \
-swt/org.argeo.cms.jcr \
 swt/rap/org.argeo.cms \
+$(A2_CATEGORY)
 
-clean:
-       rm -rf $(BUILD_BASE)
-       $(MAKE) -C jni clean
-       $(MAKE) -f Makefile-rcp.mk clean
-
-GRAALVM_HOME = /opt/graalvm-ce
-A2_BUNDLES_CLASSPATH = $(subst $(space),$(pathsep),$(strip $(A2_BUNDLES)))
+NATIVE_PACKAGES= \
+org_argeo_api_uuid_libuuid
 
-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 \
-               --enable-url-protocols=http,https \
-               -H:AdditionalSecurityProviders=sun.security.jgss.SunProvider \
-               --initialize-at-build-time=org.argeo.init.logging.ThinLogging,org.slf4j.LoggerFactory \
-               --no-fallback \
-               -Dargeo.logging.synchronous=true \
-                org.argeo.tool.server.ArgeoServer \
-                argeo
+clean: osgi-clean
+#      rm -rf $(BUILD_BASE)
+#      $(MAKE) -C jni clean
+       $(MAKE) -f Makefile-rcp.mk clean
 
+native-deps-debian:
+       sudo apt install uuid-dev
 
 include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
\ No newline at end of file