diff options
Diffstat (limited to 'solenv/bin/deliver.pl')
| -rwxr-xr-x | solenv/bin/deliver.pl | 85 |
1 files changed, 16 insertions, 69 deletions
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl index b87665c6b011..1d1c53618105 100755 --- a/solenv/bin/deliver.pl +++ b/solenv/bin/deliver.pl @@ -43,11 +43,6 @@ use File::Spec; ( $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/; -$id_str = ' $Revision: 275594 $ '; -$id_str =~ /Revision:\s+(\S+)\s+\$/ - ? ($script_rev = $1) : ($script_rev = "-"); - - #### globals #### ### valid actions ### @@ -141,8 +136,6 @@ use sigtrap 'handler' => \&cleanup_and_die, 'normal-signals'; parse_options(); -print "$script_name -- version: $script_rev\n" if !$opt_silent; - if ( ! $opt_delete ) { if ( $ENV{GUI} eq 'WNT' ) { if ($ENV{COM} eq 'GCC') { @@ -238,7 +231,7 @@ sub do_linklib return unless $has_symlinks; $from_dir = expand_macros('../%__SRC%/lib'); - $to_dir = expand_macros('%_DEST%/lib%_EXT%'); + $to_dir = expand_macros('%_DEST%/lib'); @globbed_files = glob("$from_dir/$lib"); @@ -268,7 +261,6 @@ sub do_linklib } else { - # $lib =~ /^(lib[\w-]+(\.so|\.dylib))\.(\d+)$/; $long = 0; } @@ -368,13 +360,13 @@ sub do_symlink } } else { + return unless -e $fullfrom; print "REMOVE: $to\n" if $opt_verbose; unlink $to; if ( $opt_delete ) { push_on_ziplist($to) if $opt_zip; return; } - return unless -e $fullfrom; print "SYMLIB: $from -> $to\n" if $opt_verbose; if ( !symlink("$from", "$to") ) { print_error("can't symlink $from -> $to: $!",0); @@ -446,7 +438,6 @@ sub parse_options sub init_globals { - my $ext; ($module, $repository, $base_dir, $dlst_file) = get_base(); # for CWS: @@ -459,38 +450,18 @@ sub init_globals $umask = 22; } - my $build_sosl = $ENV{'BUILD_SOSL'}; my $common_outdir = $ENV{'COMMON_OUTDIR'}; my $inpath = $ENV{'INPATH'}; my $solarversion = $ENV{'SOLARVERSION'}; my $updater = $ENV{'UPDATER'}; - my $updminor = $ENV{'UPDMINOR'}; - my $updminorext = $ENV{'UPDMINOREXT'}; my $work_stamp = $ENV{'WORK_STAMP'}; - # special security check for release engineers - if ( defined($updater) && !defined($build_sosl) && !$opt_force) { - my $path = getcwd(); - if ( $path !~ /$work_stamp/io ) { - print_error("can't deliver from local directory to SOLARVERSION"); - print STDERR "\nDANGER! Release Engineer:\n"; - print STDERR "do you really want to deliver from $path to SOLARVERSION?\n"; - print STDERR "If so, please use the -force switch\n\n"; - exit(7); - } - } - # do we have a valid environment? if ( !defined($inpath) ) { print_error("no environment", 0); exit(3); } - $ext = ""; - if ( ($updminor) && !$dest ) { - $ext = "$updminorext"; - } - # Do we have common trees? if ( defined($ENV{'common_build'}) && $ENV{'common_build'} eq 'TRUE' ) { $common_build = 1; @@ -530,7 +501,6 @@ sub init_globals [ '%__PRJROOT%', $base_dir ], [ '%__SRC%', $inpath ], [ '%_DEST%', $dest ], - [ '%_EXT%', $ext ], [ '%COMMON_OUTDIR%', $common_outdir ], [ '%COMMON_DEST%', $common_dest ], [ '%GUI%', $gui ] @@ -601,7 +571,7 @@ sub parse_dlst if ( /\.res\s/ ) { my $imagelist = $_; $imagelist =~ s/\.res/\.$ilst_ext/g; - $imagelist =~ s/\\bin%_EXT%\\/\\res%_EXT%\\img\\/; + $imagelist =~ s/DEST%\\bin\\/DEST%\\res\\img\\/; push(@action_data, ['copy', $imagelist]); } } @@ -829,10 +799,6 @@ sub copy_if_newer } } fix_file_permissions($$from_stat_ref[2], $temp_file); - if ( $^O eq 'os2' ) - { - $rc = unlink($to); # YD OS/2 can't rename if $to exists! - } # Ugly hack: on windows file locking(?) sometimes prevents renaming. # Until we've found and fixed the real reason try it repeatedly :-( my $try = 0; @@ -1021,33 +987,33 @@ sub push_default_actions if ( ! $opt_delete ) { # create all the subdirectories on solver foreach $subdir (@subdirs) { - push(@action_data, ['mkdir', "%_DEST%/$subdir%_EXT%"]); + push(@action_data, ['mkdir', "%_DEST%/$subdir"]); } if ( $common_build ) { foreach $subdir (@common_subdirs) { - push(@action_data, ['mkdir', "%COMMON_DEST%/$subdir%_EXT%"]); + push(@action_data, ['mkdir', "%COMMON_DEST%/$subdir"]); } } } - push(@action_data, ['mkdir', "%_DEST%/inc%_EXT%/$module"]); + push(@action_data, ['mkdir', "%_DEST%/inc/$module"]); if ( $common_build ) { - push(@action_data, ['mkdir', "%COMMON_DEST%/inc%_EXT%/$module"]); - push(@action_data, ['mkdir', "%COMMON_DEST%/res%_EXT%/img"]); + push(@action_data, ['mkdir', "%COMMON_DEST%/inc/$module"]); + push(@action_data, ['mkdir', "%COMMON_DEST%/res/img"]); } else { - push(@action_data, ['mkdir', "%_DEST%/res%_EXT%/img"]); + push(@action_data, ['mkdir', "%_DEST%/res/img"]); } # deliver build.lst to $dest/inc/$module - push(@action_data, ['copy', "build.lst %_DEST%/inc%_EXT%/$module/build.lst"]); + push(@action_data, ['copy', "build.lst %_DEST%/inc/$module/build.lst"]); if ( $common_build ) { # ... and to $common_dest/inc/$module - push(@action_data, ['copy', "build.lst %COMMON_DEST%/inc%_EXT%/$module/build.lst"]); + push(@action_data, ['copy', "build.lst %COMMON_DEST%/inc/$module/build.lst"]); } # need to copy libstaticmxp.dylib for Mac OS X if ( $^O eq 'darwin' ) { - push(@action_data, ['copy', "../%__SRC%/lib/lib*static*.dylib %_DEST%/lib%_EXT%/lib*static*.dylib"]); + push(@action_data, ['copy', "../%__SRC%/lib/lib*static*.dylib %_DEST%/lib/lib*static*.dylib"]); } } @@ -1120,20 +1086,8 @@ sub push_on_ziplist return if ( $opt_check ); # strip $dest from path since we don't want to record it in zip file if ( $file =~ s#^\Q$dest\E/##o ) { - if ( $updminor ){ - # strip minor from path - my $ext = "%_EXT%"; - $ext = expand_macros($ext); - $file =~ s#^$ext##o; - } push(@zip_list, $file); } elsif ( $file =~ s#^\Q$common_dest\E/##o ) { - if ( $updminor ){ - # strip minor from path - my $ext = "%_EXT%"; - $ext = expand_macros($ext); - $file =~ s#^$ext##o; - } push(@common_zip_list, $file); } } @@ -1163,10 +1117,6 @@ sub push_on_loglist my $solarversion = $ENV{'SOLARVERSION'}; $solarversion =~ s#\\#/#g; $entry[2] =~ s/^\Q$solarversion\E\///; - # strip minor from 'to' - my $ext = "%_EXT%"; - $ext = expand_macros($ext); - $entry[2] =~ s#$ext([\\\/])#$1#o; if ( $common ) { push @common_log_list, [@entry]; @@ -1182,21 +1132,18 @@ sub zip_files $zipexe .= ' -y' unless $^O eq 'MSWin32'; my ($platform_zip_file, $common_zip_file); - $platform_zip_file = "%_DEST%/zip%_EXT%/$module.zip"; + $platform_zip_file = "%_DEST%/zip/$module.zip"; $platform_zip_file = expand_macros($platform_zip_file); my (%dest_dir, %list_ref); $dest_dir{$platform_zip_file} = $dest; $list_ref{$platform_zip_file} = \@zip_list; if ( $common_build ) { - $common_zip_file = "%COMMON_DEST%/zip%_EXT%/$module.zip"; + $common_zip_file = "%COMMON_DEST%/zip/$module.zip"; $common_zip_file = expand_macros($common_zip_file); $dest_dir{$common_zip_file} = $common_dest; $list_ref{$common_zip_file} = \@common_zip_list; } - my $ext = "%_EXT%"; - $ext = expand_macros($ext); - my @zipfiles; $zipfiles[0] = $platform_zip_file; if ( $common_build ) { @@ -1314,8 +1261,8 @@ sub get_tempfilename sub write_log { my (%log_file, %file_date); - $log_file{\@log_list} = "%_DEST%/inc%_EXT%/$module/deliver.log"; - $log_file{\@common_log_list} = "%COMMON_DEST%/inc%_EXT%/$module/deliver.log"; + $log_file{\@log_list} = "%_DEST%/inc/$module/deliver.log"; + $log_file{\@common_log_list} = "%COMMON_DEST%/inc/$module/deliver.log"; $file_date{\@log_list} = $logfiledate; $file_date{\@common_log_list} = $commonlogfiledate; |