1. mst
  2. ooo340

Commits

Jens-Heiner Rechtien [hr]  committed 713df41

DEV300 masterfix: #i10000#: windows: more bizare hacks ...

  • Participants
  • Parent commits d820d30
  • Branches default

Comments (0)

Files changed (1)

File solenv/gbuild/platform/windows.mk

View file
  • Ignore whitespace
 gb_defaultlangiso := en-US
 gb_smoketest_instset := $(SRCDIR)/instsetoo_native/$(INPATH)/OpenOffice/archive/install/$(gb_defaultlangiso)/OOo_*_install-arc_$(gb_defaultlangiso).zip
 
-define gb_JunitTest_JunitTest_platform
+ifeq ($(OOO_TEST_SOFFICE),)
 
-ifeq ($(OOO_TEST_SOFFICE),)
 
 # Work around Windows problems with long pathnames (see issue 50885) by
 # installing into the temp directory instead of the module output tree (in which
 # on other platforms, a single installation to solver is created in
 # smoketestoo_native.
 
+# for now, no dependency on $(shell ls $(gb_smoketest_instset))
+# because that doesn't work before the instset is built
+# and there is not much of a benefit anyway (gbuild not knowing about smoketest)
+define gb_JunitTest_JunitTest_platform_longpathname_hack
 $(call gb_JunitTest_get_target,$(1)) : $(call gb_JunitTest_get_target,$(1)).instpath
 $(call gb_JunitTest_get_target,$(1)) : CLEAN_CMD = $(call gb_Helper_abbreviate_dirs,rm -rf `cat $$@.instpath` $$@.instpath)
-$(call gb_JunitTest_get_target,$(1)).instpath : $(shell ls $(gb_smoketest_instset))
+
+$(call gb_JunitTest_get_target,$(1)).instpath : 
 	INST_DIR=$$$$(cygpath -m `mktemp -d -t testinst.XXXXXX`) \
-	&& unzip -d "$$$${INST_DIR}" "$$<" \
+	&& unzip -d "$$$${INST_DIR}"  $$(gb_smoketest_instset) \
 	&& mv "$$$${INST_DIR}"/OOo_*_install-arc_$$(gb_defaultlangiso) "$$$${INST_DIR}"/opt\
 	&& mkdir -p $$(dir $$@) \
 	&& echo "$$$${INST_DIR}" > $$@
 
+endef
+else # OOO_TEST_SOFFICE
+gb_JunitTest_JunitTest_platform_longpathname_hack =
 endif # OOO_TEST_SOFFICE
 
+define gb_JunitTest_JunitTest_platform
+$(call gb_JunitTest_JunitTest_platform_longpathname_hack,$(1))
+
 $(call gb_JunitTest_get_target,$(1)) : DEFS := \
 	-Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:`cat $(call gb_JunitTest_get_target,$(1)).instpath`/opt/OpenOffice.org 3/program/soffice.exe}" \
     -Dorg.openoffice.test.arg.env=PATH \