[Jpackage-commits] dist/javacc/JPP-6 javacc-generated-files.patch, 1.2, 1.3 javacc-javacc-source.patch, NONE, 1.1 javacc-pom.patch, 1.1, 1.2 javacc.spec, 1.12, 1.13

David Walluck david at ryu.zarb.org
Thu Dec 23 05:33:30 CET 2010


Update of /home/projects/jpackage/cvs/dist/javacc/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv29465

Modified Files:
	javacc-generated-files.patch javacc-pom.patch javacc.spec 
Added Files:
	javacc-javacc-source.patch 
Log Message:
- build as non-bootstrap

Index: javacc-generated-files.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/javacc/JPP-6/javacc-generated-files.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** javacc-generated-files.patch	23 Dec 2010 03:12:13 -0000	1.2
--- javacc-generated-files.patch	23 Dec 2010 04:33:27 -0000	1.3
***************
*** 1,5 ****
  diff -uNr javacc.orig/classes/templates/CharStream.template javacc/classes/templates/CharStream.template
  --- javacc.orig/classes/templates/CharStream.template	1969-12-31 19:00:00.000000000 -0500
! +++ javacc/classes/templates/CharStream.template	2010-12-22 21:35:03.625703573 -0500
  @@ -0,0 +1,116 @@
  +/**
--- 1,5 ----
  diff -uNr javacc.orig/classes/templates/CharStream.template javacc/classes/templates/CharStream.template
  --- javacc.orig/classes/templates/CharStream.template	1969-12-31 19:00:00.000000000 -0500
! +++ javacc/classes/templates/CharStream.template	2010-12-22 23:02:19.341418677 -0500
  @@ -0,0 +1,116 @@
[...1341 lines suppressed...]
--- 31900,31909 ----
  +
  +}
! +/* JavaCC - OriginalChecksum=8cd4768a915cd46f56a026b48ab671e8 (do not edit this line) */
  diff -uNr javacc.orig/src/org/javacc/parser/TokenMgrError.java javacc/src/org/javacc/parser/TokenMgrError.java
  --- javacc.orig/src/org/javacc/parser/TokenMgrError.java	1969-12-31 19:00:00.000000000 -0500
! +++ javacc/src/org/javacc/parser/TokenMgrError.java	2010-12-22 23:02:16.471015247 -0500
  @@ -0,0 +1,152 @@
! +/* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 5.0 */
  +/* JavaCCOptions: */
  +/**
***************
*** 32059,32061 ****
  +  }
  +}
! +/* JavaCC - OriginalChecksum=324740e100a7d3ccb516afb8be48ce62 (do not edit this line) */
--- 32056,32058 ----
  +  }
  +}
! +/* JavaCC - OriginalChecksum=2bff8e90504b0fdf6d9d7de05923207e (do not edit this line) */

Index: javacc-pom.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/javacc/JPP-6/javacc-pom.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** javacc-pom.patch	23 Dec 2010 03:12:13 -0000	1.1
--- javacc-pom.patch	23 Dec 2010 04:33:27 -0000	1.2
***************
*** 1,5 ****
  --- pom.xml.sav1	2009-07-16 16:22:47.000000000 -0400
! +++ pom.xml	2010-12-22 21:54:31.824324579 -0500
! @@ -1,6 +1,7 @@
   <?xml version="1.0"?>
  -<project>
--- 1,5 ----
  --- pom.xml.sav1	2009-07-16 16:22:47.000000000 -0400
! +++ pom.xml	2010-12-22 23:23:40.330501645 -0500
! @@ -1,11 +1,12 @@
   <?xml version="1.0"?>
  -<project>
***************
*** 11,12 ****
--- 11,18 ----
     <artifactId>javacc</artifactId>
     <packaging>jar</packaging>
+    <name>JavaCC</name>
+ -  <version>4.2</version>
+ +  <version>5.0</version>
+  
+    <description>
+  JavaCC is a parser/scanner generator for java.

Index: javacc.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/javacc/JPP-6/javacc.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -C 2 -d -r1.12 -r1.13
*** javacc.spec	23 Dec 2010 03:53:40 -0000	1.12
--- javacc.spec	23 Dec 2010 04:33:27 -0000	1.13
***************
*** 34,38 ****
  %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
  
! %bcond_without bootstrap
  %bcond_with gcj_support
  %bcond_without repolib
--- 34,38 ----
  %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
  
! %bcond_with bootstrap
  %bcond_with gcj_support
  %bcond_without repolib
***************
*** 46,53 ****
  Name:           javacc
  Version:        5.0
! Release:        4%{?dist}
  Epoch:          0
  Summary:        Parser/scanner generator for java
  License:        BSD
  Source0:        javacc-5.0src.tar.gz
  Source1:        javacc.sh
--- 46,55 ----
  Name:           javacc
  Version:        5.0
