X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=Makefile;h=492b524d1e23fab2aa6966c2c35ac6367e33cae0;hb=refs%2Ftags%2Fv2.1.24;hp=bbad25a6192878e3bc6b95275362b76625a63aef;hpb=d1a6fca2ec1bf42ed660605dc591fa5637eeac9e;p=gpl%2Fargeo-slc.git

diff --git a/Makefile b/Makefile
index bbad25a61..492b524d1 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,10 @@ include sdk.mk
 
 all: osgi jni
 	$(MAKE) -f Makefile-rcp.mk all
+	
+install: osgi-install
+
+uninstall: osgi-uninstall
 
 jni:
 	$(MAKE) -C jni
@@ -18,20 +22,21 @@ org.argeo.slc.rpmfactory \
 org.argeo.slc.jcr \
 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 \
 
 DEP_CATEGORIES = \
+crypto/fips/org.argeo.tp.crypto \
+log/syslogger/org.argeo.tp \
 org.argeo.tp \
-org.argeo.tp.sdk \
 org.argeo.tp.build \
-org.argeo.tp.crypto \
-org.argeo.tp.jetty \
-org.argeo.tp.sql \
+org.argeo.tp.sdk \
+org.argeo.tp.httpd \
 org.argeo.tp.utils \
 org.argeo.tp.jcr \
-org.argeo.tp.gis \
 osgi/api/org.argeo.tp.osgi \
 osgi/equinox/org.argeo.tp.eclipse \
 swt/rap/org.argeo.tp.swt \
@@ -47,24 +52,7 @@ clean:
 	$(MAKE) -C jni clean
 	$(MAKE) -f Makefile-rcp.mk clean
 
-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 \
-		--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
-
+native-deps-debian:
+	sudo apt install uuid-dev
 
 include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
\ No newline at end of file