[javacc] 01/03: Removed javacc 5.0 patches Added executables missing in javacc6
Benjamin Mesing
ben at moszumanska.debian.org
Thu Dec 8 20:41:24 UTC 2016
This is an automated email from the git hooks/post-receive script.
ben pushed a commit to branch debian_6_1_3
in repository javacc.
commit 47316134246d7a3a80e0b7d29a2a7949a20b7933
Author: Benjamin Mesing <bensmail at gmx.net>
Date: Thu Dec 8 21:07:55 2016 +0100
Removed javacc 5.0 patches
Added executables missing in javacc6
---
debian/patches/ParseGen.diff | 36 ----------------------------------
debian/patches/executables.diff | 30 ++++++++++++++++++++++++++++
debian/patches/executables.patch | 41 ---------------------------------------
debian/patches/javacctarget.patch | 14 -------------
debian/patches/series | 4 +---
5 files changed, 31 insertions(+), 94 deletions(-)
diff --git a/debian/patches/ParseGen.diff b/debian/patches/ParseGen.diff
deleted file mode 100644
index 671b38f..0000000
--- a/debian/patches/ParseGen.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Fixes a regression causing the encountered/expected token list to be empty
-Author: Dag H. Wanvik <dag.wanvik at oracle.com>
-Forwarded: yes
-Bug: https://java.net/jira/browse/JAVACC-244
---- a/src/org/javacc/parser/ParseGen.java
-+++ b/src/org/javacc/parser/ParseGen.java
-@@ -570,21 +570,24 @@
- ostr.println(" for (int i = 0; i < jj_endpos; i++) {");
- ostr.println(" jj_expentry[i] = jj_lasttokens[i];");
- ostr.println(" }");
-+ ostr.println(" boolean exists = false;");
- if (!Options.getGenerateGenerics())
-- ostr.println(" jj_entries_loop: for (java.util.Iterator it = jj_expentries.iterator(); it.hasNext();) {");
-+ ostr.println(" for (java.util.Iterator it = jj_expentries.iterator(); it.hasNext();) {");
- else
-- ostr.println(" jj_entries_loop: for (java.util.Iterator<?> it = jj_expentries.iterator(); it.hasNext();) {");
-+ ostr.println(" for (java.util.Iterator<?> it = jj_expentries.iterator(); it.hasNext();) {");
-+ ostr.println(" exists = true;");
- ostr.println(" int[] oldentry = (int[])(it.next());");
- ostr.println(" if (oldentry.length == jj_expentry.length) {");
- ostr.println(" for (int i = 0; i < jj_expentry.length; i++) {");
- ostr.println(" if (oldentry[i] != jj_expentry[i]) {");
-- ostr.println(" continue jj_entries_loop;");
-+ ostr.println(" exists = false;");
-+ ostr.println(" break;");
- ostr.println(" }");
- ostr.println(" }");
-- ostr.println(" jj_expentries.add(jj_expentry);");
-- ostr.println(" break jj_entries_loop;");
-+ ostr.println(" if (exists) break;");
- ostr.println(" }");
- ostr.println(" }");
-+ ostr.println(" if (!exists) jj_expentries.add(jj_expentry);");
- ostr.println(" if (pos != 0) jj_lasttokens[(jj_endpos = pos) - 1] = kind;");
- ostr.println(" }");
- ostr.println(" }");
diff --git a/debian/patches/executables.diff b/debian/patches/executables.diff
new file mode 100644
index 0000000..383d36c
--- /dev/null
+++ b/debian/patches/executables.diff
@@ -0,0 +1,30 @@
+Index: javacc/bin/javacc
+===================================================================
+--- /dev/null
++++ javacc/bin/javacc
+@@ -0,0 +1,5 @@
++#!/bin/sh
++JAR=/usr/share/java/javacc.jar
++
++java -classpath "$JAR" javacc "$@"
++
+Index: javacc/bin/jjdoc
+===================================================================
+--- /dev/null
++++ javacc/bin/jjdoc
+@@ -0,0 +1,5 @@
++#!/bin/sh
++JAR=/usr/share/java/javacc.jar
++
++java -classpath "$JAR" jjdoc "$@"
++
+Index: javacc/bin/jjtree
+===================================================================
+--- /dev/null
++++ javacc/bin/jjtree
+@@ -0,0 +1,5 @@
++#!/bin/sh
++JAR=/usr/share/java/javacc.jar
++
++java -classpath "$JAR" jjtree "$@"
++
diff --git a/debian/patches/executables.patch b/debian/patches/executables.patch
deleted file mode 100644
index 818c840..0000000
--- a/debian/patches/executables.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: Set the proper path to javacc.jar on Debian for the command line tools
-Forwarded: not-needed
---- a/bin/javacc
-+++ b/bin/javacc
-@@ -1,9 +1,5 @@
- #!/bin/sh
--JAR="`dirname $0`/lib/javacc.jar"
--
--case "`uname`" in
-- CYGWIN*) JAR="`cygpath --windows -- "$JAR"`" ;;
--esac
-+JAR=/usr/share/java/javacc.jar
-
- java -classpath "$JAR" javacc "$@"
-
---- a/bin/jjdoc
-+++ b/bin/jjdoc
-@@ -1,9 +1,5 @@
- #!/bin/sh
--JAR="`dirname $0`/lib/javacc.jar"
--
--case "`uname`" in
-- CYGWIN*) JAR="`cygpath --windows -- "$JAR"`" ;;
--esac
-+JAR=/usr/share/java/javacc.jar
-
- java -classpath "$JAR" jjdoc "$@"
-
---- a/bin/jjtree
-+++ b/bin/jjtree
-@@ -1,9 +1,5 @@
- #!/bin/sh
--JAR="`dirname $0`/lib/javacc.jar"
--
--case "`uname`" in
-- CYGWIN*) JAR="`cygpath --windows -- "$JAR"`" ;;
--esac
-+JAR=/usr/share/java/javacc.jar
-
- java -classpath "$JAR" jjtree "$@"
-
diff --git a/debian/patches/javacctarget.patch b/debian/patches/javacctarget.patch
deleted file mode 100644
index 0d2b466..0000000
--- a/debian/patches/javacctarget.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Set the compiler target
-Forwarded: not-needed
---- a/src/org/javacc/parser/build.xml
-+++ b/src/org/javacc/parser/build.xml
-@@ -52,7 +52,8 @@
- <javac srcdir="${javacc.root}/src"
- destdir="${javacc.root}/classes"
- debug="${build.compiler.debug}"
-- source="1.4"
-+ source="1.5"
-+ target="1.5"
- classpath="${javacc.root}/classes:${junit.jar}">
- </javac>
- </target>
diff --git a/debian/patches/series b/debian/patches/series
index 3ba2cad..8a32e2b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-executables.patch
-javacctarget.patch
-ParseGen.diff
+executables.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/javacc.git
More information about the pkg-java-commits
mailing list