pool/antlr
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 624302 from Java:packages

Browse Source 
- 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:
Dominique Leuenberger 2018-07-24 15:33:24 +00:00 committed by Git OBS Bridge
commit 8e2d739c0e
4 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
antlr-bootstrap.changes
View File

@ -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

6
antlr-bootstrap.spec
View File

@ -24,10 +24,10 @@ Release: 0
Summary: Antlr for bootstrapping purposes
License: BSD-3-Clause AND SUSE-Public-Domain
Group: Development/Libraries/Java
Url: http://www.antlr.org
URL: http://www.antlr.org
Source0: antlr-%{version}.tar.bz2
Source1: manifest.antlr
BuildRequires: java-devel >= 1.6
BuildRequires: java-devel >= 1.8
BuildRequires: unzip
BuildRequires: zip
BuildArch: noarch
@ -94,7 +94,7 @@ function mkJar() {
xargs jar cfm ${1}.jar manifest.* ;
mv ${1}.jar $TARGET_DIR
}
COMPILER_COMMAND="javac -source 1.6 -target 1.6 -cp "
COMPILER_COMMAND="javac -source 8 -target 8 -cp "
delBinaryFiles
mkdir src
mv antlr src

11
antlr.changes
View File

@ -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

29
antlr.spec
View File

@ -21,9 +21,9 @@ Name: antlr
Version: 2.7.7
Release: 0
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
Url: http://www.antlr.org/
URL: http://www.antlr.org/
Source0: antlr-%{version}.tar.bz2
Source1: %{name}-build.xml
Source2: %{name}-script
@ -35,16 +35,16 @@ Patch2: fix-docpath.diff
BuildRequires: ant
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: java-devel >= 1.6
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-tools
%if %{with python2}
BuildRequires: python2-base
%endif
BuildRequires: xml-commons-apis
Requires: %{name}-java
Provides: %{name}-bootstrap = %{version}
Obsoletes: %{name}-bootstrap < %{version}
Obsoletes: %{name}-javadoc
%if %{with python2}
BuildRequires: python2-base
%endif
%description
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
Summary: ANother Tool for Language Recognition (Manual)
Group: Development/Tools/Other
Requires: java >= 1.6
Requires: java >= 1.8
BuildArch: noarch
%description java
@ -123,7 +123,7 @@ find | grep "\(ShowString.java$\|StreamConverter.java$\)" && exit 42 || :
%build
ant \
-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
%configure
make -j1
@ -147,11 +147,11 @@ install -m 0755 scripts/%{name}-config %{buildroot}%{_bindir}/
### python runtime ###
%if %{with python2}
install -d -m 0755 %{buildroot}%{py_sitedir}/%{name}
cp -a lib/python/antlr/* %{buildroot}%{py_sitedir}/%{name}
install -d -m 0755 %{buildroot}%{python_sitearch}/%{name}
cp -a lib/python/antlr/* %{buildroot}%{python_sitearch}/%{name}
# compat symlink
ln -s -f %{py_sitedir}/%{name}/*.py %{buildroot}%{_datadir}/%{name}-%{version}/
ln -s -f %{py_sitedir}/%{name}/*.pyc %{buildroot}%{_datadir}/%{name}-%{version}/
ln -s -f %{python_sitearch}/%{name}/*.py %{buildroot}%{_datadir}/%{name}-%{version}/
ln -s -f %{python_sitearch}/%{name}/*.pyc %{buildroot}%{_datadir}/%{name}-%{version}/
%endif
### cpp runtime ###
@ -167,7 +167,8 @@ find doc -type f | xargs chmod 0644
%fdupes -s doc
%files
%doc LICENSE.txt README.txt CHANGES.txt
%license LICENSE.txt
%doc README.txt CHANGES.txt
%dir %{_datadir}/%{name}-%{version}
%{_bindir}/antlr
%{_bindir}/antlr-config
@ -189,7 +190,7 @@ find doc -type f | xargs chmod 0644
%dir %{_datadir}/%{name}-%{version}
%{_datadir}/%{name}-%{version}/*py
%{_datadir}/%{name}-%{version}/*pyc
%{py_sitedir}/%{name}
%{python_sitearch}/%{name}
%endif
%changelog