pool/ant
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Build with antlr-bootstrap, ignore antlr(-java)

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=11
This commit is contained in:
Michal Vyskocil 2010-09-01 07:54:41 +00:00 committed by Git OBS Bridge
parent 971f4661db
commit 877f7429e4
6 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ant-antlr.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Apr 9 10:42:30 UTC 2010 - mvyskocil@suse.cz
- fix bnc#595144 - Compiled binary in ant
remove test.exe from source tarball
-------------------------------------------------------------------
Thu Mar 18 15:59:33 UTC 2010 - mvyskocil@suse.cz

5
ant-antlr.spec
View File

@ -29,7 +29,7 @@ Name: ant-antlr
# This line is not a comment, please do not remove it!
#%(sh %{_sourcedir}/ant-antlr-prepare.sh %{_sourcedir} %{name})
Version: 1.7.1
Release: 7
Release: 8
%if %bootstrap
Summary: Antlr Task for ant
%else
@ -38,7 +38,7 @@ Summary: Antlr Task for ant
License: Apache Software License ..
Url: http://jakarta.apache.org/
Group: Development/Tools/Building
Source0: %{cvs_name}-%{version}-src.tar.bz2
Source0: %{cvs_name}-%{version}-src-suse.tar.bz2
Source2: %{cvs_name}-%{major_version}.ant.conf
Source1: http://repo1.maven.org/maven2/org/apache/ant/ant/1.7.1/ant-1.7.1.pom
Source3: http://repo1.maven.org/maven2/org/apache/ant/ant-launcher/1.7.1/ant-launcher-1.7.1.pom
@ -68,7 +68,6 @@ Source26: http://repo1.maven.org/maven2/org/apache/ant/ant-parent/1.7.1/an
Source1000: ant-antlr-prepare.sh
# Fix some places where copies of classes are included in the wrong jarfiles
Patch0: apache-ant-jars.patch
#Patch1: apache-ant-bz163689.patch
Patch2: apache-ant-gnu-classpath.patch
Patch3: apache-ant-no-test-jar.patch
# SUSE patches

11
ant.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Aug 31 12:08:16 UTC 2010 - mvyskocil@suse.cz
- Build with antlr-bootstrap, ignore antlr(-java)
-------------------------------------------------------------------
Fri Apr 9 10:41:42 UTC 2010 - mvyskocil@suse.cz
- fix bnc#595144 - Compiled binary in ant
remove test.exe from source tarball
-------------------------------------------------------------------
Thu Mar 18 15:58:41 UTC 2010 - mvyskocil@suse.cz

10
ant.spec
View File

@ -28,7 +28,7 @@ Name: ant
# This line is not a comment, please do not remove it!
#%(sh %{_sourcedir}/ant-antlr-prepare.sh %{_sourcedir} %{name})
Version: 1.7.1
Release: 7
Release: 8
%if %bootstrap
Summary: Antlr Task for ant
%else
@ -37,7 +37,8 @@ Summary: Antlr Task for ant
License: Apache Software License ..
Url: http://jakarta.apache.org/
Group: Development/Tools/Building
Source0: %{cvs_name}-%{version}-src.tar.bz2
# rm src/etc/testcases/taskdefs/zip/test.exe
Source0: %{cvs_name}-%{version}-src-suse.tar.bz2
Source2: %{cvs_name}-%{major_version}.ant.conf
Source1: http://repo1.maven.org/maven2/org/apache/ant/ant/1.7.1/ant-1.7.1.pom
Source3: http://repo1.maven.org/maven2/org/apache/ant/ant-launcher/1.7.1/ant-launcher-1.7.1.pom
@ -67,7 +68,6 @@ Source26: http://repo1.maven.org/maven2/org/apache/ant/ant-parent/1.7.1/an
Source1000: ant-antlr-prepare.sh
# Fix some places where copies of classes are included in the wrong jarfiles
Patch0: apache-ant-jars.patch
#Patch1: apache-ant-bz163689.patch
Patch2: apache-ant-gnu-classpath.patch
Patch3: apache-ant-no-test-jar.patch
# SUSE patches
@ -75,6 +75,7 @@ Patch103: apache-ant-source-level.patch
BuildRequires: jpackage-utils >= 1.7.5
BuildRequires: java-1_5_0-gcj-compat-devel
BuildRequires: antlr-bootstrap
#!BuildIgnore: antlr antlr-java
BuildRequires: unzip
BuildRequires: xerces-j2-bootstrap
BuildRequires: xml-commons-apis-bootstrap
@ -85,7 +86,6 @@ BuildRequires: ant
BuildRequires: junit
BuildRequires: xml-commons-apis
BuildRequires: xerces-j2
#!BuildIgnore: antlr
%endif
%if %bootstrap
Requires: xerces-j2 >= 2.7.1-2
@ -494,7 +494,7 @@ find . -name "*.jar" | %{_bindir}/xargs -t rm
%build
export OPT_JAR_LIST=:
%if ! %bootstrap
export CLASSPATH=$(build-classpath xerces-j2 xml-commons-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xml-commons-resolver)
export CLASSPATH=$(build-classpath xerces-j2 xml-commons-apis antlr-bootstrap bcel jaf javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xml-commons-resolver)
%{ant} jars
%{ant} javadocs
%else

3
apache-ant-1.7.1-src-suse.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:305176617ba522c6b272fdd77d2063cd6231f5fa43a97bcd02dab7a1a365b3ea
size 6923290

3
apache-ant-1.7.1-src.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4dc49a7260ef90a6dc6611b7e96b9f047d507589736d4a2ad6efbe3edfc6fba6
size 6979386