[Jpackage-commits] dist/javacc/JPP-6 .cvsignore, 1.3, 1.4 javacc, 1.1, NONE javacc-build.patch, 1.1, NONE javacc-generated-files.patch, 1.1, 1.2 javacc-pom.patch, NONE, 1.1 javacc.sh, NONE, 1.1 javacc.spec, 1.6, 1.7 jjdoc, 1.1, NONE jjdoc.sh, NONE, 1.1 jjtree, 1.1, NONE jjtree.sh, NONE, 1.1 sources, 1.3, 1.4

David Walluck david at ryu.zarb.org
Thu Dec 23 04:12:16 CET 2010


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

Modified Files:
	.cvsignore javacc-generated-files.patch javacc.spec sources 
Added Files:
	javacc-pom.patch javacc.sh jjdoc.sh jjtree.sh 
Removed Files:
	javacc javacc-build.patch jjdoc jjtree 
Log Message:
- 5.0

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/javacc/JPP-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** .cvsignore	12 Jan 2009 21:27:18 -0000	1.3
--- .cvsignore	23 Dec 2010 03:12:13 -0000	1.4
***************
*** 1 ****
! javacc-4.0src.tar.bz2
--- 1 ----
! javacc-5.0src.tar.gz

Index: javacc.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/javacc/JPP-6/javacc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -C 2 -d -r1.6 -r1.7
*** javacc.spec	12 Jan 2009 21:49:12 -0000	1.6
--- javacc.spec	23 Dec 2010 03:12:13 -0000	1.7
***************
*** 1,3 ****
! # Copyright (c) 2000-2009, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2010, JPackage Project
  # All rights reserved.
  #
***************
*** 34,38 ****
  %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
  
! %bcond_with bootstrap
  %bcond_with gcj_support
  %bcond_without repolib
--- 34,38 ----
  %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
  
! %bcond_without bootstrap
  %bcond_with gcj_support
  %bcond_without repolib
***************
*** 45,61 ****
  
  Name:           javacc
! Version:        4.0
! Release:        5%{?dist}
  Epoch:          0
  Summary:        Parser/scanner generator for java
  License:        BSD
! # Re-zipped with jars removed
! Source0:        https://javacc.dev.java.net/files/documents/17/26783/javacc-%{version}src.tar.bz2
! Source1:        javacc
! Source2:        jjdoc
! Source3:        jjtree
  Source4:        javacc-component-info.xml
! Patch0:         javacc-build.patch
! Patch1:         javacc-generated-files.patch
  URL:            https://javacc.dev.java.net/
  Group:          Development/Java
--- 45,60 ----
  
  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
! Source2:        jjdoc.sh
! Source3:        jjtree.sh
  Source4:        javacc-component-info.xml
! Patch0:         javacc-generated-files.patch
! Patch1:         javacc-pom.patch
  URL:            https://javacc.dev.java.net/
  Group:          Development/Java
***************
*** 67,70 ****
--- 66,72 ----
  BuildRequires:  java-devel
  BuildRequires:  junit
+ %if %with repolib
+ BuildRequires:  maven2-plugin-deploy
+ %endif
  %if %with gcj_support
  BuildRequires:  java-gcj-compat-devel
***************
*** 109,140 ****
  %prep
  %setup -q -n %{name}
- %patch0 -p1
  %if %without bootstrap
  %{__ln_s} %{_javadir}/javacc.jar bootstrap/javacc.jar
  %else
! %patch1 -p1
  %endif
! %{__ln_s} %{_javadir}/junit.jar lib/junit3.8.1/junit.jar
  
! %{__cp} -a %{SOURCE1} javacc
! %{__cp} -a %{SOURCE2} jjdoc
! %{__cp} -a %{SOURCE3} jjtree
! %{__mv} www/doc .
  
  %build
  export CLASSPATH=
  export OPT_JAR_LIST=:
! %ant -Dversion=%{version} jar
  
  %install
  %{__rm} -rf %{buildroot}
  %{__mkdir_p} %{buildroot}%{_javadir}
  %{__cp} -p bin/lib/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
  %{__ln_s} %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
  %{__mkdir_p} %{buildroot}%{_bindir}
! %{__cp} -p javacc jjdoc jjtree %{buildroot}%{_bindir}
  %{__mkdir_p} %{buildroot}%{_datadir}/%{name}
  %{__cp} -pr examples %{buildroot}%{_datadir}/%{name}
  
  %if %with repolib
  %{__mkdir_p} %{buildroot}%{repodir}
--- 111,149 ----
  %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 -b .sav0
  %endif
! %patch1 -p0 -b .sav1
  
! %{_bindir}/find lib -name "*.jar" | %{_bindir}/xargs -t %{__rm}
! %{__ln_s} %(%{_bindir}/build-classpath junit) lib/junit3.8.1/junit.jar
  
  %build
  export CLASSPATH=
  export OPT_JAR_LIST=:
! %{ant} -Dversion=%{version} jar
  
  %install
  %{__rm} -rf %{buildroot}
+ 
  %{__mkdir_p} %{buildroot}%{_javadir}
  %{__cp} -p bin/lib/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
  %{__ln_s} %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+ 
  %{__mkdir_p} %{buildroot}%{_bindir}
! %{__cp} -p %{SOURCE1} %{buildroot}%{_bindir}/javacc
! %{__cp} -p %{SOURCE2} %{buildroot}%{_bindir}/jjdoc
! %{__cp} -p %{SOURCE3} %{buildroot}%{_bindir}/jjtree
  %{__mkdir_p} %{buildroot}%{_datadir}/%{name}
  %{__cp} -pr examples %{buildroot}%{_datadir}/%{name}
  
+ install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+ install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom
+ 
+ %add_to_maven_depmap net.java.dev.javacc javacc %{version} JPP %{name}
+ 
  %if %with repolib
  %{__mkdir_p} %{buildroot}%{repodir}
***************
*** 146,154 ****
  %{__mkdir_p} %{buildroot}%{repodirsrc}
  %{__install} -p -m 0644 %{SOURCE0} %{buildroot}%{repodirsrc}
  %{__install} -p -m 0644 %{PATCH0} %{buildroot}%{repodirsrc}
! %{__install} -p -m 0644 %{PATCH1} %{buildroot}%{repodirsrc}
  %{__cp} -p %{buildroot}%{_javadir}/%{name}-%{version}.jar %{buildroot}%{repodirlib}/javacc.jar
  %endif
  
  %if %with gcj_support
  %{_bindir}/aot-compile-rpm
--- 155,179 ----
  %{__mkdir_p} %{buildroot}%{repodirsrc}
  %{__install} -p -m 0644 %{SOURCE0} %{buildroot}%{repodirsrc}
