From: Mathieu Baudier Date: Sat, 26 Feb 2022 10:33:11 +0000 (+0100) Subject: Remove old build scripts X-Git-Tag: v2.3.6~5 X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=93c59ef275b84d75563648eaf2877fb6c3ce1f33 Remove old build scripts --- diff --git a/cnf/argeo.bnd b/cnf/argeo.bnd deleted file mode 100644 index 22ed0df6b..000000000 --- a/cnf/argeo.bnd +++ /dev/null @@ -1,14 +0,0 @@ -# Common -Bundle-Version: ${version.released}${qualifier} -Private-Package: *.internal.* -Export-Package: !*.internal.*, * -#-consumer-policy : ${range;[==,=+)} --contract: !JavaServlet,* --savemanifest : META-INF/MANIFEST.MF --includeresource.default : bin,OSGI-INF/=-OSGI-INF/,e4xmi/=-e4xmi/,icons/=-icons/,img/=-img/ --compression STORE --source true --removeheaders = Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By -Automatic-Module-Name: ${bsn} -SLC-Category=${category} --groupid=${category} diff --git a/cnf/maven.bnd b/cnf/maven.bnd deleted file mode 100644 index f3a6e83cf..000000000 --- a/cnf/maven.bnd +++ /dev/null @@ -1,3 +0,0 @@ --include: \ -../cnf/argeo.bnd, \ -../cnf/unstable.bnd diff --git a/sdk/ecj.args b/sdk/ecj.args deleted file mode 100644 index 852a33d4a..000000000 --- a/sdk/ecj.args +++ /dev/null @@ -1,4 +0,0 @@ --source 17 --target 11 --nowarn --time \ No newline at end of file diff --git a/sdk/excludes.txt b/sdk/excludes.txt deleted file mode 100644 index 3f5b4e501..000000000 --- a/sdk/excludes.txt +++ /dev/null @@ -1,8 +0,0 @@ -src -target -.* -bnd.bnd -pom.xml -build.properties -bin -generated \ No newline at end of file diff --git a/sdk/osgi.mk b/sdk/osgi.mk deleted file mode 100644 index bf578ef14..000000000 --- a/sdk/osgi.mk +++ /dev/null @@ -1,68 +0,0 @@ - - -# -# GENERIC -# -JVM := $(JAVA_HOME)/bin/java -JAVADOC := $(JAVA_HOME)/bin/javadoc -ECJ_JAR := $(A2_BASE)/org.argeo.tp.sdk/org.eclipse.jdt.core.compiler.batch.3.28.jar -BND_TOOL := /usr/bin/bnd - -BUILD_BASE = $(SDK_BUILD_BASE)/$(A2_CATEGORY) - -WORKSPACE_BNDS := $(shell cd $(SDK_SRC_BASE) && find cnf -name '*.bnd') -BUILD_WORKSPACE_BNDS := $(WORKSPACE_BNDS:%=$(BUILD_BASE)/%) - -A2_JARS = $(foreach category, $(DEP_CATEGORIES), $(shell find $(A2_BASE)/$(category) -name '*.jar')) -A2_CLASSPATH = $(subst $(space),$(pathsep),$(strip $(A2_JARS))) - -A2_BUNDLES = $(foreach bundle, $(BUNDLES),$(A2_OUTPUT)/$(A2_CATEGORY)/$(shell basename $(bundle)).$(MAJOR).$(MINOR).jar) - -JAVA_SRCS = $(foreach bundle, $(BUNDLES), $(shell find $(bundle) -name '*.java')) -BNDS = $(foreach bundle, $(BUNDLES), $(BUILD_BASE)/$(shell basename $(bundle))/bnd.bnd) -ECJ_SRCS = $(foreach bundle, $(BUNDLES), $(bundle)/src[-d $(BUILD_BASE)/$(shell basename $(bundle))/bin]) - -JAVADOC_SRCS = $(foreach bundle, $(JAVADOC_BUNDLES),$(bundle)/src) - -osgi: $(BUILD_WORKSPACE_BNDS) $(A2_BUNDLES) - -javadoc: $(BUILD_BASE)/java-compiled - $(JAVADOC) -d $(BUILD_BASE)/api --source-path $(subst $(space),$(pathsep),$(strip $(JAVADOC_SRCS))) -subpackages $(JAVADOC_PACKAGES) - - -# SDK level -$(BUILD_BASE)/cnf/%.bnd: cnf/%.bnd - mkdir -p $(dir $@) - cp $< $@ - -$(A2_OUTPUT)/$(A2_CATEGORY)/%.$(MAJOR).$(MINOR).jar : $(BUILD_BASE)/%.jar - mkdir -p $(dir $@) - cp $< $@ - -$(BUILD_BASE)/%.jar: $(BUILD_BASE)/jars-built - mv $(basename $@)/generated/*.jar $(basename $@).jar - -# Build level -$(BUILD_BASE)/jars-built: $(BNDS) - cd $(BUILD_BASE) && $(BND_TOOL) build - touch $@ - -$(BUILD_BASE)/%/bnd.bnd : %/bnd.bnd $(BUILD_BASE)/java-compiled - mkdir -p $(dir $@)bin - rsync -r --exclude "*.java" $(dir $<)src/ $(dir $@)bin - rsync -r --exclude-from $(SDK_SRC_BASE)/sdk/excludes.txt $(dir $<) $(dir $@)bin - if [ -d "$(dir $<)OSGI-INF" ]; then rsync -r $(dir $<)OSGI-INF/ $(dir $@)/OSGI-INF; fi - cp $< $@ - echo "\n-sourcepath:$(SDK_SRC_BASE)/$(dir $<)src\n" >> $@ - -$(BUILD_BASE)/java-compiled : $(JAVA_SRCS) - $(JVM) -jar $(ECJ_JAR) @$(SDK_SRC_BASE)/sdk/ecj.args -cp $(A2_CLASSPATH) $(ECJ_SRCS) - touch $@ - -# Local manifests -manifests : osgi - $(foreach bundle, $(BUNDLES), cp -v $(BUILD_BASE)/$(shell basename $(bundle))/META-INF/MANIFEST.MF $(bundle)/META-INF/MANIFEST.MF;) - -null := -space := $(null) # -pathsep := :