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
61b1c246
Kaydet (Commit)
61b1c246
authored
Tem 25, 2012
tarafından
Jan Holesovsky
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
More full paths for cross msi* tools.
Change-Id: I813d22bc5081a0cc5f1af9fbc6661a970eb16b86
üst
4c1c5aaa
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
0 deletions
+17
-0
admin.pm
solenv/bin/modules/installer/windows/admin.pm
+17
-0
No files found.
solenv/bin/modules/installer/windows/admin.pm
Dosyayı görüntüle @
61b1c246
...
...
@@ -48,6 +48,11 @@ sub unpack_cabinet_file
push
(
@
installer::globals::
logfileinfo
,
$infoline
);
my
$expandfile
=
"expand.exe"
;
# Has to be in the path
if
(
$
installer::globals::
isunix
)
{
$infoline
=
"ERROR: We need to change this to use cabextract instead of expand.exe\n"
;
push
(
@
installer::globals::
logfileinfo
,
$infoline
);
}
# expand.exe has to be located in the system directory.
# Cygwin has another tool expand.exe, that converts tabs to spaces. This cannot be used of course.
...
...
@@ -104,6 +109,10 @@ sub include_tables_into_pcpfile
my
(
$fullmsidatabasepath
,
$workdir
,
$tables
)
=
@_
;
my
$msidb
=
"msidb.exe"
;
# Has to be in the path
if
(
$
installer::globals::
isunix
)
{
$msidb
=
"$ENV{'OUTDIR_FOR_BUILD'}/bin/msidb.exe"
;
}
my
$infoline
=
""
;
my
$systemcall
=
""
;
my
$returnvalue
=
""
;
...
...
@@ -159,6 +168,10 @@ sub extract_tables_from_pcpfile
my
(
$fullmsidatabasepath
,
$workdir
,
$tablelist
)
=
@_
;
my
$msidb
=
"msidb.exe"
;
# Has to be in the path
if
(
$
installer::globals::
isunix
)
{
$msidb
=
"$ENV{'OUTDIR_FOR_BUILD'}/bin/msidb.exe"
;
}
my
$infoline
=
""
;
my
$systemcall
=
""
;
my
$returnvalue
=
""
;
...
...
@@ -699,6 +712,10 @@ sub write_sis_info
if
(
!
-
f
$msidatabase
)
{
installer::exiter::
exit_program
(
"ERROR: Cannot find file $msidatabase"
,
"write_sis_info"
);
}
my
$msiinfo
=
"msiinfo.exe"
;
# Has to be in the path
if
(
$
installer::globals::
isunix
)
{
$msiinfo
=
"$ENV{'OUTDIR_FOR_BUILD'}/bin/msiinfo.exe"
;
}
my
$infoline
=
""
;
my
$systemcall
=
""
;
my
$returnvalue
=
""
;
...
...
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