This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository proguard.
commit f64cc044fc882dbde4d2016877270c37f4e45e95
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Mon Mar 12 13:46:21 2018 +0100
Build with buildscripts/build.sh instead of Gradle
---
debian/changelog | 1 +
debian/clean | 6 ++++++
debian/control | 1 -
debian/patches/01-fix-usage.patch | 6 +++---
debian/patches/02-build-classpath.patch | 14 ++++++++++++++
debian/patches/03-disable-wtk-plugin.patch | 10 ++++++++++
debian/patches/series | 2 ++
debian/proguard.poms | 4 ++--
debian/rules | 9 +++++++--
9 files changed, 45 insertions(+), 8 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0cbf2df..1bcb081 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ proguard (6.0-1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release
- Refreshed the patch
+ - Build with buildscripts/build.sh instead of Gradle
* Standards-Version updated to 4.1.3
* Switch to debhelper level 11
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..67f4388
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,6 @@
+annotations/out/
+ant/out/
+core/out/
+gradle/out/
+gui/out/
+retrace/out/
diff --git a/debian/control b/debian/control
index f32940e..c835570 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,6 @@ Build-Depends:
ant,
debhelper (>= 11),
default-jdk,
- gradle-debian-helper,
maven-repo-helper
Standards-Version: 4.1.3
Vcs-Git: https://anonscm.debian.org/git/pkg-java/proguard.git
diff --git a/debian/patches/01-fix-usage.patch
b/debian/patches/01-fix-usage.patch
index d4e38f7..2cda4a2 100644
--- a/debian/patches/01-fix-usage.patch
+++ b/debian/patches/01-fix-usage.patch
@@ -1,9 +1,9 @@
Description: Modifies the usage message for the command line tool
Author: Emmanuel Bourg <ebo...@apache.org>
Forwarded: not-needed
---- a/src/proguard/ProGuard.java
-+++ b/src/proguard/ProGuard.java
-@@ -513,7 +513,7 @@
+--- a/core/src/proguard/ProGuard.java
++++ b/core/src/proguard/ProGuard.java
+@@ -547,7 +547,7 @@
if (args.length == 0)
{
System.out.println(VERSION);
diff --git a/debian/patches/02-build-classpath.patch
b/debian/patches/02-build-classpath.patch
new file mode 100644
index 0000000..9205e13
--- /dev/null
+++ b/debian/patches/02-build-classpath.patch
@@ -0,0 +1,14 @@
+Description: Adjusts the classpath to build the Gradle plugin
+Author: Emmanuel Bourg <ebo...@apache.org>
+Forwarded: not-needed
+--- a/gradle/build.sh
++++ b/gradle/build.sh
+@@ -17,7 +17,7 @@
+ $(echo $GRADLE_HOME/lib/gradle-base-services-groovy-*.jar):\
+ $(echo $GRADLE_HOME/lib/gradle-core-[0-9]*.jar):\
+ $(echo $GRADLE_HOME/lib/gradle-core-api-*.jar):\
+-$(echo $GRADLE_HOME/lib/groovy-all-*.jar)
++$(echo /usr/share/java/groovy-all-*.jar)
+
+ # Make sure the Gradle jars are present.
+ if [ ! -f "${GRADLE_PATH%%:*}" ]; then
diff --git a/debian/patches/03-disable-wtk-plugin.patch
b/debian/patches/03-disable-wtk-plugin.patch
new file mode 100644
index 0000000..e3b41bb
--- /dev/null
+++ b/debian/patches/03-disable-wtk-plugin.patch
@@ -0,0 +1,10 @@
+Description: Disables the WTK plugin
+Author: Emmanuel Bourg <ebo...@apache.org>
+Forwarded: not-needed
+--- a/buildscripts/build.sh
++++ b/buildscripts/build.sh
+@@ -13,4 +13,3 @@
+ # Optional modules.
+ ../gradle/build.sh
+ ../ant/build.sh
+-../wtk/build.sh
diff --git a/debian/patches/series b/debian/patches/series
index 82cf2a3..367db3e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
01-fix-usage.patch
+02-build-classpath.patch
+03-disable-wtk-plugin.patch
diff --git a/debian/proguard.poms b/debian/proguard.poms
index 6af3934..3daeefc 100644
--- a/debian/proguard.poms
+++ b/debian/proguard.poms
@@ -1,2 +1,2 @@
-buildscripts/maven/base/pom.xml --no-parent --has-package-version
--java-lib --artifact=lib/proguard.jar --usj-name=proguard
--relocate=net.sf.proguard:proguard-gradle --package=libproguard-java
-buildscripts/maven/retrace/pom.xml --no-parent --has-package-version
--java-lib --artifact=lib/retrace.jar --package=libproguard-java
+core/pom.xml --no-parent --has-package-version --java-lib
--artifact=lib/proguard.jar --package=libproguard-java --usj-name=proguard
--relocate=net.sf.proguard:proguard-gradle
+retrace/pom.xml --no-parent --has-package-version --java-lib
--artifact=lib/retrace.jar --package=libproguard-java
diff --git a/debian/rules b/debian/rules
index 9615f99..0cb8142 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,15 @@
#!/usr/bin/make -f
+export ANT_HOME=/usr/share/ant
+export GRADLE_HOME=/usr/share/gradle
+
%:
- dh $@ --buildsystem=gradle --with maven-repo-helper
+ dh $@ --with maven-repo-helper
override_dh_auto_build:
- dh_auto_build -- -p buildscripts
+ mkdir -p lib
+ cd buildscripts && ./build.sh
+ find . |grep jar
override_dh_auto_clean:
dh_auto_clean
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/proguard.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
