sb138: merged in DEV300_m100

3 files changed, 26 insertions, 7 deletions

diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index 50900cad0d7f..3b096337d5d7 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -610,6 +610,7 @@ unxlngi6
             ENABLE_GCONF TRUE
             ENABLE_GNOMEVFS TRUE
             GNUCOPY cp
+            GNUMAKE make
         }
         common0
         {
@@ -891,6 +892,7 @@ unxlngx6
             ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
             ENABLE_GCONF TRUE
             ENABLE_GNOMEVFS TRUE
+            GNUMAKE make
         }
         common0
         {
@@ -1170,6 +1172,7 @@ unxmacxi
             SOLAR_JAVA TRUE
             ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
             GNUCOPY gnucp
+            GNUMAKE make
         }
         common0
         {
@@ -1442,6 +1445,7 @@ unxsoli4
             ENABLE_GCONF TRUE
             ENABLE_GNOMEVFS TRUE
             GNUCOPY gnucp
+            GNUMAKE gmake
         }
         common0
         {
@@ -1703,6 +1707,7 @@ unxsols4
             ENABLE_GCONF TRUE
             ENABLE_GNOMEVFS TRUE
             GNUCOPY gnucp
+            GNUMAKE gmake
         }
         common0
         {
@@ -1979,6 +1984,7 @@ unxsolu4
             __cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
             ENABLE_GCONF TRUE
 #           ENABLE_GNOMEVFS TRUE
+            GNUMAKE gmake
         }
         common0
         {
@@ -2217,6 +2223,7 @@ wntgcci1
             SOLAR_JAVA TRUE
             XCLASSPATH .
             ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
+            GNUMAKE make
         }
         common0
         {
@@ -2757,6 +2764,7 @@ wntmsci12
             BUILD_X64 TRUE
             CHECK_LUCENCE_INDEXER_OUTPUT TRUE
             GNUCOPY cp
+            GNUMAKE make
         }
         common0
         {
@@ -3100,6 +3108,7 @@ wntmsci13
             ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
             BUILD_X64 TRUE
             GNUCOPY cp
+            GNUMAKE make
         }
         common0
         {
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index ed9820630099..a4137c077b09 100755
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -595,10 +595,9 @@ endef
 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),)
 
+
 # Work around Windows problems with long pathnames (see issue 50885) by
 # installing into the temp directory instead of the module output tree (in which
 # case $(target).instpath contains the path to the temp installation,
@@ -606,17 +605,28 @@ ifeq ($(OOO_TEST_SOFFICE),)
 # 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 \
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index cda7b46e158c..240547d98fa7 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
 RSCVERSION=300
-RSCREVISION=300m99(Build:9570)
-BUILD=9570
-LAST_MINOR=m99
+RSCREVISION=300m100(Build:9571)
+BUILD=9571
+LAST_MINOR=m100
 SOURCEVERSION=DEV300