Accepting request 624302 from Java:packages
- Build with source and target 8 to prepare for a possible removal of 1.6 compatibility - Do not use old compat macros for python directories - Build with source and target 8 to prepare for a possible removal of 1.6 compatibility OBS-URL: https://build.opensuse.org/request/show/624302 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/antlr?expand=0&rev=43
This commit is contained in:
commit
8e2d739c0e
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue May 15 05:55:58 UTC 2018 - fstrba@suse.com
|
||||||
|
|
||||||
|
- Build with source and target 8 to prepare for a possible removal
|
||||||
|
of 1.6 compatibility
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Dec 7 11:38:17 UTC 2017 - dimstar@opensuse.org
|
Thu Dec 7 11:38:17 UTC 2017 - dimstar@opensuse.org
|
||||||
|
|
||||||
|
@ -24,10 +24,10 @@ 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: java-devel >= 1.6
|
BuildRequires: java-devel >= 1.8
|
||||||
BuildRequires: unzip
|
BuildRequires: unzip
|
||||||
BuildRequires: zip
|
BuildRequires: zip
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
@ -94,7 +94,7 @@ function mkJar() {
|
|||||||
xargs jar cfm ${1}.jar manifest.* ;
|
xargs jar cfm ${1}.jar manifest.* ;
|
||||||
mv ${1}.jar $TARGET_DIR
|
mv ${1}.jar $TARGET_DIR
|
||||||
}
|
}
|
||||||
COMPILER_COMMAND="javac -source 1.6 -target 1.6 -cp "
|
COMPILER_COMMAND="javac -source 8 -target 8 -cp "
|
||||||
delBinaryFiles
|
delBinaryFiles
|
||||||
mkdir src
|
mkdir src
|
||||||
mv antlr src
|
mv antlr src
|
||||||
|
@ -1,3 +1,14 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jul 20 15:27:49 UTC 2018 - tchvatal@suse.com
|
||||||
|
|
||||||
|
- Do not use old compat macros for python directories
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue May 15 05:54:51 UTC 2018 - fstrba@suse.com
|
||||||
|
|
||||||
|
- Build with source and target 8 to prepare for a possible removal
|
||||||
|
of 1.6 compatibility
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Jan 12 11:53:47 UTC 2018 - tchvatal@suse.com
|
Fri Jan 12 11:53:47 UTC 2018 - tchvatal@suse.com
|
||||||
|
|
||||||
|
29
antlr.spec
29
antlr.spec
@ -21,9 +21,9 @@ 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-or-later 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
|
||||||
Source1: %{name}-build.xml
|
Source1: %{name}-build.xml
|
||||||
Source2: %{name}-script
|
Source2: %{name}-script
|
||||||
@ -35,16 +35,16 @@ Patch2: fix-docpath.diff
|
|||||||
BuildRequires: ant
|
BuildRequires: ant
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: java-devel >= 1.6
|
BuildRequires: java-devel >= 1.8
|
||||||
BuildRequires: javapackages-tools
|
BuildRequires: javapackages-tools
|
||||||
%if %{with python2}
|
|
||||||
BuildRequires: python2-base
|
|
||||||
%endif
|
|
||||||
BuildRequires: xml-commons-apis
|
BuildRequires: xml-commons-apis
|
||||||
Requires: %{name}-java
|
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
|
||||||
|
%if %{with python2}
|
||||||
|
BuildRequires: python2-base
|
||||||
|
%endif
|
||||||
|
|
||||||
%description
|
%description
|
||||||
ANTLR, Another Tool for Language Recognition, (formerly PCCTS) is a
|
ANTLR, Another Tool for Language Recognition, (formerly PCCTS) is a
|
||||||
@ -55,7 +55,7 @@ or Java actions (you can use PCCTS 1.xx to generate C-based parsers).
|
|||||||
%package java
|
%package java
|
||||||
Summary: ANother Tool for Language Recognition (Manual)
|
Summary: ANother Tool for Language Recognition (Manual)
|
||||||
Group: Development/Tools/Other
|
Group: Development/Tools/Other
|
||||||
Requires: java >= 1.6
|
Requires: java >= 1.8
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
%description java
|
%description java
|
||||||
@ -123,7 +123,7 @@ find | grep "\(ShowString.java$\|StreamConverter.java$\)" && exit 42 || :
|
|||||||
%build
|
%build
|
||||||
ant \
|
ant \
|
||||||
-Dj2se.apidoc=%{_javadocdir}/java \
|
-Dj2se.apidoc=%{_javadocdir}/java \
|
||||||
-Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \
|
-Dant.build.javac.source=8 -Dant.build.javac.target=8 \
|
||||||
jar
|
jar
|
||||||
%configure
|
%configure
|
||||||
make -j1
|
make -j1
|
||||||
@ -147,11 +147,11 @@ install -m 0755 scripts/%{name}-config %{buildroot}%{_bindir}/
|
|||||||
|
|
||||||
### python runtime ###
|
### python runtime ###
|
||||||
%if %{with python2}
|
%if %{with python2}
|
||||||
install -d -m 0755 %{buildroot}%{py_sitedir}/%{name}
|
install -d -m 0755 %{buildroot}%{python_sitearch}/%{name}
|
||||||
cp -a lib/python/antlr/* %{buildroot}%{py_sitedir}/%{name}
|
cp -a lib/python/antlr/* %{buildroot}%{python_sitearch}/%{name}
|
||||||
# compat symlink
|
# compat symlink
|
||||||
ln -s -f %{py_sitedir}/%{name}/*.py %{buildroot}%{_datadir}/%{name}-%{version}/
|
ln -s -f %{python_sitearch}/%{name}/*.py %{buildroot}%{_datadir}/%{name}-%{version}/
|
||||||
ln -s -f %{py_sitedir}/%{name}/*.pyc %{buildroot}%{_datadir}/%{name}-%{version}/
|
ln -s -f %{python_sitearch}/%{name}/*.pyc %{buildroot}%{_datadir}/%{name}-%{version}/
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
### cpp runtime ###
|
### cpp runtime ###
|
||||||
@ -167,7 +167,8 @@ find doc -type f | xargs chmod 0644
|
|||||||
%fdupes -s doc
|
%fdupes -s doc
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%doc LICENSE.txt README.txt CHANGES.txt
|
%license LICENSE.txt
|
||||||
|
%doc README.txt CHANGES.txt
|
||||||
%dir %{_datadir}/%{name}-%{version}
|
%dir %{_datadir}/%{name}-%{version}
|
||||||
%{_bindir}/antlr
|
%{_bindir}/antlr
|
||||||
%{_bindir}/antlr-config
|
%{_bindir}/antlr-config
|
||||||
@ -189,7 +190,7 @@ find doc -type f | xargs chmod 0644
|
|||||||
%dir %{_datadir}/%{name}-%{version}
|
%dir %{_datadir}/%{name}-%{version}
|
||||||
%{_datadir}/%{name}-%{version}/*py
|
%{_datadir}/%{name}-%{version}/*py
|
||||||
%{_datadir}/%{name}-%{version}/*pyc
|
%{_datadir}/%{name}-%{version}/*pyc
|
||||||
%{py_sitedir}/%{name}
|
%{python_sitearch}/%{name}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
Loading…
Reference in New Issue
Block a user