[Libreoffice-commits] .: 2 commits - solenv/bin solenv/inc

[Fridrich Strba]

 solenv/bin/modules/installer/download.pm |   10 +++++-----
 solenv/inc/installationtest.mk           |    4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit fee229195cf1392f02d7e052e6ba795aa79ef8da
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Oct 8 17:23:35 2010 +0200

    LO -> LibO

diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 53e58c4..738a360 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -469,15 +469,15 @@ sub get_downloadname_productname
 
     my $start = "LO";
 
-    if ( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) { $start = "LO"; }
+    if ( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) { $start = "LibO"; }
     
-    if ( $allvariables->{'PRODUCTNAME'} eq "LO-dev" ) { $start = "LO-Dev"; }
+    if ( $allvariables->{'PRODUCTNAME'} eq "LibO-dev" ) { $start = "LibO-Dev"; }
 
-    if (( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "LO-SDK"; }
+    if (( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "LibO-SDK"; }
 
-    if (( $allvariables->{'PRODUCTNAME'} eq "LO-dev" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "LO-Dev-SDK"; }
+    if (( $allvariables->{'PRODUCTNAME'} eq "LibO-dev" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "LibO-Dev-SDK"; }
     
-    if ( $allvariables->{'PRODUCTNAME'} eq "URE" ) { $start = "LO-URE"; }
+    if ( $allvariables->{'PRODUCTNAME'} eq "URE" ) { $start = "LibO-URE"; }
     
     if ( $allvariables->{'PRODUCTNAME'} eq "BrOffice.org" ) { $start = "BrOo"; }
 
commit bff037c82a50097c5105af97b33b47b61121a7ea
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Oct 8 17:21:11 2010 +0200

    Fix smoketests with new LibreOffice directories

diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk
index 322ba4d..396d456 100644
--- a/solenv/inc/installationtest.mk
+++ b/solenv/inc/installationtest.mk
@@ -35,11 +35,11 @@ my_file = file://
 .IF "$(UPDATER)" == "YES" && "$(SHIPDRIVE)" != "" && \
     "$(CWS_WORK_STAMP)" == "" && "$(SOLARENV:s/$(SOL_TMP)//" == "$(SOLARENV)"
 my_instsets = $(shell ls -dt \
-    $(SHIPDRIVE)/$(INPATH)/OpenOffice/archive/$(WORK_STAMP)_$(LAST_MINOR)_native_packed-*_$(defaultlangiso).$(BUILD))
+    $(SHIPDRIVE)/$(INPATH)/LibreOffice/archive/$(WORK_STAMP)_$(LAST_MINOR)_native_packed-*_$(defaultlangiso).$(BUILD))
 installationtest_instset = $(my_instsets:1)
 .ELSE
 installationtest_instset = \
-    $(SOLARSRC)/instsetoo_native/$(INPATH)/OpenOffice/archive/install/$(defaultlangiso)
+    $(SOLARSRC)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/$(defaultlangiso)
 .END
 
 .IF "$(OS)" == "WNT"