From 7af3985069ac6d6ff7678cb17b28c6b7ce8f5165 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 18 Jun 2011 13:04:34 +0300 Subject: It is whether the HOST platform supports symlinks that is relevant --- solenv/bin/deliver.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'solenv/bin') diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl index 1d1c53618105..c9f7a2d6f9af 100755 --- a/solenv/bin/deliver.pl +++ b/solenv/bin/deliver.pl @@ -506,8 +506,8 @@ sub init_globals [ '%GUI%', $gui ] ); - # find out if the system supports symlinks - $has_symlinks = eval { symlink("",""); 1 }; + # find out if the *HOST* system supports symlinks. They all do except Windows + $has_symlinks = $ENV{GUI} ne 'WNT'; } sub get_base -- cgit From 7a189a97abf22a2266ef755f77f693e8b2d9a5ad Mon Sep 17 00:00:00 2001 From: David Tardon Date: Mon, 20 Jun 2011 10:48:08 +0200 Subject: this does not apply now that IDL files are processed by gnumake --- solenv/bin/linkoo | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) (limited to 'solenv/bin') diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo index b1fdc6e271d0..2113c76ae9e9 100755 --- a/solenv/bin/linkoo +++ b/solenv/bin/linkoo @@ -79,6 +79,8 @@ my %replaceable = ( $program_dir . '/resource' => '\.res$', $program_dir . '/classes' => '\.jar$', 'basis-link/share/config' => '\.zip$', + $program_dir => '\.rdb', + 'ure/share/misc' => '\.rdb' # 'share/uno_packages' => '\.zip$' ); @@ -303,25 +305,6 @@ sub link_iso_res() print "\n"; } -# Hack for (renamed) types.rdb (types.db) -sub link_oovbaapi_rdb() -{ - print "oovbaapi.rdb case:"; - my $src = "$OOO_BUILD/oovbaapi/$TARGET/ucr"; - my $dest = "$OOO_INSTALL/" . $program_dir; - do_link ($src, $dest, 'oovbaapi.db', 'oovbaapi.rdb'); - print "\n"; -} - -sub link_types_rdb() -{ - print "Types.rdb case:"; - my $src = "$OOO_BUILD/offapi/$TARGET/ucr"; - my $dest = "$OOO_INSTALL/" . $ure_misc_dir; - do_link ($src, $dest, 'types.db', 'types.rdb'); - print "\n"; -} - sub link_pagein_files() { print "pagein case:"; @@ -377,8 +360,6 @@ my $installed_files = build_installed_list ($OOO_INSTALL); scan_and_link_files ($OOO_BUILD, $installed_files, $TARGET); link_iso_res(); -link_types_rdb(); -link_oovbaapi_rdb(); link_pagein_files(); if (!-f "$OOO_INSTALL/" . $brand_program_dir . "/ooenv") { -- cgit From 934da4d8f8a6a9099d59fbf072b6dc37d4368ad5 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Tue, 21 Jun 2011 15:43:28 +0100 Subject: fix bug with duplicate entry in hash trampling on dll linking --- solenv/bin/linkoo | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'solenv/bin') diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo index 2113c76ae9e9..a1a469ae9d58 100755 --- a/solenv/bin/linkoo +++ b/solenv/bin/linkoo @@ -74,20 +74,19 @@ $program_dir = 'openoffice.org/basis-link/MacOS' if ($ENV{OS} eq 'MACOSX'); # FI my @exceptions = ( 'cppuhelper', 'sunjavaplugin', 'libjvmfwk' ); +my $dllre = '\.so$'; +$dllre = '\.dylib$' if ($ENV{OS} eq 'MACOSX'); + my %replaceable = ( - $program_dir => '\.so', + $program_dir => "($dllre|\.rdb)", + $ure_lib_dir => "$dllre", $program_dir . '/resource' => '\.res$', $program_dir . '/classes' => '\.jar$', 'basis-link/share/config' => '\.zip$', - $program_dir => '\.rdb', 'ure/share/misc' => '\.rdb' # 'share/uno_packages' => '\.zip$' ); -# strangely enough, OSX has those small differences... -$replaceable{$program_dir} = '\.dylib$' if ($ENV{OS} eq 'MACOSX'); -$replaceable{$ure_lib_dir} = '\.dylib$' if ($ENV{OS} eq 'MACOSX'); - my @search_dirs = ( 'lib', 'bin', 'class' ); my @known_duplicates = ( 'db.jar', 'libi18n' ); -- cgit From 0953ccda128c17dc714d064d46a90f8ab08b6cf2 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 28 Jun 2011 13:01:29 +0100 Subject: use g log for buildid, modify this if we unsplit repos or change vcs --- solenv/bin/modules/installer/scriptitems.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'solenv/bin') diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index f6b3909a53a0..ed1b6bc5964e 100644 --- a/solenv/bin/modules/installer/scriptitems.pm +++ b/solenv/bin/modules/installer/scriptitems.pm @@ -802,7 +802,10 @@ sub replace_setup_variables if ( $localbuild =~ /^\s*(\w+?)(\d+)\s*$/ ) { $localbuild = $2; } # using "680" instead of "src680" - my $buildidstring = $localbuild . $localminor . "(Build:" . $installer::globals::buildid . ")"; + my $buildidstring = `$ENV{'SRC_ROOT'}/g -s log -n 1 --pretty=format:%h-`; + if (!$buildidstring) { + $buildidstring = $localbuild . $localminor . "(Build:" . $installer::globals::buildid . ")"; + } # the environment variable CWS_WORK_STAMP is set only in CWS if ( $ENV{'CWS_WORK_STAMP'} ) { $buildidstring = $buildidstring . "\[CWS\:" . $ENV{'CWS_WORK_STAMP'} . "\]"; } -- cgit From f34252f647db9f5d274afb0b12bc897544236003 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Wed, 29 Jun 2011 12:25:42 +0200 Subject: sorting additional language packs and dictionaries fdo#34479 --- solenv/bin/modules/installer/windows/feature.pm | 39 +++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'solenv/bin') diff --git a/solenv/bin/modules/installer/windows/feature.pm b/solenv/bin/modules/installer/windows/feature.pm index e5aa5f5a3fdc..fa8ebd2cae1a 100644 --- a/solenv/bin/modules/installer/windows/feature.pm +++ b/solenv/bin/modules/installer/windows/feature.pm @@ -432,6 +432,45 @@ sub create_feature_table } } + # Sorting names of language packs and dictionaries + my @tempfeaturetable; + my @langlist; + my @langpack; + my @dictlist; + my @sorteddictlist; + my @sortedlanglist; + + foreach (@featuretable) { + if (/^gm_r_Extension_Dictionary_/) { + push (@dictlist, $_); + } + elsif (/^gm_Langpack_r_/) { + push (@langlist, $_); + } + elsif (/\tgm_Langpack_r_/) { + push (@langpack, $_); + } + else { + push (@tempfeaturetable, $_); + } + } + + @sorteddictlist = sort { (split(/\t/, $a))[2] cmp (split(/\t/, $b))[2] } @dictlist; + @sortedlanglist = sort { (split(/\t/, $a))[2] cmp (split(/\t/, $b))[2] } @langlist; + + @featuretable = (@tempfeaturetable, @sorteddictlist); + + foreach (@sortedlanglist) { + my $sortedlanglistline = $_; + push (@featuretable, $sortedlanglistline); + foreach (@langpack) { + my $langpackline = $_; + if ( (split(/\t/, $langpackline))[1] eq (split(/\t/, $sortedlanglistline))[0] ) { + push (@featuretable, $langpackline); + } + } + } + # Saving the file my $featuretablename = $basedir . $installer::globals::separator . "Feature.idt" . "." . $onelanguage; -- cgit From 04da22088ebbe5418c9d14c31f52a0d7f42abcc0 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 29 Jun 2011 20:55:26 +0300 Subject: Handle *.mm files too, don't use non-portable comma operator of find(1) --- solenv/bin/add-modelines | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'solenv/bin') diff --git a/solenv/bin/add-modelines b/solenv/bin/add-modelines index 71d42090121d..e7491c24ac08 100755 --- a/solenv/bin/add-modelines +++ b/solenv/bin/add-modelines @@ -31,7 +31,7 @@ set -o posix # Change these to taste FirstLine='/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */' LastLine='/* vim:set shiftwidth=4 softtabstop=4 expandtab: */' -SourceFiles='*.cxx *.cpp *.hxx *.hpp *.c *.h' +SourceFiles='*.cxx *.cpp *.hxx *.hpp *.c *.h *.mm' # Set defaults (don't change these) ModelineReplace="false" @@ -160,11 +160,11 @@ if [ -z "$findPath" ]; then fi for FileType in ${SourceFiles}; do - findArgs="$findArgs"' ( -iname '"$FileType"' -print ) , ' + findArgs="$findArgs"' ( -iname '"$FileType"' -print -o -true ) -a ' done -# This gets rid of the final " , " in the find argument list -findArgs="${findArgs:0:(${#findArgs}-2)}" +# This gets rid of the final " -a " in the find argument list +findArgs="${findArgs:0:(${#findArgs}-3)}" for file in $($findCMD $findArgs); do EditFile "$file" -- cgit From 918695a2bf8f95fd437071bfc6ac59e446c256f8 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 29 Jun 2011 22:33:49 +0100 Subject: remove trailing - ourselves --- solenv/bin/modules/installer/scriptitems.pm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'solenv/bin') diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index ed1b6bc5964e..bc7d9572d5e3 100644 --- a/solenv/bin/modules/installer/scriptitems.pm +++ b/solenv/bin/modules/installer/scriptitems.pm @@ -806,6 +806,9 @@ sub replace_setup_variables if (!$buildidstring) { $buildidstring = $localbuild . $localminor . "(Build:" . $installer::globals::buildid . ")"; } + else { + $buildidstring = substr($buildidstring, 0, -1); + } # the environment variable CWS_WORK_STAMP is set only in CWS if ( $ENV{'CWS_WORK_STAMP'} ) { $buildidstring = $buildidstring . "\[CWS\:" . $ENV{'CWS_WORK_STAMP'} . "\]"; } -- cgit From ce31567afbc01fe700913019061419207d1bbebb Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 1 Jul 2011 15:37:03 +0300 Subject: Goodbye to CWS_WORK_STAMP --- solenv/bin/build.pl | 25 +++--------------------- solenv/bin/build_client.pl | 6 +----- solenv/bin/deliver.pl | 2 +- solenv/bin/modules/installer/control.pm | 10 +--------- solenv/bin/modules/installer/download.pm | 12 ++---------- solenv/bin/modules/installer/scriptitems.pm | 3 --- solenv/bin/modules/installer/windows/msp.pm | 9 ++------- solenv/bin/modules/installer/windows/property.pm | 3 --- solenv/bin/modules/installer/worker.pm | 3 --- solenv/bin/modules/installer/ziplist.pm | 3 --- solenv/bin/modules/packager/work.pm | 11 ++--------- 11 files changed, 12 insertions(+), 75 deletions(-) (limited to 'solenv/bin') diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl index 896d0095e4ac..cc53a5dcc477 100755 --- a/solenv/bin/build.pl +++ b/solenv/bin/build.pl @@ -248,7 +248,6 @@ exit 0; } get_module_and_buildlist_paths(); - provide_consistency() if (defined $ENV{CWS_WORK_STAMP} && defined($ENV{COMMON_ENV_TOOLS})); $deliver_command .= ' -verbose' if ($html || $verbose); $deliver_command .= ' '. $dlv_switch if ($dlv_switch); @@ -2190,22 +2189,6 @@ sub modules_classify { }; }; -# -# This procedure provides consistency for cws -# and optimized build (ie in case of --with_branches, -all:prj_name -# and -since switches) -# -sub provide_consistency { - check_dir(); - foreach my $var_ref (\$build_all_cont, \$build_since) { - if ($$var_ref) { - return if (defined $module_paths{$$var_ref}); - print_error("Cannot find module '$$var_ref'", 9); - return; - }; - }; -}; - # # Procedure clears up module for incompatible build # @@ -2359,7 +2342,7 @@ sub prepare_incompatible_build { @modules_built = keys %$deps_hash; %add_to_config = %$deps_hash; if ($prepare) { - if ((!(defined $ENV{UPDATER} && (!defined $ENV{CWS_WORK_STAMP}))) || (defined $ENV{CWS_WORK_STAMP})) { + if (!(defined $ENV{UPDATER})) { $source_config->add_active_modules([keys %add_to_config], 0); } clear_delivered(); @@ -2570,9 +2553,8 @@ sub read_ssolar_vars { my ($source_root, $cwsname); $source_root = '-sourceroot' if (defined $ENV{SOURCE_ROOT_USED}); - my $cws_name = "-cwsname $ENV{CWS_WORK_STAMP}" if (defined $ENV{CWS_WORK_STAMP}); - my $param = "-$ENV{WORK_STAMP} $source_root $cws_name $pro $platform"; + my $param = "-$ENV{WORK_STAMP} $source_root $pro $platform"; my $ss_command = "$perl $setsolar -file $tmp_file $param $nul"; if (system($ss_command)) { unlink $tmp_file; @@ -2720,8 +2702,7 @@ sub generate_html_file { my $build_duration = get_time_line(time - $build_time); my $temp_html_file = File::Temp::tmpnam($tmp_dir); my $title; - $title = $ENV{CWS_WORK_STAMP} . ': ' if (defined $ENV{CWS_WORK_STAMP}); - $title .= $ENV{INPATH}; + $title = $ENV{INPATH}; die("Cannot open $temp_html_file") if (!open(HTML, ">$temp_html_file")); print HTML ''; print HTML '' . $title . ''; diff --git a/solenv/bin/build_client.pl b/solenv/bin/build_client.pl index f518f8198dcc..2b1bf1461e9a 100755 --- a/solenv/bin/build_client.pl +++ b/solenv/bin/build_client.pl @@ -357,11 +357,7 @@ sub do_job { delete $ENV{$_} foreach (keys %ENV); $ENV{$_} = $$solar_vars{$_} foreach (keys %$solar_vars); print 'Workspace: '; - if (defined $ENV{CWS_WORK_STAMP}) { - print $ENV{CWS_WORK_STAMP}; - } else { - print $ENV{SOLARSRC}; - }; + print $ENV{SOLARSRC}; print "\nplatform: $ENV{INPATH} $^O"; print "\ndir: $job_hash{job_dir}\n"; diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl index c9f7a2d6f9af..aba400453c0e 100755 --- a/solenv/bin/deliver.pl +++ b/solenv/bin/deliver.pl @@ -120,7 +120,7 @@ if ($^O ne 'cygwin') { # iz59477 - cygwin needes a dot "." at the e $tempcounter = 0; # zip is default for RE master builds -$opt_zip = 1 if ( defined($ENV{DELIVER_TO_ZIP}) && uc($ENV{DELIVER_TO_ZIP}) eq 'TRUE' && ! defined($ENV{CWS_WORK_STAMP})); +$opt_zip = 1 if ( defined($ENV{DELIVER_TO_ZIP}) && uc($ENV{DELIVER_TO_ZIP}) eq 'TRUE'); $has_symlinks = 0; # system supports symlinks diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm index 3f6b43f563fb..def9869ba706 100644 --- a/solenv/bin/modules/installer/control.pm +++ b/solenv/bin/modules/installer/control.pm @@ -478,11 +478,8 @@ sub check_updatepack $infoline = "\nEnvironment variable UPDATER set\n"; push(@installer::globals::globallogfileinfo, $infoline); - if ( ! $ENV{'CWS_WORK_STAMP'} ) # the environment variable CWS_WORK_STAMP must not be set (set only in CWS) + # There are no CWSes any more, no environment variable CWS_WORK_STAMP { - $infoline = "Environment variable CWS_WORK_STAMP not set\n"; - push(@installer::globals::globallogfileinfo, $infoline); - if ( $ENV{'SHIPDRIVE'} ) # the environment variable SHIPDRIVE must be set { $shipdrive = $ENV{'SHIPDRIVE'}; @@ -584,11 +581,6 @@ sub check_updatepack push(@installer::globals::globallogfileinfo, $infoline); } } - else - { - $infoline = "Environment variable CWS_WORK_STAMP defined: No updatepack\n"; - push(@installer::globals::globallogfileinfo, $infoline); - } } if ( $installer::globals::updatepack ) { $infoline = "Setting updatepack true\n\n"; } diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm index 604f7574cc95..a21fdad0bb62 100644 --- a/solenv/bin/modules/installer/download.pm +++ b/solenv/bin/modules/installer/download.pm @@ -490,11 +490,7 @@ sub get_download_version my $devproduct = 0; if (( $allvariables->{'DEVELOPMENTPRODUCT'} ) && ( $allvariables->{'DEVELOPMENTPRODUCT'} == 1 )) { $devproduct = 1; } - my $cwsproduct = 0; - # the environment variable CWS_WORK_STAMP is set only in CWS - if ( $ENV{'CWS_WORK_STAMP'} ) { $cwsproduct = 1; } - - if (( $cwsproduct ) || ( $devproduct )) # use "DEV300m75" + if ( $devproduct ) # use "DEV300m75" { my $source = uc($installer::globals::build); # DEV300 my $localminor = ""; @@ -525,14 +521,10 @@ sub set_date_string my $devproduct = 0; if (( $allvariables->{'DEVELOPMENTPRODUCT'} ) && ( $allvariables->{'DEVELOPMENTPRODUCT'} == 1 )) { $devproduct = 1; } - my $cwsproduct = 0; - # the environment variable CWS_WORK_STAMP is set only in CWS - if ( $ENV{'CWS_WORK_STAMP'} ) { $cwsproduct = 1; } - my $releasebuild = 1; if (( $allvariables->{'SHORT_PRODUCTEXTENSION'} ) && ( $allvariables->{'SHORT_PRODUCTEXTENSION'} ne "" )) { $releasebuild = 0; } - if (( ! $devproduct ) && ( ! $cwsproduct ) && ( ! $releasebuild )) + if (( ! $devproduct ) && ( ! $releasebuild )) { my @timearray = localtime(time); diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index bc7d9572d5e3..34f16ec0be64 100644 --- a/solenv/bin/modules/installer/scriptitems.pm +++ b/solenv/bin/modules/installer/scriptitems.pm @@ -810,9 +810,6 @@ sub replace_setup_variables $buildidstring = substr($buildidstring, 0, -1); } - # the environment variable CWS_WORK_STAMP is set only in CWS - if ( $ENV{'CWS_WORK_STAMP'} ) { $buildidstring = $buildidstring . "\[CWS\:" . $ENV{'CWS_WORK_STAMP'} . "\]"; } - if ( $localminor =~ /^\s*\w(\d+)\w*\s*$/ ) { $localminor = $1; } my $updateid = $productname . "_" . $userdirproductversion . "_" . $$languagestringref; diff --git a/solenv/bin/modules/installer/windows/msp.pm b/solenv/bin/modules/installer/windows/msp.pm index 7593c96a6ea8..c62e9923d5fb 100644 --- a/solenv/bin/modules/installer/windows/msp.pm +++ b/solenv/bin/modules/installer/windows/msp.pm @@ -524,7 +524,6 @@ sub set_mspfilename my $hotfixaddon = "hotfix_"; $hotfixaddon = $hotfixaddon . $installer::globals::buildid; my $cwsname = ""; - if ( $ENV{'CWS_WORK_STAMP'} ) { $hotfixaddon = $ENV{'CWS_WORK_STAMP'}; } if ( $allvariables->{'OVERWRITE_CWSNAME'} ) { $hotfixaddon = $allvariables->{'OVERWRITE_CWSNAME'}; } $databasename = $databasename . "_" . $hotfixaddon; } @@ -904,10 +903,6 @@ sub change_patchmetadata_table my $displayaddon = ""; if ( $allvariables->{'PATCHDISPLAYADDON'} ) { $displayaddon = $allvariables->{'PATCHDISPLAYADDON'}; } - my $cwsname = ""; - if ( $ENV{'CWS_WORK_STAMP'} ) { $cwsname = $ENV{'CWS_WORK_STAMP'}; } - if (( $cwsname ne "" ) && ( $allvariables->{'OVERWRITE_CWSNAME'} )) { $cwsname = $allvariables->{'OVERWRITE_CWSNAME'}; } - my $patchsequence = get_patchsequence($allvariables); if (( $allvariables->{'SERVICEPACK'} ) && ( $allvariables->{'SERVICEPACK'} == 1 )) @@ -917,8 +912,8 @@ sub change_patchmetadata_table } else { - $displaynamevalue = $base . " Hotfix " . $cwsname . " " . $displayaddon . " " . $patchsequence . " Build: " . $installer::globals::buildid; - $descriptionvalue = $base . " Hotfix " . $cwsname . " " . $displayaddon . " " . $patchsequence . " Build: " . $installer::globals::buildid; + $displaynamevalue = $base . " Hotfix " . $displayaddon . " " . $patchsequence . " Build: " . $installer::globals::buildid; + $descriptionvalue = $base . " Hotfix " . $displayaddon . " " . $patchsequence . " Build: " . $installer::globals::buildid; $displaynamevalue =~ s/ / /g; $descriptionvalue =~ s/ / /g; $displaynamevalue =~ s/ / /g; diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm index 5cfa674dd7c0..7a2bc5193d25 100644 --- a/solenv/bin/modules/installer/windows/property.pm +++ b/solenv/bin/modules/installer/windows/property.pm @@ -74,9 +74,6 @@ sub get_arpcomments_for_property_table my $buildidstring = "(" . $installer::globals::build . $localminor . "(Build:" . $installer::globals::buildid . "))"; - # the environment variable CWS_WORK_STAMP is set only in CWS - if ( $ENV{'CWS_WORK_STAMP'} ) { $buildidstring = $buildidstring . "\[CWS\:" . $ENV{'CWS_WORK_STAMP'} . "\]"; } - $comment = $comment . " " . $buildidstring; return $comment; diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm index d3b96d155e59..ada43720fc75 100644 --- a/solenv/bin/modules/installer/worker.pm +++ b/solenv/bin/modules/installer/worker.pm @@ -1611,9 +1611,6 @@ sub prepare_windows_patchfiles if ( ! $allvariableshashref->{'WINDOWSPATCHLEVEL'} ) { installer::exiter::exit_program("ERROR: No Windows patch level defined in list file (WINDOWSPATCHLEVEL) !", "prepare_windows_patchfiles"); } my $windowspatchlevel = $installer::globals::buildid; - # the environment variable CWS_WORK_STAMP is set only in CWS - if ( $ENV{'CWS_WORK_STAMP'} ) { $windowspatchlevel = $ENV{'CWS_WORK_STAMP'} . $windowspatchlevel; } - for ( my $i = 0; $i <= $#{$filesref}; $i++ ) { my $onefile = ${$filesref}[$i]; diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm index d52e97bf4e87..f0ea1acaddc7 100644 --- a/solenv/bin/modules/installer/ziplist.pm +++ b/solenv/bin/modules/installer/ziplist.pm @@ -734,9 +734,6 @@ sub replace_variables_in_ziplist_variables my $buildidstringcws = $installer::globals::build . $localminor . "(Build:" . $installer::globals::buildid . ")"; - # the environment variable CWS_WORK_STAMP is set only in CWS - if ( $ENV{'CWS_WORK_STAMP'} ) { $buildidstringcws = $buildidstringcws . "\[CWS\:" . $ENV{'CWS_WORK_STAMP'} . "\]"; } - for ( my $i = 0; $i <= $#{$blockref}; $i++ ) { if ($installer::globals::lastminor) { ${$blockref}[$i] =~ s/\{milestone\}/$milestonevariable/; } diff --git a/solenv/bin/modules/packager/work.pm b/solenv/bin/modules/packager/work.pm index 014d53b19efe..f84ae22355f4 100644 --- a/solenv/bin/modules/packager/work.pm +++ b/solenv/bin/modules/packager/work.pm @@ -268,7 +268,6 @@ sub do_broadcast if ( ! $ENV{'WORK_STAMP'} ) { packager::exiter::exit_program("ERROR: Environment variable WORK_STAMP not set!", "do_broadcast"); } my $workstamp = $ENV{WORK_STAMP}; - my $cwsworkstamp = $ENV{CWS_WORK_STAMP}; my $prjdir = $tempdir; $prjdir =~ s/$prj/$prjname/; @@ -280,14 +279,8 @@ sub do_broadcast if ( ! $tmpfile_handle ) { packager::exiter::exit_program("ERROR: Couldn't open temporary file \"$tmpfile_name\"!", "do_broadcast"); } - if (defined($cwsworkstamp)) { - print $tmpfile_handle "\"$cwsworkstamp;$platform;$prjname;$prjdir;nobase;$prjdep\""; - print "to tmpfile: \"$cwsworkstamp;$platform;$prjname;$prjdir;nobase;$prjdep\"\n"; - } - else { - print $tmpfile_handle "\"$workstamp;$platform;$prjname;$prjdir;nobase;$prjdep\""; - print "to tmpfile: \"$workstamp;$platform;$prjname;$prjdir;nobase;$prjdep\"\n"; - } + print $tmpfile_handle "\"$workstamp;$platform;$prjname;$prjdir;nobase;$prjdep\""; + print "to tmpfile: \"$workstamp;$platform;$prjname;$prjdir;nobase;$prjdep\"\n"; close $tmpfile_handle; my $returnvalue = system("cmd_bcst -s 18 \@$tmpfile_name"); print "cmd_bcst -s 18 \@$tmpfile_name\n"; -- cgit From 72cd238dccdfc67abb8aee8810b7a7d6dd0d3c58 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 3 Jul 2011 15:26:24 +0300 Subject: Use \r instead of \x0d in awk pattern for portability Hex escapes in the regexps are not supported in Solaris nawk, for instance. \r should match a CR in all cases as far as I know. --- solenv/bin/getcompver.awk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'solenv/bin') diff --git a/solenv/bin/getcompver.awk b/solenv/bin/getcompver.awk index 068960481130..124e915b72c9 100644 --- a/solenv/bin/getcompver.awk +++ b/solenv/bin/getcompver.awk @@ -52,13 +52,13 @@ BEGIN { x = match( $0, /[0-9]*\.[0-9]*\.[0-9]*/ ) CCversion = substr( $0, RSTART, RLENGTH) } -/^[0-9]*[.][0-9]*\x0d*$/ { +/^[0-9]*[.][0-9]*\r*$/ { if ( compiler_matched == 0 ) { # need to blow to x.xx.xx for comparing CCversion = $0 ".0" } } -/^[0-9]*[.][0-9]*[.][0-9]*\x0d*$/ { +/^[0-9]*[.][0-9]*[.][0-9]*\r*$/ { if ( compiler_matched == 0 ) { CCversion = $0 } -- cgit From 3653e5828237b231b158dbcb73da4f5f98126068 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 4 Jul 2011 12:09:30 +0100 Subject: Try and copy from versioned libgcc if possible, fallback to unversioned if not On Fedora 13 multilib ppc, the unversioned libgcc.so is a ld script to point to the "real" one, so its unsuitable for inclusion in the install set. --- solenv/bin/gccinstlib.pl | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'solenv/bin') diff --git a/solenv/bin/gccinstlib.pl b/solenv/bin/gccinstlib.pl index 654c95b7290a..2deb4d438e08 100755 --- a/solenv/bin/gccinstlib.pl +++ b/solenv/bin/gccinstlib.pl @@ -43,13 +43,22 @@ if ($Dest =~ /--help/ || @ARGV < 1) { foreach $File (@ARGV) { my $string; - my $normalized_file = $File; - $normalized_file =~ s/\.so\.\d+/.so/; - open (GCCOut, "LANGUAGE=C LC_ALL=C $cc -print-file-name=$normalized_file|") || die "Failed to exec $cc -print-file-name=$normalized_file $!"; - $string=; - chomp ($string); - $SrcAndDest{$string} = "$Dest/$File"; - close (GCCOut); + + my $NormFile = $File; + $NormFile =~ s/\.so\.\d+/.so/; + @search = ($File, $NormFile); + + foreach $entry (@search) { + open (GCCOut, "LANGUAGE=C LC_ALL=C $cc -print-file-name=$entry|") || + next; + $string=; + chomp ($string); + close (GCCOut); + if (-e $string) { + $SrcAndDest{$string} = "$Dest/$File"; + last; + } + } } while (($Src, $FullDest) = each %SrcAndDest) { -- cgit