X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=Makefile;h=82dcf494b5e24bf0464edb1702a9d3745993d53a;hb=9e809d77cebd3e037ccac97e3b4a4d1d639ce2e8;hp=daa8e29387926f3c9efac193bbf9f56af50a6a25;hpb=9d7afbd488afb0c7e4e1cdc0e4282e0194a6d372;p=lgpl%2Fargeo-commons.git diff --git a/Makefile b/Makefile index daa8e2938..82dcf494b 100644 --- a/Makefile +++ b/Makefile @@ -1,58 +1,30 @@ include sdk.mk -.PHONY: clean all build-base build-rcp +.PHONY: clean all osgi all: osgi jni -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 \ - - -NATIVE_PROJECTS = org.argeo.api.uuid/jni - -jni: - $(foreach dir, $(NATIVE_PROJECTS), $(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=\ +BUNDLE_PREFIX = org.argeo +A2_CATEGORY = org.argeo + +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 \ +org.argeo.cms.pgsql \ +eclipse/org.argeo.cms.servlet \ +rcp/org.argeo.swt.minidesktop \ +rcp/org.argeo.swt.specific.rcp \ +eclipse/org.argeo.cms.swt \ +rcp/org.argeo.cms.ui.rcp \ + +NATIVE_PROJECTS = \ +org.argeo.api.uuid/jni \ + +BUILD_CLASSPATH = \ /usr/share/java/osgi-core/osgi.core.jar:$\ /usr/share/java/osgi-compendium/osgi.cmpn.jar:$\ /usr/share/java/ecj/ecj.jar:$\ @@ -63,27 +35,7 @@ BASE_CLASSPATH=\ /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_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_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/postgresql-jdbc.jar:$\ /usr/share/java/tomcat-servlet-api.jar:$\ /usr/share/java/eclipse/equinox.http.jetty.jar:$\ /usr/lib/java/swt.jar:$\ @@ -94,15 +46,92 @@ $(SDK_BUILD_BASE)/org.argeo.cms/bin:$\ /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 +/usr/share/java/sac.jar:$\ + +JAVADOC_BUNDLES = \ +org.argeo.api.uuid \ +org.argeo.api.acr \ +org.argeo.api.cms + +JAVADOC_PACKAGES = \ +org.argeo.api.uuid \ +org.argeo.api.acr \ +org.argeo.api.cms -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] \ +jni: + $(foreach dir, $(NATIVE_PROJECTS), $(MAKE) -C $(dir);) + +# TODO relativize from SDK_SRC_BASE +BUILD_BASE = $(SDK_BUILD_BASE) + +# +# GENERIC +# +JVM := /usr/lib/jvm/jre-11/bin/java +JAVADOC := /usr/lib/jvm/jre-11/bin/javadoc +ECJ_JAR := /usr/share/java/ecj/ecj.jar +BND_TOOL := /usr/bin/bnd +WORKSPACE_BNDS := $(shell cd $(SDK_SRC_BASE) && find cnf -name '*.bnd') +#BND_WORKSPACES := $(foreach bundle, $(BUNDLES), ./$(dir $(bundle))) +BUILD_WORKSPACE_BNDS := $(WORKSPACE_BNDS:%=$(SDK_BUILD_BASE)/%) $(WORKSPACE_BNDS:%=$(SDK_BUILD_BASE)/eclipse/%) $(WORKSPACE_BNDS:%=$(SDK_BUILD_BASE)/rcp/%) +cnf: $(BUILD_WORKSPACE_BNDS) + +A2_BUNDLES = $(BUNDLES:%=$(SDK_BUILD_BASE)/a2/$(A2_CATEGORY)/%.$(MAJOR).$(MINOR).jar) + +#JAVA_SRCS = $(shell find $(BUNDLE_PREFIX).* -name '*.java') +JAVA_SRCS = $(foreach bundle, $(BUNDLES), $(shell find $(bundle) -name '*.java')) +ECJ_SRCS = $(foreach bundle, $(BUNDLES), $(bundle)/src[-d $(BUILD_BASE)/$(bundle)/bin]) + +JAVADOC_SRCS = $(foreach bundle, $(JAVADOC_BUNDLES),$(bundle)/src) + +osgi: cnf $(A2_BUNDLES) + +javadoc: $(BUILD_BASE)/java-compiled + $(JAVADOC) -d $(SDK_BUILD_BASE)/api --source-path $(subst $(space),$(pathsep),$(strip $(JAVADOC_SRCS))) -subpackages $(JAVADOC_PACKAGES) + +clean: + rm -rf $(BUILD_BASE)/*-compiled + rm -rf $(BUILD_BASE)/{cnf,a2} + rm -rf $(BUILD_BASE)/$(BUNDLE_PREFIX).* $(BUILD_BASE)/eclipse $(BUILD_BASE)/rcp + $(foreach dir, $(NATIVE_PROJECTS), $(MAKE) -C $(dir) clean;) + +# SDK level +$(SDK_BUILD_BASE)/cnf/%.bnd: cnf/%.bnd + mkdir -p $(dir $@) + cp $< $@ + +$(SDK_BUILD_BASE)/eclipse/cnf/%.bnd: cnf/%.bnd + mkdir -p $(dir $@) + cp $< $@ + +$(SDK_BUILD_BASE)/rcp/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 $< $@ + +# 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 $@) + cd $(dir $@) && $(BND_TOOL) build + mv $(dir $@)generated/*.jar $(dir $@)bundle.jar + +$(BUILD_BASE)/java-compiled : $(JAVA_SRCS) + $(JVM) -jar $(ECJ_JAR) -11 -nowarn -time -cp $(BUILD_CLASSPATH) \ + $(ECJ_SRCS) + touch $@ + +null := +space := $(null) # +pathsep := : + +#WITH_LIST := $(subst $(space),$(pathsep),$(strip $(WITH_LIST))) +