rpms/jflex
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to upstream version 1.5.0

Browse Source
This commit is contained in:
Mikolaj Izdebski 2014-01-27 12:54:18 +01:00
parent 0bde70fd33
commit 2946bcb0e7
7 changed files with 21 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
jflex-1.4.1.tar.gz
jflex-1.4.3.tar.gz
/jflex-1.4.3-clean.tar.gz
/jflex-1.5.0-clean.tar.gz

2
create-tarball.sh
View File

@ -14,7 +14,7 @@ tar xvf ${NAME}-${VERSION}.tar.gz
(
cd ${NAME}-${VERSION}
find . -name "*.jar" -delete
rm -Rf src/java_cup/ examples/
rm -Rf src/main/java/java_cup/ examples/
)
tar czvf ${NAME}-${VERSION}-clean.tar.gz ${NAME}-${VERSION}

62
jflex-1.4.3.pom
View File

@ -1,62 +0,0 @@
<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>
<dependency>
<groupId>java_cup</groupId>
<artifactId>java_cup</artifactId>
</dependency>
</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@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>

32
jflex-build_xml.patch
View File

@ -1,32 +0,0 @@
--- src/build.xml.sav 2008-05-28 11:45:28.000000000 +0300
+++ src/build.xml 2010-01-08 12:22:48.820864187 +0200
@@ -69,6 +69,14 @@
classpath=".:${junit.jar}"
debug="on" />
</target>
+
+ <target name="compile-bootstrap"
+ description="compile all classes during a bootstrap">
+ <javac srcdir="."
+ destdir="../lib"
+ classpath="."
+ debug="on" />
+ </target>
<target name="jflex" depends="declare" description="generate scanner">
<jflex file="JFlex/LexScan.flex" skeleton="skeleton.nested"/>
@@ -89,6 +97,14 @@
jarfile="../lib/JFlex.jar"
manifest="manifest"/>
</target>
+
+ <target name="jar-bootstrap" depends="compile-bootstrap,copy" description="make JFlex.jar">
+ <jar basedir="../lib"
+ includes="JFlex/**,java_cup/**,skeleton"
+ jarfile="../lib/JFlex.jar"
+ manifest="manifest"/>
+ </target>
+
<target name="libclean" description="remove compiled classes">
<delete dir="../lib/JFlex" />

12
jflex-junit-incompatibility.patch
View File

