forked from pool/java-cup
This commit is contained in:
parent
3b397d0c1d
commit
7633f33dc2
@ -1,9 +1,10 @@
|
|||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Mar 9 08:52:37 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
Mon Mar 14 13:15:42 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
- Build and package also the previous API version 0.9e, since the
|
- Modified patch:
|
||||||
jump from 0.9 to 0.10 is completely API incompatible and the
|
* java-cup-classpath.patch
|
||||||
build does not require any additional dependencies
|
+ use the java-cup name instead of the java_cup one
|
||||||
|
- Regenerate the generated files with newer flex
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Jan 14 06:59:22 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
Fri Jan 14 06:59:22 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
@ -22,8 +22,6 @@
|
|||||||
%define real_name java-cup
|
%define real_name java-cup
|
||||||
%define git_hash d69c832
|
%define git_hash d69c832
|
||||||
%define git_date 20210814
|
%define git_date 20210814
|
||||||
%define compat_name java_cup
|
|
||||||
%define compat_version 9e
|
|
||||||
%bcond_with bootstrap
|
%bcond_with bootstrap
|
||||||
Name: java-cup-bootstrap
|
Name: java-cup-bootstrap
|
||||||
Version: 0.11
|
Version: 0.11
|
||||||
@ -34,7 +32,6 @@ Group: Development/Libraries/Java
|
|||||||
URL: http://www2.cs.tum.edu/projects/cup/
|
URL: http://www2.cs.tum.edu/projects/cup/
|
||||||
Source0: %{real_name}-%{git_hash}.tar.xz
|
Source0: %{real_name}-%{git_hash}.tar.xz
|
||||||
Source1: %{real_name}-generated-files.tar.xz
|
Source1: %{real_name}-generated-files.tar.xz
|
||||||
Source2: https://www.cs.princeton.edu/~appel/modern/java/CUP/%{compat_name}_v%{compat_version}.tar.gz
|
|
||||||
Source100: java-cup-nogit.patch.in
|
Source100: java-cup-nogit.patch.in
|
||||||
Patch0: java-cup-no-classpath-in-manifest.patch
|
Patch0: java-cup-no-classpath-in-manifest.patch
|
||||||
Patch1: java-cup-java8.patch
|
Patch1: java-cup-java8.patch
|
||||||
@ -107,8 +104,6 @@ cat %{SOURCE100} | sed 's#@GIT_HASH@#%{git_hash}#g' | sed 's#@GIT_DATE@#%{git_da
|
|||||||
%endif
|
%endif
|
||||||
find . -name '*.jar' -print -delete
|
find . -name '*.jar' -print -delete
|
||||||
mkdir -p target/classes
|
mkdir -p target/classes
|
||||||
mkdir -p compat/classes
|
|
||||||
tar xf %{SOURCE2} -C compat
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%if %{with bootstrap}
|
%if %{with bootstrap}
|
||||||
@ -118,23 +113,17 @@ export CLASSPATH=$(build-classpath java-cup jflex)
|
|||||||
%endif
|
%endif
|
||||||
export OPT_JAR_LIST=:
|
export OPT_JAR_LIST=:
|
||||||
ant
|
ant
|
||||||
pushd compat
|
|
||||||
javac -d classes -source 1.7 -target 1.7 %{compat_name}/runtime/*.java %{compat_name}/*.java
|
|
||||||
jar -cf %{compat_name}.jar -C classes .
|
|
||||||
popd
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
# jar
|
# jar
|
||||||
mkdir -p %{buildroot}%{_javadir}/%{compat_name}_compat
|
mkdir -p %{buildroot}%{_javadir}
|
||||||
cp -a target/dist/%{real_name}-%{cvs_version}.jar %{buildroot}%{_javadir}/%{real_name}.jar
|
cp -a target/dist/%{real_name}-%{cvs_version}.jar %{buildroot}%{_javadir}/%{real_name}.jar
|
||||||
cp -a target/dist/%{real_name}-%{cvs_version}-runtime.jar %{buildroot}%{_javadir}/%{real_name}-runtime.jar
|
cp -a target/dist/%{real_name}-%{cvs_version}-runtime.jar %{buildroot}%{_javadir}/%{real_name}-runtime.jar
|
||||||
cp -a compat/%{compat_name}.jar %{buildroot}%{_javadir}/%{compat_name}_compat/%{compat_name}.jar
|
|
||||||
|
|
||||||
%if %{without bootstrap}
|
%if %{without bootstrap}
|
||||||
# maven data
|
# maven data
|
||||||
%add_maven_depmap com.github.vbmacher:%{real_name}:%{cvs_version}-%{git_date} %{real_name}.jar
|
%add_maven_depmap com.github.vbmacher:%{real_name}:%{cvs_version}-%{git_date} %{real_name}.jar
|
||||||
%add_maven_depmap com.github.vbmacher:%{real_name}-runtime:%{cvs_version}-%{git_date} %{real_name}-runtime.jar
|
%add_maven_depmap com.github.vbmacher:%{real_name}-runtime:%{cvs_version}-%{git_date} %{real_name}-runtime.jar
|
||||||
%add_maven_depmap %{compat_name}:%{compat_name}:%{compat_version} %{compat_name}_compat/%{compat_name}.jar
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# compatibility symlinks
|
# compatibility symlinks
|
||||||
@ -146,7 +135,6 @@ mkdir -p %{buildroot}%{_bindir}
|
|||||||
%if %{with bootstrap}
|
%if %{with bootstrap}
|
||||||
%files
|
%files
|
||||||
%{_javadir}/%{real_name}*.jar
|
%{_javadir}/%{real_name}*.jar
|
||||||
%{_javadir}/%{compat_name}_compat
|
|
||||||
%else
|
%else
|
||||||
|
|
||||||
%files -f .mfiles
|
%files -f .mfiles
|
||||||
|
BIN
java-cup-generated-files.tar.xz
(Stored with Git LFS)
BIN
java-cup-generated-files.tar.xz
(Stored with Git LFS)
Binary file not shown.
@ -1,9 +1,10 @@
|
|||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Mar 9 08:52:37 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
Mon Mar 14 13:15:42 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
- Build and package also the previous API version 0.9e, since the
|
- Modified patch:
|
||||||
jump from 0.9 to 0.10 is completely API incompatible and the
|
* java-cup-classpath.patch
|
||||||
build does not require any additional dependencies
|
+ use the java-cup name instead of the java_cup one
|
||||||
|
- Regenerate the generated files with newer flex
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Jan 14 06:59:22 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
Fri Jan 14 06:59:22 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
@ -21,8 +21,6 @@
|
|||||||
%define real_name java-cup
|
%define real_name java-cup
|
||||||
%define git_hash d69c832
|
%define git_hash d69c832
|
||||||
%define git_date 20210814
|
%define git_date 20210814
|
||||||
%define compat_name java_cup
|
|
||||||
%define compat_version 9e
|
|
||||||
%bcond_with bootstrap
|
%bcond_with bootstrap
|
||||||
Name: java-cup
|
Name: java-cup
|
||||||
Version: 0.11
|
Version: 0.11
|
||||||
@ -33,7 +31,6 @@ Group: Development/Libraries/Java
|
|||||||
URL: http://www2.cs.tum.edu/projects/cup/
|
URL: http://www2.cs.tum.edu/projects/cup/
|
||||||
Source0: %{real_name}-%{git_hash}.tar.xz
|
Source0: %{real_name}-%{git_hash}.tar.xz
|
||||||
Source1: %{real_name}-generated-files.tar.xz
|
Source1: %{real_name}-generated-files.tar.xz
|
||||||
Source2: https://www.cs.princeton.edu/~appel/modern/java/CUP/%{compat_name}_v%{compat_version}.tar.gz
|
|
||||||
Source100: java-cup-nogit.patch.in
|
Source100: java-cup-nogit.patch.in
|
||||||
Patch0: java-cup-no-classpath-in-manifest.patch
|
Patch0: java-cup-no-classpath-in-manifest.patch
|
||||||
Patch1: java-cup-java8.patch
|
Patch1: java-cup-java8.patch
|
||||||
@ -106,8 +103,6 @@ cat %{SOURCE100} | sed 's#@GIT_HASH@#%{git_hash}#g' | sed 's#@GIT_DATE@#%{git_da
|
|||||||
%endif
|
%endif
|
||||||
find . -name '*.jar' -print -delete
|
find . -name '*.jar' -print -delete
|
||||||
mkdir -p target/classes
|
mkdir -p target/classes
|
||||||
mkdir -p compat/classes
|
|
||||||
tar xf %{SOURCE2} -C compat
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%if %{with bootstrap}
|
%if %{with bootstrap}
|
||||||
@ -117,23 +112,17 @@ export CLASSPATH=$(build-classpath java-cup jflex)
|
|||||||
%endif
|
%endif
|
||||||
export OPT_JAR_LIST=:
|
export OPT_JAR_LIST=:
|
||||||
ant
|
ant
|
||||||
pushd compat
|
|
||||||
javac -d classes -source 1.7 -target 1.7 %{compat_name}/runtime/*.java %{compat_name}/*.java
|
|
||||||
jar -cf %{compat_name}.jar -C classes .
|
|
||||||
popd
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
# jar
|
# jar
|
||||||
mkdir -p %{buildroot}%{_javadir}/%{compat_name}_compat
|
mkdir -p %{buildroot}%{_javadir}
|
||||||
cp -a target/dist/%{real_name}-%{cvs_version}.jar %{buildroot}%{_javadir}/%{real_name}.jar
|
cp -a target/dist/%{real_name}-%{cvs_version}.jar %{buildroot}%{_javadir}/%{real_name}.jar
|
||||||
cp -a target/dist/%{real_name}-%{cvs_version}-runtime.jar %{buildroot}%{_javadir}/%{real_name}-runtime.jar
|
cp -a target/dist/%{real_name}-%{cvs_version}-runtime.jar %{buildroot}%{_javadir}/%{real_name}-runtime.jar
|
||||||
cp -a compat/%{compat_name}.jar %{buildroot}%{_javadir}/%{compat_name}_compat/%{compat_name}.jar
|
|
||||||
|
|
||||||
%if %{without bootstrap}
|
%if %{without bootstrap}
|
||||||
# maven data
|
# maven data
|
||||||
%add_maven_depmap com.github.vbmacher:%{real_name}:%{cvs_version}-%{git_date} %{real_name}.jar
|
%add_maven_depmap com.github.vbmacher:%{real_name}:%{cvs_version}-%{git_date} %{real_name}.jar
|
||||||
%add_maven_depmap com.github.vbmacher:%{real_name}-runtime:%{cvs_version}-%{git_date} %{real_name}-runtime.jar
|
%add_maven_depmap com.github.vbmacher:%{real_name}-runtime:%{cvs_version}-%{git_date} %{real_name}-runtime.jar
|
||||||
%add_maven_depmap %{compat_name}:%{compat_name}:%{compat_version} %{compat_name}_compat/%{compat_name}.jar
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# compatibility symlinks
|
# compatibility symlinks
|
||||||
@ -145,7 +134,6 @@ mkdir -p %{buildroot}%{_bindir}
|
|||||||
%if %{with bootstrap}
|
%if %{with bootstrap}
|
||||||
%files
|
%files
|
||||||
%{_javadir}/%{real_name}*.jar
|
%{_javadir}/%{real_name}*.jar
|
||||||
%{_javadir}/%{compat_name}_compat
|
|
||||||
%else
|
%else
|
||||||
|
|
||||||
%files -f .mfiles
|
%files -f .mfiles
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:be176e9356ff1695c64d08277ba31cea14ea4f617b93787502cf93c6fd35625f
|
|
||||||
size 93657
|
|
Loading…
x
Reference in New Issue
Block a user