X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=blobdiff_plain;f=Makefile;h=8c15c13072eab1e3b7760e395d3e2335a28fae0e;hp=3f4dc3c67b3f0f3509d435cf5753ce7d0c7833d0;hb=4b524aca3798d121e67eaf84842a8de8f056cc0d;hpb=440389217546979193b60acdf973a40abac50747 diff --git a/Makefile b/Makefile index 3f4dc3c67..8c15c1307 100644 --- a/Makefile +++ b/Makefile @@ -1,152 +1,54 @@ include sdk.mk -.PHONY: clean all build-base build-rcp -#.PRECIOUS: $(SDK_BUILD_BASE)/%/bundle.jar +.PHONY: clean all osgi -all: osgi jni +all: osgi + $(MAKE) -f Makefile-rcp.mk all -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 := \ +A2_CATEGORY = org.argeo.cms + +BUNDLES = \ org.argeo.init \ -org.argeo.util \ org.argeo.api.uuid \ +org.argeo.api.register \ org.argeo.api.acr \ +org.argeo.api.cli \ 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) +org.argeo.cms.ux \ +org.argeo.cms.ee \ +org.argeo.cms.lib.jetty \ +org.argeo.cms.lib.dbus \ +org.argeo.cms.lib.sshd \ +org.argeo.cms.cli \ +osgi/equinox/org.argeo.cms.lib.equinox \ +swt/org.argeo.swt.minidesktop \ +swt/org.argeo.cms.swt \ +swt/org.argeo.cms.e4 \ +swt/rap/org.argeo.swt.specific.rap \ +swt/rap/org.argeo.cms.swt.rap \ +swt/rap/org.argeo.cms.e4.rap \ + +DEP_CATEGORIES = \ +org.argeo.tp \ +org.argeo.tp.crypto \ +org.argeo.tp.jetty \ +osgi/api/org.argeo.tp.osgi \ +osgi/equinox/org.argeo.tp.eclipse \ +swt/rap/org.argeo.tp.swt \ +swt/rap/org.argeo.tp.swt.workbench \ +$(A2_CATEGORY) \ +swt/$(A2_CATEGORY) \ +swt/rap/$(A2_CATEGORY) \ + +JAVADOC_PACKAGES = \ +org.argeo.api.uuid \ +org.argeo.api.acr \ +org.argeo.api.cms -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;) - -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') -BUILD_WORKSPACE_BNDS := $(WORKSPACE_BNDS:%=$(SDK_BUILD_BASE)/%) - -JAVA_SRCS := $(shell find cnf -name '*.java') - - -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 $< $@ - - -$(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 - 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 - - -$(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] \ - - 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 + rm -rf $(BUILD_BASE) + $(MAKE) -f Makefile-rcp.mk clean +A2_BUNDLES_CLASSPATH = $(subst $(space),$(pathsep),$(strip $(A2_BUNDLES))) +include $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk \ No newline at end of file