@ -1,12 +0,0 @@
diff -Naur jflex-1.4.3.orig/src/JFlex/tests/AllTests.java jflex-1.4.3/src/JFlex/tests/AllTests.java
--- jflex-1.4.3.orig/src/JFlex/tests/AllTests.java 2009-01-31 09:52:34.000000000 +0100
+++ jflex-1.4.3/src/JFlex/tests/AllTests.java 2012-03-12 13:47:35.835005672 +0100
@@ -32,7 +32,7 @@
public class AllTests {
public static void main(String[] args) {
- junit.textui.TestRunner.run(AllTests.class);
+// junit.textui.TestRunner.run(AllTests.class);
}
public static Test suite() {

75
jflex.spec
View File

@ -1,37 +1,27 @@
%bcond_with bootstrap
Summary: Fast Scanner Generator
Name: jflex
Version: 1.4.3
Release: 16%{?dist}
Epoch: 0
Version: 1.5.0
Release: 1%{?dist}
License: GPL+
URL: http://jflex.de/
BuildArch: noarch
# ./create-tarball.sh %%{version}
Source0: %{name}-%{version}-clean.tar.gz
Source1: http://repo2.maven.org/maven2/de/jflex/jflex/1.4.3/jflex-1.4.3.pom
Source2: %{name}.desktop
Source3: %{name}.png
Source4: %{name}.1
Source5: create-tarball.sh
Patch0: jflex-build_xml.patch
Patch1: jflex-junit-incompatibility.patch
# Build-require itself except in bootstrapping mode
%{!?with_bootstrap:BuildRequires: jflex}
BuildRequires: jpackage-utils >= 0:1.5
BuildRequires: ant
BuildRequires: emacs
BuildRequires: jflex
BuildRequires: junit
BuildRequires: java-devel
BuildRequires: java_cup
BuildRequires: desktop-file-utils
Requires: emacs-filesystem >= %{_emacs_version}
Requires: java
Requires: java_cup
BuildArch: noarch
%description
JFlex is a lexical analyzer generator (also known as scanner
@ -52,55 +42,29 @@ This package provides %{summary}.
%prep
%setup -q
%patch0 -b .sav
%patch1 -p1 -b .sav
%mvn_file : %{name}
%pom_add_dep java_cup:java_cup
%{__sed} -i 's/\r//' COPYRIGHT
%{__sed} -i 's|includes="JFlex/\*\*,java_cup/\*\*,skeleton|includes="JFlex/\*\*,skeleton|g' src/build.xml
%pom_remove_plugin :maven-antrun-plugin
%pom_remove_plugin :maven-jflex-plugin
%build
pushd src
%if %{with bootstrap}
# intial build using the autogenerated sym.java LexParse.java and LexScan.java
# these are created by the jflex ant task which needs to be built first
export CLASSPATH=$(build-classpath junit java_cup)
ant jar-bootstrap
# now that the JFlex.jar has been build we can use jflex ant tasks
# removing the generated files and rebuilding using the JFlex.jar
export CLASSPATH=${CLASSPATH}:../lib/JFlex.jar
%else
export CLASSPATH=$(build-classpath junit java_cup jflex)
%endif
ant genclean libclean jar
javadoc -sourcepath . -d ../api JFlex
popd
java -jar /usr/share/java/java_cup.jar -parser LexParse -interface -destdir src/main/java src/main/cup/LexParse.cup
jflex -d src/main/java/jflex --skel src/main/jflex/skeleton.nested src/main/jflex/LexScan.flex
%mvn_build
# Compile Emacs jflex-mode source
%{_emacs_bytecompile} lib/jflex-mode.el
%install
install -d -m 755 %{buildroot}%{_javadir}
install -d -m 755 %{buildroot}%{_mavenpomdir}
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
%mvn_install
install -d -m 755 %{buildroot}%{_mandir}/man1
install -d -m 755 %{buildroot}%{_emacs_sitelispdir}/%{name}
install -d -m 755 %{buildroot}%{_datadir}/pixmaps
# jars
install -p -m 644 lib/JFlex.jar %{buildroot}%{_javadir}/%{name}.jar
ln -sf %{name}.jar %{buildroot}%{_javadir}/JFlex.jar
# pom
install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
%add_maven_depmap
# javadoc
cp -pr api/* %{buildroot}%{_javadocdir}/%{name}
# wrapper script for direct execution
%jpackage_script JFlex.Main "" "" jflex:java_cup jflex true
%jpackage_script jflex.Main "" "" jflex:java_cup jflex true
# manpage
install -p -m 644 %{SOURCE4} %{buildroot}%{_mandir}/man1
@ -113,15 +77,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/%{name}.png
install -p -m 644 lib/jflex-mode.el %{buildroot}%{_emacs_sitelispdir}/%{name}
install -p -m 644 lib/jflex-mode.elc %{buildroot}%{_emacs_sitelispdir}/%{name}
%pre javadoc
# workaround for rpm bug, can be removed in F-21
[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%files -f .mfiles
%doc doc
%doc COPYRIGHT
%{_javadir}/JFlex.jar
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz
%{_datadir}/applications/%{name}.desktop
@ -134,6 +92,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%changelog
* Mon Jan 27 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.5.0-1
- Update to upstream version 1.5.0
* Fri Aug 02 2013 Michal Srb <msrb@redhat.com> - 0:1.4.3-16
- Add create-tarball.sh script to SRPM

2
sources
View File

@ -1 +1 @@
d214231ffdeea7f687acc1163bbf8202 jflex-1.4.3-clean.tar.gz
66e82b715db28ae10406085572bd1bfe jflex-1.5.0-clean.tar.gz