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
e0aa5e6f
Kaydet (Commit)
e0aa5e6f
authored
Agu 30, 2012
tarafından
Tim Retout
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
installer: Make @forced_properties non-global.
Change-Id: I42f1511126bcbda466cb956cbcac722b449bd9a5
üst
21284778
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
6 deletions
+12
-6
globals.pm
solenv/bin/modules/installer/globals.pm
+0
-2
setupscript.pm
solenv/bin/modules/installer/setupscript.pm
+12
-4
No files found.
solenv/bin/modules/installer/globals.pm
Dosyayı görüntüle @
e0aa5e6f
...
@@ -289,8 +289,6 @@ BEGIN
...
@@ -289,8 +289,6 @@ BEGIN
%
all_english_languagestrings
=
();
%
all_english_languagestrings
=
();
%
all_required_english_languagestrings
=
();
%
all_required_english_languagestrings
=
();
@forced_properties
=
(
"SERVICETAG_PRODUCTNAME"
,
"SERVICETAG_PRODUCTVERSION"
,
"SERVICETAG_PARENTNAME"
,
"SERVICETAG_SOURCE"
,
"SERVICETAG_URN"
);
@removedirs
=
();
@removedirs
=
();
@removefiletable
=
();
@removefiletable
=
();
...
...
solenv/bin/modules/installer/setupscript.pm
Dosyayı görüntüle @
e0aa5e6f
...
@@ -464,17 +464,25 @@ sub add_installationobject_to_variables
...
@@ -464,17 +464,25 @@ sub add_installationobject_to_variables
#####################################################################################
#####################################################################################
# Adding all variables, that must be defined, but are not defined until now.
# Adding all variables, that must be defined, but are not defined until now.
# List of this varibles: @installer::globals::forced_properties
#####################################################################################
#####################################################################################
sub
add_forced_properties
sub
add_forced_properties
{
{
my
(
$allvariables
)
=
@_
;
my
(
$allvariables
)
=
@_
;
my
$property
;
my
@forced_properties
=
qw(
foreach
$property
(
@
installer::globals::
forced_properties
)
SERVICETAG_PRODUCTNAME
SERVICETAG_PRODUCTVERSION
SERVICETAG_PARENTNAME
SERVICETAG_SOURCE
SERVICETAG_URN
)
;
for
my
$property
(
@forced_properties
)
{
{
if
(
!
exists
(
$allvariables
->
{
$property
})
)
{
$allvariables
->
{
$property
}
=
""
;
}
if
(
!
exists
(
$allvariables
->
{
$property
})
)
{
$allvariables
->
{
$property
}
=
""
;
}
}
}
}
}
...
...
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