! Release:        5%{?dist}
  Epoch:          0
  Summary:        Parser/scanner generator for java
  License:        BSD
+ URL:            https://javacc.dev.java.net/
+ Group:          Development/Java
  Source0:        javacc-5.0src.tar.gz
  Source1:        javacc.sh
***************
*** 57,62 ****
  Patch0:         javacc-generated-files.patch
  Patch1:         javacc-pom.patch
! URL:            https://javacc.dev.java.net/
! Group:          Development/Java
  Requires:       jpackage-utils
  BuildRequires:  ant
--- 59,63 ----
  Patch0:         javacc-generated-files.patch
  Patch1:         javacc-pom.patch
! Patch2:         javacc-javacc-source.patch
  Requires:       jpackage-utils
  BuildRequires:  ant
***************
*** 115,127 ****
  %prep
  %setup -q -n %{name}
  %if %without bootstrap
  %{__ln_s} %{_javadir}/javacc.jar bootstrap/javacc.jar
  %else
- %{_bindir}/find bootstrap -name "*.jar" | %{_bindir}/xargs -t %{__rm}
  %patch0 -p1
  %endif
  %patch1 -p0
  
- %{_bindir}/find lib -name "*.jar" | %{_bindir}/xargs -t %{__rm}
  %{__ln_s} %(%{_bindir}/build-classpath junit) lib/junit3.8.1/junit.jar
  
--- 116,128 ----
  %prep
  %setup -q -n %{name}
+ %{_bindir}/find -type f -name "*.jar" | %{_bindir}/xargs -t %{__rm}
  %if %without bootstrap
  %{__ln_s} %{_javadir}/javacc.jar bootstrap/javacc.jar
  %else
  %patch0 -p1
  %endif
  %patch1 -p0
+ %patch2 -p0
  
  %{__ln_s} %(%{_bindir}/build-classpath junit) lib/junit3.8.1/junit.jar
  
***************
*** 129,133 ****
  export CLASSPATH=
  export OPT_JAR_LIST=:
! %{ant} -Dversion=%{version} jar
  
  %install
--- 130,134 ----
  export CLASSPATH=
  export OPT_JAR_LIST=:
! %{ant} -Dversion=%{version}
  
  %install
***************
*** 163,166 ****
--- 164,169 ----
  %{__install} -p -m 0644 %{SOURCE3} %{buildroot}%{repodirsrc}
  %{__install} -p -m 0644 %{PATCH0} %{buildroot}%{repodirsrc}
+ %{__install} -p -m 0644 %{PATCH1} %{buildroot}%{repodirsrc}
+ %{__install} -p -m 0644 %{PATCH2} %{buildroot}%{repodirsrc}
  %{__cp} -p %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom %{buildroot}%{repodirlib}/javacc.pom
  %{__cp} -p %{buildroot}%{_javadir}/%{name}-%{version}.jar %{buildroot}%{repodirlib}/javacc.jar
***************
*** 234,237 ****
--- 237,243 ----
  
  %changelog
+ * Thu Dec 23 2010 David Walluck <dwalluck at redhat.com> 0:5.0-5
+ - build as non-bootstrap
+ 
  * Thu Dec 23 2010 David Walluck <dwalluck at redhat.com> 0:5.0-4
  - 5.0

--- NEW FILE: javacc-javacc-source.patch ---
--- src/org/javacc/jjdoc/build.xml.orig	2010-12-22 23:30:30.418389962 -0500
+++ src/org/javacc/jjdoc/build.xml	2010-12-22 23:31:36.995570550 -0500
@@ -46,7 +46,7 @@
     <javac srcdir="${javacc.root}/src"
            destdir="${javacc.root}/classes"
            debug="${build.compiler.debug}"
-           source="1.4"
+           source="1.5"
            classpath="${javacc.root}/classes">
     </javac>
   </target>
--- src/org/javacc/jjtree/build.xml.orig	2010-12-22 23:30:30.424388714 -0500
+++ src/org/javacc/jjtree/build.xml	2010-12-22 23:31:37.001569307 -0500
@@ -54,7 +54,7 @@
     <javac srcdir="${javacc.root}/src"
            destdir="${javacc.root}/classes"
            debug="${build.compiler.debug}"
-           source="1.4"
+           source="1.5"
            classpath="${javacc.root}/classes">
     </javac>
   </target>
--- src/org/javacc/parser/build.xml.orig	2010-12-22 23:30:30.424388714 -0500
+++ src/org/javacc/parser/build.xml	2010-12-22 23:31:37.001569307 -0500
@@ -52,7 +52,7 @@
     <javac srcdir="${javacc.root}/src"
            destdir="${javacc.root}/classes"
            debug="${build.compiler.debug}"
-           source="1.4"
+           source="1.5"
            classpath="${javacc.root}/classes:${junit.jar}">
     </javac>
   </target>




More information about the JPackage-commits mailing list