From b6527afd2a434288212f7249008969bd4565cdd5b2978d46233e65c31b291714 Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Wed, 9 Mar 2011 13:20:10 +0000 Subject: [PATCH] fix build of ant-antlr - the rest of ant's modules OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=17 --- ant-antlr.changes | 46 ++++++++++++++++++++++++++++++++++++++++++++++ ant-antlr.spec | 25 +++++++++++++++---------- ant.spec | 25 +++++++++++++++---------- 3 files changed, 76 insertions(+), 20 deletions(-) diff --git a/ant-antlr.changes b/ant-antlr.changes index 0acf046..a88c31f 100644 --- a/ant-antlr.changes +++ b/ant-antlr.changes @@ -1,3 +1,49 @@ +------------------------------------------------------------------- +Wed Mar 9 08:56:33 UTC 2011 - mvyskocil@suse.cz + +- Update to ant 1.8.2 + * performance improvements in directory scanning + * XSLT task honors classpath again (bugrep 49271) + * distinction between core tasks and optional tasks is abolished + * new task augment allows to add attributes or nested elements to previously + defined references + * Lexically scoped local properties, i.e. properties that are only defined + inside a target, sequential block or similar environment. This is very + useful inside of s where a macro can now define a temporary + property that will disappear once the task has finished. + * can now import from any file- or URL-providing resource - this + includes . This means can read build file snippets + from JARs or fixed server URLs. There are several other improvements in the + area of import. + * Various improvements to the directory scanning code that help with symbolic + link cycles (as can be found on MacOS X Java installations for example) and + improve scanning performance. For big directory trees the improvement is + dramatic. + * The way developers can extend Ant's property expansion algorithm has been + rewritten (breaking the older API) to be easier to use and be more + powerful. The whole local properties mechanism is implemented using that + API and could be implemented in a separate library without changes in Ant's + core. Things like the yet-to-be-released props Antlib can now provide often + required "scripty" fuctions without touching Ant itself. At the same time + the if and unless attributes have been rewritten to do the expected thing + if applied to a property expansion (i.e. if="${foo}" will mean "yes, do it" + if ${foo} expands to true, in Ant 1.7.1 it would mean "no" unless a + property named "true" existed). This adds "testing conditions" as a new + use-case to property expansion. + * A new top-level element assists in writing re-usable + build files that are meant to be imported. has a name and + a dependency-list like and can be used like a from the + command line or a dependency-list but the importing build file can add + targets to the 's depends list. + * Ant now requires Java 1.4 or later new task include provides an alternative + to that should be preferred when you don't want to override any + targets + * numerous bug fixes and improvements as documented in + Bugzilla and in WHATSNEW +- merge the nodeps and trax packages to main one +- build ant-antlr.spec using openjdk +- add ant-apache-xalan2 and ant-testutil + ------------------------------------------------------------------- Fri Apr 9 10:42:30 UTC 2010 - mvyskocil@suse.cz diff --git a/ant-antlr.spec b/ant-antlr.spec index 2d360d9..a1765ce 100644 --- a/ant-antlr.spec +++ b/ant-antlr.spec @@ -473,9 +473,10 @@ sed -i -e "s|IMAGE_FILE_TYPE|BINARY_FILE_TYPE|g" src/main/org/apache/tools/ant/t %patch1 -p1 -b .sav1 %endif -# Update ant to work with recent versions of GNU Classpath # When bootstrapping, we don't have junit +%if %bootstrap %patch3 -p1 +%endif # Fix class-path-in-manifest rpmlint warning %patch4 @@ -537,7 +538,7 @@ install -d -m 755 %{buildroot}%{_datadir}/maven2/poms for jar in build/lib/*.jar do jarname=$(basename $jar .jar) - pomname="JPP.%{name}-${jarname}.pom" + pomname="JPP.ant-${jarname}.pom" #Determine where to put it case $jarname in @@ -552,6 +553,8 @@ do #Bootstracp builds an incomplete ant-junit, don't ship it %if %bootstrap ant-junit) continue;; +%else + ant-jmf|ant-swing) continue;; %endif #These go into %%{_javadir}/ant *) destdir=%{buildroot}%{_javadir}/ant; destname="/ant"; @@ -605,6 +608,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}.d echo "ant/ant-jmf" > %{buildroot}%{_sysconfdir}/%{name}.d/jmf echo "ant/ant-swing" > %{buildroot}%{_sysconfdir}/%{name}.d/swing %else +mkdir -p %{buildroot}%{_sysconfdir}/ant.d echo "antlr ant/ant-antlr" > %{buildroot}%{_sysconfdir}/ant.d/antlr echo "bsf ant/ant-apache-bsf" > %{buildroot}%{_sysconfdir}/ant.d/apache-bsf echo "xml-commons-resolver ant/ant-apache-resolver" > %{buildroot}%{_sysconfdir}/ant.d/apache-resolver @@ -772,9 +776,7 @@ rm -rf %{buildroot} %files -n ant-apache-bcel %defattr(0644,root,root,0755) %{_javadir}/ant/ant-apache-bcel.jar -%{_javadir}/ant/ant-jakarta-bcel.jar %{ant_home}/lib/ant-apache-bcel.jar -%{ant_home}/lib/ant-jakarta-bcel.jar %config(noreplace) %{_sysconfdir}/ant.d/apache-bcel %{_datadir}/maven2/poms/JPP.ant-ant-apache-bcel.pom %dir %{_datadir}/maven2/ @@ -783,9 +785,7 @@ rm -rf %{buildroot} %files -n ant-apache-log4j %defattr(0644,root,root,0755) %{_javadir}/ant/ant-apache-log4j.jar -%{_javadir}/ant/ant-jakarta-log4j.jar %{ant_home}/lib/ant-apache-log4j.jar -%{ant_home}/lib/ant-jakarta-log4j.jar %config(noreplace) %{_sysconfdir}/ant.d/apache-log4j %{_datadir}/maven2/poms/JPP.ant-ant-apache-log4j.pom %dir %{_datadir}/maven2/ @@ -794,9 +794,10 @@ rm -rf %{buildroot} %files -n ant-apache-oro %defattr(0644,root,root,0755) %{_javadir}/ant/ant-apache-oro.jar -%{_javadir}/ant/ant-jakarta-oro.jar %{ant_home}/lib/ant-apache-oro.jar -%{ant_home}/lib/ant-jakarta-oro.jar +%{ant_home}/etc/maudit-frames.xsl +%config(noreplace) %{_sysconfdir}/ant.d/apache-oro +%{_datadir}/maven2/poms/JPP.ant-ant-apache-oro.pom %dir %{_datadir}/maven2/ %dir %{_datadir}/maven2/poms @@ -804,7 +805,7 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %{_javadir}/ant/ant-apache-regexp.jar %{ant_home}/lib/ant-apache-regexp.jar -%config(noreplace) %{_sysconfdir}/ant/apache-regexp +%config(noreplace) %{_sysconfdir}/ant.d/apache-regexp %{_datadir}/maven2/poms/JPP.ant-ant-apache-regexp.pom %dir %{_datadir}/maven2/ %dir %{_datadir}/maven2/poms @@ -814,6 +815,7 @@ rm -rf %{buildroot} %{_javadir}/ant/ant-apache-xalan2.jar %{ant_home}/lib/ant-apache-xalan2.jar %config(noreplace) %{_sysconfdir}/ant.d/apache-xalan2 +%{_datadir}/maven2/poms/JPP.ant-ant-apache-xalan2.pom %files -n ant-javamail %defattr(0644,root,root,0755) @@ -860,6 +862,9 @@ rm -rf %{buildroot} %{_javadir}/ant/ant-testutil.jar %{ant_home}/lib/ant-testutil.jar %config(noreplace) %{_sysconfdir}/ant.d/testutil +%{_datadir}/maven2/poms/JPP.ant-ant-testutil.pom +%dir %{_datadir}/maven2/ +%dir %{_datadir}/maven2/poms %files -n ant-manual %defattr(0644,root,root,0755) @@ -867,7 +872,7 @@ rm -rf %{buildroot} %files -n ant-javadoc %defattr(0644,root,root,0755) -%{_javadocdir}/ant-%{version} +%{_javadocdir}/ant %endif %changelog diff --git a/ant.spec b/ant.spec index 40973de..2656433 100644 --- a/ant.spec +++ b/ant.spec @@ -472,9 +472,10 @@ sed -i -e "s|IMAGE_FILE_TYPE|BINARY_FILE_TYPE|g" src/main/org/apache/tools/ant/t %patch1 -p1 -b .sav1 %endif -# Update ant to work with recent versions of GNU Classpath # When bootstrapping, we don't have junit +%if %bootstrap %patch3 -p1 +%endif # Fix class-path-in-manifest rpmlint warning %patch4 @@ -536,7 +537,7 @@ install -d -m 755 %{buildroot}%{_datadir}/maven2/poms for jar in build/lib/*.jar do jarname=$(basename $jar .jar) - pomname="JPP.%{name}-${jarname}.pom" + pomname="JPP.ant-${jarname}.pom" #Determine where to put it case $jarname in @@ -551,6 +552,8 @@ do #Bootstracp builds an incomplete ant-junit, don't ship it %if %bootstrap ant-junit) continue;; +%else + ant-jmf|ant-swing) continue;; %endif #These go into %%{_javadir}/ant *) destdir=%{buildroot}%{_javadir}/ant; destname="/ant"; @@ -604,6 +607,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}.d echo "ant/ant-jmf" > %{buildroot}%{_sysconfdir}/%{name}.d/jmf echo "ant/ant-swing" > %{buildroot}%{_sysconfdir}/%{name}.d/swing %else +mkdir -p %{buildroot}%{_sysconfdir}/ant.d echo "antlr ant/ant-antlr" > %{buildroot}%{_sysconfdir}/ant.d/antlr echo "bsf ant/ant-apache-bsf" > %{buildroot}%{_sysconfdir}/ant.d/apache-bsf echo "xml-commons-resolver ant/ant-apache-resolver" > %{buildroot}%{_sysconfdir}/ant.d/apache-resolver @@ -771,9 +775,7 @@ rm -rf %{buildroot} %files -n ant-apache-bcel %defattr(0644,root,root,0755) %{_javadir}/ant/ant-apache-bcel.jar -%{_javadir}/ant/ant-jakarta-bcel.jar %{ant_home}/lib/ant-apache-bcel.jar -%{ant_home}/lib/ant-jakarta-bcel.jar %config(noreplace) %{_sysconfdir}/ant.d/apache-bcel %{_datadir}/maven2/poms/JPP.ant-ant-apache-bcel.pom %dir %{_datadir}/maven2/ @@ -782,9 +784,7 @@ rm -rf %{buildroot} %files -n ant-apache-log4j %defattr(0644,root,root,0755) %{_javadir}/ant/ant-apache-log4j.jar -%{_javadir}/ant/ant-jakarta-log4j.jar %{ant_home}/lib/ant-apache-log4j.jar -%{ant_home}/lib/ant-jakarta-log4j.jar %config(noreplace) %{_sysconfdir}/ant.d/apache-log4j %{_datadir}/maven2/poms/JPP.ant-ant-apache-log4j.pom %dir %{_datadir}/maven2/ @@ -793,9 +793,10 @@ rm -rf %{buildroot} %files -n ant-apache-oro %defattr(0644,root,root,0755) %{_javadir}/ant/ant-apache-oro.jar -%{_javadir}/ant/ant-jakarta-oro.jar %{ant_home}/lib/ant-apache-oro.jar -%{ant_home}/lib/ant-jakarta-oro.jar +%{ant_home}/etc/maudit-frames.xsl +%config(noreplace) %{_sysconfdir}/ant.d/apache-oro +%{_datadir}/maven2/poms/JPP.ant-ant-apache-oro.pom %dir %{_datadir}/maven2/ %dir %{_datadir}/maven2/poms @@ -803,7 +804,7 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %{_javadir}/ant/ant-apache-regexp.jar %{ant_home}/lib/ant-apache-regexp.jar -%config(noreplace) %{_sysconfdir}/ant/apache-regexp +%config(noreplace) %{_sysconfdir}/ant.d/apache-regexp %{_datadir}/maven2/poms/JPP.ant-ant-apache-regexp.pom %dir %{_datadir}/maven2/ %dir %{_datadir}/maven2/poms @@ -813,6 +814,7 @@ rm -rf %{buildroot} %{_javadir}/ant/ant-apache-xalan2.jar %{ant_home}/lib/ant-apache-xalan2.jar %config(noreplace) %{_sysconfdir}/ant.d/apache-xalan2 +%{_datadir}/maven2/poms/JPP.ant-ant-apache-xalan2.pom %files -n ant-javamail %defattr(0644,root,root,0755) @@ -859,6 +861,9 @@ rm -rf %{buildroot} %{_javadir}/ant/ant-testutil.jar %{ant_home}/lib/ant-testutil.jar %config(noreplace) %{_sysconfdir}/ant.d/testutil +%{_datadir}/maven2/poms/JPP.ant-ant-testutil.pom +%dir %{_datadir}/maven2/ +%dir %{_datadir}/maven2/poms %files -n ant-manual %defattr(0644,root,root,0755) @@ -866,7 +871,7 @@ rm -rf %{buildroot} %files -n ant-javadoc %defattr(0644,root,root,0755) -%{_javadocdir}/ant-%{version} +%{_javadocdir}/ant %endif %changelog