- use dist and javadocs targets to make javadoc build really configurable

- disable javadoc build on arm to speedup the build of java platform

- use dist and javadocs targets to make javadoc build really configurable
- disable javadoc build on arm to speedup the build of java platform

OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=23
This commit is contained in:
Michal Vyskocil 2011-12-15 08:55:54 +00:00 committed by Git OBS Bridge
parent 5ef869429d
commit 72a88fb4cc
4 changed files with 61 additions and 8 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Dec 15 08:49:28 UTC 2011 - mvyskocil@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
-------------------------------------------------------------------
Sat Sep 17 11:04:53 UTC 2011 - jengelh@medozas.de

View File

@ -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 @@ Patch4: apache-ant-class-path-in-manifest.patch
%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 @@ Apache Ant is a Java-based build tool.
This package contains the manual for Apache Ant.
%if %{build_javadoc}
%package -n ant-javadoc
License: Apache Software License ..
@ -446,8 +451,7 @@ Group: Development/Tools/Building
Apache Ant is a Java-based build tool.
This package contains the javadoc documentation for Apache Ant.
%endif #javadoc
%endif
@ -507,16 +511,23 @@ chmod +x %{__perl_requires}
%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 "junit ant/ant-junit" > %{buildroot}%{_sysconfdir}/ant.d/junit
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 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
%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

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Dec 15 08:49:28 UTC 2011 - mvyskocil@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
-------------------------------------------------------------------
Sat Sep 17 11:04:48 UTC 2011 - jengelh@medozas.de

View File

@ -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 @@ Apache Ant is a Java-based build tool.
This package contains the manual for Apache Ant.
%if %{build_javadoc}
%package -n ant-javadoc
License: Apache Software License ..
@ -446,8 +450,7 @@ Group: Development/Tools/Building
Apache Ant is a Java-based build tool.
This package contains the javadoc documentation for Apache Ant.
%endif #javadoc
%endif
@ -507,16 +510,23 @@ chmod +x %{__perl_requires}
%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 "junit ant/ant-junit" > %{buildroot}%{_sysconfdir}/ant.d/junit
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 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
%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