Author: damjan
Date: Sun Apr 8 13:25:06 2018
New Revision: 1828640
URL: http://svn.apache.org/viewvc?rev=1828640&view=rev
Log:
Pass the Windows path to Ant on Windows, as /cygdrive/c/... doesn't work.
Skip tests when JUnit is absent correctly: the OOO_JUNIT_JAR variable
isn't blank but absent.
This should fix building on Windows.
Patch by: me
Modified:
openoffice/trunk/main/solenv/ant/aoo-ant.xml
openoffice/trunk/main/solenv/gbuild/Ant.mk
Modified: openoffice/trunk/main/solenv/ant/aoo-ant.xml
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/ant/aoo-ant.xml?rev=1828640&r1=1828639&r2=1828640&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/ant/aoo-ant.xml (original)
+++ openoffice/trunk/main/solenv/ant/aoo-ant.xml Sun Apr 8 13:25:06 2018
@@ -119,10 +119,10 @@
</target>
<target name="test-compile" depends="compile,idl">
- <property property="test.skip" value="true"
if:blank="${OOO_JUNIT_JAR}"/>
- <echo message="No junit, skipping tests" if:blank="${OOO_JUNIT_JAR}"/>
+ <property name="test.skip" value="true" unless:set="OOO_JUNIT_JAR"/>
+ <echo message="No junit, skipping tests" unless:set="OOO_JUNIT_JAR"/>
- <mkdir dir="${test.build.dir}" unless:blank="${OOO_JUNIT_JAR}"/>
+ <mkdir dir="${test.build.dir}" if:set="OOO_JUNIT_JAR"/>
<javac srcdir="${test.src.dir}"
destdir="${test.build.dir}"
debug="${test.debug}"
@@ -130,12 +130,12 @@
deprecation="${test.deprecation}"
classpathref="internal.test.classpath"
includeantruntime="false"
- unless:blank="${OOO_JUNIT_JAR}"/>
+ if:set="OOO_JUNIT_JAR"/>
</target>
<!-- fork="true" is sadly necessary on Ubuntu due to multiple versions of
junit confusing Ant,
see https://github.com/real-logic/simple-binary-encoding/issues/96 -->
- <target name="test" depends="test-compile" unless:set="${test.skip}">
+ <target name="test" depends="test-compile" unless="${test.skip}">
<mkdir dir="${test.reports.dir}"/>
<junit printsummary="yes" haltonfailure="yes" showoutput="true"
filtertrace="false" fork="true">
<classpath refid="internal.test.classpath"/>
Modified: openoffice/trunk/main/solenv/gbuild/Ant.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/Ant.mk?rev=1828640&r1=1828639&r2=1828640&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/Ant.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/Ant.mk Sun Apr 8 13:25:06 2018
@@ -50,8 +50,13 @@ FORCE:
# adds jar files to DeliverLogTarget
# adds dependency for outdir target to workdir target (pattern rule for
delivery is in Package.mk)
define gb_Ant_Ant
+ifeq ($(OS),WNT)
+$(call gb_Ant_get_target,$(1)) : ANTBUILDFILE := `cygpath -m $(2)`
+$(call gb_Ant_get_clean_target,$(1)) : ANTBUILDFILE := `cygpath -m $(2)`
+else
$(call gb_Ant_get_target,$(1)) : ANTBUILDFILE := $(2)
$(call gb_Ant_get_clean_target,$(1)) : ANTBUILDFILE := $(2)
+endif
$(eval $(call gb_Module_register_target,$(call
gb_Jar_get_outdir_target,$(1)),$(call gb_Ant_get_clean_target,$(1))))
$(call gb_Deliver_add_deliverable,$(call gb_Jar_get_outdir_target,$(1)),$(call
gb_Ant_get_target,$(1)),$(1))
$(call gb_Jar_get_outdir_target,$(1)) : $(call gb_Ant_get_target,$(1))
