This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository bnd.
commit 0bea2dad55da2dc73d343df3aaf3b842fbd25742 Author: 殷啟聰 | Kai-Chung Yan <seamli...@gmail.com> Date: Sat Mar 3 13:46:17 2018 +0800 d/rules: Fix the rules for correctly building this release --- debian/bnd.poms | 19 +++++- debian/pom-annotation.xml | 25 -------- debian/pom-bnd.xml | 53 --------------- debian/pom-bndlib.xml | 48 -------------- debian/rules | 160 +++++++++++++++++----------------------------- 5 files changed, 76 insertions(+), 229 deletions(-) diff --git a/debian/bnd.poms b/debian/bnd.poms index e61290e..bd3d013 100644 --- a/debian/bnd.poms +++ b/debian/bnd.poms @@ -1,3 +1,16 @@ -debian/pom-bnd.xml --has-package-version --java-lib --no-parent -debian/pom-bndlib.xml --has-package-version --java-lib --no-parent -debian/pom-annotation.xml --has-package-version --java-lib --no-parent +debian/.m2/biz/aQute/bnd/aQute.libg/3.5.0/aQute.libg-3.5.0.pom --java-lib --artifact=debian/.m2/biz/aQute/bnd/aQute.libg/3.5.0/aQute.libg-3.5.0.jar +debian/.m2/biz/aQute/bnd/biz.aQute.bnd.annotation/3.5.0/biz.aQute.bnd.annotation-3.5.0.pom --java-lib --artifact=debian/.m2/biz/aQute/bnd/biz.aQute.bnd.annotation/3.5.0/biz.aQute.bnd.annotation-3.5.0.jar --relocate=biz.aQute:annotation:debian +debian/.m2/biz/aQute/bnd/biz.aQute.bnd/3.5.0/biz.aQute.bnd-3.5.0.pom --java-lib --artifact=debian/.m2/biz/aQute/bnd/biz.aQute.bnd/3.5.0/biz.aQute.bnd-3.5.0.jar --relocate=biz.aQute:bnd:debian +debian/.m2/biz/aQute/bnd/biz.aQute.bndlib/3.5.0/biz.aQute.bndlib-3.5.0.pom --java-lib --artifact=debian/.m2/biz/aQute/bnd/biz.aQute.bndlib/3.5.0/biz.aQute.bndlib-3.5.0.jar --relocate=biz.aQute:bndlib:debian +debian/.m2/biz/aQute/bnd/biz.aQute.junit/3.5.0/biz.aQute.junit-3.5.0.pom --java-lib --artifact=debian/.m2/biz/aQute/bnd/biz.aQute.junit/3.5.0/biz.aQute.junit-3.5.0.jar +debian/.m2/biz/aQute/bnd/biz.aQute.launcher/3.5.0/biz.aQute.launcher-3.5.0.pom --java-lib --artifact=debian/.m2/biz/aQute/bnd/biz.aQute.launcher/3.5.0/biz.aQute.launcher-3.5.0.jar +debian/.m2/biz/aQute/bnd/biz.aQute.remote.agent/3.5.0/biz.aQute.remote.agent-3.5.0.pom --java-lib --artifact=debian/.m2/biz/aQute/bnd/biz.aQute.remote.agent/3.5.0/biz.aQute.remote.agent-3.5.0.jar +debian/.m2/biz/aQute/bnd/biz.aQute.remote.api/3.5.0/biz.aQute.remote.api-3.5.0.pom --java-lib --artifact=debian/.m2/biz/aQute/bnd/biz.aQute.remote.api/3.5.0/biz.aQute.remote.api-3.5.0.jar +debian/.m2/biz/aQute/bnd/biz.aQute.remote.gc/3.5.0/biz.aQute.remote.gc-3.5.0.pom --java-lib --artifact=debian/.m2/biz/aQute/bnd/biz.aQute.remote.gc/3.5.0/biz.aQute.remote.gc-3.5.0.jar +debian/.m2/biz/aQute/bnd/biz.aQute.remote.launcher/3.5.0/biz.aQute.remote.launcher-3.5.0.pom --java-lib --artifact=debian/.m2/biz/aQute/bnd/biz.aQute.remote.launcher/3.5.0/biz.aQute.remote.launcher-3.5.0.jar +debian/.m2/biz/aQute/bnd/biz.aQute.remote.main/3.5.0/biz.aQute.remote.main-3.5.0.pom --java-lib --artifact=debian/.m2/biz/aQute/bnd/biz.aQute.remote.main/3.5.0/biz.aQute.remote.main-3.5.0.jar +debian/.m2/biz/aQute/bnd/biz.aQute.repository/3.5.0/biz.aQute.repository-3.5.0.pom --java-lib --artifact=debian/.m2/biz/aQute/bnd/biz.aQute.repository/3.5.0/biz.aQute.repository-3.5.0.jar +debian/.m2/biz/aQute/bnd/biz.aQute.resolve/3.5.0/biz.aQute.resolve-3.5.0.pom --java-lib --artifact=debian/.m2/biz/aQute/bnd/biz.aQute.resolve/3.5.0/biz.aQute.resolve-3.5.0.jar +debian/.m2/biz/aQute/bnd/biz.aQute.tester/3.5.0/biz.aQute.tester-3.5.0.pom --java-lib --artifact=debian/.m2/biz/aQute/bnd/biz.aQute.tester/3.5.0/biz.aQute.tester-3.5.0.jar +debian/.m2/biz/aQute/bnd/org.osgi.impl.bundle.repoindex.api/3.5.0/org.osgi.impl.bundle.repoindex.api-3.5.0.pom --java-lib --artifact=debian/.m2/biz/aQute/bnd/org.osgi.impl.bundle.repoindex.api/3.5.0/org.osgi.impl.bundle.repoindex.api-3.5.0.jar +debian/.m2/biz/aQute/bnd/org.osgi.impl.bundle.repoindex.lib/3.5.0/org.osgi.impl.bundle.repoindex.lib-3.5.0.pom --java-lib --artifact=debian/.m2/biz/aQute/bnd/org.osgi.impl.bundle.repoindex.lib/3.5.0/org.osgi.impl.bundle.repoindex.lib-3.5.0.jar diff --git a/debian/pom-annotation.xml b/debian/pom-annotation.xml deleted file mode 100644 index 50b9269..0000000 --- a/debian/pom-annotation.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns='http://maven.apache.org/POM/4.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' - xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>biz.aQute.bnd</groupId> - <artifactId>parent</artifactId> - <version>2.4.1</version> - </parent> - - <artifactId>annotation</artifactId> - - <name>bnd Annotations Library</name> - <description>The annotations for bnd.</description> - - <licenses> - <license> - <name>Apache Software License 2.0</name> - <url>http://www.opensource.org/licenses/apache2.0.php</url> - <distribution>repo</distribution> - </license> - </licenses> - -</project> diff --git a/debian/pom-bnd.xml b/debian/pom-bnd.xml deleted file mode 100644 index 8bb7ac4..0000000 --- a/debian/pom-bnd.xml +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns='http://maven.apache.org/POM/4.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' - xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>biz.aQute.bnd</groupId> - <artifactId>parent</artifactId> - <version>2.4.1</version> - </parent> - - <artifactId>bnd</artifactId> - - <name>aQute Bundle Tool</name> - <description> - A command line utility and Ant plugin to wrap, build, or examine bundles. - </description> - - <licenses> - <license> - <name>Apache Software License 2.0</name> - <url>http://www.opensource.org/licenses/apache2.0.php</url> - <distribution>repo</distribution> - </license> - </licenses> - - <dependencies> - <dependency> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - <version>1.6.5</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> - <version>4.3.1</version> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> - <version>4.3.1</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.2</version> - <optional>true</optional> - </dependency> - </dependencies> - -</project> diff --git a/debian/pom-bndlib.xml b/debian/pom-bndlib.xml deleted file mode 100644 index 8a0c099..0000000 --- a/debian/pom-bndlib.xml +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns='http://maven.apache.org/POM/4.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' - xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>biz.aQute.bnd</groupId> - <artifactId>parent</artifactId> - <version>2.4.1</version> - </parent> - - <artifactId>bndlib</artifactId> - - <name>A Swiss Army Knife for OSGi</name> - <description> - The bndlib project is a general library to be used with OSGi bundles. It contains - lots of cool functionality that calculates dependencies, etc. - </description> - - <licenses> - <license> - <name>Apache Software License 2.0</name> - <url>http://www.opensource.org/licenses/apache2.0.php</url> - <distribution>repo</distribution> - </license> - </licenses> - - <dependencies> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> - <version>4.3.1</version> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> - <version>4.3.1</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.2</version> - <optional>true</optional> - </dependency> - </dependencies> - -</project> diff --git a/debian/rules b/debian/rules index 177299c..936fc6c 100755 --- a/debian/rules +++ b/debian/rules @@ -1,101 +1,67 @@ #!/usr/bin/make -f -MAVEN_REPO := http://repo1.maven.org/maven2/biz/aQute/ -MAVEN_VERSION := 2.4.1 - +include /usr/share/dpkg/pkg-info.mk PACKAGE := bnd -VERSION := $(MAVEN_VERSION) - export JAVA_HOME = /usr/lib/jvm/default-java %: - dh $@ --buildsystem=gradle --no-parallel + dh $@ --buildsystem=gradle --with maven-repo-helper --no-parallel override_dh_auto_build: + $(RM) cnf/ext/central.mvn # It forces Gradle to fetch artifacts from remote. ant -f debian/bootstrap.xml - mkdir -p cnf/repo/biz.aQute.bnd/ \ - cnf/repo/com.springsource.junit/ \ - cnf/repo/com.springsource.org.junit \ - cnf/repo/org.eclipse.osgi \ - cnf/repo/osgi.core \ - cnf/repo/osgi.cmpn \ - cnf/repo/ee.minimum \ - cnf/repo/junit.osgi \ - cnf/repo/org.apache.tools.ant \ - cnf/repo/org.eclipse.core.runtime \ - cnf/repo/org.eclipse.core.resources \ - cnf/repo/org.eclipse.core.commands \ - cnf/repo/org.eclipse.jface \ - cnf/repo/org.eclipse.jface.text \ - cnf/repo/org.eclipse.swt \ - cnf/repo/org.eclipse.debug.ui \ - cnf/repo/org.eclipse.debug.core \ - cnf/repo/org.eclipse.equinox.common \ - cnf/repo/org.eclipse.equinox.registry \ - cnf/repo/org.eclipse.ui \ - cnf/repo/org.eclipse.ui.editors \ - cnf/repo/org.eclipse.ui.workbench \ - cnf/repo/org.eclipse.ui.workbench.texteditor \ - cnf/repo/org.eclipse.ui.ide \ - cnf/repo/org.eclipse.core.jobs \ - cnf/repo/org.eclipse.text \ + mkdir -p \ + cnf/repo/biz.aQute.bnd/ \ + cnf/repo/ant \ + cnf/repo/org.apache.felix.framework \ + cnf/repo/org.apache.felix.gogo.runtime \ + cnf/repo/org.apache.felix.resolver \ + cnf/repo/org.apache.servicemix.bundles.junit \ cnf/repo/org.osgi.impl.bundle.bindex \ + cnf/repo/org.osgi.util.function \ + cnf/repo/org.osgi.util.promise \ + cnf/repo/org.tukaani.xz \ + cnf/repo/org.yaml.snakeyaml \ + cnf/repo/osgi.annotation \ + cnf/repo/osgi.cmpn \ + cnf/repo/osgi.core \ + cnf/repo/slf4j.api \ + cnf/repo/slf4j.simple \ cnf/cache \ cnf/gradle/dependencies \ cnf/plugins/biz.aQute.bnd + ln -s -r bootstrap/bnd.jar cnf/cache/biz.aQute.bnd.gradle.jar ln -s -r bootstrap/bnd.jar cnf/gradle/dependencies/biz.aQute.repository.jar ln -s -r bootstrap/bnd.jar cnf/plugins/biz.aQute.repository.jar - ln -s -r bootstrap/bnd.jar cnf/cache/biz.aQute.bnd.gradle.jar - ln -s /usr/share/java/junit.jar cnf/repo/com.springsource.junit/com.springsource.junit-3.8.2.jar - ln -s /usr/share/java/junit4.jar cnf/repo/com.springsource.org.junit/com.springsource.org.junit-4.11.0.jar - ln -s /usr/share/java/junit.jar cnf/repo/junit.osgi/junit.osgi-3.8.2.jar - ln -s /usr/share/java/osgi.core.jar cnf/repo/org.eclipse.osgi/org.eclipse.osgi-3.5.0.jar - ln -s /usr/share/java/osgi.core.jar cnf/repo/osgi.core/osgi.core-4.3.1.jar - ln -s /usr/share/java/osgi.compendium.jar cnf/repo/osgi.cmpn/osgi.cmpn-4.3.1.jar -# ln -s /usr/share/java/ee.foundation.jar cnf/repo/ee.minimum/ee.minimum-1.2.1.jar - ln -s /usr/share/java/ant.jar cnf/repo/org.apache.tools.ant/org.apache.tools.ant-1.7.1.jar - ln -s /usr/share/java/bindex.jar cnf/repo/org.osgi.impl.bundle.bindex/org.osgi.impl.bundle.bindex-2.2.0.jar - # Bypassing the FileNotFound error - mkdir biz.aQute.bnd.annotation/src - dh_auto_build -- -x :biz.aQute.repository:compileJava \ - -x :biz.aQute.repository:jar \ - -x :biz.aQute.repository.aether:compileJava \ - -x :biz.aQute.repository.aether:jar \ - -x :biz.aQute.resolve:compileJava \ - -x :biz.aQute.resolve:jar \ - -x :demo:compileJava \ - -x :biz.aQute.bndlib.tests:compileJava \ - -x :biz.aQute.jpm:compileJava \ - -x :biz.aQute.jpm:jar \ - -x :org.osgi.impl.bundle.repoindex.lib:compileJava \ - -x :org.osgi.impl.bundle.repoindex.lib:jar \ - -x :org.osgi.impl.bundle.repoindex.ant:compileJava \ - -x :org.osgi.impl.bundle.repoindex.ant:jar \ - -x :org.osgi.impl.bundle.repoindex.cli:compileJava \ - -x :org.osgi.impl.bundle.repoindex.cli:jar \ - -x :org.osgi.impl.bundle.repoindex.cli:pom \ - -x :org.osgi.impl.bundle.repoindex.test:compileJava \ - -x :org.osgi.impl.bundle.repoindex.test:jar \ - -x :osgi.r5:jar \ - -x :biz.aQute.launcher:test \ - -x check -x sourcesJar -x javadocJar jar + ln -s /usr/share/java/ant.jar cnf/repo/ant/ant-latest.jar + ln -s /usr/share/java/bindex.jar cnf/repo/org.osgi.impl.bundle.bindex/org.osgi.impl.bundle.bindex-latest.jar + ln -s /usr/share/java/junit4.jar cnf/repo/org.apache.servicemix.bundles.junit/org.apache.servicemix.bundles.junit-latest.jar + ln -s /usr/share/java/org.apache.felix.framework.jar cnf/repo/org.apache.felix.framework/org.apache.felix.framework-latest.jar + ln -s /usr/share/java/org.apache.felix.gogo.runtime.jar cnf/repo/org.apache.felix.gogo.runtime/org.apache.felix.gogo.runtime-latest.jar + ln -s /usr/share/java/org.apache.felix.resolver.jar cnf/repo/org.apache.felix.resolver/org.apache.felix.resolver-latest.jar + ln -s /usr/share/java/osgi.annotation.jar cnf/repo/osgi.annotation/osgi.annotation-latest.jar + ln -s /usr/share/java/osgi.cmpn.jar cnf/repo/org.osgi.util.function/org.osgi.util.function-latest.jar + ln -s /usr/share/java/osgi.cmpn.jar cnf/repo/org.osgi.util.promise/org.osgi.util.promise-latest.jar + ln -s /usr/share/java/osgi.cmpn.jar cnf/repo/osgi.cmpn/osgi.cmpn-latest.jar + ln -s /usr/share/java/osgi.core.jar cnf/repo/osgi.core/osgi.core-latest.jar + ln -s /usr/share/java/slf4j-api.jar cnf/repo/slf4j.api/slf4j.api-latest.jar + ln -s /usr/share/java/slf4j-simple.jar cnf/repo/slf4j.simple/slf4j.simple-latest.jar + ln -s /usr/share/java/snakeyaml.jar cnf/repo/org.yaml.snakeyaml/org.yaml.snakeyaml-latest.jar + ln -s /usr/share/java/xz.jar cnf/repo/org.tukaani.xz/org.tukaani.xz-latest.jar + $(RM) -r biz.aQute.repository/src/aQute/bnd/jpm # This package depends on non-free code + dh_auto_build -- :biz.aQute.bnd:assemble \ + :biz.aQute.launcher:assemble \ + :biz.aQute.junit:assemble \ + :org.osgi.impl.bundle.repoindex.lib:jar \ + -x :demo:compileJava -x :demo:jar -x :cnf:jar \ + --system-prop maven.repo.local=debian/.m2 pod2man -c 'BND for Debian GNU/Linux' \ - -r $(PACKAGE)-$(VERSION) \ + -r $(PACKAGE)-$(DEB_VERSION_UPSTREAM) \ debian/bnd.pod > debian/bnd.1 override_dh_auto_install: dh_auto_install - - mkdir install/ - cp biz.aQute.launcher/generated/biz.aQute.launcher-*.jar install/bnd.launcher.jar - cp biz.aQute.junit/generated/biz.aQute.junit-*.jar install/bnd.junit.jar - mh_installpoms -p$(PACKAGE) -e$(VERSION) - mh_installjar -p$(PACKAGE) -e$(VERSION) -l debian/pom-bndlib.xml --usj-name=bndlib biz.aQute.bndlib/generated/biz.aQute.bndlib-*.jar - mh_installjar -p$(PACKAGE) -e$(VERSION) -l debian/pom-bnd.xml --usj-name=bnd biz.aQute.bnd/generated/biz.aQute.bnd-*.jar - mh_installjar -p$(PACKAGE) -e$(VERSION) -l debian/pom-annotation.xml --usj-name=bnd.annotation biz.aQute.bnd.annotation/generated/biz.aQute.bnd.annotation-*.jar - jh_installlibs -p$(PACKAGE) install/bnd.launcher.jar - jh_installlibs -p$(PACKAGE) install/bnd.junit.jar dh_install -p$(PACKAGE) debian/bnd.sh /usr/bin/ mv debian/$(PACKAGE)/usr/bin/bnd.sh debian/$(PACKAGE)/usr/bin/bnd @@ -104,9 +70,6 @@ override_dh_auto_clean: -rm -rf cnf/cache -rm -rf cnf/generated - -rm -rf demo/bin/ - -rm -rf demo/generated/ - -rm -rf dist/generated -rm -rf aQute.libg/bin/ -rm -rf aQute.libg/generated/ -rm -rf biz.aQute.bndlib/bin/ @@ -115,35 +78,32 @@ override_dh_auto_clean: -rm -rf biz.aQute.bnd/bin/ -rm -rf biz.aQute.bnd/generated/ -rm -rf biz.aQute.bnd.annotation/generated/ - -rm -rf biz.aQute.bnd.gradle/bin/ - -rm -rf biz.aQute.bnd.gradle/generated/ - -rm -rf biz.aQute.bnd.test/bin/ - -rm -rf biz.aQute.bnd.test/generated/ - -rm -rf biz.aQute.bnd.testextension/bin/ - -rm -rf biz.aQute.bnd.testextension/generated/ + $(RM) -r biz.aQute.bnd.annotation/bin -rm -rf biz.aQute.junit/bin/ -rm -rf biz.aQute.junit/generated/ -rm -rf biz.aQute.launcher/bin/ -rm -rf biz.aQute.launcher/generated/ - -rm -rf biz.aQute.bnd.doc/bin/ - -rm -rf biz.aQute.bnd.doc/generated/ - -rm -rf biz.aQute.bndlib.tests/bin/ - -rm -rf biz.aQute.bndoc/bin/ - -rm -rf biz.aQute.bndoc/generated/ - -rm -rf org.osgi.impl.bundle.repoindex.api/bin/ - -rm -rf org.osgi.impl.bundle.repoindex.api/generated/ + $(RM) -r biz.aQute.bnd.embedded-repo/generated + $(RM) -r biz.aQute.remote/bin + $(RM) -r biz.aQute.remote/generated + $(RM) -r biz.aQute.repository/bin + $(RM) -r biz.aQute.repository/generated + $(RM) -r biz.aQute.resolve/bin + $(RM) -r biz.aQute.resolve/generated + $(RM) -r biz.aQute.tester/bin + $(RM) -r biz.aQute.tester/generated + $(RM) -r org.osgi.impl.bundle.repoindex.api/bin + $(RM) -r org.osgi.impl.bundle.repoindex.api/generated + $(RM) -r org.osgi.impl.bundle.repoindex.lib/bin + $(RM) -r org.osgi.impl.bundle.repoindex.lib/generated -find . -type l -name '*.jar' -delete jh_clean mh_clean -rm -rf install/ -rm -f debian/bnd.1 -rm -Rf bootstrap - $(RM) -r biz.aQute.bnd.annotation/src + $(RM) -r debian/.m2 + $(RM) cnf/local.mvn get-orig-source: - uscan --download-current-version --force-download --repack --compression xz - -get-orig-pom: - wget --user-agent="" -O debian/pom-bnd.xml $(MAVEN_REPO)/bnd/bnd/$(MAVEN_VERSION)/bnd-$(MAVEN_VERSION).pom - wget --user-agent="" -O debian/pom-bndlib.xml $(MAVEN_REPO)/bnd/bndlib/$(MAVEN_VERSION)/bndlib-$(MAVEN_VERSION).pom - wget --user-agent="" -O debian/pom-annotation.xml $(MAVEN_REPO)/bnd/annotation/$(MAVEN_VERSION)/annotation-$(MAVEN_VERSION).pom + uscan --download-current-version --force-download --repack --compression xz \ No newline at end of file -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/bnd.git _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits