[Jpackage-commits] rpms/free/jflex jflex-1.4.3.pom, NONE, 1.1 jflex-bootwith-1.4.2.patch, NONE, 1.1 jflex-byaccj-utl.patch, 1.2, NONE jflex-classpath.patch, 1.2, NONE jflex-javac-no-target.patch, 1.2, NONE jflex-lex-scan.patch, 1.1, NONE jflex-no-cup-no-jflex.patch, 1.2, NONE jflex-settings.xml, NONE, 1.1 jflex.script, 1.1, 1.2 jflex.spec, 1.4, 1.5

jpackage jpackage at ryu.zarb.org
Wed Dec 8 11:35:53 CET 2010


Update of /home/projects/jpackage/cvs/rpms/free/jflex
In directory ryu.zarb.org:/tmp/bw1gXqpuE4/rpms/free/jflex

Modified Files:
	jflex.script jflex.spec 
Added Files:
	jflex-1.4.3.pom jflex-bootwith-1.4.2.patch jflex-settings.xml 
Removed Files:
	jflex-byaccj-utl.patch jflex-classpath.patch 
	jflex-javac-no-target.patch jflex-lex-scan.patch 
	jflex-no-cup-no-jflex.patch 
Log Message:
1.4.3-1.jpp6

Index: jflex.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/jflex/jflex.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** jflex.spec	7 Aug 2008 17:21:45 -0000	1.4
--- jflex.spec	8 Dec 2010 10:35:51 -0000	1.5
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2010, JPackage Project
  # All rights reserved.
  #
***************
*** 39,43 ****
  
  Name:           jflex
! Version:        1.4.2
  Release:        1%{?dist}
  Epoch:          0
--- 39,43 ----
  
  Name:           jflex
! Version:        1.4.3
  Release:        1%{?dist}
  Epoch:          0
***************
*** 46,56 ****
  Group:          Development/Java
  URL:            http://www.jflex.de/
! Source0:        http://www.jflex.de/jflex-1.4.2.tar.gz
  Source1:        jflex.script
! Patch0:         jflex-javac-no-target.patch
! Patch1:         jflex-no-cup-no-jflex.patch
! Patch2:         jflex-classpath.patch
! Patch3:         jflex-lex-scan.patch
! Patch4:         jflex-byaccj-utl.patch
  Requires:       java_cup
  Requires:       jpackage-utils
--- 46,57 ----
  Group:          Development/Java
  URL:            http://www.jflex.de/
! Source0:        jflex-1.4.3.tar.gz
! # svn export http://jflex.svn.sourceforge.net/svnroot/jflex/tags/release_1_4_3/ jflex-1.4.3
! # tar czf jflex-1.4.3.tar.gz jflex-1.4.3/
  Source1:        jflex.script
! Source2:        jflex-settings.xml
! Source3:        jflex-1.4.3.pom
! Patch0:         jflex-bootwith-1.4.2.patch
! 
  Requires:       java_cup
  Requires:       jpackage-utils
***************
*** 62,65 ****
--- 63,73 ----
  BuildRequires:  java-devel
  BuildRequires:  junit
+ 
+ BuildRequires:  maven2 >= 2.0.8
+ BuildRequires:  maven2-plugin-compiler
+ BuildRequires:  maven2-plugin-install
+ BuildRequires:  maven2-plugin-jar
+ BuildRequires:  maven-plugin-tools
+ BuildRequires:  apache-commons-parent
  %if %{gcj_support}
  BuildRequires:  java-gcj-compat-devel
***************
*** 84,87 ****
--- 92,103 ----
      * JLex compatibility
  
+ %package maven-plugin
+ Group:          Development/Java
+ Summary:        Maven2 plugin for %{name}
+ Requires:       %{name} = %{epoch}:%{version}-%{release}
+ 
+ %description maven-plugin
+ %{summary}.
+ 
  %package javadoc
  Group:          Development/Java
***************
*** 93,118 ****
  %prep
  %setup -q
! %{__perl} -pi -e 's/\r$//g' examples/standalone/sample.inp
! %{__rm} -rf src/java_cup
! find . -name '*.jar' | xargs -t %{__rm}
  %if %without bootstrap
  export CLASSPATH=$(build-classpath java-cup junit jflex)
  export OPT_JAR_LIST=:
! pushd src
  %ant realclean
  %ant jflex
  popd
! %endif
! %patch0 -p1
! %if %with bootstrap
! %patch1 -p1
! %else
! %patch2 -p1
! %patch3 -p1
! %patch4 -p1
  %endif
  
  %build
! pushd src
  %if %without bootstrap
  export CLASSPATH=$(build-classpath java-cup junit jflex)
--- 109,133 ----
  %prep
  %setup -q
