[scala] 07/15: No longer build scala-partest.jar

[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.

commit 828c0404f48d2964efaffb020dfca635724ba1c7
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jun 5 16:09:21 2015 +0200

    No longer build scala-partest.jar
---
 debian/changelog                         |  1 +
 debian/patches/0007-ignore-partest.patch | 67 ++++++++++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 debian/scala-library.jlibs               |  1 -
 4 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a1ea64f..c188e55 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 ]
+  * 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)
   * debian/control:
diff --git a/debian/patches/0007-ignore-partest.patch b/debian/patches/0007-ignore-partest.patch
new file mode 100644
index 0000000..1e60d65
--- /dev/null
+++ b/debian/patches/0007-ignore-partest.patch
@@ -0,0 +1,67 @@
+Description: Disables the compilation of partest until diffutils is packaged (ITP #696165) or replaced
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -227,10 +227,6 @@
+         <dependency groupId="junit" artifactId="junit" version="${junit.version}"/>
+       </artifact:dependencies>
+ 
+-      <artifact:dependencies pathId="partest.extras.classpath" filesetId="partest.extras.fileset" versionsId="partest.extras.versions">
+-        <dependency groupId="com.googlecode.java-diff-utils" artifactId="diffutils" version="1.3.0"/>
+-      </artifact:dependencies>
+-
+       <!-- BND support -->
+       <typedef resource="aQute/bnd/ant/taskdef.properties" classpathref="extra.tasks.classpath" />
+ 
+@@ -595,7 +591,6 @@
+       <pathelement location="${build-pack.dir}/lib/scala-actors.jar"/>
+       <pathelement location="${ant.jar}"/>
+       <pathelement location="${jline.jar}"/>
+-      <path refid="partest.extras.classpath"/>
+       <path refid="aux.libs"/>
+     </path>
+ 
+@@ -1207,7 +1202,7 @@
+     </staged-uptodate>
+   </target>
+ 
+-  <target name="quick.bin" depends="quick.lib, quick.reflect, quick.comp, quick.scalacheck, quick.scalap, quick.swing, quick.plugins, quick.partest">
++  <target name="quick.bin" depends="quick.lib, quick.reflect, quick.comp, quick.scalacheck, quick.scalap, quick.swing, quick.plugins">
+     <staged-bin stage="quick" classpathref="quick.bin.tool.path"/>
+   </target>
+ 
+@@ -1260,21 +1255,22 @@
+ 
+   <target name="pack.scalap"     depends="quick.scalap">     <staged-pack project="scalap"     targetjar="scalap.jar"/> </target>
+ 
+-  <target name="pack.bin" depends="pack.comp, pack.lib, pack.actors, pack.partest, pack.plugins, pack.reflect, pack.scalacheck, pack.scalap, pack.swing">
++  <target name="pack.bin" depends="pack.comp, pack.lib, pack.actors, pack.plugins, pack.reflect, pack.scalacheck, pack.scalap, pack.swing">
+     <staged-bin stage="pack"/>
+   </target>
+ 
+   <!-- depend on quick.done so quick.bin is run when pack.done is -->
+   <target name="pack.done" depends="quick.done, pack.bin">
+     <!-- copy dependencies to build/pack/lib, it only takes a second so don't bother with uptodate checks -->
++<!--
+     <copy todir="${build-pack.dir}/lib">
+       <resources refid="partest.extras.fileset"/>
+       <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper"
+               from="${partest.extras.versions}" to="flatten"/>
+     </copy>
++-->
+ 
+     <taskdef resource="scala/tools/ant/antlib.xml" classpathref="pack.compiler.path"/>
+-    <taskdef resource="scala/tools/partest/antlib.xml" classpathref="partest.classpath"/>
+   </target>
+ 
+ 
+@@ -1790,7 +1786,7 @@
+     </staged-uptodate>
+   </target>
+ 
+-  <target name="docs.done" depends="docs.jline, docs.comp, docs.man, docs.lib, docs.scalap, docs.partest, docs.continuations-plugin"/>
++  <target name="docs.done" depends="docs.jline, docs.comp, docs.man, docs.lib, docs.scalap, docs.continuations-plugin"/>
+ 
+ 
+ <!-- ===========================================================================
diff --git a/debian/patches/series b/debian/patches/series
index 20c565d..b83a1ed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ remove-non-ascii-ftbfs.patch
 0003-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch
 0005-java7-compilation.patch
 0006-ignore-pax-exam-dependencies.patch
+0007-ignore-partest.patch
diff --git a/debian/scala-library.jlibs b/debian/scala-library.jlibs
index 1ff855e..c356ff4 100644
--- a/debian/scala-library.jlibs
+++ b/debian/scala-library.jlibs
@@ -2,4 +2,3 @@ dists/latest/lib/scala-library.jar
 dists/latest/lib/scala-actors.jar
 dists/latest/lib/scala-reflect.jar
 dists/latest/lib/scala-swing.jar
-dists/latest/lib/scala-partest.jar

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