diff options
| author | Release Engineers <releng@openoffice.org> | 2009-05-12 10:56:17 +0000 |
|---|---|---|
| committer | Release Engineers <releng@openoffice.org> | 2009-05-12 10:56:17 +0000 |
| commit | 7c3ffa7bd4e1437d7fd833956584ee6867833e3e (patch) | |
| tree | f78c26cd7861958733bf0a34eeb6dd8a854f538c | |
| parent | 9d4682cca8c58497666d84a22ccc2d7069772e2c (diff) | |
#100000# some changes for SO build environment
| -rw-r--r-- | solenv/bin/cws.pl | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/solenv/bin/cws.pl b/solenv/bin/cws.pl index 2ea012beab35..bca7fe3cc271 100644 --- a/solenv/bin/cws.pl +++ b/solenv/bin/cws.pl @@ -1016,7 +1016,7 @@ sub relink_workspace { # if these are not present. my %added_modules_hash; if (defined $ENV{ADDED_MODULES}) { - for ( split /\s/, $ENV{ADDED_MODULES} ) { + for ( split(/\s/, $ENV{ADDED_MODULES}) ) { $added_modules_hash{$_}++; } } @@ -1039,12 +1039,16 @@ sub relink_workspace { } } + # Originally the extension .lnk indicated a linked module. This turned out to be + # not an overly smart choice. Cygwin has some heuristics which regards .lnk + # files as Windows shortcuts, breaking the build. Use .link instead. + # When in restoring mode still consider .lnk as link to modules (for old CWSs) my $old_link_dir = "$bd/" . $old_link_dirs[0]; if ( $restore ) { if ( !opendir(DIR, $old_link_dir) ) { print_error("Can't open directory '$old_link_dir': $!.", 44); } - my @links = grep { !/\.lnk/ } readdir(DIR); + my @links = grep { !(/\.lnk/ || /\.link/) } readdir(DIR); close(DIR); # everything which is not a link to a directory can't be an "added" module foreach (@links) { @@ -1076,7 +1080,7 @@ sub relink_workspace { if ( !chdir($linkdir) ) { print_error("Can't chdir() to directory '$linkdir': $!.", 44); } - my $suffix = '.lnk'; + my $suffix = '.link'; foreach(@ooo_top_level_dirs) { if ( $_ eq 'REBASE.LOG' || $_ eq 'REBASE.CONFIG_DONT_DELETE' ) { next; |