Hello community,
here is the log from the commit of package ant for openSUSE:Factory checked in
at 2011-12-15 16:05:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ant (Old)
and /work/SRC/openSUSE:Factory/.ant.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ant", Maintainer is "bnc-team-j...@forge.provo.novell.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ant/ant-antlr.changes 2011-09-23
11:36:20.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ant.new/ant-antlr.changes 2011-12-15
16:05:16.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Dec 15 08:49:28 UTC 2011 - mvysko...@suse.cz
+
+- use dist and javadocs targets to make javadoc build really configurable
+- disable javadoc build on arm to speedup the build of java platform
+
+-------------------------------------------------------------------
ant.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ant-antlr.spec ++++++
--- /var/tmp/diff_new_pack.wyTH9T/_old 2011-12-15 16:05:18.000000000 +0100
+++ /var/tmp/diff_new_pack.wyTH9T/_new 2011-12-15 16:05:18.000000000 +0100
@@ -30,8 +30,11 @@
%if %with bootstrap
%global build_javadoc 0
%else
+# disable javadoc build on arm platform - it delays a build a lot
+%ifnarch %arm
%global build_javadoc 1
%endif
+%endif
%global with_manifest_only 0
@@ -61,6 +64,7 @@
%if %bootstrap
BuildRequires: java-1_5_0-gcj-compat-devel
+#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel
%else
BuildRequires: java-devel >= 1.5.0
%endif
@@ -436,6 +440,7 @@
This package contains the manual for Apache Ant.
+%if %{build_javadoc}
%package -n ant-javadoc
License: Apache Software License ..
@@ -446,8 +451,7 @@
Apache Ant is a Java-based build tool.
This package contains the javadoc documentation for Apache Ant.
-
-
+%endif #javadoc
%endif
@@ -507,16 +511,23 @@
%build
export OPT_JAR_LIST=:
+
%if ! %bootstrap
export CLASSPATH=$(build-classpath xerces-j2 xml-commons-jaxp-1.3-apis antlr
bcel jaf javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging
commons-net jsch xalan-j2 xml-commons-resolver)
-%{ant} -Dbuild.sysclasspath=first distribution
+%{ant} -Dbuild.sysclasspath=first dist
+
+%if %{build_javadoc}
%{ant} javadocs
+%endif
+
%else
+
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
export JAVA_HOME=%{java_home}
export CLASSPATH=$JAVA_HOME/lib/tools.jar
export BOOTJAVAC_OPTS="-C -Wno-deprecated"
sh -x ./build.sh --noconfig jars
+
%endif
%install
@@ -618,12 +629,19 @@
echo "testutil ant/ant-testutil" > %{buildroot}%{_sysconfdir}/ant.d/testutil
%endif
%if ! %bootstrap
-# javadoc
+
+%if %{build_javadoc}
mkdir -p %{buildroot}%{_javadocdir}/ant
cp -pr build/javadocs/* %{buildroot}%{_javadocdir}/ant
+%endif #javadoc
+
%endif
+
+%if %{build_javadoc}
# fix link between manual and javadoc
(cd docs/manual; ln -sf %{_javadocdir}/%{name} api)
+%endif #javadoc
+
%if %bootstrap
find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
-a ! -name ant-update.xsl \
@@ -861,9 +879,12 @@
%defattr(0644,root,root,0755)
%doc docs/*
+%if %{build_javadoc}
+
%files -n ant-javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/ant
+%endif #javadoc
%endif
%changelog
++++++ ant.spec ++++++
--- /var/tmp/diff_new_pack.wyTH9T/_old 2011-12-15 16:05:18.000000000 +0100
+++ /var/tmp/diff_new_pack.wyTH9T/_new 2011-12-15 16:05:18.000000000 +0100
@@ -29,8 +29,11 @@
%if %with bootstrap
%global build_javadoc 0
%else
+# disable javadoc build on arm platform - it delays a build a lot
+%ifnarch %arm
%global build_javadoc 1
%endif
+%endif
%global with_manifest_only 0
@@ -436,6 +439,7 @@
This package contains the manual for Apache Ant.
+%if %{build_javadoc}
%package -n ant-javadoc
License: Apache Software License ..
@@ -446,8 +450,7 @@
Apache Ant is a Java-based build tool.
This package contains the javadoc documentation for Apache Ant.
-
-
+%endif #javadoc
%endif
@@ -507,16 +510,23 @@
%build
export OPT_JAR_LIST=:
+
%if ! %bootstrap
export CLASSPATH=$(build-classpath xerces-j2 xml-commons-jaxp-1.3-apis antlr
bcel jaf javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging
commons-net jsch xalan-j2 xml-commons-resolver)
-%{ant} -Dbuild.sysclasspath=first distribution
+%{ant} -Dbuild.sysclasspath=first dist
+
+%if %{build_javadoc}
%{ant} javadocs
+%endif
+
%else
+
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
export JAVA_HOME=%{java_home}
export CLASSPATH=$JAVA_HOME/lib/tools.jar
export BOOTJAVAC_OPTS="-C -Wno-deprecated"
sh -x ./build.sh --noconfig jars
+
%endif
%install
@@ -618,12 +628,19 @@
echo "testutil ant/ant-testutil" > %{buildroot}%{_sysconfdir}/ant.d/testutil
%endif
%if ! %bootstrap
-# javadoc
+
+%if %{build_javadoc}
mkdir -p %{buildroot}%{_javadocdir}/ant
cp -pr build/javadocs/* %{buildroot}%{_javadocdir}/ant
+%endif #javadoc
+
%endif
+
+%if %{build_javadoc}
# fix link between manual and javadoc
(cd docs/manual; ln -sf %{_javadocdir}/%{name} api)
+%endif #javadoc
+
%if %bootstrap
find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
-a ! -name ant-update.xsl \
@@ -861,9 +878,12 @@
%defattr(0644,root,root,0755)
%doc docs/*
+%if %{build_javadoc}
+
%files -n ant-javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/ant
+%endif #javadoc
%endif
%changelog
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
