include sdk.mk
.PHONY: clean all build-base build-rcp
+#.PRECIOUS: $(SDK_BUILD_BASE)/%/bundle.jar
all: osgi jni
-BASE_BUNDLES := \
+OLD_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.cms.tp.$(MAJOR).$(MINOR).jar \
$(SDK_BUILD_BASE)/org.argeo.cms.$(MAJOR).$(MINOR).jar \
-
+BASE_BUNDLES := \
+org.argeo.init \
+org.argeo.util \
+org.argeo.api.uuid \
+org.argeo.api.acr \
+org.argeo.api.cms \
+org.argeo.cms.tp \
+org.argeo.cms \
+
NATIVE_PROJECTS = org.argeo.api.uuid/jni
+A2_BASE_BUNDLES := $(BASE_BUNDLES:%=$(SDK_BUILD_BASE)/a2/org.argeo/%.$(MAJOR).$(MINOR).jar)
+
+
+osgi : $(A2_BASE_BUNDLES)
+
jni:
$(foreach dir, $(NATIVE_PROJECTS), $(MAKE) -C $(dir);)
clean:
+ rm -rf $(SDK_BUILD_BASE)/*-compiled
+ rm -rf $(SDK_BUILD_BASE)/{cnf,a2}
+ rm -rf $(SDK_BUILD_BASE)/org.argeo.*
$(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)
+WORKSPACE_BNDS := $(shell find cnf -name '*.bnd')
+BUILD_WORKSPACE_BNDS := $(WORKSPACE_BNDS:%=$(SDK_BUILD_BASE)/%)
+
+JAVA_SRCS := $(shell find cnf -name '*.java')
+
-$(SDK_BUILD_BASE)/%.$(MAJOR).$(MINOR).jar : $(SDK_SRC_BASE)/*/generated/%.jar
- $(BND_TOOL) build $<
+INTERMEDIATE_BASE_BUNDLES := $(BASE_BUNDLES:%=$(SDK_BUILD_BASE)/%/bundle.jar)
+
+#bnd-workspace : $(BUILD_WORKSPACE_BNDS)
+
+$(SDK_BUILD_BASE)/a2/org.argeo/%.$(MAJOR).$(MINOR).jar : $(SDK_BUILD_BASE)/%/bundle.jar
+ mkdir -p $(dir $@)
cp $< $@
-$(SDK_SRC_BASE)/*/generated/*.jar : build-base
-#base-java-sources : $(shell find org.argeo.* -name '*.java')
+$(A2_BASE_BUNDLES) : $(BUILD_WORKSPACE_BNDS) $(INTERMEDIATE_BASE_BUNDLES)
+#$(BUILD_WORKSPACE_BNDS) : $(WORKSPACE_BNDS)
-#base-java-classes : $(shell find org.argeo.* -name '*.class')
+$(SDK_BUILD_BASE)/%/bundle.jar : $(SDK_BUILD_BASE)/%/bnd.bnd $(SDK_BUILD_BASE)/base-java-compiled
+ rsync -r --exclude "*.java" $(dir $<)src/ $(dir $@)bin
+ rsync -r $(dir $<)src/ $(dir $@)src
+ if [ -d "$(dir $<)OSGI-INF" ]; then rsync -r $(dir $<)OSGI-INF/ $(dir $@)/OSGI-INF; fi
+ #cp $< $(dir $@)
+ cd $(dir $@) && $(BND_TOOL) build
+ mv $(dir $@)generated/*.jar $(dir $@)bundle.jar
+# cat $(dir $@)/generated/*.jar > $(dir $@)/bundle.jar
+# rm -rf $(dir $@)/generated
-# 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)
+$(SDK_BUILD_BASE)/cnf/%.bnd: $(SDK_SRC_BASE)/cnf/%.bnd
+ mkdir -p $(dir $@)
+ cp $< $@
-# convert dir to package
-#$(shell find %/src -mindepth 1 -type d -printf '%P\n' | sed "s/\//\./g")
+$(SDK_BUILD_BASE)/%.bnd: $(SDK_SRC_BASE)/%.bnd
+ mkdir -p $(dir $@)
+ cp $< $@
-# 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=\
+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/commons-httpclient3.jar:$\
/usr/share/java/postgresql-jdbc.jar
-build-base:
+$(SDK_BUILD_BASE)/base-java-compiled : $(JAVA_SRCS)
$(JVM) -jar $(ECJ_JAR) -11 -nowarn -time -cp $(BASE_CLASSPATH) \
$(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.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
+ touch $@
RCP_CLASSPATH=$(BASE_CLASSPATH):$\
$(SDK_BUILD_BASE)/org.argeo.api.uuid/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] \
+#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
+