strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CWS-TOOLING: integrate CWS so91s10u8_DEV300

Browse source 
2009-07-21 09:12:39 +0200 releng  r274160 : #b6835838#
2009-07-21 09:10:03 +0200 releng  r274158 : #b6836360#
2009-06-26 16:18:53 +0200 releng  r273427 : #i10000# remove wrong elsif lines
2009-06-26 13:54:07 +0200 obo  r273408 : #b6836339#,#b6835838#,#b6836573#,#b6836360#,#b6840384#,#b6836711#,#159633#,#159138#,#b6838895#,#b6836340#,#b6836712# initial changes
This commit is contained in:
Jens-Heiner Rechtien 2009-07-28 15:05:10 +00:00
parent e52df004a1
commit 0fd3b3464b
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
solenv/bin/modules/installer/epmfile.pm
View file

@ -1931,10 +1931,8 @@ sub include_patchinfos_into_pkginfo
$newline = "SUNW_REQUIRES=" . $requires . "\n"; $newline = "SUNW_REQUIRES=" . $requires . "\n";
add_one_line_into_file($changefile, $newline, $filename); add_one_line_into_file($changefile, $newline, $filename);
} }
$newline = "SUNW_PATCH_PROPERTIES=\n"; $newline = "SUNW_PATCH_PROPERTIES=\n";
add_one_line_into_file($changefile, $newline, $filename); add_one_line_into_file($changefile, $newline, $filename);
# $newline = "SUNW_PKGTYPE=usr\n"; # $newline = "SUNW_PKGTYPE=usr\n";
# add_one_line_into_file($changefile, $newline, $filename); # add_one_line_into_file($changefile, $newline, $filename);
@ -1954,14 +1952,20 @@ sub get_solaris_language_for_langpack
$sollanguage =~ s/\-/\_/; $sollanguage =~ s/\-/\_/;
if ( $sollanguage eq "de" ) { $sollanguage = "de"; } if ( $sollanguage eq "de" ) { $sollanguage = "de"; }
elsif ( $sollanguage eq "en_US" ) { $sollanguage = "en_AU,en_CA,en_GB,en_IE,en_MT,en_NZ,en_US,en_US.UTF-8"; }
elsif ( $sollanguage eq "es" ) { $sollanguage = "es"; } elsif ( $sollanguage eq "es" ) { $sollanguage = "es"; }
elsif ( $sollanguage eq "fr" ) { $sollanguage = "fr"; } elsif ( $sollanguage eq "fr" ) { $sollanguage = "fr"; }
elsif ( $sollanguage eq "hu" ) { $sollanguage = "hu_HU"; }
elsif ( $sollanguage eq "it" ) { $sollanguage = "it"; } elsif ( $sollanguage eq "it" ) { $sollanguage = "it"; }
elsif ( $sollanguage eq "nl" ) { $sollanguage = "nl_BE,nl_NL"; }
elsif ( $sollanguage eq "pl" ) { $sollanguage = "pl_PL"; }
elsif ( $sollanguage eq "sv" ) { $sollanguage = "sv"; } elsif ( $sollanguage eq "sv" ) { $sollanguage = "sv"; }
elsif ( $sollanguage eq "pt" ) { $sollanguage = "pt_PT"; }
elsif ( $sollanguage eq "pt_BR" ) { $sollanguage = "pt_BR"; } elsif ( $sollanguage eq "pt_BR" ) { $sollanguage = "pt_BR"; }
elsif ( $sollanguage eq "ru" ) { $sollanguage = "ru_RU"; }
elsif ( $sollanguage eq "ja" ) { $sollanguage = "ja,ja_JP,ja_JP.PCK,ja_JP.UTF-8"; } elsif ( $sollanguage eq "ja" ) { $sollanguage = "ja,ja_JP,ja_JP.PCK,ja_JP.UTF-8"; }
elsif ( $sollanguage eq "ko" ) { $sollanguage = "ko,ko.UTF-8"; } elsif ( $sollanguage eq "ko" ) { $sollanguage = "ko,ko.UTF-8"; }
elsif ( $sollanguage eq "zh_CN" ) { $sollanguage = "zh,zh.GBK,zh_CN,zh_CN.GB18030,zh.UTF-8"; } elsif ( $sollanguage eq "zh_CN" ) { $sollanguage = "zh,zh.GBK,zh_CN.GB18030,zh.UTF-8"; }
elsif ( $sollanguage eq "zh_TW" ) { $sollanguage = "zh_TW,zh_TW.BIG5,zh_TW.UTF-8,zh_HK.BIG5HK,zh_HK.UTF-8"; } elsif ( $sollanguage eq "zh_TW" ) { $sollanguage = "zh_TW,zh_TW.BIG5,zh_TW.UTF-8,zh_HK.BIG5HK,zh_HK.UTF-8"; }
return $sollanguage; return $sollanguage;
@ -2156,7 +2160,7 @@ sub prepare_packages
if ( $installer::globals::issolarisx86build ) { fix_architecture_setting($changefile); } if ( $installer::globals::issolarisx86build ) { fix_architecture_setting($changefile); }
if ( ! $installer::globals::patch ) { set_patchlist_in_pkginfo_for_respin($changefile, $filename, $variableshashref, $packagename); } if ( ! $installer::globals::patch ) { set_patchlist_in_pkginfo_for_respin($changefile, $filename, $variableshashref, $packagename); }
if ( $installer::globals::patch ) { include_patchinfos_into_pkginfo($changefile, $filename, $variableshashref); } if ( $installer::globals::patch ) { include_patchinfos_into_pkginfo($changefile, $filename, $variableshashref); }
if (( $onepackage->{'language'} ) && ( $onepackage->{'language'} ne "" )) { include_languageinfos_into_pkginfo($changefile, $filename, $languagestringref, $onepackage, $variableshashref); } if (( $onepackage->{'language'} ) && ( $onepackage->{'language'} ne "" ) && ( $onepackage->{'language'} ne "en-US" )) { include_languageinfos_into_pkginfo($changefile, $filename, $languagestringref, $onepackage, $variableshashref); }
installer::files::save_file($completefilename, $changefile); installer::files::save_file($completefilename, $changefile);
my $prototypefilename = $packagename . ".prototype"; my $prototypefilename = $packagename . ".prototype";