Don't depend on ecj-bootstrap
OBS-URL: https://build.opensuse.org/package/show/Java:packages/antlr?expand=0&rev=35
This commit is contained in:
parent
c957d0ca63
commit
9abad35cae
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Sep 20 17:39:46 UTC 2017 - fstrba@suse.com
|
||||||
|
|
||||||
|
- Remove requirements of ecj-bootstrap and fastjar
|
||||||
|
* use the gcj.jar that comes with gccN-java
|
||||||
|
* use gjar-N instead of fastjar
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Jul 4 11:17:30 UTC 2014 - tchvatal@suse.com
|
Fri Jul 4 11:17:30 UTC 2014 - tchvatal@suse.com
|
||||||
|
|
||||||
|
@ -16,23 +16,21 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
|
%define gccbinsuffix %(rpm -q --qf "-%{VERSION}" gcc-java)
|
||||||
%define real_name antlr
|
%define real_name antlr
|
||||||
Name: antlr-bootstrap
|
Name: antlr-bootstrap
|
||||||
Version: 2.7.7
|
Version: 2.7.7
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Antlr for bootstrapping purposes
|
Summary: Antlr for bootstrapping purposes
|
||||||
License: BSD-3-Clause and SUSE-Public-Domain
|
License: BSD-3-Clause AND SUSE-Public-Domain
|
||||||
Group: Development/Libraries/Java
|
Group: Development/Libraries/Java
|
||||||
Url: http://www.antlr.org
|
Url: http://www.antlr.org
|
||||||
Source0: antlr-%{version}.tar.bz2
|
Source0: antlr-%{version}.tar.bz2
|
||||||
Source1: manifest.antlr
|
Source1: manifest.antlr
|
||||||
BuildRequires: ecj-bootstrap >= 0.570
|
|
||||||
BuildRequires: fastjar
|
|
||||||
BuildRequires: gcc-gij
|
BuildRequires: gcc-gij
|
||||||
BuildRequires: gcc-java
|
BuildRequires: gcc-java
|
||||||
BuildRequires: unzip
|
BuildRequires: unzip
|
||||||
BuildRequires: zip
|
BuildRequires: zip
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -96,10 +94,11 @@ function compileFiles() {
|
|||||||
# uses $TARGET_DIR to move created jar to
|
# uses $TARGET_DIR to move created jar to
|
||||||
function mkJar() {
|
function mkJar() {
|
||||||
find -name "version.txt" -or -name "*.class" -or -name "*.properties" -or -name "*.rsc" -or -name "*manifest*" |\
|
find -name "version.txt" -or -name "*.class" -or -name "*.properties" -or -name "*.rsc" -or -name "*manifest*" |\
|
||||||
xargs %{_bindir}/fastjar -m manifest.* -cf ${1}.jar ;
|
xargs gjar%{gccbinsuffix} -m manifest.* -cf ${1}.jar ;
|
||||||
mv ${1}.jar $TARGET_DIR
|
mv ${1}.jar $TARGET_DIR
|
||||||
}
|
}
|
||||||
COMPILER_COMMAND="gij -jar %{_javadir}/jdtcore.jar -cp "
|
ECJJAR=`gcj%{gccbinsuffix} -print-file-name=ecj.jar`
|
||||||
|
COMPILER_COMMAND="gij%{gccbinsuffix} -cp $ECJJAR org.eclipse.jdt.internal.compiler.batch.Main -cp "
|
||||||
delBinaryFiles
|
delBinaryFiles
|
||||||
mkdir src
|
mkdir src
|
||||||
mv antlr src
|
mv antlr src
|
||||||
@ -115,7 +114,6 @@ install -m 0644 %{name}.jar %{buildroot}%{_javadir}/
|
|||||||
ln -s -f %{_javadir}/%{name}.jar %{buildroot}/%{_javadir}/%{name}-%{version}.jar
|
ln -s -f %{_javadir}/%{name}.jar %{buildroot}/%{_javadir}/%{name}-%{version}.jar
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root)
|
|
||||||
%{_javadir}/%{name}*.jar
|
%{_javadir}/%{name}*.jar
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
@ -20,7 +20,7 @@ Name: antlr
|
|||||||
Version: 2.7.7
|
Version: 2.7.7
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Another Tool for Language Recognition
|
Summary: Another Tool for Language Recognition
|
||||||
License: GPL-2.0+ and SUSE-Public-Domain and MIT
|
License: GPL-2.0+ AND SUSE-Public-Domain AND MIT
|
||||||
Group: Development/Tools/Other
|
Group: Development/Tools/Other
|
||||||
Url: http://www.antlr.org/
|
Url: http://www.antlr.org/
|
||||||
Source0: antlr-%{version}.tar.bz2
|
Source0: antlr-%{version}.tar.bz2
|
||||||
@ -41,7 +41,6 @@ Requires: %{name}-java
|
|||||||
Provides: %{name}-bootstrap = %{version}
|
Provides: %{name}-bootstrap = %{version}
|
||||||
Obsoletes: %{name}-bootstrap < %{version}
|
Obsoletes: %{name}-bootstrap < %{version}
|
||||||
Obsoletes: %{name}-javadoc
|
Obsoletes: %{name}-javadoc
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
ANTLR, Another Tool for Language Recognition, (formerly PCCTS) is a
|
ANTLR, Another Tool for Language Recognition, (formerly PCCTS) is a
|
||||||
@ -156,7 +155,6 @@ find examples -type f | xargs chmod 0644
|
|||||||
%fdupes -s examples
|
%fdupes -s examples
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(0644,root,root,0755)
|
|
||||||
%doc LICENSE.txt README.txt CHANGES.txt
|
%doc LICENSE.txt README.txt CHANGES.txt
|
||||||
%dir %{_datadir}/%{name}-%{version}
|
%dir %{_datadir}/%{name}-%{version}
|
||||||
%defattr(0755,root,root,0755)
|
%defattr(0755,root,root,0755)
|
||||||
@ -164,22 +162,18 @@ find examples -type f | xargs chmod 0644
|
|||||||
%{_bindir}/antlr-config
|
%{_bindir}/antlr-config
|
||||||
|
|
||||||
%files java
|
%files java
|
||||||
%defattr(0644,root,root,0755)
|
|
||||||
%dir %{_datadir}/%{name}-%{version}
|
%dir %{_datadir}/%{name}-%{version}
|
||||||
%{_datadir}/%{name}-%{version}/*jar
|
%{_datadir}/%{name}-%{version}/*jar
|
||||||
%{_javadir}/%{name}*.jar
|
%{_javadir}/%{name}*.jar
|
||||||
|
|
||||||
%files manual
|
%files manual
|
||||||
%defattr(0644,root,root,0755)
|
|
||||||
%doc doc examples
|
%doc doc examples
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%defattr(0644,root,root,0755)
|
|
||||||
%attr(755,root,root) %{_libdir}/libantlr.a
|
%attr(755,root,root) %{_libdir}/libantlr.a
|
||||||
%{_includedir}/%{name}
|
%{_includedir}/%{name}
|
||||||
|
|
||||||
%files -n python-%{name}
|
%files -n python-%{name}
|
||||||
%defattr(-,root,root)
|
|
||||||
%dir %{_datadir}/%{name}-%{version}
|
%dir %{_datadir}/%{name}-%{version}
|
||||||
%{_datadir}/%{name}-%{version}/*py
|
%{_datadir}/%{name}-%{version}/*py
|
||||||
%{_datadir}/%{name}-%{version}/*pyc
|
%{_datadir}/%{name}-%{version}/*pyc
|
||||||
|
Loading…
x
Reference in New Issue
Block a user