Prepare next development cycle

[gpl/argeo-slc.git] / Makefile

diff --git a/Makefile b/Makefile
index d6bda7804bdc61f1076b9a960f1ba72186770191..562eba3bef7bb15f8a7fea4e44453fdb345bd536 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,89 +1,53 @@
 include sdk.mk
-.PHONY: clean all osgi
+.PHONY: clean all osgi jni
 
-all: osgi
-
-BUNDLE_PREFIX = org.argeo
-A2_CATEGORY = org.argeo
-
-BUNDLES = \
-org.argeo.slc.api \
-org.argeo.slc.build \
-
-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/commons-exec.jar:$\
-
-# 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)/%)
-
-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])
-
-osgi: cnf $(A2_BUNDLES)
-
-clean:
-       rm -rf $(BUILD_BASE)/*-compiled
-       rm -rf $(BUILD_BASE)/{cnf,a2}
-       rm -rf $(BUILD_BASE)/$(BUNDLE_PREFIX).* 
-
-# SDK level
-$(SDK_BUILD_BASE)/cnf/%.bnd: cnf/%.bnd
-       mkdir -p $(dir $@)
-       cp $< $@
+all: osgi-all
+       $(MAKE) -f Makefile-rcp.mk all
        
-$(SDK_BUILD_BASE)/eclipse/cnf/%.bnd: cnf/%.bnd
-       mkdir -p $(dir $@)
-       cp $< $@
+install: osgi-install
 
-$(SDK_BUILD_BASE)/rcp/cnf/%.bnd: cnf/%.bnd
-       mkdir -p $(dir $@)
-       cp $< $@
+uninstall: osgi-uninstall
 
-$(SDK_BUILD_BASE)/a2/$(A2_CATEGORY)/%.$(MAJOR).$(MINOR).jar : $(BUILD_BASE)/%/bundle.jar
-       mkdir -p $(dir $@)
-       cp $< $@
+#jni:
+#      $(MAKE) -C jni
 
-# 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
+A2_CATEGORY = org.argeo.slc
 
-$(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)))
-       
+BUNDLES = \
+org.argeo.api.slc \
+org.argeo.slc.runtime \
+org.argeo.slc.cms \
+org.argeo.rt.cms \
+lib/linux/org.argeo.slc.systemd \
+swt/org.argeo.cms.e4 \
+swt/rap/org.argeo.cms.e4.rap \
+swt/rap/org.argeo.tool.rap.cli \
+swt/rap/org.argeo.tool.server \
+
+DEP_CATEGORIES = \
+crypto/fips/org.argeo.tp.crypto \
+log/syslogger/org.argeo.tp \
+org.argeo.tp \
+org.argeo.tp.httpd \
+org.argeo.tp.sys \
+osgi/equinox/org.argeo.tp.osgi \
+osgi/equinox/org.argeo.tp.eclipse \
+swt/rap/org.argeo.tp.swt \
+swt/rap/org.argeo.tp.swt.workbench \
+org.argeo.cms \
+swt/org.argeo.cms \
+swt/rap/org.argeo.cms \
+$(A2_CATEGORY)
+
+NATIVE_PACKAGES= \
+org_argeo_api_uuid_libuuid
+
+clean: osgi-clean
+#      rm -rf $(BUILD_BASE)
+#      $(MAKE) -C jni clean
+       $(MAKE) -f Makefile-rcp.mk clean
+
+native-deps-debian:
+       sudo apt install uuid-dev
+
+include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
\ No newline at end of file