summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-java/javacup/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-java/javacup/files')
-rw-r--r--dev-java/javacup/files/javacup-0.11b_beta20150326-build-xml-svn.patch44
-rw-r--r--dev-java/javacup/files/javacup-0.11b_beta20150326-build-xml.patch26
2 files changed, 70 insertions, 0 deletions
diff --git a/dev-java/javacup/files/javacup-0.11b_beta20150326-build-xml-svn.patch b/dev-java/javacup/files/javacup-0.11b_beta20150326-build-xml-svn.patch
new file mode 100644
index 000000000000..d5a14af3587b
--- /dev/null
+++ b/dev-java/javacup/files/javacup-0.11b_beta20150326-build-xml-svn.patch
@@ -0,0 +1,44 @@
+From 1a908a86fa6c253332b673ecc98e4ec8dffcdca2 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 8 Aug 2015 14:49:02 +0200
+Subject: [PATCH] No longer query subversion revision
+
+There is not .svn folder shipped anyway
+---
+ build.xml | 13 +------------
+ 1 file changed, 1 insertion(+), 12 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index 33f0c60..860bbb5 100644
+--- a/build.xml
++++ b/build.xml
+@@ -18,17 +18,6 @@
+ <mkdir dir="${classes}" />
+ <mkdir dir="${dist}" />
+ <loadfile property="cupversion" srcFile="version.txt"/>
+- <exec executable="svn" outputproperty="svnversion">
+- <arg value="info"/>
+- <redirector>
+- <outputfilterchain>
+- <linecontains>
+- <contains value="Revision"/>
+- </linecontains>
+- <deletecharacters chars="Revision: "/>
+- </outputfilterchain>
+- </redirector>
+- </exec>
+ </target>
+
+ <property environment="env" />
+@@ -67,7 +56,7 @@
+ <copy todir="${java}"><fileset dir="${src}"></fileset></copy>
+ <replace file="${java}/java_cup/version.java"
+ token="+ version_str"
+- value='+ "v0.11b ${cupversion} (SVN rev ${svnversion})"'>
++ value='+ "v0.11b ${cupversion}"'>
+ </replace>
+ <javac srcdir="${java}" destdir="${classes}" verbose="off" listfiles="off" debug="on" source="1.5" target="1.5">
+ <classpath refid="libraries"/>
+--
+2.5.0
+
diff --git a/dev-java/javacup/files/javacup-0.11b_beta20150326-build-xml.patch b/dev-java/javacup/files/javacup-0.11b_beta20150326-build-xml.patch
new file mode 100644
index 000000000000..5aa346303dc0
--- /dev/null
+++ b/dev-java/javacup/files/javacup-0.11b_beta20150326-build-xml.patch
@@ -0,0 +1,26 @@
+From 1488926a5731b17a577a1fd161eb95b88458a09b Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Fri, 7 Aug 2015 21:42:29 +0200
+Subject: [PATCH] Bundled JFlex.jar also contains java_cup/runtime/Scanner, our
+ replacement does not
+
+---
+ build.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build.xml b/build.xml
+index 33f0c60..89c9793 100644
+--- a/build.xml
++++ b/build.xml
+@@ -53,7 +53,7 @@
+ </target>
+
+ <taskdef name="cup" classname="java_cup.anttask.CUPTask" classpath="${bin}/java-cup-11.jar" />
+- <taskdef name="jflex" classname="JFlex.anttask.JFlexTask" classpath="${bin}/JFlex.jar" />
++ <taskdef name="jflex" classname="JFlex.anttask.JFlexTask" classpath="${bin}/JFlex.jar:${bin}/java-cup-11.jar" />
+
+ <target name="cup" depends="init">
+ <cup srcfile="${cup}/parser.cup" interface="on" destdir="${java}" parser="parser" symbols="sym" quiet="false" nonterms="true"/>
+--
+2.5.0
+