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
396f0856
Kaydet (Commit)
396f0856
authored
Mar 12, 2018
tarafından
Michael Stahl
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
solenv: installer's -m parameter & globals::minor & PRODUCTMINOR unused
Change-Id: I2f550ca5b02551b84d3631e0101918af49924fe2
üst
36b23fdd
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
2 additions
and
31 deletions
+2
-31
installer.pm
solenv/bin/modules/installer.pm
+0
-4
globals.pm
solenv/bin/modules/installer/globals.pm
+0
-1
parameter.pm
solenv/bin/modules/installer/parameter.pm
+0
-4
scriptitems.pm
solenv/bin/modules/installer/scriptitems.pm
+1
-6
property.pm
solenv/bin/modules/installer/windows/property.pm
+0
-6
ziplist.pm
solenv/bin/modules/installer/ziplist.pm
+1
-10
No files found.
solenv/bin/modules/installer.pm
Dosyayı görüntüle @
396f0856
...
...
@@ -458,9 +458,6 @@ sub run {
@
installer::globals::
logfileinfo
=
();
# new logfile array and new logfile name
installer::logger::
copy_globalinfo_into_logfile
();
my
$logminor
=
""
;
$logminor
=
$
installer::globals::
minor
;
my
$loglanguagestring
=
$$languagestringref
;
my
$loglanguagestring_orig
=
$loglanguagestring
;
if
(
length
(
$loglanguagestring
)
>
$
installer::globals::
max_lang_length
)
...
...
@@ -474,7 +471,6 @@ sub run {
}
$
installer::globals::
logfilename
=
"log_"
.
$
installer::globals::
build
;
if
(
$logminor
ne
""
)
{
$
installer::globals::
logfilename
.=
"_"
.
$logminor
;
}
$
installer::globals::
logfilename
.=
"_"
.
$loglanguagestring
;
$
installer::globals::
logfilename
.=
".log"
;
$loggingdir
=
$loggingdir
.
$loglanguagestring
.
$
installer::globals::
separator
;
...
...
solenv/bin/modules/installer/globals.pm
Dosyayı görüntüle @
396f0856
...
...
@@ -37,7 +37,6 @@ BEGIN
@languageproducts
=
();
$build
=
""
;
$minor
=
""
;
$os
=
""
;
$cpuname
=
""
;
$com
=
""
;
...
...
solenv/bin/modules/installer/parameter.pm
Dosyayı görüntüle @
396f0856
...
...
@@ -42,7 +42,6 @@ The following parameter are needed:
-p: Product from product list to be created (required)
-l: Language of the product (comma and hash) (optional, defined in productlist)
-b: Build, e.g. srx645 (optional)
-m: Minor, e.g. m10 (optional)
-simple: Path to do a simple install to
-u: Path, in which zipfiles are unpacked (optional)
-msitemplate: Source of the msi file templates (Windows compiler only)
...
...
@@ -114,7 +113,6 @@ sub getparameter
elsif
(
$param
eq
"-p"
)
{
$
installer::globals::
product
=
shift
(
@ARGV
);
}
elsif
(
$param
eq
"-l"
)
{
$
installer::globals::
languagelist
=
shift
(
@ARGV
);
}
elsif
(
$param
eq
"-b"
)
{
$
installer::globals::
build
=
shift
(
@ARGV
);
}
elsif
(
$param
eq
"-m"
)
{
$
installer::globals::
minor
=
shift
(
@ARGV
);
}
elsif
(
$param
eq
"-dontunzip"
)
{
$
installer::globals::
dounzip
=
0
;
}
elsif
(
$param
eq
"-pro"
)
{
$
installer::globals::
pro
=
1
;
}
elsif
(
$param
eq
"-format"
)
{
$
installer::globals::
packageformat
=
shift
(
@ARGV
);
}
...
...
@@ -521,8 +519,6 @@ sub outputparameter
push
(
@output
,
"Product: $installer::globals::product\n"
);
push
(
@output
,
"BuildID: $installer::globals::buildid\n"
);
push
(
@output
,
"Build: $installer::globals::build\n"
);
if
(
$
installer::globals::
minor
)
{
push
(
@output
,
"Minor: $installer::globals::minor\n"
);
}
else
{
push
(
@output
,
"No minor set\n"
);
}
if
(
$
installer::globals::
pro
)
{
push
(
@output
,
"Product version\n"
);
}
else
{
push
(
@output
,
"Non-Product version\n"
);
}
if
(
$
installer::globals::
rootpath
eq
""
)
{
push
(
@output
,
"Using default installpath\n"
);
}
...
...
solenv/bin/modules/installer/scriptitems.pm
Dosyayı görüntüle @
396f0856
...
...
@@ -638,20 +638,15 @@ sub replace_setup_variables
# string $buildid, which is used to replace the setup variable <buildid>
my
$localminor
=
"flat"
;
if
(
$
installer::globals::
minor
ne
""
)
{
$localminor
=
$
installer::globals::
minor
;
}
my
$localbuild
=
$
installer::globals::
build
;
if
(
$localbuild
=~
/^\s*(\w+?)(\d+)\s*$/
)
{
$localbuild
=
$2
;
}
# using "680" instead of "src680"
my
$buildidstring
=
`cd $ENV{'SRCDIR'} 2>&1 >/dev/null && git log -n 1 --pretty=format:"%H"`
;
if
(
$?
||
!
$buildidstring
)
{
$buildidstring
=
$localbuild
.
$localminor
.
"(Build:"
.
$
installer::globals::
buildid
.
")"
;
$buildidstring
=
$localbuild
.
"(Build:"
.
$
installer::globals::
buildid
.
")"
;
}
if
(
$localminor
=~
/^\s*\w(\d+)\w*\s*$/
)
{
$localminor
=
$1
;
}
my
$updateid
=
$productname
.
"_"
.
$libo_version_major
.
"_"
.
$$languagestringref
;
$updateid
=~
s/ /_/g
;
...
...
solenv/bin/modules/installer/windows/property.pm
Dosyayı görüntüle @
396f0856
...
...
@@ -221,12 +221,6 @@ sub set_important_properties
push
(
@
{
$propertyfile
},
$onepropertyline
);
}
if
(
$allvariables
->
{
'PRODUCTMINOR'
}
)
{
my
$onepropertyline
=
"PRODUCTMINOR"
.
"\t"
.
$allvariables
->
{
'PRODUCTMINOR'
}
.
"\n"
;
push
(
@
{
$propertyfile
},
$onepropertyline
);
}
if
(
$allvariables
->
{
'PRODUCTBUILDID'
}
)
{
my
$onepropertyline
=
"PRODUCTBUILDID"
.
"\t"
.
$allvariables
->
{
'PRODUCTBUILDID'
}
.
"\n"
;
...
...
solenv/bin/modules/installer/ziplist.pm
Dosyayı görüntüle @
396f0856
...
...
@@ -768,14 +768,10 @@ sub replace_variables_in_ziplist_variables
{
my
(
$blockref
)
=
@_
;
my
$localminor
=
""
;
if
(
$
installer::globals::
minor
)
{
$localminor
=
$
installer::globals::
minor
;
}
for
(
my
$i
=
0
;
$i
<=
$#
{
$blockref
};
$i
++
)
{
$
{
$blockref
}[
$i
]
=~
s/\{milestone\}//
;
if
(
$localminor
)
{
$
{
$blockref
}[
$i
]
=~
s/\{minor\}/$localminor/
;
}
else
{
$
{
$blockref
}[
$i
]
=~
s/\{minor\}//
;
}
$
{
$blockref
}[
$i
]
=~
s/\{minor\}//
;
if
(
$
installer::globals::
buildid
)
{
$
{
$blockref
}[
$i
]
=~
s/\{buildid\}/$installer::globals::buildid/
;
}
else
{
$
{
$blockref
}[
$i
]
=~
s/\{buildid\}//
;
}
if
(
$
installer::globals::
build
)
{
$
{
$blockref
}[
$i
]
=~
s/\{buildsource\}/$installer::globals::build/
;
}
...
...
@@ -826,11 +822,6 @@ sub add_variables_to_allvariableshashref
if
(
$localbuild
=~
/^\s*(\w+?)(\d+)\s*$/
)
{
$localbuild
=
$2
;
}
# using "680" instead of "src680"
$variableshashref
->
{
'PRODUCTMAJOR'
}
=
$localbuild
;
my
$localminor
=
""
;
if
(
$
installer::globals::
minor
ne
""
)
{
$localminor
=
$
installer::globals::
minor
;
}
if
(
$localminor
=~
/^\s*\w(\d+)\w*\s*$/
)
{
$localminor
=
$1
;
}
$variableshashref
->
{
'PRODUCTMINOR'
}
=
$localminor
;
$variableshashref
->
{
'PRODUCTBUILDID'
}
=
$
installer::globals::
buildid
;
}
...
...
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