sb120: merged in DEV300 masterfixes

solenv/bin/modules/installer/download.pm

@@ -653,10 +653,6 @@ sub get_install_type
 
     my $type = "";
 
-    my $cwsproduct = 0;
-    # the environment variable CWS_WORK_STAMP is set only in CWS
-    if ( $ENV{'CWS_WORK_STAMP'} ) { $cwsproduct = 1; }
-
     if ( $installer::globals::languagepack )
     {
         $type = "langpack";
@@ -671,7 +667,7 @@ sub get_install_type
             $type = $type . "-deb";
         }
 
-        if (( $installer::globals::packageformat eq "archive" ) && ( $cwsproduct ))
+        if ( $installer::globals::packageformat eq "archive" )
         {
             $type = $type . "-arc";
         }
@@ -690,7 +686,7 @@ sub get_install_type
             $type = $type . "-deb";
         }
 
-        if (( $installer::globals::packageformat eq "archive" ) && ( $cwsproduct ))
+        if ( $installer::globals::packageformat eq "archive" )
         {
             $type = $type . "-arc";
         }

solenv/inc/installationtest.mk

@@ -72,12 +72,12 @@ my_javaenv = \
 # smoketestoo_native:
 .IF "$(OS)" == "WNT"
 $(MISC)/$(TARGET)/installation.flag : $(shell \
-        ls $(installationtest_instset)/OOo_*_install_$(defaultlangiso).zip)
+        ls $(installationtest_instset)/OOo_*_install-arc_$(defaultlangiso).zip)
     $(MKDIRHIER) $(@:d)
     my_tmp=$$(cygpath -m $$(mktemp -dt ooosmoke.XXXXXX)) && \
-    unzip $(installationtest_instset)/OOo_*_install_$(defaultlangiso).zip \
+    unzip $(installationtest_instset)/OOo_*_install-arc_$(defaultlangiso).zip \
         -d "$$my_tmp" && \
-    mv "$$my_tmp"/OOo_*_install_$(defaultlangiso) "$$my_tmp"/opt && \
+    mv "$$my_tmp"/OOo_*_install-arc_$(defaultlangiso) "$$my_tmp"/opt && \
     echo "$$my_tmp" > $@
 .END