[scala-2.10] 134/166: Patched the build to avoid downloading libraries from the Internet

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository scala-2.10.

commit 92ace5d51adc0e298f055d35c718eefbc505d8be
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jun 5 16:17:20 2015 +0200

    Patched the build to avoid downloading libraries from the Internet
---
 debian/changelog                               |  1 +
 debian/control                                 |  4 ++-
 debian/patches/0008-disable-lib-fetching.patch | 36 ++++++++++++++++++++++++++
 debian/patches/series                          |  1 +
 debian/rules                                   |  9 ++++++-
 5 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c188e55..d5dfd15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ scala (2.10.4+dfsg-1) UNRELEASED; urgency=low
   * Remove myself from Uploaders.
 
   [ Emmanuel Bourg ]
+  * Patched the build to avoid downloading libraries from the Internet
   * No longer build scala-partest.jar until diffutils is packaged or replaced
   * debian/watch: Fixed the versions matched (x.y.z instead of x.y.z..z)
   * debian/rules: Added the missing get-orig-source target (Closes: #724704)
diff --git a/debian/control b/debian/control
index 1ccea2e..7287b9f 100644
--- a/debian/control
+++ b/debian/control
@@ -10,12 +10,14 @@ Build-Depends:
  ant,
  ant-contrib,
  ant-optional,
+ bnd,
  libmaven-ant-tasks-java,
  junit4,
  libjansi-java,
  debhelper (>= 9),
  javahelper,
- maven-repo-helper (>= 1.6~)
+ maven-repo-helper (>= 1.6~),
+ scala (>= 2.10)
 Standards-Version: 3.9.6
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-scala/packages/scala.git
 Vcs-Git: git://anonscm.debian.org/pkg-scala/packages/scala.git
diff --git a/debian/patches/0008-disable-lib-fetching.patch b/debian/patches/0008-disable-lib-fetching.patch
new file mode 100644
index 0000000..530f7ff
--- /dev/null
+++ b/debian/patches/0008-disable-lib-fetching.patch
@@ -0,0 +1,36 @@
+Description: Fetch the dependencies from /usr/share/maven-repo instead of Maven Central
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -200,7 +200,7 @@
+     </touch>
+   </target>
+ 
+-  <target name="init" depends="boot">
++  <target name="init">
+     <!-- Set up Ant contrib tasks so we can use <if><then><else> instead of the clunky `unless` attribute -->
+     <taskdef resource="net/sf/antcontrib/antlib.xml" classpath="${javalib.dir}/ant-contrib.jar"/>
+ 
+@@ -218,12 +218,14 @@
+       <mkdir dir="${user.home}/.m2/repository"/>
+       <!-- This task has an issue where if the user directory does not exist, so we create it above. UGH. -->
+       <artifact:dependencies pathId="extra.tasks.classpath" filesetId="extra.tasks.fileset">
+-        <dependency groupId="biz.aQute" artifactId="bnd" version="1.50.0"/>
++        <remoteRepository id="central" url="file:///usr/share/maven-repo"/>
++        <dependency groupId="biz.aQute" artifactId="bnd" version="debian"/>
+       </artifact:dependencies>
+ 
+       <!-- JUnit -->
+       <property name="junit.version" value="4.10"/>
+       <artifact:dependencies pathId="junit.classpath" filesetId="junit.fileset">
++        <remoteRepository id="central" url="file:///usr/share/maven-repo"/>
+         <dependency groupId="junit" artifactId="junit" version="${junit.version}"/>
+       </artifact:dependencies>
+ 
+--- a/starr.number
++++ b/starr.number
+@@ -1,2 +1 @@
+ starr.version=2.10.3
+-starr.use.released=1
+\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
index b83a1ed..13f4a94 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ remove-non-ascii-ftbfs.patch
 0005-java7-compilation.patch
 0006-ignore-pax-exam-dependencies.patch
 0007-ignore-partest.patch
+0008-disable-lib-fetching.patch
diff --git a/debian/rules b/debian/rules
index 7f84289..3b3555d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,14 @@ override_dh_auto_build:
 	# Build Jline
 	ant -f debian/build-jline.xml -propertyfile debian/ant-jline.properties
 	# Build Scala
-	ANT_OPTS="-Xmx1024M -Xss64M" ant -Dversion.number=$(BUNDLE_VERSION) fastdist-opt
+	ANT_OPTS="-Xmx1024M -Xss64M" \
+	ant -Dversion.number=$(BUNDLE_VERSION) \
+	    -Djunit.version=4.x \
+	    -Dextra.repo.url=file:///usr/share/maven-repo \
+	    -Dlibrary.starr.jar=/usr/share/java/scala-library.jar \
+	    -Dreflect.starr.jar=/usr/share/java/scala-reflect.jar \
+	    -Dcompiler.starr.jar=/usr/share/java/scala-compiler.jar \
+	    fastdist-opt
 
 	for file in scala scala-library; do \
 		sed "s/@VERSION@/$(BUNDLE_VERSION)/" debian/$${file}.pom.xml.in > debian/$${file}.pom.xml; \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/scala-2.10.git