X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=Makefile;h=562eba3bef7bb15f8a7fea4e44453fdb345bd536;hb=HEAD;hp=eec35df132c1c19ca59faf147b71ab2186c0a343;hpb=d64292c93f4a3532576e98f651344d89e883e2aa;p=gpl%2Fargeo-slc.git

diff --git a/Makefile b/Makefile
index eec35df13..562eba3be 100644
--- a/Makefile
+++ b/Makefile
@@ -1,46 +1,53 @@
 include sdk.mk
-.PHONY: clean all osgi
+.PHONY: clean all osgi jni
 
-all: osgi move-ext
+all: osgi-all
+	$(MAKE) -f Makefile-rcp.mk all
+	
+install: osgi-install
+
+uninstall: osgi-uninstall
+
+#jni:
+#	$(MAKE) -C jni
 
 A2_CATEGORY = org.argeo.slc
 
 BUNDLES = \
-org.argeo.slc.api \
-org.argeo.slc.factory \
+org.argeo.api.slc \
 org.argeo.slc.runtime \
-ext/org.argeo.ext.slf4j \
-
-BOOTSTRAP_BASE=$(SDK_BUILD_BASE)/bootstrap
-
-distribution: bootstrap
-	$(JVM) -cp \
-	 $(BOOTSTRAP_BASE)/bndlib.jar:$(BOOTSTRAP_BASE)/slf4j-api.jar:$(BOOTSTRAP_BASE)/org.argeo.slc.api/bin:$(BOOTSTRAP_BASE)/org.argeo.slc.factory/bin \
-	 tp/Make.java $(A2_OUTPUT)
-	
-bootstrap :
-	mkdir -p $(SDK_BUILD_BASE)/bootstrap
-	wget -c -O $(BOOTSTRAP_BASE)/ecj.jar https://repo1.maven.org/maven2/org/eclipse/jdt/ecj/3.28.0/ecj-3.28.0.jar
-	wget -c -O $(BOOTSTRAP_BASE)/slf4j-api.jar https://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.28/slf4j-api-1.7.28.jar
-	wget -c -O $(BOOTSTRAP_BASE)/bndlib.jar https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/5.3.0/biz.aQute.bndlib-5.3.0.jar
-	$(JVM) -cp $(BOOTSTRAP_BASE)/ecj.jar org.eclipse.jdt.internal.compiler.batch.Main -11 -nowarn -time -cp \
-	 $(BOOTSTRAP_BASE)/bndlib.jar:$(BOOTSTRAP_BASE)/slf4j.jar \
-	 org.argeo.slc.api/src[-d $(BOOTSTRAP_BASE)/org.argeo.slc.api/bin] \
-	 org.argeo.slc.factory/src[-d $(BOOTSTRAP_BASE)/org.argeo.slc.factory/bin] \
-
-move-ext: osgi
-	mkdir -p $(SDK_BUILD_BASE)/a2/org.argeo.tp
-	cp $(SDK_BUILD_BASE)/a2/$(A2_CATEGORY)/org.argeo.ext.slf4j.$(MAJOR).$(MINOR).jar $(SDK_BUILD_BASE)/a2/org.argeo.tp
-#	mv $(SDK_BUILD_BASE)/a2/$(A2_CATEGORY)/org.argeo.ext.equinox.jetty.$(MAJOR).$(MINOR).jar $(SDK_BUILD_BASE)/a2/org.argeo.tp.eclipse.equinox
-
-clean:
-	rm -rf $(BUILD_BASE)
-	rm -rf $(BOOTSTRAP_BASE)
-
-A2_OUTPUT = $(SDK_BUILD_BASE)/a2
-A2_BASE = $(A2_OUTPUT)
-
-VPATH = .:ext
-DEP_CATEGORIES = org.argeo.tp org.argeo.tp.apache org.argeo.tp.sdk org.argeo.tp.jcr
+org.argeo.slc.cms \
+org.argeo.rt.cms \
+lib/linux/org.argeo.slc.systemd \
+swt/org.argeo.cms.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.httpd \
+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 \
+swt/org.argeo.cms \
+swt/rap/org.argeo.cms \
+$(A2_CATEGORY)
+
+NATIVE_PACKAGES= \
+org_argeo_api_uuid_libuuid
+
+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