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

[Petr Mladek]

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

New commits:
commit 64da94d889b24aec47afc210ce8d4248221c6442
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Nov 18 20:39:50 2010 +0100

    Do not mention date in the downlaod tarball name
    
    it was to long; version is enough

diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 91ccdfc..25f55ab 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -766,9 +766,7 @@ sub get_current_version
 ###############################################################################################
 # Setting the download file name
 # Syntax:
-# (PRODUCTNAME)_(VERSION)_(TIMESTAMP)_(OS)_(ARCH)_(INSTALLTYPE)_(LANGUAGE).(FILEEXTENSION)
-# Rules:
-# Timestamp only for Beta and Release Candidate
+# (PRODUCTNAME)_(VERSION)_(OS)_(ARCH)_(INSTALLTYPE)_(LANGUAGE).(FILEEXTENSION)
 ###############################################################################################
 
 sub set_download_filename
@@ -777,7 +775,6 @@ sub set_download_filename
     
     my $start = get_downloadname_productname($allvariables);
     my $versionstring = get_download_version($allvariables);
-    my $date = set_date_string($allvariables);
     my $platform = get_download_platformname();
     my $architecture = get_download_architecture();
     my $type = get_install_type($allvariables);
@@ -785,7 +782,7 @@ sub set_download_filename
     
     # Setting the extension happens automatically
 
-    my $filename = $start . "_" . $versionstring . "_" . $date . "_" . $platform . "_" . $architecture . "_" . $type . "_" . $language; 
+    my $filename = $start . "_" . $versionstring . "_" . "_" . $platform . "_" . $architecture . "_" . $type . "_" . $language;
     
     $filename =~ s/\_\_/\_/g;	# necessary, if $versionstring or $platform or $language are empty
     $filename =~ s/\_\s*$//;	# necessary, if $language and $addon are empty
commit f27277de5c5ca5608a97d787dbeed0257a37d292
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Nov 18 20:38:25 2010 +0100

    Revert "fix smoketest with the improved download tarball (fdo#30837)"
    
    This reverts commit bdbd0385f6972f49a5e954cebb342263f3666c7d.
    It is not longer needed after the previous fix.

diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk
index 80de446..15a80b0 100644
--- a/solenv/inc/installationtest.mk
+++ b/solenv/inc/installationtest.mk
@@ -39,7 +39,7 @@ my_instsets = $(shell ls -dt \
 installationtest_instset = $(my_instsets:1)
 .ELSE
 installationtest_instset = \
-    $(SOLARSRC)/instsetoo_native/$(INPATH)/LibreOffice/archive/install
+    $(SOLARSRC)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/$(defaultlangiso)
 .END
 
 .IF "$(OS)" == "WNT"
commit 187c09ed3bbb4f84caa7e920630f065f5434461c
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Nov 18 20:35:06 2010 +0100

    fallback to the old install dirname if ooodownloadfilename is not defined
    
    the check for versioned install dir (fdo#30837) broke creation of
    languagepack on Windows and MAC; it is because ooodownloadfilename
    was defined only for linux; we still need lang-specific directory
    for other archs

diff --git a/solenv/bin/modules/installer/systemactions.pm b/solenv/bin/modules/installer/systemactions.pm
index 8007a34..a6a8380 100644
--- a/solenv/bin/modules/installer/systemactions.pm
+++ b/solenv/bin/modules/installer/systemactions.pm
@@ -290,10 +290,10 @@ sub create_directories
 
         if ( $$languagesref ) { $locallanguagesref = $$languagesref; }
 
-        if ($newdirectory eq "install" )
+        if ($newdirectory eq "install" && $installer::globals::ooodownloadfilename ne "" )
         {
-            # put packages into versioned path (fdo#30837)
-            $path = $path . "$installer::globals::ooodownloadfilename";
+            # put packages into versioned path; needed only on linux (fdo#30837)
+            $path = $path . "$installer::globals::ooodownloadfilename" . $installer::globals::separator;
             create_directory($path);
         }
         else
@@ -311,7 +311,7 @@ sub create_directories
                     $languagestring = "lang_" . $number_of_languages . "_id_" . $id;
                 }
 
-                $path = $path . $languagestring  . $installer::globals::separator;
+                $path = $path . $languagestring . $installer::globals::separator;
                 create_directory($path);
             }
         }