X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=Makefile;h=daa8e29387926f3c9efac193bbf9f56af50a6a25;hb=9d7afbd488afb0c7e4e1cdc0e4282e0194a6d372;hp=21af0b9d0cc5334ca8f3dcd42e50f82314623329;hpb=633a8acd189cc22f06944d278879601189be1bc8;p=lgpl%2Fargeo-commons.git

diff --git a/Makefile b/Makefile
index 21af0b9d0..daa8e2938 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,56 @@
 include sdk.mk
+.PHONY: clean all build-base build-rcp
 
-MAKEDIRS = org.argeo.api.uuid
+all: osgi jni
 
-BUILD_BASE=generated
+BASE_BUNDLES := \
+$(SDK_BUILD_BASE)/org.argeo.init.$(MAJOR).$(MINOR).jar \
+$(SDK_BUILD_BASE)/org.argeo.util.$(MAJOR).$(MINOR).jar \
+$(SDK_BUILD_BASE)/org.argeo.api.uuid.$(MAJOR).$(MINOR).jar \
+$(SDK_BUILD_BASE)/org.argeo.api.acr.$(MAJOR).$(MINOR).jar \
+$(SDK_BUILD_BASE)/org.argeo.api.cms.$(MAJOR).$(MINOR).jar \
+$(SDK_BUILD_BASE)/org.argeo.cms.tp.$(MAJOR).$(MINOR).jar \
+$(SDK_BUILD_BASE)/org.argeo.cms.$(MAJOR).$(MINOR).jar \
+ 
 
-.PHONY: clean all base rcp
-all: base
-	$(foreach dir, $(MAKEDIRS), $(MAKE) -C $(dir);)
+NATIVE_PROJECTS = org.argeo.api.uuid/jni
+
+jni:
+	$(foreach dir, $(NATIVE_PROJECTS), $(MAKE) -C $(dir);)
 	
 clean:
-	$(foreach dir, $(MAKEDIRS), $(MAKE) -C $(dir) clean;)
+	$(foreach dir, $(NATIVE_PROJECTS), $(MAKE) -C $(dir) clean;)
+	rm -rf $(SDK_BUILD_BASE)/*
+
 
 
 JVM := /usr/lib/jvm/jre-11/bin/java
 ECJ_JAR := /usr/share/java/ecj/ecj.jar
+BND_TOOL := /usr/bin/bnd
+
+osgi : $(BASE_BUNDLES)
+
+$(SDK_BUILD_BASE)/%.$(MAJOR).$(MINOR).jar : $(SDK_SRC_BASE)/*/generated/%.jar
+	$(BND_TOOL) build $<
+	cp $< $@
+
+$(SDK_SRC_BASE)/*/generated/*.jar : build-base
+
+#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:$\
@@ -28,24 +65,25 @@ BASE_CLASSPATH=\
 /usr/share/java/commons-httpclient3.jar:$\
 /usr/share/java/postgresql-jdbc.jar
 
-base: 
+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] \
-
+	$(SDK_SRC_BASE)/org.argeo.api.uuid/src[-d $(SDK_BUILD_BASE)/org.argeo.api.uuid/bin] \
+	$(SDK_SRC_BASE)/org.argeo.api.acr/src[-d $(SDK_BUILD_BASE)/org.argeo.api.acr/bin] \
+	$(SDK_SRC_BASE)/org.argeo.api.cms/src[-d $(SDK_BUILD_BASE)/org.argeo.api.cms/bin] \
+	$(SDK_SRC_BASE)/org.argeo.init/src[-d $(SDK_BUILD_BASE)/org.argeo.init/bin] \
+	$(SDK_SRC_BASE)/org.argeo.util/src[-d $(SDK_BUILD_BASE)/org.argeo.util/bin] \
+	$(SDK_SRC_BASE)/org.argeo.cms.tp/src[-d $(SDK_BUILD_BASE)/org.argeo.cms.tp/bin] \
+	$(SDK_SRC_BASE)/org.argeo.cms/src[-d $(SDK_BUILD_BASE)/org.argeo.cms/bin] \
+	$(SDK_SRC_BASE)/org.argeo.cms.pgsql/src[-d $(SDK_BUILD_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:$\
+$(SDK_BUILD_BASE)/org.argeo.api.uuid/bin:$\
+$(SDK_BUILD_BASE)/org.argeo.api.acr/bin:$\
+$(SDK_BUILD_BASE)/org.argeo.api.cms/bin:$\
+$(SDK_BUILD_BASE)/org.argeo.util/bin:$\
+$(SDK_BUILD_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:$\
@@ -59,12 +97,12 @@ $(SDK_SRC_BASE)/org.argeo.cms/bin:$\
 /usr/share/java/sac.jar
 
 
-rcp: base
+build-rcp: build-base
 	$(JVM) -jar $(ECJ_JAR) -11 -nowarn -time -cp $(RCP_CLASSPATH) \
-	$(SDK_SRC_BASE)/org.argeo.cms.servlet/src[-d $(SDK_SRC_BASE)/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)/org.argeo.cms.swt/src[-d $(SDK_SRC_BASE)/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] \
+	$(SDK_SRC_BASE)/eclipse/org.argeo.cms.servlet/src[-d $(SDK_BUILD_BASE)/eclipse/org.argeo.cms.servlet/bin] \
+	$(SDK_SRC_BASE)/rcp/org.argeo.swt.minidesktop/src[-d $(SDK_BUILD_BASE)/rcp/org.argeo.swt.minidesktop/bin] \
+	$(SDK_SRC_BASE)/rcp/org.argeo.swt.specific.rcp/src[-d $(SDK_BUILD_BASE)/rcp/org.argeo.swt.specific.rcp/bin] \
+	$(SDK_SRC_BASE)/eclipse/org.argeo.cms.swt/src[-d $(SDK_BUILD_BASE)/eclipse/org.argeo.cms.swt/bin] \
+	$(SDK_SRC_BASE)/rcp/org.argeo.cms.ui.rcp/src[-d $(SDK_BUILD_BASE)/rcp/org.argeo.cms.ui.rcp/bin] \