X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=Makefile;h=497de15b0e1e2a03e0dc816b00669a25920a1fff;hb=HEAD;hp=1145dde26b1bc838c6e7235bf80dfed3843bed1e;hpb=cd9c92edd861a4af57713284ba796186a5505dd2;p=lgpl%2Fargeo-commons.git

diff --git a/Makefile b/Makefile
index 1145dde26..497de15b0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,98 +1,57 @@
 include sdk.mk
 
-MAKEDIRS = org.argeo.api.uuid
-
-BUILD_BASE := generated
-
-BASE_BUNDLES := $(BUILD_BASE)/org.argeo.api.uuid.$(MAJOR).$(MINOR).jar 
-
-.PHONY: clean all build-base build-rcp
-all: build-base
-	$(foreach dir, $(MAKEDIRS), $(MAKE) -C $(dir);)
+A2_CATEGORY = org.argeo.cms
+
+BUNDLES = \
+org.argeo.init \
+org.argeo.api.uuid \
+org.argeo.api.register \
+org.argeo.api.acr \
+org.argeo.api.cms \
+org.argeo.cms \
+org.argeo.cms.ux \
+org.argeo.cms.jshell \
+org.argeo.cms.lib.json \
+org.argeo.cms.lib.jetty \
+org.argeo.cms.lib.dbus \
+org.argeo.cms.lib.sshd \
+org.argeo.cms.ee \
+org.argeo.cms.cli \
+osgi/equinox/org.argeo.cms.lib.equinox \
+swt/org.argeo.swt.minidesktop \
+swt/org.argeo.cms.swt \
+swt/rap/org.argeo.swt.specific.rap \
+swt/rap/org.argeo.cms.swt.rap \
+
+DEP_CATEGORIES = \
+crypto/fips/org.argeo.tp.crypto \
+org.argeo.tp \
+org.argeo.tp.httpd \
+org.argeo.tp.sshd \
+osgi/equinox/org.argeo.tp.osgi \
+osgi/equinox/org.argeo.tp.eclipse \
+swt/rap/org.argeo.tp.swt \
+$(A2_CATEGORY) \
+swt/$(A2_CATEGORY) \
+swt/rap/$(A2_CATEGORY) \
+
+JAVADOC_PACKAGES =  \
+org.argeo.api.uuid \
+org.argeo.api.acr \
+org.argeo.api.cms
+
+all: osgi-all
+	$(MAKE) -f Makefile-rcp.mk all
 	
-clean:
-	$(foreach dir, $(MAKEDIRS), $(MAKE) -C $(dir) clean;)
-
-
-
-
-JVM := /usr/lib/jvm/jre-11/bin/java
-ECJ_JAR := /usr/share/java/ecj/ecj.jar
-BND_TOOL := /usr/bin/bnd
-
-#osgi : $(BASE_BUNDLES)
-
-#$(BUILD_BASE)/%.$(MAJOR).$(MINOR).jar : $(SDK_SRC_BASE)/%
-#	$(BND_TOOL) build $<
-#	cp $</generated/$<.jar $@
-
-#base-java-sources : $(shell find org.argeo.* -name '*.java') 
-
-#base-java-classes : $(shell find org.argeo.* -name '*.class') 
-
-# each dir depends on its package directories
-#$(SDK_SRC_BASE)/% : $(shell  find */src -type f  | sed "s%/[^/]*$%%" | sort -u)
-
-# non empty package dirs
-#$(SDK_SRC_BASE)/*/src/% : $(shell  grep --no-filename ^import '%/*.java' | sed 's/import //g' | sed 's/static //g' | sed 's/\.[A-Za-z0-9_]*;//' | sed 's/\.[A-Z].*//'  | sort |  uniq)
-
-# convert dir to package
-#$(shell find %/src -mindepth 1 -type d -printf '%P\n' | sed "s/\//\./g")
-
-# all packages
-# grep --no-filename ^import src/org/argeo/api/uuid/*.java | sed "s/import //g" | sed "s/static //g" | sed "s/\.[A-Za-z0-9_]*;//" | sed "s/\.[A-Z].*//"  | sort |  uniq
-
-BASE_CLASSPATH=\
-/usr/share/java/osgi-core/osgi.core.jar:$\
-/usr/share/java/osgi-compendium/osgi.cmpn.jar:$\
-/usr/share/java/ecj/ecj.jar:$\
-/usr/share/java/aqute-bnd/biz.aQute.bndlib.jar:$\
-/usr/share/java/slf4j/api.jar:$\
-/usr/share/java/commons-io.jar:$\
-/usr/share/java/commons-cli.jar:$\
-/usr/share/java/bcprov.jar:$\
-/usr/share/java/bcpkix.jar:$\
-/usr/share/java/commons-httpclient3.jar:$\
-/usr/share/java/postgresql-jdbc.jar
-
-build-base:
-	$(JVM) -jar $(ECJ_JAR) -11 -nowarn -time -cp $(BASE_CLASSPATH) \
-	$(SDK_SRC_BASE)/org.argeo.api.uuid/src[-d $(SDK_SRC_BASE)/org.argeo.api.uuid/bin] \
-	$(SDK_SRC_BASE)/org.argeo.api.acr/src[-d $(SDK_SRC_BASE)/org.argeo.api.acr/bin] \
-	$(SDK_SRC_BASE)/org.argeo.api.cms/src[-d $(SDK_SRC_BASE)/org.argeo.api.cms/bin] \
-	$(SDK_SRC_BASE)/org.argeo.init/src[-d $(SDK_SRC_BASE)/org.argeo.init/bin] \
-	$(SDK_SRC_BASE)/org.argeo.util/src[-d $(SDK_SRC_BASE)/org.argeo.util/bin] \
-	$(SDK_SRC_BASE)/org.argeo.cms.tp/src[-d $(SDK_SRC_BASE)/org.argeo.cms.tp/bin] \
-	$(SDK_SRC_BASE)/org.argeo.cms/src[-d $(SDK_SRC_BASE)/org.argeo.cms/bin] \
-	$(SDK_SRC_BASE)/org.argeo.cms.pgsql/src[-d $(SDK_SRC_BASE)/org.argeo.cms.pgsql/bin] \
-	
-	$(BND_TOOL) build
-
-RCP_CLASSPATH=$(BASE_CLASSPATH):$\
-$(SDK_SRC_BASE)/org.argeo.api.uuid/bin:$\
-$(SDK_SRC_BASE)/org.argeo.api.acr/bin:$\
-$(SDK_SRC_BASE)/org.argeo.api.cms/bin:$\
-$(SDK_SRC_BASE)/org.argeo.util/bin:$\
-$(SDK_SRC_BASE)/org.argeo.cms/bin:$\
-/usr/share/java/tomcat-servlet-api.jar:$\
-/usr/share/java/eclipse/equinox.http.jetty.jar:$\
-/usr/lib/java/swt.jar:$\
-/usr/lib/eclipse/plugins/org.eclipse.swt.gtk.linux.x86_64_3.116.0.v20210304-1735:$\
-/usr/lib/eclipse/plugins/org.eclipse.e4.ui.css.core_0.13.0.v20210304-1735.jar:$\
-/usr/lib/eclipse/plugins/org.eclipse.e4.ui.css.swt_0.14.100.v20210304-1735.jar:$\
-/usr/lib/eclipse/plugins/org.eclipse.e4.ui.css.swt.theme_0.13.0.v20210304-1735.jar:$\
-/usr/lib/eclipse/plugins/org.eclipse.jface_3.22.100.v20210304-1735.jar:$\
-/usr/lib/eclipse/plugins/org.eclipse.core.commands_3.9.800.v20210304-1735.jar:$\
-/usr/share/java/eclipse/equinox.common.jar:$\
-/usr/share/java/sac.jar
+clean: osgi-clean
+	$(MAKE) -f Makefile-rcp.mk clean
 
+install: osgi-install
+	$(MAKE) -f Makefile-rcp.mk install
 
-build-rcp: build-base
-	$(JVM) -jar $(ECJ_JAR) -11 -nowarn -time -cp $(RCP_CLASSPATH) \
-	$(SDK_SRC_BASE)/eclipse/org.argeo.cms.servlet/src[-d $(SDK_SRC_BASE)/eclipse/org.argeo.cms.servlet/bin] \
-	$(SDK_SRC_BASE)/rcp/org.argeo.swt.minidesktop/src[-d $(SDK_SRC_BASE)/rcp/org.argeo.swt.minidesktop/bin] \
-	$(SDK_SRC_BASE)/rcp/org.argeo.swt.specific.rcp/src[-d $(SDK_SRC_BASE)/rcp/org.argeo.swt.specific.rcp/bin] \
-	$(SDK_SRC_BASE)/eclipse/org.argeo.cms.swt/src[-d $(SDK_SRC_BASE)/eclipse/org.argeo.cms.swt/bin] \
-	$(SDK_SRC_BASE)/rcp/org.argeo.cms.ui.rcp/src[-d $(SDK_SRC_BASE)/rcp/org.argeo.cms.ui.rcp/bin] \
+uninstall: osgi-uninstall
+	$(MAKE) -f Makefile-rcp.mk uninstall
 
+include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
 
+.PHONY: clean all install uninstall