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

Accepting request 46166 from Java:packages

Browse Source 
Copy from Java:packages/antlr based on submit request 46166 from user mvyskocil

OBS-URL: https://build.opensuse.org/request/show/46166
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/antlr?expand=0&rev=14
This commit is contained in:
OBS User autobuild 2010-08-27 19:40:20 +00:00 committed by Git OBS Bridge
parent 44bc9edcc4
commit 507a7c8b89
8 changed files with 395 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
antlr-bootstrap.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Aug 23 08:18:40 UTC 2010 - mvyskocil@suse.cz
- do not Provide antlr
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 3 11:02:14 CET 2008 - mvyskocil@suse.cz Mon Mar 3 11:02:14 CET 2008 - mvyskocil@suse.cz

32
antlr-bootstrap.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package antlr-bootstrap (Version 2.7.7) # spec file for package antlr-bootstrap (Version 2.7.7)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -22,16 +22,13 @@ Name: antlr-bootstrap
%define non_bootstrap_name antlr %define non_bootstrap_name antlr
BuildRequires: fastjar gcc-gij gcc-java unzip zip BuildRequires: fastjar gcc-gij gcc-java unzip zip
BuildRequires: ecj-bootstrap >= 0.570 BuildRequires: ecj-bootstrap >= 0.570
Provides: antlr
%if %{?mandriva_release:1}0
%endif
%define real_name antlr %define real_name antlr
Summary: Antlr for bootstrapping purposes Summary: Antlr for bootstrapping purposes
Version: 2.7.7 Version: 2.7.7
Release: 53 Release: 78
Url: http://www.antlr.org Url: http://www.antlr.org
Group: Development/Libraries/Java Group: Development/Libraries/Java
License: BSD 3-Clause; Public Domain, Freeware License: BSD3c ; Public Domain, Freeware
AutoReqProv: on AutoReqProv: on
Source0: antlr-%{version}.tar.bz2 Source0: antlr-%{version}.tar.bz2
Source1: manifest.antlr Source1: manifest.antlr
@ -152,26 +149,3 @@ rm -rf $RPM_BUILD_ROOT
# vim:fdm=marker:foldmarker=#>>>,#<<<:foldcolumn=6: # vim:fdm=marker:foldmarker=#>>>,#<<<:foldcolumn=6:
%changelog %changelog
* Mon Mar 03 2008 mvyskocil@suse.cz
- updated to 2.7.7
* Wed Jan 30 2008 adrian@suse.de
- add Provides: antlr on sugggestion of dbornkessel
* Fri May 04 2007 dbornkessel@suse.de
- added unzip to BuildRequires
* Wed Nov 15 2006 dbornkessel@suse.de
- delete "Provides: antlr" ... packages that need the bootstrap package should have a hard require on it
* Thu Oct 12 2006 ro@suse.de
- change buildreq to ">=" for ecj-bootstrap
* Sat Oct 07 2006 dbornkessel@suse.de
- added check that checks whether deleted files ShowString.java and StreamConverter.java are really not in place
* Thu Oct 05 2006 dbornkessel@suse.de
- deleted
antlr-2.7.6/examples/java/unicode.IDENTs/ShowString.java
antlr-2.7.6/examples/java/unicode.IDENTs/StreamConverter.java
from tar ball due to licensing issues (Bug #207621)
* Thu Sep 28 2006 ro@suse.de
- added gcc-gij to BuildRequires
* Wed Sep 20 2006 dbornkessel@suse.de
- renamed antlr-bootstrap.jar to antlr.jar
* Mon Sep 18 2006 dbornkessel@suse.de
- created bootstrapping package

3
antlr-rpmlintrc Normal file
View File

@ -0,0 +1,3 @@
addFilter("zero-length /usr/share/doc/packages/antlr-manual/examples/csharp/csharp_v1/testfiles/Empty.cs")
addFilter("wrong-file-end-of-line-encoding /usr/share/doc/packages/antlr-manual/examples/")
addFilter("no-binary")

21
antlr.changes
View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Mon Aug 23 08:18:09 UTC 2010 - mvyskocil@suse.cz
- add missing java requires of antlr-java package
-------------------------------------------------------------------
Thu Aug 19 12:43:18 UTC 2010 - mvyskocil@suse.cz
- enabled the python (python-antlr) and csharp (antlr-csharp) support
- moved jar files to new antlr-java package, which is required by main antlr
one. This is to have jar files in noarch package
- do not use default make install, but install files manually with a
compatibility links to /usr/share/antlr-2.7.7
-------------------------------------------------------------------
Wed Aug 18 18:32:11 UTC 2010 - tittiatcoke@opensuse.org
- Ensure that the development files are build too. The package is now a build
requirement for the KDESDK4 package.
- Removed the structure to build just the native version.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 3 11:02:35 CET 2008 - mvyskocil@suse.cz Mon Mar 3 11:02:35 CET 2008 - mvyskocil@suse.cz

313
antlr.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package antlr (Version 2.7.7) # spec file for package antlr (Version 2.7.7)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,15 +17,13 @@
# norootforbuild # norootforbuild
%define section free
Name: antlr Name: antlr
BuildRequires: ant gcc-c++ java2-devel-packages unzip xml-commons-apis
%define section free
%define native 0
Summary: Another Tool for Language Recognition Summary: Another Tool for Language Recognition
Version: 2.7.7 Version: 2.7.7
Release: 70 Release: 78
License: GPL v2 or later; Public Domain, Freeware; X11/MIT License: GPLv2+ ; Public Domain, Freeware ; MIT
Url: http://www.antlr.org/ Url: http://www.antlr.org/
Group: Development/Tools/Other Group: Development/Tools/Other
#Source0: http://www.antlr.org/download/antlr-2.7.4.tar.gz #Source0: http://www.antlr.org/download/antlr-2.7.4.tar.gz
@ -33,18 +31,27 @@ Source0: %{name}-%{version}.tar.bz2
Source1: %{name}-build.xml Source1: %{name}-build.xml
Source2: %{name}-script Source2: %{name}-script
Source3: http://www.antlr.org/share/1069557132934/makefile.gcj Source3: http://www.antlr.org/share/1069557132934/makefile.gcj
Source1000: antlr-rpmlintrc
Patch0: %{name}-jedit.patch Patch0: %{name}-jedit.patch
Patch150: java150_build.patch Patch1: gcc45fix.diff
Patch2: fix-docpath.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %{native} BuildRequires: ant
%else BuildRequires: java-devel
BuildArch: noarch BuildRequires: xml-commons-apis
BuildRequires: gcc-c++
BuildRequires: libstdc++-devel
BuildRequires: python-devel
%py_requires
BuildRequires: mono-core
BuildRequires: mono-data
BuildRequires: mono-devel
BuildRequires: unzip
BuildRequires: fdupes
Requires: jpackage-utils Requires: jpackage-utils
PreReq: update-alternatives Requires: %{name}-java
Requires(postun): %{_sbindir}/update-alternatives Provides: %{name}-bootstrap = %{version}-%{release}
%endif Obsoletes: %{name}-bootstrap < %{version}-%{release}
Provides: %{name}-bootstrap
Obsoletes: %{name}-bootstrap
%description %description
ANTLR, Another Tool for Language Recognition, (formerly PCCTS) is a ANTLR, Another Tool for Language Recognition, (formerly PCCTS) is a
@ -52,183 +59,189 @@ language tool that provides a framework for constructing recognizers,
compilers, and translators from grammatical descriptions containing C++ compilers, and translators from grammatical descriptions containing C++
or Java actions (you can use PCCTS 1.xx to generate C-based parsers). or Java actions (you can use PCCTS 1.xx to generate C-based parsers).
# To not introduce arch dependent java package, lets have this in separate subpackage
%package java
%package manual License: GPLv2+ ; Public Domain, Freeware ; MIT
License: GPL v2 or later; Public Domain, Freeware; X11/MIT
Group: Development/Tools/Other Group: Development/Tools/Other
Summary: ANother Tool for Language Recognition (Manual) Summary: ANother Tool for Language Recognition (Manual)
BuildArch: noarch
Requires: java >= 1.6.0
Provides: file:/%{_javadir}/%{name}.jar
%description java
Java runtime for antlr
%package manual
License: GPLv2+ ; Public Domain, Freeware ; MIT
Group: Development/Tools/Other
Summary: ANother Tool for Language Recognition (Manual)
BuildArch: noarch
%description manual %description manual
Manual for antlr. Manual and examples for antlr.
%package javadoc %package javadoc
License: GPL v2 or later; Public Domain, Freeware; X11/MIT License: GPLv2+ ; Public Domain, Freeware ; MIT
PreReq: coreutils PreReq: coreutils
Group: Development/Tools/Other Group: Development/Tools/Other
Summary: ANother Tool for Language Recognition (Java Documentation) Summary: ANother Tool for Language Recognition (Java Documentation)
BuildArch: noarch
%description javadoc %description javadoc
Javadoc for antlr. Javadoc for antlr.
%package devel
License: GPLv2+ ; Public Domain, Freeware ; MIT
Group: Development/Tools/Other
Summary: ANother Tool for Language Recognition (c++ runtime)
Requires: antlr
%description devel
C++ runtime (libantlr.a) and a headers files of antlr
%package -n python-%{name}
License: GPLv2+ ; Public Domain, Freeware ; MIT
Group: Development/Tools/Other
Summary: ANother Tool for Language Recognition (python runtime)
Requires: antlr
%py_requires
%description -n python-%{name}
Python support for generating your Lexers, Parsers and TreeParsers in Python.
This feature extends the benefits of ANTLR's predicated-LL(k) parsing
technology to the Python language and platform.
ANTLR Python support was contributed (and is to be maintained) by Wolfgang
Haefelinger and Marq Kole.
%package csharp
License: GPLv2+ ; Public Domain, Freeware ; MIT
Group: Development/Tools/Other
Summary: ANother Tool for Language Recognition (python runtime)
Requires: mono-core
Requires: antlr
%description csharp
To be able to build and use the C# language Lexers, Parsers and TreeParsers,
you will need to link to the ANTLR C# runtime library. The C# runtime model is
based on the existing runtime models for Java and C++ and is thus immediately
familiar. The C# runtime and the Java runtime in particular are very similar
although there a number of subtle (and not so subtle) differences. Some of
these result from differences in the respective runtime environments.
ANTLR C# support was contributed (and is maintained) by Kunle Odutola, Micheal
Jordan and Anthony Oguntimehin.
%prep %prep
%setup -q %setup -q
# remove all binary libs # remove all binary libs
find . -name "*.jar" -exec rm -f {} \; find . -name "*.jar" -exec rm -f {} \;
%if !%{native}
%patch0 -p0 %patch0 -p0
cp -p %{SOURCE1} build.xml cp -p %{SOURCE1} build.xml
## fixup paths to manual #Fix the source so that it compiles with GCC 4.5
#%{__perl} -pi -e 's|"doc/|"%{_docdir}/%{name}-manual-%{version}/|g' \ %patch1 -p1
# install.html #Ensure that the manuals are installed in the correct openSUSE docpath
%patch150 -p1 %patch2 -p0
%endif
# check for license problematic files: # check for license problematic files:
find | grep "\(ShowString.java$\|StreamConverter.java$\)" && exit 42 find | grep "\(ShowString.java$\|StreamConverter.java$\)" && exit 42
%fdupes -s doc/ examples/
%build %build
%if %{native}
%{__make} -f %{SOURCE3} COMPOPTS="$RPM_OPT_FLAGS"
%else
ant -Dj2se.apidoc=%{_javadocdir}/java ant -Dj2se.apidoc=%{_javadocdir}/java
%endif %configure
%__make
%py_compile lib/python/antlr
%install %install
install -dm 755 $RPM_BUILD_ROOT%{_bindir} # % {makeinstall}
touch $RPM_BUILD_ROOT%{_bindir}/antlr # for %%ghost # The upstream make install just installs a files to more or less random location
%if %{native} # instead of fixing it, let's install it in %%install section
install -pm 755 cantlr $RPM_BUILD_ROOT%{_bindir}/antlr-native
%else #### jars ###
# jars %{__install} -d -m 0755 %{buildroot}%{_javadir}
mkdir -p $RPM_BUILD_ROOT%{_javadir} %{__cp} -a work/lib/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
cp -p work/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar (cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do %{__ln_s} -f ${jar} `echo $jar| %{__sed} "s|-%{version}||g"`; done)
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) # compat symlink
# script %{__install} -d -m 0755 %{buildroot}%{_datadir}/%{name}-%{version}/
cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/antlr-java %{__ln_s} -f %{_javadir}/%{name}-%{version}.jar %{buildroot}%{_datadir}/%{name}-%{version}/%{name}.jar
# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} ### scripts ###
cp -pr work/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} %{__install} -d -m 0755 %{buildroot}%{_bindir}/
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} %{__install} -m 0755 %{SOURCE2} %{buildroot}%{_bindir}/%{name}
%endif %{__install} -m 0755 scripts/%{name}-config %{buildroot}%{_bindir}/
### javadoc ###
%{__install} -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
%{__cp} -ar work/api/* %{buildroot}%{_javadocdir}/%{name}
### python runtime ###
%{__install} -d -m 0755 %{buildroot}%{py_sitedir}/%{name}
%{__cp} -a lib/python/antlr/* %{buildroot}%{py_sitedir}/%{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}/
### csharp runtime ###
%{__install} -d -m 0755 %{buildroot}%{_libdir}
%{__install} -m 0755 lib/*dll %{buildroot}%{_libdir}
# compat symlink
%{__ln_s} -f %{_libdir}/%{name}.astframe.dll %{buildroot}%{_datadir}/%{name}-%{version}/
%{__ln_s} -f %{_libdir}/%{name}.runtime.dll %{buildroot}%{_datadir}/%{name}-%{version}/
### cpp runtime ###
%{__install} -m 0644 lib/cpp/src/lib%{name}.a %{buildroot}%{_libdir}
%{__install} -d -m 0755 %{buildroot}%{_includedir}/%{name}
%{__install} -m 0644 lib/cpp/%{name}/*hpp %{buildroot}%{_includedir}/%{name}
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf %{buildroot}
%post %check
%{_sbindir}/update-alternatives --install %{_bindir}/antlr \ # % {__make} check
%{name} %{_bindir}/antlr-java 10
%postun # % post -p /sbin/ldconfig
if [ $1 -eq 0 ] ; then
%{_sbindir}/update-alternatives --remove %{name} %{_bindir}/antlr-java
fi
%if %{native}
%post native # % postun -p /sbin/ldconfig
%{_sbindir}/update-alternatives --install %{_bindir}/antlr \
%{name} %{_bindir}/antlr-native 20
%postun native
if [ $1 -eq 0 ] ; then
%{_sbindir}/update-alternatives --remove %{name} %{_bindir}/antlr-native
fi
%endif
%post javadoc
rm -f %{_javadocdir}/%{name}
ln -s %{name}-%{version} %{_javadocdir}/%{name}
%if %{native}
%files native
%defattr(0644,root,root,0755)
%doc install.html LICENSE.txt
%defattr(0755,root,root,0755)
%ghost %{_bindir}/antlr
%{_bindir}/antlr-native
%else
%files %files
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)
%doc LICENSE.txt %doc LICENSE.txt README.txt CHANGES.txt
%{_javadir}/%{name}*.jar %dir %{_datadir}/%{name}-%{version}
%defattr(0755,root,root,0755) %defattr(0755,root,root,0755)
%ghost %{_bindir}/antlr %{_bindir}/antlr
%{_bindir}/antlr-java %{_bindir}/antlr-config
%files java
%defattr(0644,root,root,0755)
%dir %{_datadir}/%{name}-%{version}
%{_datadir}/%{name}-%{version}/*jar
%{_javadir}/%{name}*.jar
%files manual %files manual
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)
%doc doc/* %doc doc examples
%files javadoc %files javadoc
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)
%doc %{_javadocdir}/%{name}-%{version} %doc %{_javadocdir}/%{name}
%ghost %doc %{_javadocdir}/%{name}
%endif %files devel
%defattr(-,root,root)
%{_libdir}/libantlr.a
%{_includedir}/%{name}
%files -n python-%{name}
%defattr(-,root,root)
%dir %{_datadir}/%{name}-%{version}
%{_datadir}/%{name}-%{version}/*py
%{_datadir}/%{name}-%{version}/*pyc
%py_sitedir/%{name}
%files csharp
%defattr(-,root,root)
%dir %{_datadir}/%{name}-%{version}
%{_datadir}/%{name}-%{version}/*dll
%{_libdir}/*.dll
%changelog %changelog
* Mon Mar 03 2008 mvyskocil@suse.cz
- updated to 2.7.7
* updated BaseAST.java to make the doWorkForAll method static. Same
behaviour, except no ClassCastExceptions when sibling.getFirstChild()
happens to return an AST that doesn't extend BaseAST. Oliver Wong contributed
the patch.
* updated TokenStreamRewriteEngine.java to reflect bug fixes discovered
in v3 counterpart.
* Wed Feb 20 2008 adrian@suse.de
- do not PreReq files to fix build env setup for other packages
- remove SL-9.1 traces
* Fri May 04 2007 dbornkessel@suse.de
- added unzip to BuildRequires
* Sat Oct 07 2006 dbornkessel@suse.de
- added check that checks whether deleted files ShowString.java and StreamConverter.java are really not in place
* Thu Oct 05 2006 dbornkessel@suse.de
- deleted
antlr-2.7.6/examples/java/unicode.IDENTs/ShowString.java
antlr-2.7.6/examples/java/unicode.IDENTs/StreamConverter.java
from tar ball due to licensing issues (Bug #207621)
* Mon Sep 25 2006 dbornkessel@suse.de
- fixes necessary to compile with Java 1.5.0
- set source="1.4" and target="1.4" for ant "javac" tasks
- set source="1.4" for ant "javadoc" tasks
* Wed Sep 20 2006 dbornkessel@suse.de
- Provide: antlr-bootstrap
Obsoletes: antlr-bootstrap
* Mon Sep 18 2006 dbornkessel@suse.de
- update to 2.7.6
- added size, index methods to TokenStreamRewriteEngine.java
- bug in syn preds for tree parsers. Submitted by Ole Kniemeyer.
- all Class.forName yanked out; uses thread context loader
- option to prevent System.exit termination
- added recover() method to lexers
- fixed code gen bug for syn preds in tree parsers. Thanks to Marc Horowitz.
- BaseAST was not checking for null text in toString()
- Scott added java line ouput in code gen
- Prashant tweaked a few things for ANTLRStudio; a few new classes in ASdebug package
- Give errors if the user attempts to set k>1 in a TreeWalker
- Added missing Makefile.in for C++ heteroAST example and enabled it
in configure.in
- Many small C++ support code and codegen tweaks fixes to increase
portability. (Compaq Tru64 UNIX V5.1, VC's)
- Prevent '\' entering the bitset dump comments, might occur at end of
line. Some compilers continue the comment to the next line (not sure
if this is a compiler bug, should look it up)
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
* Tue Oct 25 2005 jsmeix@suse.de
- removed sub-package antlr-jedit because since jedit version 4.2
/usr/share/jedit/modes/antlr.xml is included in jedit.
* Wed Jul 27 2005 jsmeix@suse.de
- Adjustments in the spec file.
* Tue Jul 19 2005 jsmeix@suse.de
- Current version 2.7.4 from JPackage.org
* Wed Mar 02 2005 skh@suse.de
- added support for C++ output (#67164)
* Thu Sep 16 2004 skh@suse.de
- Fix prerequires of javadoc subpackage
- conflict with pccts
* Thu Sep 02 2004 skh@suse.de
- Initial package created with version 2.7.4 (JPackage 1.5)

11
fix-docpath.diff Normal file
View File

@ -0,0 +1,11 @@
--- doc/Makefile.in 2006-11-01 22:37:17.000000000 +0100
+++ doc/Makefile.in 2010-08-18 16:03:51.767735508 +0200
@@ -10,7 +10,7 @@
## get configured rules
@stdmake@
-antlr_doc_DIR = $(datadir)/doc/$(versioneddir)
+antlr_doc_DIR = $(datadir)/doc/packages/antlr/
antlr_doc_FILES = \
@abs_top_srcdir@/doc/closure.gif \

189
gcc45fix.diff Normal file
View File

@ -0,0 +1,189 @@
diff -urB antlr-2.7.7/antlr/Makefile.in new/antlr/Makefile.in
--- antlr-2.7.7/antlr/Makefile.in 2006-11-01 22:37:17.000000000 +0100
+++ new/antlr/Makefile.in 2010-08-02 16:52:40.515132125 +0200
@@ -321,11 +321,11 @@
## install antlr.jar in libdirectory if exists
install :: @ANTLR_JAR@
- -$(MKDIR) -p "$(libdir)"
- -$(MKDIR) -p "$(datadir)/$(versioneddir)"
+ -$(MKDIR) -p "$(DESTDIR)$(libdir)"
+ -$(MKDIR) -p "$(DESTDIR)$(datadir)/$(versioneddir)"
-test -f @ANTLR_JAR@ && {\
- $(INSTALL) -m 444 @ANTLR_JAR@ "$(datadir)/$(versioneddir)" ; \
- $(INSTALL) -m 444 @ANTLR_JAR@ "$(libdir)" ; \
+ $(INSTALL) -m 444 @ANTLR_JAR@ "$(DESTDIR)$(datadir)/$(versioneddir)" ; \
+ $(INSTALL) -m 444 @ANTLR_JAR@ "$(DESTDIR)$(libdir)" ; \
}
distclean :: clean
diff -urB antlr-2.7.7/doc/Makefile.in new/doc/Makefile.in
--- antlr-2.7.7/doc/Makefile.in 2006-11-01 22:37:17.000000000 +0100
+++ new/doc/Makefile.in 2010-08-02 16:53:27.179728157 +0200
@@ -43,12 +43,12 @@
$(eol)
install ::
- @$(MKDIR) -p "$(antlr_doc_DIR)"
+ @$(MKDIR) -p "$(DESTDIR)$(antlr_doc_DIR)"
@@ECHO@ "install doc files .. "
@for f in $(antlr_doc_FILES) ; do \
@ECHO@ "install $${f}" ; \
if test -f "$${f}" ; then \
- $(INSTALL) -m 444 "$${f}" "$(antlr_doc_DIR)" ; \
+ $(INSTALL) -m 444 "$${f}" "$(DESTDIR)$(antlr_doc_DIR)" ; \
fi ;\
done
diff -urB antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp new/lib/cpp/antlr/CharScanner.hpp
--- antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp 2006-11-01 22:37:17.000000000 +0100
+++ new/lib/cpp/antlr/CharScanner.hpp 2010-08-02 15:37:59.888152499 +0200
@@ -11,6 +11,8 @@
#include <antlr/config.hpp>
#include <map>
+#include <stdio.h>
+#include <string.h>
#ifdef HAS_NOT_CCTYPE_H
#include <ctype.h>
diff -urB antlr-2.7.7/lib/cpp/antlr/Makefile.in new/lib/cpp/antlr/Makefile.in
--- antlr-2.7.7/lib/cpp/antlr/Makefile.in 2006-11-01 22:37:17.000000000 +0100
+++ new/lib/cpp/antlr/Makefile.in 2010-08-02 16:54:40.276072824 +0200
@@ -75,11 +75,11 @@
install:
@@ECHO@ "install hpp files .. "
- @$(MKDIR) -p "$(includedir)/antlr"
+ @$(MKDIR) -p "$(DESTDIR)$(includedir)/antlr"
@for f in $(antlr_hpp_FILES) ; do \
@ECHO@ "install $${f}" ; \
if test -f "$${f}" ; then \
- $(INSTALL) -m 444 "$${f}" "$(includedir)/antlr" ; \
+ $(INSTALL) -m 444 "$${f}" "$(DESTDIR)$(includedir)/antlr" ; \
fi ;\
done
diff -urB antlr-2.7.7/lib/cpp/src/Makefile.in new/lib/cpp/src/Makefile.in
--- antlr-2.7.7/lib/cpp/src/Makefile.in 2006-11-01 22:37:17.000000000 +0100
+++ new/lib/cpp/src/Makefile.in 2010-08-02 16:54:09.396352933 +0200
@@ -114,12 +114,12 @@
$(eol)
this-install: @ANTLR_LIB@
- @$(MKDIR) -p "$(libdir)"
+ @$(MKDIR) -p "$(DESTDIR)$(libdir)"
@@ECHO@ "install C++ core files .. "
@for f in $(antlr_lib_FILES) ; do \
@ECHO@ "install $${f}" ; \
if test -f "$${f}" ; then \
- $(INSTALL) -m 444 "$${f}" "$(libdir)" ; \
+ $(INSTALL) -m 444 "$${f}" "$(DESTDIR)$(libdir)" ; \
fi ;\
done
diff -urB antlr-2.7.7/lib/csharp/antlr.astframe/Makefile.in new/lib/csharp/antlr.astframe/Makefile.in
--- antlr-2.7.7/lib/csharp/antlr.astframe/Makefile.in 2006-11-01 22:37:17.000000000 +0100
+++ new/lib/csharp/antlr.astframe/Makefile.in 2010-08-02 16:55:58.989338267 +0200
@@ -45,13 +45,13 @@
## install our target ..
install :: @ASTFRAME_NET@
- @$(MKDIR) -p "$(libdir)"
+ @$(MKDIR) -p "$(DESTDIR)$(libdir)"
@@ECHO@ "install C# core files .. "
@for f in @ASTFRAME_NET@ ; do \
@ECHO@ "install $${f}" ; \
if test -f "$${f}" ; then \
- $(INSTALL) -m 444 "$${f}" "$(libdir)" ; \
- $(INSTALL) -m 444 "$${f}" "$(datadir)/$(versioneddir)" ; \
+ $(INSTALL) -m 444 "$${f}" "$(DESTDIR)$(libdir)" ; \
+ $(INSTALL) -m 444 "$${f}" "$(DESTDIR)$(datadir)/$(versioneddir)" ; \
fi ;\
done
diff -urB antlr-2.7.7/lib/csharp/antlr.runtime/Makefile.in new/lib/csharp/antlr.runtime/Makefile.in
--- antlr-2.7.7/lib/csharp/antlr.runtime/Makefile.in 2006-11-01 22:37:17.000000000 +0100
+++ new/lib/csharp/antlr.runtime/Makefile.in 2010-08-02 16:56:29.183049014 +0200
@@ -135,13 +135,13 @@
@RMF@ Makefile
install :: @ANTLR_NET@
- @$(MKDIR) -p "$(libdir)"
+ @$(MKDIR) -p "$(DESTDIR)$(libdir)"
@@ECHO@ "install C# core files .. "
@for f in @ANTLR_NET@ ; do \
@ECHO@ "install $${f}" ; \
if test -f "$${f}" ; then \
- $(INSTALL) -m 444 "$${f}" "$(libdir)" ; \
- $(INSTALL) -m 444 "$${f}" "$(datadir)/$(versioneddir)" ; \
+ $(INSTALL) -m 444 "$${f}" "$(DESTDIR)$(libdir)" ; \
+ $(INSTALL) -m 444 "$${f}" "$(DESTDIR)$(datadir)/$(versioneddir)" ; \
fi ;\
done
diff -urB antlr-2.7.7/lib/python/Makefile.in new/lib/python/Makefile.in
--- antlr-2.7.7/lib/python/Makefile.in 2006-11-01 22:37:17.000000000 +0100
+++ new/lib/python/Makefile.in 2010-08-02 16:55:21.052695892 +0200
@@ -41,26 +41,26 @@
extradir = $(datadir)/$(versioneddir)
install-this:
- $(MKDIR) -p "$(antlr_py_DIR)"
- $(MKDIR) -p "$(libdir)"
+ $(MKDIR) -p "$(DESTDIR)$(antlr_py_DIR)"
+ $(MKDIR) -p "$(DESTDIR)$(libdir)"
@@ECHO@ "install python files .. "
@for f in $(antlr_py_FILES) ; do \
@ECHO@ "install $${f}" ; \
if test -f "$${f}" ; then \
- $(INSTALL) -m 444 "$${f}" "$(libdir)" ; \
+ $(INSTALL) -m 444 "$${f}" "$(DESTDIR)$(libdir)" ; \
fi ;\
done
@for f in $(antlr_py1_FILES) ; do \
@ECHO@ "install $${f}" ; \
if test -f "$${f}" ; then \
- $(INSTALL) -m 444 "$${f}" "$(antlr_py_DIR)" ; \
+ $(INSTALL) -m 444 "$${f}" "$(DESTDIR)$(antlr_py_DIR)" ; \
fi ;\
done
@f="$(objdir)/scripts/pyantlr.sh"; \
if test -f "$${f}" ; then \
@ECHO@ "install Python installer" ; \
$(MKDIR) -p "$(sbindir)" ; \
- $(INSTALL) -m 555 "$${f}" "$(sbindir)" ; \
+ $(INSTALL) -m 555 "$${f}" "$(DESTDIR)$(sbindir)" ; \
fi
diff -urB antlr-2.7.7/Makefile.in new/Makefile.in
--- antlr-2.7.7/Makefile.in 2006-11-01 22:37:18.000000000 +0100
+++ new/Makefile.in 2010-08-02 16:52:05.892424224 +0200
@@ -124,16 +124,16 @@
extradir = $(datadir)/$(versioneddir)
install ::
- $(MKDIR) -p "$(bindir)"
- $(MKDIR) -p "$(extradir)"
- $(MKDIR) -p "$(docdir)"
- $(INSTALL) -m 755 scripts/run-antlr "$(bindir)/antlr"
- $(INSTALL) -m 755 scripts/antlr-config "$(bindir)/antlr-config"
- $(INSTALL) -m 444 @abs_top_srcdir@/extras/antlr-mode.el "$(extradir)"
- $(INSTALL) -m 444 @abs_top_srcdir@/extras/antlr-jedit.xml "$(extradir)"
- $(INSTALL) -m 444 @abs_top_srcdir@/LICENSE.txt "$(docdir)"
- $(INSTALL) -m 444 @abs_top_srcdir@/README.txt "$(docdir)"
- $(INSTALL) -m 444 @abs_top_srcdir@/INSTALL.txt "$(docdir)"
+ $(MKDIR) -p "$(DESTDIR)$(bindir)"
+ $(MKDIR) -p "$(DESTDIR)$(extradir)"
+ $(MKDIR) -p "$(DESTDIR)$(docdir)"
+ $(INSTALL) -m 755 scripts/run-antlr "$(DESTDIR)$(bindir)/antlr"
+ $(INSTALL) -m 755 scripts/antlr-config "$(DESTDIR)$(bindir)/antlr-config"
+ $(INSTALL) -m 444 @abs_top_srcdir@/extras/antlr-mode.el "$(DESTDIR)$(extradir)"
+ $(INSTALL) -m 444 @abs_top_srcdir@/extras/antlr-jedit.xml "$(DESTDIR)$(extradir)"
+ $(INSTALL) -m 444 @abs_top_srcdir@/LICENSE.txt "$(DESTDIR)$(docdir)"
+ $(INSTALL) -m 444 @abs_top_srcdir@/README.txt "$(DESTDIR)$(docdir)"
+ $(INSTALL) -m 444 @abs_top_srcdir@/INSTALL.txt "$(DESTDIR)$(docdir)"
install ::
@ECHO@ "installation done"

20
java150_build.patch
View File

@ -1,20 +0,0 @@
Index: antlr-2.7.6/build.xml
===================================================================
--- antlr-2.7.6.orig/build.xml
+++ antlr-2.7.6/build.xml
@@ -36,6 +36,7 @@
<!-- Build classes -->
<target name="classes" depends="prepare">
<javac srcdir="${src}" destdir="${build.classes}"
+ source="1.4" target="1.4"
debug="off" optimize="on" deprecation="on"/>
</target>
@@ -52,6 +53,7 @@
<!-- Build the full JavaDocs -->
<target name="javadoc" depends="prepare">
<javadoc sourcepath="${src}"
+ source="1.4"
destdir="${build.doc}"
doctitle="${name} Javadoc"
windowtitle="${name} Javadoc"