[gradle-1.12] 110/211: Prepare for building binaries
Kai-Chung Yan
seamlik-guest at moszumanska.debian.org
Wed Jul 1 14:18:31 UTC 2015
This is an automated email from the git hooks/post-receive script.
seamlik-guest pushed a commit to branch master
in repository gradle-1.12.
commit ad3ba4f06f5fb18dc33fcd8aa1e515b80ebc02d6
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date: Wed May 27 00:37:28 2015 +0800
Prepare for building binaries
---
debian/changelog | 14 +++++++++---
debian/docs | 2 ++
debian/gradle-doc.docs | 3 ---
debian/gradle.install | 11 +---------
debian/gradle.jlibs | 3 +++
debian/libgradle-core-java.install | 1 -
debian/libgradle-core-java.jlibs | 10 ++++++---
debian/libgradle-core-java.links | 41 -----------------------------------
debian/libgradle-plugins-java.jlibs | 42 ++++++++++++++++++++----------------
debian/libgradle-plugins-java.links | 37 -------------------------------
debian/rules | 43 +++++++++----------------------------
11 files changed, 58 insertions(+), 149 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8714b41..4637513 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,16 @@
gradle (1.12-1) UNRELEASED; urgency=low
* New upstream release
-
- -- Kai-Chung Yan <seamlikok at gmail.com> Thu, 21 May 2015 16:02:50 +0800
+ * Move jars between packages
+ - gradle-cli.jar from gradle to libgradle-core-java
+ - gradle-open-api.jar from gradle to libgradle-core-java
+ - gradle-messaging.jar from gradle to libgradle-core-java
+ - gradle-native.jar from gradle to libgradle-core-java
+ - gradle-wrapper.jar from libgradle-core-java to libgradle-plugins-java
+ * Remove all symlinks
+ * d/docs: Add LICENSE and NOTICE to every package
+
+ -- Kai-Chung Yan <seamlikok at gmail.com> Thu, 21 May 2015 16:02:50 +0800
gradle (1.5-2) unstable; urgency=medium
@@ -42,7 +50,7 @@ gradle (1.4-2) unstable; urgency=low
to speed-up package build.
* d/control: Merge Depends/Recommends field because Gradle just fails on
missing dependencies (event if module is not used by user).
- (Closes: #718960, #707764).
+ (Closes: #718960, #707764).
-- Damien Raude-Morvan <drazzib at debian.org> Sun, 11 Aug 2013 16:13:00 +0200
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..d93cc48
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,2 @@
+subprojects/distributions/src/toplevel/NOTICE
+subprojects/distributions/src/toplevel/LICENSE
\ No newline at end of file
diff --git a/debian/gradle-doc.docs b/debian/gradle-doc.docs
index 9ec4adb..e69de29 100644
--- a/debian/gradle-doc.docs
+++ b/debian/gradle-doc.docs
@@ -1,3 +0,0 @@
-build/distributions/all/gradle-*/docs/groovydoc
-build/distributions/all/gradle-*/docs/dsl
-build/distributions/all/gradle-*/docs/userguide
diff --git a/debian/gradle.install b/debian/gradle.install
index 212653d..afbdd06 100644
--- a/debian/gradle.install
+++ b/debian/gradle.install
@@ -1,10 +1 @@
-build/distributions/bin/gradle-*/bin/gradle usr/share/gradle/bin
-
-build/distributions/bin/gradle-*/lib/gradle-base-services-*.jar usr/share/gradle/lib
-build/distributions/bin/gradle-*/lib/gradle-cli-*.jar usr/share/gradle/lib
-build/distributions/bin/gradle-*/lib/gradle-launcher-*.jar usr/share/gradle/lib
-build/distributions/bin/gradle-*/lib/gradle-messaging-*.jar usr/share/gradle/lib
-build/distributions/bin/gradle-*/lib/gradle-native-*.jar usr/share/gradle/lib
-build/distributions/bin/gradle-*/lib/gradle-open-api-*.jar usr/share/gradle/lib
-build/distributions/bin/gradle-*/lib/gradle-tooling-api-*.jar usr/share/gradle/lib
-build/distributions/bin/gradle-*/lib/gradle-ui-*.jar usr/share/gradle/lib
+subprojects/launcher/build/startScripts/gradle usr/share/gradle/bin
\ No newline at end of file
diff --git a/debian/gradle.jlibs b/debian/gradle.jlibs
new file mode 100644
index 0000000..6a3b704
--- /dev/null
+++ b/debian/gradle.jlibs
@@ -0,0 +1,3 @@
+subprojects/launcher/build/libs/*.jar
+subprojects/tooling-api/build/libs/*.jar
+subprojects/ui/build/libs/*.jar
\ No newline at end of file
diff --git a/debian/libgradle-core-java.install b/debian/libgradle-core-java.install
deleted file mode 100644
index d3c128e..0000000
--- a/debian/libgradle-core-java.install
+++ /dev/null
@@ -1 +0,0 @@
-build/distributions/bin/gradle-*/lib/plugins/jarjar-*.jar /usr/share/gradle/lib/plugins/
\ No newline at end of file
diff --git a/debian/libgradle-core-java.jlibs b/debian/libgradle-core-java.jlibs
index 9f04945..7d2d2c7 100644
--- a/debian/libgradle-core-java.jlibs
+++ b/debian/libgradle-core-java.jlibs
@@ -1,3 +1,7 @@
-build/distributions/bin/gradle-*/lib/gradle-core-*.jar
-build/distributions/bin/gradle-*/lib/gradle-wrapper-*.jar
-build/distributions/bin/gradle-*/lib/plugins/gradle-core-impl-*.jar
+subprojects/cli/build/libs/*.jar
+subprojects/core/build/libs/*.jar
+subprojects/core-impl/build/libs/*.jar
+subprojects/base-services/build/libs/*.jar
+subprojects/base-services-groovy/build/libs/*.jar
+subprojects/messaging/build/libs/*.jar
+subprojects/native/build/libs/*.jar
\ No newline at end of file
diff --git a/debian/libgradle-core-java.links b/debian/libgradle-core-java.links
deleted file mode 100644
index 4c181bd..0000000
--- a/debian/libgradle-core-java.links
+++ /dev/null
@@ -1,41 +0,0 @@
-# gradle-core
-usr/share/java/asm4-all.jar usr/share/gradle/lib/asm4-all.jar
-usr/share/java/ant.jar usr/share/gradle/lib/ant.jar
-usr/share/java/commons-collections3.jar usr/share/gradle/lib/commons-collections3.jar
-usr/share/java/commons-io.jar usr/share/gradle/lib/commons-io.jar
-usr/share/java/commons-lang.jar usr/share/gradle/lib/commons-lang.jar
-usr/share/java/ivy.jar usr/share/gradle/lib/ivy.jar
-usr/share/java/logback-core.jar usr/share/gradle/lib/logback-core.jar
-usr/share/java/logback-classic.jar usr/share/gradle/lib/logback-classic.jar
-usr/share/java/guava.jar usr/share/gradle/lib/guava.jar
-usr/share/java/jcip.jar usr/share/gradle/lib/jcip.jar
-usr/share/java/jul-to-slf4j.jar usr/share/gradle/lib/jul-to-slf4j.jar
-usr/share/java/jarjar.jar usr/share/gradle/lib/jarjar.jar
-usr/share/java/atinject-jsr330-api.jar usr/share/gradle/lib/atinject-jsr330-api.jar
-usr/share/java/groovy-all.jar usr/share/gradle/lib/groovy-all.jar
-usr/share/java/slf4j-api.jar usr/share/gradle/lib/slf4j-api.jar
-usr/share/java/log4j-over-slf4j.jar usr/share/gradle/lib/log4j-over-slf4j.jar
-usr/share/java/jcl-over-slf4j.jar usr/share/gradle/lib/jcl-over-slf4j.jar
-usr/share/java/ant-launcher.jar usr/share/gradle/lib/ant-launcher.jar
-usr/share/java/jsch.jar usr/share/gradle/lib/jsch.jar
-
-# gradle-core-impl
-usr/share/java/httpclient.jar usr/share/gradle/lib/plugins/httpclient.jar
-# commons-lang
-# commons-io
-# ivy
-# slf4j-api
-usr/share/java/maven-ant-tasks.jar usr/share/gradle/lib/plugins/maven-ant-tasks.jar
-usr/share/java/nekohtml.jar usr/share/gradle/lib/plugins/nekohtml.jar
-# groovy-all
-# jcl-over-slf4j
-usr/share/java/jcifs.jar usr/share/gradle/lib/plugins/jcifs.jar
-usr/share/java/commons-codec.jar usr/share/gradle/lib/plugins/commons-codec.jar
-usr/share/java/httpcore.jar usr/share/gradle/lib/plugins/httpcore.jar
-# jsch
-usr/share/java/xercesImpl.jar usr/share/gradle/lib/plugins/xercesImpl.jar
-usr/share/java/jaxp-1.4.jar usr/share/gradle/lib/plugins/jaxp-1.4.jar
-usr/share/java/plexus-component-annotations-1.5.jar usr/share/gradle/lib/plugins/plexus-component-annotations-1.5.jar
-usr/share/java/pmaven-common.jar usr/share/gradle/lib/plugins/pmaven-common.jar
-usr/share/java/pmaven-groovy.jar usr/share/gradle/lib/plugins/pmaven-groovy.jar
-usr/share/java/xbean-reflect.jar usr/share/gradle/lib/plugins/xbean-reflect.jar
diff --git a/debian/libgradle-plugins-java.jlibs b/debian/libgradle-plugins-java.jlibs
index c1b7d00..697632e 100644
--- a/debian/libgradle-plugins-java.jlibs
+++ b/debian/libgradle-plugins-java.jlibs
@@ -1,18 +1,24 @@
-build/distributions/bin/gradle-*/lib/plugins/gradle-announce-*.jar
-build/distributions/bin/gradle-*/lib/plugins/gradle-antlr-*.jar
-build/distributions/bin/gradle-*/lib/plugins/gradle-build-comparison-*.jar
-build/distributions/bin/gradle-*/lib/plugins/gradle-code-quality-*.jar
-build/distributions/bin/gradle-*/lib/plugins/gradle-cpp-*.jar
-build/distributions/bin/gradle-*/lib/plugins/gradle-diagnostics-*.jar
-build/distributions/bin/gradle-*/lib/plugins/gradle-ear-*.jar
-build/distributions/bin/gradle-*/lib/plugins/gradle-ide-*.jar
-build/distributions/bin/gradle-*/lib/plugins/gradle-ivy-*.jar
-build/distributions/bin/gradle-*/lib/plugins/gradle-javascript-*.jar
-build/distributions/bin/gradle-*/lib/plugins/gradle-jetty-*.jar
-build/distributions/bin/gradle-*/lib/plugins/gradle-maven-*.jar
-build/distributions/bin/gradle-*/lib/plugins/gradle-osgi-*.jar
-build/distributions/bin/gradle-*/lib/plugins/gradle-plugins-*.jar
-build/distributions/bin/gradle-*/lib/plugins/gradle-publish-*.jar
-build/distributions/bin/gradle-*/lib/plugins/gradle-reporting-*.jar
-build/distributions/bin/gradle-*/lib/plugins/gradle-scala-*.jar
-build/distributions/bin/gradle-*/lib/plugins/gradle-signing-*.jar
+subprojects/announce/build/libs/*.jar
+subprojects/antlr/build/libs/*.jar
+subprojects/announce/build/libs/*.jar
+subprojects/build-comparison/build/libs/*.jar
+subprojects/build-init/build/libs/*.jar
+subprojects/code-quality/build/libs/*.jar
+subprojects/cpp/build/libs/*.jar
+subprojects/diagnostics/build/libs/*.jar
+subprojects/ear/build/libs/*.jar
+subprojects/ide/build/libs/*.jar
+subprojects/ivy/build/libs/*.jar
+subprojects/jacoco/build/libs/*.jar
+subprojects/javascript/build/libs/*.jar
+subprojects/jetty/build/libs/*.jar
+subprojects/language-base/build/libs/*.jar
+subprojects/language-jvm/build/libs/*.jar
+subprojects/maven/build/libs/*.jar
+subprojects/osgi/build/libs/*.jar
+subprojects/plugins/build/libs/*.jar
+subprojects/publish/build/libs/*.jar
+subprojects/reporting/build/libs/*.jar
+subprojects/resources/build/libs/*.jar
+subprojects/signing/build/libs/*.jar
+subprojects/wrapper/build/libs/*.jar
\ No newline at end of file
diff --git a/debian/libgradle-plugins-java.links b/debian/libgradle-plugins-java.links
deleted file mode 100644
index ed7bd33..0000000
--- a/debian/libgradle-plugins-java.links
+++ /dev/null
@@ -1,37 +0,0 @@
-# gradle-antlr
-usr/share/java/ant-antlr.jar usr/share/gradle/lib/plugins/ant-antlr.jar
-usr/share/java/antlr.jar usr/share/gradle/lib/plugins/antlr.jar
-
-# gradle-codequality
-usr/share/java/checkstyle.jar usr/share/gradle/lib/plugins/checkstyle.jar
-usr/share/java/CodeNarc.jar usr/share/gradle/lib/plugins/CodeNarc.jar
-usr/share/java/GMetrics.jar usr/share/gradle/lib/plugins/GMetrics.jar
-
-# gradle-js
-usr/share/java/js.jar usr/share/gradle/lib/plugins/js.jar
-usr/share/java/gson.jar usr/share/gradle/lib/plugins/gson.jar
-
-# gradle-jetty
-usr/share/java/jetty.jar usr/share/gradle/lib/plugins/jetty.jar
-usr/share/java/jetty-util.jar usr/share/gradle/lib/plugins/jetty-util.jar
-usr/share/java/servlet-api-2.5.jar usr/share/gradle/lib/plugins/servlet-api-2.5.jar
-usr/share/java/jetty-plus.jar usr/share/gradle/lib/plugins/jetty-plus.jar
-usr/share/java/jsp-api-2.1.jar usr/share/gradle/lib/plugins/jsp-api-2.1.jar
-usr/share/java/jetty-annotations.jar usr/share/gradle/lib/plugins/jetty-annotations.jar
-usr/share/java/jetty-naming.jar usr/share/gradle/lib/plugins/jetty-naming.jar
-usr/share/java/eclipse-ecj.jar usr/share/gradle/lib/plugins/eclipse-ecj.jar
-
-# gradle-osgi
-usr/share/java/bndlib.jar usr/share/gradle/lib/plugins/bndlib.jar
-
-#gradle-plugins
-usr/share/java/junit4.jar usr/share/gradle/lib/plugins/junit4.jar
-usr/share/java/testng.jar usr/share/gradle/lib/plugins/testng.jar
-usr/share/java/commons-cli.jar usr/share/gradle/lib/plugins/commons-cli.jar
-
-# gradle-signing
-usr/share/java/bcpg.jar usr/share/gradle/lib/plugins/bcpg.jar
-usr/share/java/bcprov.jar usr/share/gradle/lib/plugins/bcprov.jar
-
-# gradle-reporting
-usr/share/java/jatl.jar usr/share/gradle/lib/plugins/jatl.jar
diff --git a/debian/rules b/debian/rules
index 7b4fa58..2fb1a66 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,14 @@
#!/usr/bin/make -f
-VERSION := $(shell dpkg-parsechangelog | grep ^Version: | sed 's/^Version: \(.\+\)-.\+$$/\1/')
UPSTREAM_VERSION := $(shell cat version.txt)
-GRADLE_TASKS := announce antlr build-comparison code-quality cpp diagnostics ear ide ivy javascript jetty language-base language-jvm maven native osgi plugins publish reporting signing
-SUBPROJECTS_LIST := announce antlr baseServices baseServicesGroovy buildComparison buildInit cli codeQuality core coreImpl cpp diagnostics ear ide ivy jacoco javascript jetty languageBase languageJvm launcher native openApi osgi performance plugins publish maven messaging reporting resources signing toolingApi ui wrapper
-export JAVA_HOME=/usr/lib/jvm/default-java
-export GRADLE_OPTS=-Dfile.encoding=UTF-8 -Xmx512m
+SUBPROJECTS_LIST := announce antlr baseServices baseServicesGroovy buildComparison buildInit cli codeQuality core coreImpl cpp diagnostics ear ide ivy jacoco javascript jetty languageBase languageJvm launcher native openApi osgi plugins publish maven messaging reporting resources signing toolingApi ui wrapper
+GRADLE_TASKS := $(foreach TASK, $(SUBPROJECTS_LIST), :$(TASK):assemble :$(TASK):javadoc :$(TASK):groovydoc)
+GRADLE_TASKS += :launcher:startScripts
+
# Only for debug purpose
# export JAVA_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005
-DEB_GRADLE_OPTS := --project-prop finalRelease=true --stacktrace --offline
+# Under fakeroot Gradle will show error while creating /root/.gradle, hence specify the Gradle home location
+GRADLE_FLAGS := --project-prop finalRelease=true --offline --gradle-user-home .gradlehome
# Support for DEB_BUILD_OPTIONS parallel=n
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@ -21,37 +21,14 @@ endif
override_dh_auto_build:
find /usr/share/gradle -type l ! -exec test -r {} \; -print
- gradle $(DEB_GRADLE_OPTS) $(GRADLE_TASKS) --gradle-user-home ./.gradlehome
- unzip -q -n build/distributions/gradle-*-bin.zip -d build/distributions/bin
- unzip -q -n build/distributions/gradle-*-all.zip -d build/distributions/all
- pod2man -c '' -r '' debian/gradle.pod > build/gradle.1
+ gradle $(GRADLE_TASKS)
+ pod2man -c '' -r '' debian/gradle.pod > debian/gradle.1
patch -p1 < debian/patches/90_respect_user_java_home.diff
override_dh_auto_clean:
dh_auto_clean
- gradle $(DEB_GRADLE_OPTS) clean --gradle-user-home ./.gradlehome
- rm -rf .gradle buildSrc/.gradle buildSrc/build ./.gradlehome build
-
-override_dh_link:
- dh_link
- # plugins symlinks
- for j in $(PLUGINS_LIST); do \
- dh_link -plibgradle-plugins-java usr/share/java/gradle-$$j.jar \
- usr/share/gradle/lib/plugins/gradle-$$j-$(VERSION).jar; \
- done ;
- dh_link -plibgradle-core-java usr/share/java/gradle-core-impl.jar \
- usr/share/gradle/lib/plugins/gradle-core-impl-$(VERSION).jar
- dh_link -plibgradle-core-java usr/share/java/gradle-wrapper.jar \
- usr/share/gradle/lib/gradle-wrapp--gradle-user-home ./.gradlehomeer-$(VERSION).jar
- dh_link -pgradle usr/share/java/gradle-core.jar \
- usr/share/gradle/lib/gradle-core-$(VERSION).jar
-
-override_jh_installlibs:
- jh_installlibs --upstream-version=$(UPSTREAM_VERSION)
-
-override_jh_installjavadoc:
- jh_installjavadoc -pgradle-doc \
- build/distributions/all/gradle-$(UPSTREAM_VERSION)/docs/javadoc
+ gradle clean $(GRADLE_FLAGS)
+ rm -rf .gradle .gradlehome debian/gradle.1
get-orig-source:
cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle-1.12.git
More information about the pkg-java-commits
mailing list