Accepting request 672435 from Java:packages
Upgrade to 7.0.4 OBS-URL: https://build.opensuse.org/request/show/672435 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/javacc?expand=0&rev=20
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
689138c811
3
7.0.4.tar.gz
Normal file
3
7.0.4.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a6a2381dfae5fdfe7849b921c9950af594ff475b69fbc6e8568365c5734cf77c
|
||||
size 2842349
|
||||
25
javacc
25
javacc
@ -1,25 +0,0 @@
|
||||
#!/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.jar"
|
||||
|
||||
# Set parameters
|
||||
set_jvm
|
||||
set_classpath $BASE_JARS
|
||||
set_flags $BASE_FLAGS
|
||||
set_options $BASE_OPTIONS
|
||||
|
||||
# Let's start
|
||||
run "$@"
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:766cae9d3710054f452a7f0779db885eacfdae363152cb2e7fe025aa7ea17370
|
||||
size 810123
|
||||
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 6 09:12:23 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Upgrade to 7.0.4
|
||||
* No obvious changelog
|
||||
* Fixes a number of C++ generation issues
|
||||
- Generate the scripts during build using jpackage_script
|
||||
- Build and package the javadoc documentation
|
||||
- Removed patch:
|
||||
* javacc.patch
|
||||
+ not needed any more in this version
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 18 16:25:17 UTC 2017 - fstrba@suse.com
|
||||
|
||||
|
||||
33
javacc.patch
33
javacc.patch
@ -1,33 +0,0 @@
|
||||
diff -Naur javacc.old/src/org/javacc/jjdoc/build.xml javacc.changed/src/org/javacc/jjdoc/build.xml
|
||||
--- javacc.old/src/org/javacc/jjdoc/build.xml 2004-12-24 19:11:13.000000000 +0100
|
||||
+++ javacc.changed/src/org/javacc/jjdoc/build.xml 2008-01-28 14:25:00.000000000 +0100
|
||||
@@ -38,7 +38,6 @@
|
||||
<javac srcdir="${javacc.root}/src"
|
||||
destdir="${javacc.root}/classes"
|
||||
debug="${build.compiler.debug}"
|
||||
- source="1.4"
|
||||
classpath="${javacc.root}/classes">
|
||||
</javac>
|
||||
</target>
|
||||
diff -Naur javacc.old/src/org/javacc/jjtree/build.xml javacc.changed/src/org/javacc/jjtree/build.xml
|
||||
--- javacc.old/src/org/javacc/jjtree/build.xml 2005-08-13 18:57:35.000000000 +0200
|
||||
+++ javacc.changed/src/org/javacc/jjtree/build.xml 2008-01-28 14:24:43.000000000 +0100
|
||||
@@ -47,7 +47,6 @@
|
||||
<javac srcdir="${javacc.root}/src"
|
||||
destdir="${javacc.root}/classes"
|
||||
debug="${build.compiler.debug}"
|
||||
- source="1.4"
|
||||
classpath="${javacc.root}/classes">
|
||||
</javac>
|
||||
</target>
|
||||
diff -Naur javacc.old/src/org/javacc/parser/build.xml javacc.changed/src/org/javacc/parser/build.xml
|
||||
--- javacc.old/src/org/javacc/parser/build.xml 2005-01-09 15:15:34.000000000 +0100
|
||||
+++ javacc.changed/src/org/javacc/parser/build.xml 2008-01-28 14:24:12.000000000 +0100
|
||||
@@ -45,7 +45,6 @@
|
||||
<javac srcdir="${javacc.root}/src"
|
||||
destdir="${javacc.root}/classes"
|
||||
debug="${build.compiler.debug}"
|
||||
- source="1.4"
|
||||
classpath="${javacc.root}/classes:${junit.jar}">
|
||||
</javac>
|
||||
</target>
|
||||
112
javacc.spec
112
javacc.spec
@ -1,7 +1,8 @@
|
||||
#
|
||||
# spec file for package javacc
|
||||
#
|
||||
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2000-2005, JPackage Project
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -12,26 +13,24 @@
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
Name: javacc
|
||||
Version: 5.0
|
||||
Version: 7.0.4
|
||||
Release: 0
|
||||
Summary: A Parser and Scanner Generator for Java
|
||||
License: BSD-3-Clause
|
||||
Group: Development/Libraries/Java
|
||||
Url: http://javacc.java.net/
|
||||
Source0: http://java.net/projects/%{name}/downloads/download/%{name}-%{version}src.tar.gz
|
||||
Source1: javacc
|
||||
Source2: jjdoc
|
||||
Source3: jjtree
|
||||
Patch0: javacc.patch
|
||||
URL: http://javacc.org
|
||||
Source0: https://github.com/javacc/javacc/archive/%{version}.tar.gz
|
||||
BuildRequires: ant
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: java-devel
|
||||
BuildRequires: xml-commons-apis
|
||||
BuildRequires: javacc
|
||||
BuildRequires: javapackages-local
|
||||
# Explicit javapackages-tools requires since scripts use
|
||||
# /usr/share/java-utils/java-functions
|
||||
Requires: javapackages-tools
|
||||
BuildArch: noarch
|
||||
|
||||
@ -45,65 +44,76 @@ generation such as tree building (via a tool called JJTree included
|
||||
with JavaCC), actions, debugging, etc.
|
||||
|
||||
%package manual
|
||||
Summary: A Parser and Scanner Generator for Java
|
||||
Group: Development/Libraries/Java
|
||||
Summary: Manual for %{name}
|
||||
Group: Documentation/Other
|
||||
|
||||
%description manual
|
||||
Java Compiler Compiler (JavaCC) is the most popular parser generator
|
||||
for use with Java applications. A parser generator is a tool that reads
|
||||
a grammar specification and converts it to a Java program that can
|
||||
recognize matches to the grammar. In addition to the parser generator
|
||||
itself, JavaCC provides other standard capabilities related to parser
|
||||
generation such as tree building (via a tool called JJTree included
|
||||
with JavaCC), actions, debugging, etc.
|
||||
Manual for %{name}.
|
||||
|
||||
%package demo
|
||||
Summary: A Parser and Scanner Generator for Java
|
||||
Summary: Examples for %{name}
|
||||
Group: Development/Libraries/Java
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description demo
|
||||
Java Compiler Compiler (JavaCC) is the most popular parser generator
|
||||
for use with Java applications. A parser generator is a tool that reads
|
||||
a grammar specification and converts it to a Java program that can
|
||||
recognize matches to the grammar. In addition to the parser generator
|
||||
itself, JavaCC provides other standard capabilities related to parser
|
||||
generation such as tree building (via a tool called JJTree included
|
||||
with JavaCC), actions, debugging, etc.
|
||||
Examples for %{name}.
|
||||
|
||||
%package javadoc
|
||||
Summary: Javadoc for %{name}
|
||||
Group: Documentation/HTML
|
||||
|
||||
%description javadoc
|
||||
This package contains the API documentation for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q -n javacc
|
||||
%patch0 -p1
|
||||
cp %{SOURCE1} javacc
|
||||
cp %{SOURCE2} jjdoc
|
||||
cp %{SOURCE3} jjtree
|
||||
mv www/doc .
|
||||
%setup -q
|
||||
|
||||
find ./examples -type f -exec sed -i 's/\r//' {} \;
|
||||
|
||||
# The pom dependencies are wrong
|
||||
%pom_xpath_remove pom:project/pom:dependencies
|
||||
|
||||
%build
|
||||
ant \
|
||||
-Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \
|
||||
-Dversion=%{version} \
|
||||
jar
|
||||
jar javadoc
|
||||
|
||||
%install
|
||||
install -d -m 755 %{buildroot}%{_javadir}
|
||||
install -m 644 bin/lib/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
|
||||
ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
|
||||
install -d -m 755 %{buildroot}%{_prefix}/bin
|
||||
install -m 755 javacc jjdoc jjtree %{buildroot}%{_prefix}/bin
|
||||
install -d -m 755 %{buildroot}%{_datadir}/%{name}
|
||||
cp -pr examples %{buildroot}%{_datadir}/%{name}
|
||||
%fdupes -s %{buildroot}%{_datadir}/%{name}
|
||||
# jar
|
||||
install -dm 0755 %{buildroot}%{_javadir}
|
||||
install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
|
||||
# pom
|
||||
install -dm 0755 %{buildroot}%{_mavenpomdir}
|
||||
install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
|
||||
%add_maven_depmap %{name}.pom %{name}.jar
|
||||
# javadoc
|
||||
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
|
||||
cp -pr target/javadoc/* %{buildroot}%{_javadocdir}/%{name}/
|
||||
%fdupes -s %{buildroot}%{_javadocdir}
|
||||
%fdupes -s www
|
||||
%fdupes -s examples
|
||||
|
||||
%files
|
||||
%{_javadir}/*.jar
|
||||
%doc LICENSE README
|
||||
%defattr(0755,root,root,0755)
|
||||
%{_bindir}/*
|
||||
%jpackage_script javacc '' '' javacc javacc true
|
||||
ln -s %{_bindir}/javacc %{buildroot}%{_bindir}/javacc.sh
|
||||
%jpackage_script jjdoc '' '' javacc jjdoc true
|
||||
%jpackage_script jjtree '' '' javacc jjtree true
|
||||
|
||||
%files -f .mfiles
|
||||
%license LICENSE
|
||||
%doc README
|
||||
%{_bindir}/javacc
|
||||
%{_bindir}/javacc.sh
|
||||
%{_bindir}/jjdoc
|
||||
%{_bindir}/jjtree
|
||||
|
||||
%files manual
|
||||
%doc doc/*
|
||||
%doc www/*
|
||||
|
||||
%files demo
|
||||
%{_datadir}/%{name}/
|
||||
%doc examples
|
||||
|
||||
%files javadoc
|
||||
%license LICENSE
|
||||
%{_javadocdir}/%{name}
|
||||
|
||||
%changelog
|
||||
|
||||
25
jjdoc
25
jjdoc
@ -1,25 +0,0 @@
|
||||
#!/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.jar"
|
||||
|
||||
# Set parameters
|
||||
set_jvm
|
||||
set_classpath $BASE_JARS
|
||||
set_flags $BASE_FLAGS
|
||||
set_options $BASE_OPTIONS
|
||||
|
||||
# Let's start
|
||||
run "$@"
|
||||
25
jjtree
25
jjtree
@ -1,25 +0,0 @@
|
||||
#!/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.jar"
|
||||
|
||||
# Set parameters
|
||||
set_jvm
|
||||
set_classpath $BASE_JARS
|
||||
set_flags $BASE_FLAGS
|
||||
set_options $BASE_OPTIONS
|
||||
|
||||
# Let's start
|
||||
run "$@"
|
||||
Loading…
Reference in New Issue
Block a user