Kaydet (Commit) 6ee0f9ae authored tarafından Jordan Ayers's avatar Jordan Ayers Kaydeden (comit) Sebastian Spaeth

Remove unused global from perl installer

Per comments in globals.pm, remove wrapcmd and all references to it.
üst 19a19d52
...@@ -530,9 +530,6 @@ BEGIN ...@@ -530,9 +530,6 @@ BEGIN
$isunix = 1; $isunix = 1;
$iswin = 0; $iswin = 0;
} }
# WRAPCMD is gone - remove this and all related
# $installer::globals::wrapcmd entries
$wrapcmd = "";
if ( $plat =~ /linux/i ) { $islinux = 1; } if ( $plat =~ /linux/i ) { $islinux = 1; }
if ( $plat =~ /kfreebsd/i ) { $islinux = 1; } if ( $plat =~ /kfreebsd/i ) { $islinux = 1; }
......
...@@ -167,7 +167,7 @@ sub call_regcomp ...@@ -167,7 +167,7 @@ sub call_regcomp
my $error_occured = 0; 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"); open (REG, "$systemcall");
while (<REG>) {push(@regcompoutput, $_); } while (<REG>) {push(@regcompoutput, $_); }
...@@ -229,7 +229,7 @@ sub register_javacomponents ...@@ -229,7 +229,7 @@ sub register_javacomponents
{ {
my @regcompoutput = (); 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"); open (REG, "$systemcall");
while (<REG>) {push(@regcompoutput, $_); } while (<REG>) {push(@regcompoutput, $_); }
...@@ -276,7 +276,7 @@ sub fix_cygwin_path ...@@ -276,7 +276,7 @@ sub fix_cygwin_path
{ {
my ( $path ) = @_; my ( $path ) = @_;
if ( $installer::globals::iswin eq 1 && $installer::globals::wrapcmd eq "" ) if ( $installer::globals::iswin eq 1 )
{ {
$path = qx{cygpath -m "$path"}; $path = qx{cygpath -m "$path"};
chomp($path); chomp($path);
...@@ -365,7 +365,7 @@ sub register_pythoncomponents ...@@ -365,7 +365,7 @@ sub register_pythoncomponents
my @regcompoutput = (); my @regcompoutput = ();
$systemcall = "$installer::globals::wrapcmd $$regcompfileref -register" $systemcall = "$$regcompfileref -register"
. " -br " . fix_cygwin_path($$typesrdbref) . " -br " . fix_cygwin_path($$typesrdbref)
. " -br " . fix_cygwin_path($$pyunoservicesrdbref) . " -br " . fix_cygwin_path($$pyunoservicesrdbref)
. " -r " . fix_cygwin_path($servicesfile) . " -r " . fix_cygwin_path($servicesfile)
...@@ -715,7 +715,7 @@ sub prepare_regcomp_rdb ...@@ -715,7 +715,7 @@ sub prepare_regcomp_rdb
chdir($to); 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); my $returnvalue = system($systemcall);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment