Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
6ee0f9ae
Kaydet (Commit)
6ee0f9ae
authored
Kas 09, 2010
tarafından
Jordan Ayers
Kaydeden (comit)
Sebastian Spaeth
Kas 24, 2010
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Remove unused global from perl installer
Per comments in globals.pm, remove wrapcmd and all references to it.
üst
19a19d52
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
8 deletions
+5
-8
globals.pm
solenv/bin/modules/installer/globals.pm
+0
-3
servicesfile.pm
solenv/bin/modules/installer/servicesfile.pm
+5
-5
No files found.
solenv/bin/modules/installer/globals.pm
Dosyayı görüntüle @
6ee0f9ae
...
@@ -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
;
}
...
...
solenv/bin/modules/installer/servicesfile.pm
Dosyayı görüntüle @
6ee0f9ae
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment