From 0251663f47915586f33510af4dfbf8a0d17025df Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 29 Jan 2022 12:30:48 +0100 Subject: [PATCH] Start making Makefile more generic --- Makefile | 162 ++++++++++++----------------------------- org.argeo.init/bnd.bnd | 2 +- rcp/Makefile | 26 +++++++ sdk/osgi.mk | 21 ++++++ 4 files changed, 96 insertions(+), 115 deletions(-) create mode 100644 rcp/Makefile create mode 100644 sdk/osgi.mk diff --git a/Makefile b/Makefile index 3f4dc3c67..6e6d5dbb5 100644 --- a/Makefile +++ b/Makefile @@ -1,19 +1,12 @@ include sdk.mk -.PHONY: clean all build-base build-rcp -#.PRECIOUS: $(SDK_BUILD_BASE)/%/bundle.jar +.PHONY: clean all osgi all: osgi jni -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.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 \ - -BASE_BUNDLES := \ +BUNDLE_PREFIX = org.argeo +A2_CATEGORY = org.argeo + +BUNDLES = \ org.argeo.init \ org.argeo.util \ org.argeo.api.uuid \ @@ -21,132 +14,73 @@ 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) +NATIVE_PROJECTS = \ +org.argeo.api.uuid/jni \ -osgi : $(A2_BASE_BUNDLES) +BUILD_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 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;) +# TODO relativize from SDK_SRC_BASE +BUILD_BASE = $(SDK_BUILD_BASE) + +# +# GENERIC +# JVM := /usr/lib/jvm/jre-11/bin/java ECJ_JAR := /usr/share/java/ecj/ecj.jar BND_TOOL := /usr/bin/bnd -WORKSPACE_BNDS := $(shell find cnf -name '*.bnd') +WORKSPACE_BNDS := $(shell cd $(SDK_SRC_BASE) && find cnf -name '*.bnd') BUILD_WORKSPACE_BNDS := $(WORKSPACE_BNDS:%=$(SDK_BUILD_BASE)/%) -JAVA_SRCS := $(shell find cnf -name '*.java') +cnf: $(BUILD_WORKSPACE_BNDS) +A2_BUNDLES = $(BUNDLES:%=$(SDK_BUILD_BASE)/a2/$(A2_CATEGORY)/%.$(MAJOR).$(MINOR).jar) -INTERMEDIATE_BASE_BUNDLES := $(BASE_BUNDLES:%=$(SDK_BUILD_BASE)/%/bundle.jar) +JAVA_SRCS = $(shell find $(BUNDLE_PREFIX).* -name '*.java') +ECJ_SRCS = $(foreach bundle, $(BUNDLES), $(bundle)/src[-d $(BUILD_BASE)/$(shell basename $(bundle))/bin]) -#bnd-workspace : $(BUILD_WORKSPACE_BNDS) +osgi: cnf $(A2_BUNDLES) -$(SDK_BUILD_BASE)/a2/org.argeo/%.$(MAJOR).$(MINOR).jar : $(SDK_BUILD_BASE)/%/bundle.jar +clean: + rm -rf $(BUILD_BASE)/*-compiled + rm -rf $(BUILD_BASE)/{cnf,a2} + rm -rf $(BUILD_BASE)/$(BUNDLE_PREFIX).* + $(foreach dir, $(NATIVE_PROJECTS), $(MAKE) -C $(dir) clean;) + +# SDK level +$(SDK_BUILD_BASE)/cnf/%.bnd: cnf/%.bnd mkdir -p $(dir $@) cp $< $@ +$(SDK_BUILD_BASE)/a2/$(A2_CATEGORY)/%.$(MAJOR).$(MINOR).jar : $(BUILD_BASE)/%/bundle.jar + mkdir -p $(dir $@) + cp $< $@ -$(A2_BASE_BUNDLES) : $(BUILD_WORKSPACE_BNDS) $(INTERMEDIATE_BASE_BUNDLES) -#$(BUILD_WORKSPACE_BNDS) : $(WORKSPACE_BNDS) - -$(SDK_BUILD_BASE)/%/bundle.jar : $(SDK_BUILD_BASE)/%/bnd.bnd $(SDK_BUILD_BASE)/base-java-compiled +# Build level +$(BUILD_BASE)/%/bundle.jar : %/bnd.bnd $(BUILD_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 $@) + 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 - - -$(SDK_BUILD_BASE)/cnf/%.bnd: $(SDK_SRC_BASE)/cnf/%.bnd - mkdir -p $(dir $@) - cp $< $@ -$(SDK_BUILD_BASE)/%.bnd: $(SDK_SRC_BASE)/%.bnd - mkdir -p $(dir $@) - cp $< $@ - - -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 - -$(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.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] \ - +$(BUILD_BASE)/java-compiled : $(JAVA_SRCS) + $(JVM) -jar $(ECJ_JAR) -11 -nowarn -time -cp $(BUILD_CLASSPATH) \ + $(ECJ_SRCS) touch $@ - -RCP_CLASSPATH=$(BASE_CLASSPATH):$\ -$(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:$\ -/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 - - -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_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] \ - -#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 - - diff --git a/org.argeo.init/bnd.bnd b/org.argeo.init/bnd.bnd index 5074d5d1b..3dbe6831b 100644 --- a/org.argeo.init/bnd.bnd +++ b/org.argeo.init/bnd.bnd @@ -5,4 +5,4 @@ Bundle-Activator: org.argeo.init.osgi.Activator Import-Package: \ org.osgi.*;version=0.0.0,\ -java.util.logging.*;resolution:=optional +java.util.logging;resolution:=optional diff --git a/rcp/Makefile b/rcp/Makefile new file mode 100644 index 000000000..f8931820e --- /dev/null +++ b/rcp/Makefile @@ -0,0 +1,26 @@ +RCP_CLASSPATH=$(BASE_CLASSPATH):$\ +$(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:$\ +/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 + + +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_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] \ diff --git a/sdk/osgi.mk b/sdk/osgi.mk new file mode 100644 index 000000000..5b27b0e3b --- /dev/null +++ b/sdk/osgi.mk @@ -0,0 +1,21 @@ + + + + +#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 + + -- 2.30.2