Accepting request 312939 from home:jengelh:branches:Java:packages

- Do better quoting to get better error messages when it fails

OBS-URL: https://build.opensuse.org/request/show/312939
OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=64
This commit is contained in:
Tomáš Chvátal
2015-06-22 08:55:55 +00:00
committed by Git OBS Bridge
parent 832d3526bd
commit cd3127bad0
5 changed files with 25 additions and 15 deletions

View File

@@ -457,8 +457,8 @@ ant javadocs
%if %{with bootstrap}
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
export JAVA_HOME=%{java_home}
export CLASSPATH=$JAVA_HOME/lib/tools.jar
export JAVA_HOME="%{java_home}"
export CLASSPATH="$JAVA_HOME/lib/tools.jar"
export BOOTJAVAC_OPTS="-C -Wno-deprecated"
sh -x ./build.sh --noconfig jars
@@ -496,14 +496,14 @@ do
#These go into %%{_javadir}, pom files have different names
ant | ant-bootstrap | ant-launcher)
%if %{with bootstrap}
destdir=%{buildroot}%{_javadir}; destname="";pomname="JPP-$jarname.pom"
destdir="%{buildroot}%{_javadir}"; destname="";pomname="JPP-$jarname.pom"
%else
continue
%endif
;;
ant-jmf|ant-swing)
%if %{with bootstrap}
destdir=%{buildroot}%{_javadir}/ant; destname="ant/";
destdir="%{buildroot}%{_javadir}/ant"; destname="ant/";
%else
continue
%endif
@@ -514,7 +514,7 @@ do
continue
%else
#These go into %%{_javadir}/ant
destdir=%{buildroot}%{_javadir}/ant; destname="ant/";
destdir="%{buildroot}%{_javadir}/ant"; destname="ant/";
%endif
;;
esac

View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Jun 21 14:05:05 UTC 2015 - jengelh@inai.de
- Do better quoting to get better error messages when it fails
-------------------------------------------------------------------
Wed Mar 18 09:30:13 UTC 2015 - tchvatal@suse.com

View File

@@ -457,8 +457,8 @@ ant javadocs
%if %{with bootstrap}
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
export JAVA_HOME=%{java_home}
export CLASSPATH=$JAVA_HOME/lib/tools.jar
export JAVA_HOME="%{java_home}"
export CLASSPATH="$JAVA_HOME/lib/tools.jar"
export BOOTJAVAC_OPTS="-C -Wno-deprecated"
sh -x ./build.sh --noconfig jars
@@ -496,14 +496,14 @@ do
#These go into %%{_javadir}, pom files have different names
ant | ant-bootstrap | ant-launcher)
%if %{with bootstrap}
destdir=%{buildroot}%{_javadir}; destname="";pomname="JPP-$jarname.pom"
destdir="%{buildroot}%{_javadir}"; destname="";pomname="JPP-$jarname.pom"
%else
continue
%endif
;;
ant-jmf|ant-swing)
%if %{with bootstrap}
destdir=%{buildroot}%{_javadir}/ant; destname="ant/";
destdir="%{buildroot}%{_javadir}/ant"; destname="ant/";
%else
continue
%endif
@@ -514,7 +514,7 @@ do
continue
%else
#These go into %%{_javadir}/ant
destdir=%{buildroot}%{_javadir}/ant; destname="ant/";
destdir="%{buildroot}%{_javadir}/ant"; destname="ant/";
%endif
;;
esac

View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Jun 21 14:05:05 UTC 2015 - jengelh@inai.de
- Do better quoting to get better error messages when it fails
-------------------------------------------------------------------
Wed Mar 18 09:30:13 UTC 2015 - tchvatal@suse.com

View File

@@ -456,8 +456,8 @@ ant javadocs
%if %{with bootstrap}
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
export JAVA_HOME=%{java_home}
export CLASSPATH=$JAVA_HOME/lib/tools.jar
export JAVA_HOME="%{java_home}"
export CLASSPATH="$JAVA_HOME/lib/tools.jar"
export BOOTJAVAC_OPTS="-C -Wno-deprecated"
sh -x ./build.sh --noconfig jars
@@ -495,14 +495,14 @@ do
#These go into %%{_javadir}, pom files have different names
ant | ant-bootstrap | ant-launcher)
%if %{with bootstrap}
destdir=%{buildroot}%{_javadir}; destname="";pomname="JPP-$jarname.pom"
destdir="%{buildroot}%{_javadir}"; destname="";pomname="JPP-$jarname.pom"
%else
continue
%endif
;;
ant-jmf|ant-swing)
%if %{with bootstrap}
destdir=%{buildroot}%{_javadir}/ant; destname="ant/";
destdir="%{buildroot}%{_javadir}/ant"; destname="ant/";
%else
continue
%endif
@@ -513,7 +513,7 @@ do
continue
%else
#These go into %%{_javadir}/ant
destdir=%{buildroot}%{_javadir}/ant; destname="ant/";
destdir="%{buildroot}%{_javadir}/ant"; destname="ant/";
%endif
;;
esac