[scala/f19] fix use_sysjline patch file
Jochen Schmitt
s4504kr at fedoraproject.org
Wed Mar 20 18:44:02 UTC 2013
commit d25cc71e0d24b068aaacfbaee7a7c656b36d9ee0
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date: Wed Mar 20 19:43:55 2013 +0100
fix use_sysjline patch file
scala-2.9.2-use_system_jline.patch | 72 ++++++++++++++++++------------------
1 files changed, 36 insertions(+), 36 deletions(-)
---
diff --git a/scala-2.9.2-use_system_jline.patch b/scala-2.9.2-use_system_jline.patch
index 8b8b133..b79e16f 100644
--- a/scala-2.9.2-use_system_jline.patch
+++ b/scala-2.9.2-use_system_jline.patch
@@ -1,7 +1,7 @@
-diff -Nru scala-2.9.2-sources/build.xml scala-2.9.2-sources-gil/build.xml
---- scala-2.9.2-sources/build.xml 2012-04-04 18:03:13.000000000 +0200
-+++ scala-2.9.2-sources-gil/build.xml 2012-09-13 02:07:24.630865166 +0200
-@@ -164,7 +164,7 @@
+diff -up scala-2.9.2-sources/build.xml.sysjline scala-2.9.2-sources/build.xml
+--- scala-2.9.2-sources/build.xml.sysjline 2012-04-04 18:03:13.000000000 +0200
++++ scala-2.9.2-sources/build.xml 2013-03-20 19:28:59.058673113 +0100
+@@ -164,7 +164,7 @@ PROPERTIES
<!-- Sets location of pre-compiled libraries -->
<property name="lib.starr.jar" value="${lib.dir}/scala-library.jar"/>
<property name="comp.starr.jar" value="${lib.dir}/scala-compiler.jar"/>
@@ -10,7 +10,7 @@ diff -Nru scala-2.9.2-sources/build.xml scala-2.9.2-sources-gil/build.xml
<property name="ant.jar" value="${ant.home}/lib/ant.jar"/>
<property name="scalacheck.jar" value="${lib.dir}/scalacheck.jar"/>
-@@ -425,7 +425,7 @@
+@@ -425,7 +425,7 @@ LOCAL REFERENCE BUILD (LOCKER)
<pathelement location="${build-locker.dir}/classes/library"/>
<pathelement location="${build-locker.dir}/classes/compiler"/>
<path refid="aux.libs"/>
@@ -19,7 +19,7 @@ diff -Nru scala-2.9.2-sources/build.xml scala-2.9.2-sources-gil/build.xml
</compilationpath>
</scalacfork>
<propertyfile file="${build-locker.dir}/classes/compiler/compiler.properties">
-@@ -644,7 +644,7 @@
+@@ -644,7 +644,7 @@ QUICK BUILD (QUICK)
<pathelement location="${build-quick.dir}/classes/library"/>
<pathelement location="${build-quick.dir}/classes/compiler"/>
<path refid="aux.libs"/>
@@ -28,7 +28,7 @@ diff -Nru scala-2.9.2-sources/build.xml scala-2.9.2-sources-gil/build.xml
</compilationpath>
</scalacfork>
<propertyfile file="${build-quick.dir}/classes/compiler/compiler.properties">
-@@ -825,7 +825,7 @@
+@@ -825,7 +825,7 @@ QUICK BUILD (QUICK)
<pathelement location="${build-quick.dir}/classes/compiler"/>
<pathelement location="${build-quick.dir}/classes/scalap"/>
<path refid="aux.libs"/>
@@ -37,7 +37,7 @@ diff -Nru scala-2.9.2-sources/build.xml scala-2.9.2-sources-gil/build.xml
</path>
<taskdef name="quick-bin" classname="scala.tools.ant.ScalaTool" classpathref="quick.bin.classpath"/>
<mkdir dir="${build-quick.dir}/bin"/>
-@@ -931,7 +931,7 @@
+@@ -931,7 +931,7 @@ PACKED QUICK BUILD (PACK)
<zipfileset dirmode="755" filemode="644" src="${fjbg.jar}"/>
<zipfileset dirmode="755" filemode="644" src="${msil.jar}"/>
</jar>
@@ -46,7 +46,7 @@ diff -Nru scala-2.9.2-sources/build.xml scala-2.9.2-sources-gil/build.xml
<copy todir="${build-pack.dir}/lib">
<fileset dir="${lib-extra.dir}">
<include name="**/*.jar"/>
-@@ -1000,7 +1000,7 @@
+@@ -1000,7 +1000,7 @@ PACKED QUICK BUILD (PACK)
<classpath>
<pathelement location="${build-pack.dir}/lib/scala-library.jar"/>
<pathelement location="${build-pack.dir}/lib/scala-compiler.jar"/>
@@ -55,7 +55,7 @@ diff -Nru scala-2.9.2-sources/build.xml scala-2.9.2-sources-gil/build.xml
</classpath>
</taskdef>
<mkdir dir="${build-pack.dir}/bin"/>
-@@ -1039,7 +1039,7 @@
+@@ -1039,7 +1039,7 @@ PACKED QUICK BUILD (PACK)
<pathelement location="${build-pack.dir}/lib/scala-partest.jar"/>
<pathelement location="${build-pack.dir}/lib/scalap.jar"/>
<pathelement location="${ant.jar}"/>
@@ -64,7 +64,7 @@ diff -Nru scala-2.9.2-sources/build.xml scala-2.9.2-sources-gil/build.xml
<path refid="lib.extra"/>
</path>
<taskdef resource="scala/tools/ant/antlib.xml" classpathref="pack.classpath"/>
-@@ -1161,7 +1161,7 @@
+@@ -1161,7 +1161,7 @@ BOOTSTRAPPING BUILD (STRAP)
<pathelement location="${build-strap.dir}/classes/library"/>
<pathelement location="${build-strap.dir}/classes/compiler"/>
<path refid="aux.libs"/>
@@ -73,9 +73,9 @@ diff -Nru scala-2.9.2-sources/build.xml scala-2.9.2-sources-gil/build.xml
</compilationpath>
</scalacfork>
<propertyfile file="${build-strap.dir}/classes/compiler/compiler.properties">
-diff -Nru scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/ConsoleReaderHelper.scala scala-2.9.2-sources-gil/src/compiler/scala/tools/nsc/interpreter/ConsoleReaderHelper.scala
---- scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/ConsoleReaderHelper.scala 2012-03-18 17:09:24.000000000 +0100
-+++ scala-2.9.2-sources-gil/src/compiler/scala/tools/nsc/interpreter/ConsoleReaderHelper.scala 2012-09-13 01:58:09.000000000 +0200
+diff -up scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/ConsoleReaderHelper.scala.sysjline scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/ConsoleReaderHelper.scala
+--- scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/ConsoleReaderHelper.scala.sysjline 2012-03-18 17:09:24.000000000 +0100
++++ scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/ConsoleReaderHelper.scala 2013-03-20 19:28:59.058673113 +0100
@@ -6,8 +6,8 @@
package scala.tools.nsc
package interpreter
@@ -87,9 +87,9 @@ diff -Nru scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/ConsoleRe
import Completion._
trait ConsoleReaderHelper extends ConsoleReader {
-diff -Nru scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/Delimited.scala scala-2.9.2-sources-gil/src/compiler/scala/tools/nsc/interpreter/Delimited.scala
---- scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/Delimited.scala 2012-03-18 17:09:24.000000000 +0100
-+++ scala-2.9.2-sources-gil/src/compiler/scala/tools/nsc/interpreter/Delimited.scala 2012-09-13 01:58:43.000000000 +0200
+diff -up scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/Delimited.scala.sysjline scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/Delimited.scala
+--- scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/Delimited.scala.sysjline 2012-03-18 17:09:24.000000000 +0100
++++ scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/Delimited.scala 2013-03-20 19:28:59.059673050 +0100
@@ -6,7 +6,7 @@
package scala.tools.nsc
package interpreter
@@ -99,9 +99,9 @@ diff -Nru scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/Delimited
class JLineDelimiter extends ArgumentDelimiter {
def toJLine(args: List[String], cursor: Int) = args match {
-diff -Nru scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/JLineCompletion.scala scala-2.9.2-sources-gil/src/compiler/scala/tools/nsc/interpreter/JLineCompletion.scala
---- scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/JLineCompletion.scala 2012-03-18 17:09:26.000000000 +0100
-+++ scala-2.9.2-sources-gil/src/compiler/scala/tools/nsc/interpreter/JLineCompletion.scala 2012-09-13 01:59:30.000000000 +0200
+diff -up scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/JLineCompletion.scala.sysjline scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/JLineCompletion.scala
+--- scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/JLineCompletion.scala.sysjline 2012-03-18 17:09:26.000000000 +0100
++++ scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/JLineCompletion.scala 2013-03-20 19:28:59.059673050 +0100
@@ -6,8 +6,8 @@
package scala.tools.nsc
package interpreter
@@ -113,23 +113,23 @@ diff -Nru scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/JLineComp
import Completion._
import collection.mutable.ListBuffer
-diff -Nru scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/JLineReader.scala scala-2.9.2-sources-gil/src/compiler/scala/tools/nsc/interpreter/JLineReader.scala
---- scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/JLineReader.scala 2012-03-18 17:09:26.000000000 +0100
-+++ scala-2.9.2-sources-gil/src/compiler/scala/tools/nsc/interpreter/JLineReader.scala 2012-09-13 02:00:06.000000000 +0200
+diff -up scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/JLineReader.scala.sysjline scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/JLineReader.scala
+--- scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/JLineReader.scala.sysjline 2012-03-18 17:09:26.000000000 +0100
++++ scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/JLineReader.scala 2013-03-20 19:33:00.403315860 +0100
@@ -6,8 +6,8 @@
package scala.tools.nsc
package interpreter
-import scala.tools.jline.console.ConsoleReader
-import scala.tools.jline.console.completer._
-+import jline.console.ConsoleReader
-+import jline.console.completer._
++import jline2.console.ConsoleReader
++import jline2.console.completer._
import session._
import scala.collection.JavaConverters._
import Completion._
-diff -Nru scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/Parsed.scala scala-2.9.2-sources-gil/src/compiler/scala/tools/nsc/interpreter/Parsed.scala
---- scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/Parsed.scala 2012-03-18 17:09:24.000000000 +0100
-+++ scala-2.9.2-sources-gil/src/compiler/scala/tools/nsc/interpreter/Parsed.scala 2012-09-13 02:00:40.000000000 +0200
+diff -up scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/Parsed.scala.sysjline scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/Parsed.scala
+--- scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/Parsed.scala.sysjline 2012-03-18 17:09:24.000000000 +0100
++++ scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/Parsed.scala 2013-03-20 19:28:59.059673050 +0100
@@ -6,7 +6,7 @@
package scala.tools.nsc
package interpreter
@@ -139,10 +139,10 @@ diff -Nru scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/Parsed.sc
import util.returning
/** One instance of a command buffer.
-diff -Nru scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/ReplProps.scala scala-2.9.2-sources-gil/src/compiler/scala/tools/nsc/interpreter/ReplProps.scala
---- scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/ReplProps.scala 2012-03-18 17:09:24.000000000 +0100
-+++ scala-2.9.2-sources-gil/src/compiler/scala/tools/nsc/interpreter/ReplProps.scala 2012-09-13 02:01:19.000000000 +0200
-@@ -11,8 +11,8 @@
+diff -up scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/ReplProps.scala.sysjline scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/ReplProps.scala
+--- scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/ReplProps.scala.sysjline 2012-03-18 17:09:24.000000000 +0100
++++ scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/ReplProps.scala 2013-03-20 19:28:59.059673050 +0100
+@@ -11,8 +11,8 @@ import scala.sys._
class ReplProps {
private def bool(name: String) = BooleanProp.keyExists(name)
@@ -153,10 +153,10 @@ diff -Nru scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/ReplProps
val noThreads = bool("scala.repl.no-threads")
val info = bool("scala.repl.info")
-diff -Nru scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/session/package.scala scala-2.9.2-sources-gil/src/compiler/scala/tools/nsc/interpreter/session/package.scala
---- scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/session/package.scala 2012-03-18 17:09:24.000000000 +0100
-+++ scala-2.9.2-sources-gil/src/compiler/scala/tools/nsc/interpreter/session/package.scala 2012-09-13 02:01:54.000000000 +0200
-@@ -13,10 +13,10 @@
+diff -up scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/session/package.scala.sysjline scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/session/package.scala
+--- scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/session/package.scala.sysjline 2012-03-18 17:09:24.000000000 +0100
++++ scala-2.9.2-sources/src/compiler/scala/tools/nsc/interpreter/session/package.scala 2013-03-20 19:28:59.059673050 +0100
+@@ -13,10 +13,10 @@ package object session {
type JIterator[T] = java.util.Iterator[T]
type JListIterator[T] = java.util.ListIterator[T]
More information about the scm-commits
mailing list