! cp -p %{SOURCE2} settings.xml
! 
! sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
! sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
! sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
! sed -i -e "s|<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/maven2/plugins</url>|g" settings.xml
! sed -i -e "s|<url>__ECLIPSEDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/eclipse/plugins</url>|g" settings.xml
! 
  %if %without bootstrap
  export CLASSPATH=$(build-classpath java-cup junit jflex)
  export OPT_JAR_LIST=:
! pushd jflex/src
  %ant realclean
  %ant jflex
  popd
! # patch if bootstrapping with jflex-1.4.2
! # %patch0 -b .sav0
  %endif
  
  %build
! pushd jflex/src
  %if %without bootstrap
  export CLASSPATH=$(build-classpath java-cup junit jflex)
***************
*** 126,129 ****
--- 141,162 ----
  popd
  
+ export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
+ mkdir -p  $MAVEN_REPO_LOCAL/JPP
+ cp jflex/lib/JFlex.jar $MAVEN_REPO_LOCAL/JPP/jflex.jar
+ mkdir -p $MAVEN_REPO_LOCAL/de/jflex/jflex/%{version}/
+ cp jflex/lib/JFlex.jar $MAVEN_REPO_LOCAL/de/jflex/jflex/%{version}/jflex-%{version}.jar
+ 
+ pushd maven-jflex-plugin
+ 
+ mvn-jpp -e \
+         -s ../settings.xml \
+ 	-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+         install javadoc:javadoc
+ 
+ #       -Dmaven2.jpp.depmap.file=%{SOURCE4} \
+ #       -Dmaven.test.failure.ignore=true \
+ 
+ popd
+ 
  %install
  %{__rm} -rf %{buildroot}
***************
*** 131,135 ****
  # jar
  %{__mkdir_p} %{buildroot}%{_javadir}
! %{__cp} -a lib/JFlex.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
  (cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %{__ln_s} ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
  
--- 164,169 ----
  # jar
  %{__mkdir_p} %{buildroot}%{_javadir}
! %{__cp} -a jflex/lib/JFlex.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
! %{__cp} -a maven-jflex-plugin/target/maven-jflex-plugin-%{version}.jar %{buildroot}%{_javadir}/maven-jflex-plugin-%{version}.jar
  (cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %{__ln_s} ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
  
***************
*** 137,143 ****
  (cd %{buildroot}%{_javadir} && %{__ln_s} jflex.jar JFlex.jar)
  
  # javadoc
! %{__mkdir_p} 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
! %{__cp} -a dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
  %{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
  
--- 171,184 ----
  (cd %{buildroot}%{_javadir} && %{__ln_s} jflex.jar JFlex.jar)
  
+ # poms
+ install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
+ install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/maven2/poms/JPP-jflex.pom
+ %add_to_maven_depmap de.jflex %{name} %{version} JPP %{name}
+ install -m 644 maven-jflex-plugin/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-maven-jflex-plugin.pom
+ %add_to_maven_depmap de.jflex maven-jflex-plugin %{version} JPP maven-jflex-plugin
+ 
  # javadoc
! %{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version}
! %{__cp} -a jflex/dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
  %{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
  
***************
*** 171,179 ****
  %files
  %defattr(0644,root,root,0755)
! %doc COPYRIGHT doc examples src/README src/changelog
  %attr(0755,root,root) %{_bindir}/%{name}
  %{_javadir}/%{name}.jar
  %{_javadir}/%{name}-%{version}.jar
  %{_javadir}/JFlex.jar
  %if %{gcj_support}
  %dir %{_libdir}/gcj/%{name}
--- 212,222 ----
  %files
  %defattr(0644,root,root,0755)
! %doc jflex/COPYRIGHT jflex/doc jflex/examples jflex/src/README jflex/src/changelog
  %attr(0755,root,root) %{_bindir}/%{name}
  %{_javadir}/%{name}.jar
  %{_javadir}/%{name}-%{version}.jar
  %{_javadir}/JFlex.jar
+ %{_datadir}/maven2/poms/*
+ %{_mavendepmapfragdir}
  %if %{gcj_support}
  %dir %{_libdir}/gcj/%{name}
***************
*** 181,184 ****
--- 224,232 ----
  %endif
  
+ %files maven-plugin
+ %defattr(0644,root,root,0755)
+ %{_javadir}/maven-%{name}-plugin-%{version}.jar
+ %{_javadir}/maven-%{name}-plugin.jar
+ 
  %files javadoc
  %defattr(0644,root,root,0755)
***************
*** 187,190 ****
--- 235,247 ----
  
  %changelog
+ * Tue Dec 07 2010 Ralph Apel <r.apel at r-apel.de> 0:1.4.3-1
+ - 1.4.3 for JPP-6
+ 
+ * Thu Feb 19 2009 David Walluck <dwalluck at redhat.com> 0:1.4.2-3
+ - fix mkdir call
+ 
+ * Tue Dec 02 2008 David Walluck <dwalluck at redhat.com> 0:1.4.2-2
+ - fix script classpath
+ 
  * Mon Jul 28 2008 David Walluck <dwalluck at redhat.com> 0:1.4.2-1
  - 1.4.2

--- jflex-byaccj-utl.patch DELETED ---

--- jflex-javac-no-target.patch DELETED ---

--- jflex-no-cup-no-jflex.patch DELETED ---

--- jflex-lex-scan.patch DELETED ---

Index: jflex.script
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/jflex/jflex.script,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** jflex.script	28 Jul 2008 19:36:36 -0000	1.1
--- jflex.script	8 Dec 2010 10:35:51 -0000	1.2
***************
*** 16,20 ****
  BASE_FLAGS=""
  BASE_OPTIONS=""
! BASE_JARS="jflex"
  
  # Set parameters
--- 16,20 ----
  BASE_FLAGS=""
  BASE_OPTIONS=""
! BASE_JARS="java_cup jflex"
  
  # Set parameters

--- NEW FILE: jflex-settings.xml ---
<settings>
	<profiles>
		<profile>
			<id>JPP</id>
			<repositories>
				<repository>
					<id>internal</id>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>external</id>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>local</id>
					<layout>jpp</layout>
					<url>__MAVENREPO_DIR_PLACEHOLDER__</url>
				</repository>
			</repositories>
			<pluginRepositories>
				<pluginRepository>
					<id>plugins-internal</id>
					<name>plugins-internal</name>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-external</id>
					<name>plugins-external</name>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-maven</id>
					<name>plugins-maven</name>
					<layout>jpp</layout>
					<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>
				</pluginRepository>
			</pluginRepositories>
		</profile>
	</profiles>
	<activeProfiles>
		<activeProfile>JPP</activeProfile>
	</activeProfiles>
</settings>

--- NEW FILE: jflex-1.4.3.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>de.jflex</groupId>
  <artifactId>jflex</artifactId>
  <packaging>jar</packaging>
  <version>1.4.3</version>
  <!-- this is a pseudo POM, to be uploaded manually -->
  <dependencies />
  
  <name>JFlex - The Fast Scanner Generator for Java</name>
  <description>JFlex is a lexical analyzer generator (also known as scanner generator) for Java(tm), written in Java(tm). 
  JFlex is designed to work together with the LALR parser generator CUP by Scott Hudson, and the Java modification of Berkeley Yacc BYacc/J by Bob Jamison. It can also be used together with other parser generators like ANTLR or as a standalone tool. </description>
  <url>http://jflex.de/</url>
  <inceptionYear>1998</inceptionYear>
  <licenses>
   <license>
     <name>GNU General Public License</name>
     <url>http://jflex.de/copying.html#GPL</url>
     <distribution>repo</distribution>
     <comments>The code generated by JFlex inherits the copyright of the specification it was produced from. If it was your specification, you may use the generated code without restriction. </comments>
   </license>
  </licenses>
  <scm>
    <connection>scm:svn:http://jflex.svn.sourceforge.net/svnroot/jflex</connection>
    <developerConnection>scm:svn:https://jflex.svn.sourceforge.net/svnroot/jflex</developerConnection>
    <url>http://jflex.svn.sourceforge.net/viewvc/jflex/</url>
  </scm>
  <developers>
   <developer>
      <id>gerwin</id>
      <name>Gerwin Klein</name>
      <email>lsf at jflex.de</email>
      <roles>
        <role>architect</role>
        <role>developer</role>
      </roles>
    </developer>
  </developers>
  <issueManagement>
    <system>SF tracker</system>
    <url>http://sourceforge.net/tracker/?group_id=14929</url>
  </issueManagement>
  <mailingLists>
    <mailingList>
      <name>jflex-announce</name>
      <subscribe>http://lists.sourceforge.net/lists/listinfo/jflex-announce</subscribe>
      <unsubscribe>http://lists.sourceforge.net/lists/listinfo/jflex-announce</unsubscribe>
      <archive>http://sourceforge.net/mailarchive/forum.php?forum=jflex-announce</archive>
    </mailingList>
    <mailingList>
      <name>jflex-users</name>
      <subscribe>http://lists.sourceforge.net/lists/listinfo/jflex-users</subscribe>
      <unsubscribe>http://lists.sourceforge.net/lists/listinfo/jflex-users</unsubscribe>
      <archive>http://sourceforge.net/mailarchive/forum.php?forum=jflex-users</archive>
    </mailingList>
  </mailingLists>
</project>

--- jflex-classpath.patch DELETED ---

--- NEW FILE: jflex-bootwith-1.4.2.patch ---
--- jflex/src/JFlex/LexScan.java.sav	2010-12-08 10:53:07.000000000 +0100
+++ jflex/src/JFlex/LexScan.java	2010-12-08 10:53:23.000000000 +0100
@@ -1642,9 +1642,6 @@
     }
   }
 
-  /** denotes if the user-EOF-code has already been executed */
-  private boolean zzEOFDone;
-
   /* user code: */
   int balance = 0;
   int commentbalance = 0;




More information about the JPackage-commits mailing list