[Libreoffice-commits] .: 2 commits - scp2/source solenv/bin

[Sebastian Spaeth]

 scp2/source/ooo/file_ooo.scp                 |    7 -------
 scp2/source/ooo/module_hidden_ooo.scp        |    3 +--
 solenv/bin/modules/installer/globals.pm      |    3 ---
 solenv/bin/modules/installer/servicesfile.pm |   10 +++++-----
 4 files changed, 6 insertions(+), 17 deletions(-)

New commits:
commit 2f044137e8fa72de11c0e71c0f8f75712ca208b8
Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date:   Wed Nov 24 13:52:39 2010 +0100

    Do not package the classical icon theme
    
    It has become extremly classical and we have default icons sets for
    all other GUIS so skip that.

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index c720585..0ab9fa2 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1871,13 +1871,6 @@ File gid_File_ImagesTango_Zip
     Styles = (PACKED);
 End
 
-File gid_File_ImagesClassic8_Zip
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Config;
-    Name = "images_classic.zip";
-    Styles = (PACKED);
-End
-
 File gid_File_Share_Registry_Lingucomponent_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 4a4b2ff..7a14c62 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -713,8 +713,7 @@ Module gid_Module_Root_Files_Images
              gid_File_ImagesCrystal_Zip,
              gid_File_ImagesOxygen_Zip,
              gid_File_ImagesHicontrast_Zip,
-             gid_File_ImagesTango_Zip,
-             gid_File_ImagesClassic8_Zip);
+             gid_File_ImagesTango_Zip);
 End
 
 #ifndef WITHOUT_FONTS
commit 76370bfd72a727427b0bd36a80dd6268dd5281ad
Author: Jordan Ayers <jordan.ayers at gmail.com>
Date:   Mon Nov 8 19:56:49 2010 -0600

    Remove unused global from perl installer
    
    Per comments in globals.pm, remove wrapcmd and all references to it.

diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 441f3c0..02b71bc 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -530,9 +530,6 @@ BEGIN
         $isunix = 1;
         $iswin = 0;
     }
-    # WRAPCMD is gone - remove this and all related
-    # $installer::globals::wrapcmd entries
-    $wrapcmd = "";
 
     if ( $plat =~ /linux/i ) { $islinux = 1; } 
     if ( $plat =~ /kfreebsd/i ) { $islinux = 1; } 
diff --git a/solenv/bin/modules/installer/servicesfile.pm b/solenv/bin/modules/installer/servicesfile.pm
index 3069fea..417066a 100644
--- a/solenv/bin/modules/installer/servicesfile.pm
+++ b/solenv/bin/modules/installer/servicesfile.pm
@@ -167,7 +167,7 @@ sub call_regcomp
 
     my $error_occured = 0;
 
-    my $systemcall = "$installer::globals::wrapcmd $$regcompfileref -register -r ".fix_cygwin_path($servicesfile)." -c "  . $installer::globals::quote . $filestring . $installer::globals::quote . " -wop=" . $installer::globals::quote . $urlprefix . $installer::globals::quote . " 2\>\&1 |";
+    my $systemcall = "$$regcompfileref -register -r ".fix_cygwin_path($servicesfile)." -c "  . $installer::globals::quote . $filestring . $installer::globals::quote . " -wop=" . $installer::globals::quote . $urlprefix . $installer::globals::quote . " 2\>\&1 |";
 
     open (REG, "$systemcall");
     while (<REG>) {push(@regcompoutput, $_); }
@@ -229,7 +229,7 @@ sub register_javacomponents
             {
                 my @regcompoutput = ();
 
-                my $systemcall = "$installer::globals::wrapcmd $$regcompfileref -register -br ".fix_cygwin_path($regcomprdb)." -r ".fix_cygwin_path($servicesfile)." -c " . $installer::globals::quote . $filestring . $installer::globals::quote . " -l com.sun.star.loader.Java2 -wop=" . $installer::globals::quote . $javaservicesurlprefix . $installer::globals::quote ." -env:URE_INTERNAL_JAVA_DIR=" . $installer::globals::quote . make_file_url($$ure_internal_java_dir_ref) . $installer::globals::quote . " 2\>\&1 |";
+                my $systemcall = "$$regcompfileref -register -br ".fix_cygwin_path($regcomprdb)." -r ".fix_cygwin_path($servicesfile)." -c " . $installer::globals::quote . $filestring . $installer::globals::quote . " -l com.sun.star.loader.Java2 -wop=" . $installer::globals::quote . $javaservicesurlprefix . $installer::globals::quote ." -env:URE_INTERNAL_JAVA_DIR=" . $installer::globals::quote . make_file_url($$ure_internal_java_dir_ref) . $installer::globals::quote . " 2\>\&1 |";
 
                 open (REG, "$systemcall");
                 while (<REG>) {push(@regcompoutput, $_); }
@@ -276,7 +276,7 @@ sub fix_cygwin_path
 {
     my ( $path ) = @_;
 
-    if ( $installer::globals::iswin eq 1 && $installer::globals::wrapcmd eq "" )
+    if ( $installer::globals::iswin eq 1 )
     {
     $path = qx{cygpath -m "$path"};
     chomp($path);
@@ -365,7 +365,7 @@ sub register_pythoncomponents
                 
                 my @regcompoutput = ();
 
-                $systemcall = "$installer::globals::wrapcmd $$regcompfileref -register"
+                $systemcall = "$$regcompfileref -register"
                 . " -br " . fix_cygwin_path($$typesrdbref)
                 . " -br " . fix_cygwin_path($$pyunoservicesrdbref)
                 . " -r " . fix_cygwin_path($servicesfile)
@@ -715,7 +715,7 @@ sub prepare_regcomp_rdb
 
         chdir($to);
 
-        my $systemcall = "$installer::globals::wrapcmd $regcompfile -register -s -r " . fix_cygwin_path($regcomprdb) . " -c $libfilename";
+        my $systemcall = "$regcompfile -register -s -r " . fix_cygwin_path($regcomprdb) . " -c $libfilename";
 
         my $returnvalue = system($systemcall);