+ %{__install} -p -m 0644 %{SOURCE1} %{buildroot}%{repodirsrc}
+ %{__install} -p -m 0644 %{SOURCE2} %{buildroot}%{repodirsrc}
+ %{__install} -p -m 0644 %{SOURCE3} %{buildroot}%{repodirsrc}
  %{__install} -p -m 0644 %{PATCH0} %{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
  %endif
  
+ %if %with repolib
+ %{_bindir}/mvn-jpp deploy:deploy-file -DpomFile=%{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom -Dfile=%{buildroot}%{_javadir}/%{name}-%{version}.jar \
+     -Durl=file://%{buildroot}%{_javadir}/repository.jboss.com/maven2-brew -Dversion=%{version}
+ # FIXME: Bug in maven when a previous version is also in the local repo
+ %define previous_version 4.2
+ (mkdir -p  %{buildroot}%{_javadir}/repository.jboss.com/maven2-brew/net/java/dev/javacc/javacc/%{version}
+ cp -prf %{buildroot}%{_javadir}/repository.jboss.com/maven2-brew/net/java/dev/javacc/javacc/%{previous_version}/* %{buildroot}%{_javadir}/repository.jboss.com/maven2-brew/net/java/dev/javacc/javacc/%{version}/
+ pushd %{buildroot}%{_javadir}/repository.jboss.com/maven2-brew/net/java/dev/javacc/javacc/%{version}/
+ for i in *-%{previous_version}*; do mv $i `echo $i | sed -e 's/-%{previous_version}/-%{version}/;'`; done
+ popd
+ rm -rf %{buildroot}%{_javadir}/repository.jboss.com/maven2-brew/net/java/dev/javacc/javacc/%{previous_version}) || :
+ %endif
+ 
  %if %with gcj_support
  %{_bindir}/aot-compile-rpm
***************
*** 178,183 ****
  %attr(0755,root,root) %{_bindir}/jjdoc
  %attr(0755,root,root) %{_bindir}/jjtree
! %{_javadir}/%{name}-%{version}.jar
! %{_javadir}/%{name}.jar
  %if %with gcj_support
  %dir %{_libdir}/gcj/%{name}
--- 203,210 ----
  %attr(0755,root,root) %{_bindir}/jjdoc
  %attr(0755,root,root) %{_bindir}/jjtree
! %{_javadir}*/%{name}-%{version}.jar
! %{_javadir}*/%{name}.jar
! %{_datadir}/maven2/poms/JPP-%{name}.pom
! %{_mavendepmapfragdir}/%{name}
  %if %with gcj_support
  %dir %{_libdir}/gcj/%{name}
***************
*** 186,204 ****
  %endif
  
! %files manual
  %defattr(0644,root,root,0755)
! %doc doc/*
  
! %files demo
  %defattr(0644,root,root,0755)
! %{_datadir}/%{name}
  
  %if %with repolib
  %files repolib
  %defattr(0644,root,root,0755)
  %{_javadir}/repository.jboss.com
  %endif
  
  %changelog
  * Mon Jan 12 2008 David Walluck <dwalluck at redhat.com> 0:4.0-5
  - disable bootstrap by default
--- 213,236 ----
  %endif
  
! %files demo
  %defattr(0644,root,root,0755)
! %dir %{_datadir}/%{name}
! %{_datadir}/%{name}/*
  
! %files manual
  %defattr(0644,root,root,0755)
! %doc www/*
  
  %if %with repolib
  %files repolib
  %defattr(0644,root,root,0755)
+ %dir %{_javadir}*/
  %{_javadir}/repository.jboss.com
  %endif
  
  %changelog
+ * Thu Dec 23 2010 David Walluck <dwalluck at redhat.com> 0:5.0-4
+ - 5.0
+ 
  * Mon Jan 12 2008 David Walluck <dwalluck at redhat.com> 0:4.0-5
  - disable bootstrap by default

--- NEW FILE: jjdoc.sh ---
#!/bin/sh
# 
# JJDoc script
# JPackage Project <http://www.jpackage.org/>

# Source functions library
if [ -f /usr/share/java-utils/java-functions ] ; then 
  . /usr/share/java-utils/java-functions
else
  echo "Can't find function library, aborting"
  exit 1
fi

# Configuration
MAIN_CLASS=jjdoc
BASE_JARS="javacc"

# Set parameters
set_jvm
set_classpath $BASE_JARS
set_flags $BASE_FLAGS
set_options $BASE_OPTIONS

# Let's start
run "$@"

--- javacc-build.patch DELETED ---

--- NEW FILE: javacc.sh ---
#!/bin/sh
# 
# JavaCC script
# JPackage Project <http://www.jpackage.org/>

# Source functions library
if [ -f /usr/share/java-utils/java-functions ] ; then 
  . /usr/share/java-utils/java-functions
else
  echo "Can't find function library, aborting"
  exit 1
fi

# Configuration
MAIN_CLASS=javacc
BASE_JARS="javacc"

# Set parameters
set_jvm
set_classpath $BASE_JARS
set_flags $BASE_FLAGS
set_options $BASE_OPTIONS

# Let's start
run "$@"

--- NEW FILE: javacc-pom.patch ---
--- 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>
-  <modelVersion>5.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
   <groupId>net.java.dev.javacc</groupId>
   <artifactId>javacc</artifactId>
   <packaging>jar</packaging>

--- javacc DELETED ---

--- NEW FILE: jjtree.sh ---
#!/bin/sh
# 
# JJTree script
# JPackage Project <http://www.jpackage.org/>

# Source functions library
if [ -f /usr/share/java-utils/java-functions ] ; then 
  . /usr/share/java-utils/java-functions
else
  echo "Can't find function library, aborting"
  exit 1
fi

# Configuration
MAIN_CLASS=jjtree
BASE_JARS="javacc"

# Set parameters
set_jvm
set_classpath $BASE_JARS
set_flags $BASE_FLAGS
set_options $BASE_OPTIONS

# Let's start
run "$@"

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/javacc/JPP-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** sources	12 Jan 2009 21:27:18 -0000	1.3
--- sources	23 Dec 2010 03:12:13 -0000	1.4
***************
*** 1 ****
! baae5af1c27cd24269a29ae789c828da  javacc-4.0src.tar.bz2
--- 1 ----
! 871d78a2a5859c2eebc712c1f8135be5  javacc-5.0src.tar.gz

--- jjtree DELETED ---

--- jjdoc DELETED ---

Index: javacc-generated-files.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/javacc/JPP-6/javacc-generated-files.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** javacc-generated-files.patch	12 Jan 2009 21:35:11 -0000	1.1
--- javacc-generated-files.patch	23 Dec 2010 03:12:13 -0000	1.2
***************
*** 1,11 ****
! diff -uNr javacc/src/org/javacc/jjtree/ASTBNFAssignment.java javacc/src/org/javacc/jjtree/ASTBNFAssignment.java
! --- javacc/src/org/javacc/jjtree/ASTBNFAssignment.java	1970-01-01 01:00:00.000000000 +0100
! +++ javacc/src/org/javacc/jjtree/ASTBNFAssignment.java	2006-12-16 09:12:14.000000000 +0100
  @@ -0,0 +1,14 @@
! +/* Generated By:JJTree: Do not edit this line. ASTBNFAssignment.java */
  +
  +package org.javacc.jjtree;
  +
! +public class ASTBNFAssignment extends SimpleNode {
  +  public ASTBNFAssignment(int id) {
[...34960 lines suppressed...]
! +  /*
! +   * Constructors of various flavors follow.
! +   */
  +
! +  /** No arg constructor. */
! +  public TokenMgrError() {
! +  }
  +
! +  /** Constructor with message and reason. */
! +  public TokenMgrError(String message, int reason) {
! +    super(message);
! +    errorCode = reason;
! +  }
  +
! +  /** Full Constructor. */
! +  public TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar, int reason) {
! +    this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
! +  }
  +}
+ +/* JavaCC - OriginalChecksum=324740e100a7d3ccb516afb8be48ce62 (do not edit this line) */




More information about the JPackage-commits mailing list