[scala] 11/23: Ignore the test dependencies
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Jul 29 23:14:55 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository scala.
commit 429d75d0ae4b91c9c6a7cac3cf260c11b6b09b69
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Jun 17 12:27:42 2015 +0200
Ignore the test dependencies
---
.../0006-ignore-pax-exam-dependencies.patch | 26 --------
debian/patches/0006-ignore-test-dependencies.patch | 78 ++++++++++++++++++++++
debian/patches/0007-ignore-partest.patch | 67 -------------------
debian/patches/series | 3 +-
4 files changed, 79 insertions(+), 95 deletions(-)
diff --git a/debian/patches/0006-ignore-pax-exam-dependencies.patch b/debian/patches/0006-ignore-pax-exam-dependencies.patch
deleted file mode 100644
index b480047..0000000
--- a/debian/patches/0006-ignore-pax-exam-dependencies.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -227,23 +227,6 @@
- <dependency groupId="junit" artifactId="junit" version="${junit.version}"/>
- </artifact:dependencies>
-
-- <!-- Pax runner -->
-- <property name="pax.exam.version" value="2.6.0"/>
-- <artifact:dependencies pathId="pax.exam.classpath" filesetId="pax.exam.fileset">
-- <dependency groupId="org.ops4j.pax.exam" artifactId="pax-exam-container-native" version="${pax.exam.version}"/>
-- <dependency groupId="org.ops4j.pax.exam" artifactId="pax-exam-junit4" version="${pax.exam.version}"/>
-- <dependency groupId="org.ops4j.pax.exam" artifactId="pax-exam-link-assembly" version="${pax.exam.version}"/>
-- <!-- upgraded to 1.6.0 to get fix for https://ops4j1.jira.com/browse/PAXURL-217
-- https://ops4j1.jira.com/browse/PAXURL-138 is still unresolved... -->
-- <dependency groupId="org.ops4j.pax.url" artifactId="pax-url-aether" version="1.6.0"/>
-- <dependency groupId="org.ops4j.pax.swissbox" artifactId="pax-swissbox-framework" version="1.5.1"/>
-- <dependency groupId="ch.qos.logback" artifactId="logback-core" version="0.9.20"/>
-- <dependency groupId="ch.qos.logback" artifactId="logback-classic" version="0.9.20"/>
-- <dependency groupId="junit" artifactId="junit" version="${junit.version}"/>
-- <dependency groupId="org.apache.felix" artifactId="org.apache.felix.framework" version="3.2.2"/>
-- </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>
diff --git a/debian/patches/0006-ignore-test-dependencies.patch b/debian/patches/0006-ignore-test-dependencies.patch
new file mode 100644
index 0000000..5b6bf40
--- /dev/null
+++ b/debian/patches/0006-ignore-test-dependencies.patch
@@ -0,0 +1,78 @@
+Description: Ignore the test dependencies until they are all available in Debian.
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -283,25 +283,13 @@
+ <property name="osgi.felix.version" value="4.4.0"/>
+ <property name="osgi.equinox.version" value="3.7.1"/>
+ <artifact:dependencies pathId="pax.exam.classpath" filesetId="pax.exam.fileset">
+- <dependency groupId="org.ops4j.pax.exam" artifactId="pax-exam-container-native" version="${pax.exam.version}">
+- <exclusion groupId="org.osgi" artifactId="org.osgi.core"/><!-- Avoid dragging in a dependency which requires Java >6 -->
+- </dependency>
+- <dependency groupId="org.ops4j.pax.exam" artifactId="pax-exam-junit4" version="${pax.exam.version}"/>
+- <dependency groupId="org.ops4j.pax.exam" artifactId="pax-exam-link-assembly" version="${pax.exam.version}"/>
+- <dependency groupId="org.ops4j.pax.url" artifactId="pax-url-aether" version="2.2.0"/>
+- <dependency groupId="org.ops4j.pax.swissbox" artifactId="pax-swissbox-tracker" version="1.8.0"/>
+- <dependency groupId="ch.qos.logback" artifactId="logback-core" version="1.1.2"/>
+- <dependency groupId="ch.qos.logback" artifactId="logback-classic" version="1.1.2"/>
+- <dependency groupId="junit" artifactId="junit" version="${junit.version}"/>
+ </artifact:dependencies>
+ <copy-deps project="pax.exam"/>
+
+ <artifact:dependencies pathId="osgi.framework.felix">
+- <dependency groupId="org.apache.felix" artifactId="org.apache.felix.framework" version="${osgi.felix.version}"/>
+ </artifact:dependencies>
+
+ <artifact:dependencies pathId="osgi.framework.equinox">
+- <dependency groupId="org.eclipse.osgi" artifactId="org.eclipse.osgi" version="${osgi.equinox.version}"/>
+ </artifact:dependencies>
+
+ <artifact:remoteRepository id="sonatype-release" url="https://oss.sonatype.org/content/repositories/releases"/>
+@@ -320,20 +308,10 @@
+
+ <!-- TODO: delay until absolutely necessary to allow minimal build, also move out partest dependency from scaladoc -->
+ <artifact:dependencies pathId="partest.classpath" filesetId="partest.fileset" versionsId="partest.versions">
+- <!-- uncomment the following if you're deploying your own partest locally -->
+- <!-- <localRepository path="${user.home}/.m2/repository"/> -->
+- <!-- so we don't have to wait for artifacts to synch to maven central
+- (we don't distribute partest with Scala, so the risk of sonatype and maven being out of synch is irrelevant):
+- -->
+- <artifact:remoteRepository refid="sonatype-release"/>
+- <artifact:remoteRepository refid="extra-repo"/>
+- <dependency groupId="org.scala-lang.modules" artifactId="scala-partest${partest.cross}" version="${partest.version.number}" />
+ </artifact:dependencies>
+ <copy-deps project="partest"/>
+
+ <artifact:dependencies pathId="scalacheck.classpath" filesetId="scalacheck.fileset" versionsId="scalacheck.versions">
+- <artifact:remoteRepository refid="extra-repo"/>
+- <dependency groupId="org.scalacheck" artifactId="scalacheck${scalacheck.cross}" version="${scalacheck.version.number}" />
+ </artifact:dependencies>
+
+ <artifact:dependencies pathId="repl.deps.classpath" filesetId="repl.fileset" versionsId="repl.deps.versions">
+@@ -1210,7 +1188,7 @@
+ manifest="${src.dir}/partest-javaagent/scala/tools/partest/javaagent/MANIFEST.MF"/>
+ </target>
+
+- <target name="pack.bin" depends="pack.core, pack.modules, pack.partest-extras">
++ <target name="pack.bin" depends="pack.core, pack.modules">
+ <staged-bin stage="pack"/>
+ </target>
+
+--- a/build-ant-macros.xml
++++ b/build-ant-macros.xml
+@@ -220,12 +220,14 @@
+ <then>
+ <scalacfork taskname="@{stage}.@{project}" jvmargs="${scalacfork.jvmargs}" compilerpathref="@{with}.compiler.path" destdir="${build-@{stage}.dir}/classes/@{destproject}" srcdir="${src.dir}/@{srcdir}" params="${scalac.args.@{stage}} @{args}">
+ <include name="**/*.scala"/>
++ <exclude name="**/*Test.scala"/>
+ <compilationpath refid="@{stage}.@{project}.build.path"/>
+ </scalacfork>
+ </then>
+ <else>
+ <scalacfork taskname="@{stage}.@{project}" jvmargs="${scalacfork.jvmargs}" compilerpathref="@{with}.compiler.path" destdir="${build-@{stage}.dir}/classes/@{destproject}" srcdir="${src.dir}/@{srcdir}" srcpath="@{srcpath}" params="${scalac.args.@{stage}} @{args}">
+ <include name="**/*.scala"/>
++ <exclude name="**/*Test.scala"/>
+ <compilationpath refid="@{stage}.@{project}.build.path"/>
+ </scalacfork>
+ </else>
diff --git a/debian/patches/0007-ignore-partest.patch b/debian/patches/0007-ignore-partest.patch
deleted file mode 100644
index 1e60d65..0000000
--- a/debian/patches/0007-ignore-partest.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-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 6892b16..cbeb5e5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
0002-Use-system-ant-contrib.jar.patch
0003-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch
-0006-ignore-pax-exam-dependencies.patch
-0007-ignore-partest.patch
+0006-ignore-test-dependencies.patch
0008-disable-lib-fetching.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/scala.git
More information about the pkg-java-commits
mailing list