diff options
| -rw-r--r-- | packimages/pack/makefile.mk | 4 | ||||
| -rw-r--r-- | postprocess/checkdeliver/checkdeliver.pl | 6 | ||||
| -rwxr-xr-x | postprocess/rebase/rebase.pl | 4 |
3 files changed, 0 insertions, 14 deletions
diff --git a/packimages/pack/makefile.mk b/packimages/pack/makefile.mk index d1838b1f41d6..04233a2ac910 100644 --- a/packimages/pack/makefile.mk +++ b/packimages/pack/makefile.mk @@ -61,11 +61,7 @@ $(SORTED_LIST) : image-sort.lst $(RES)$/img$/commandimagelist.ilst .PHONY : $(SORTED_LIST) @@-$(MKDIR) $(RES)$/img #+-$(RM) $@ $@.$(INPATH) -.IF "$(use_shell)"!="4nt" $(FIND) $(SOLARSRC)$/$(RSCDEFIMG)/res/commandimagelist -name "*.png" | sed "s#$(SOLARSRC)$/$(RSCDEFIMG)/res#%GLOBALRES%#" | $(PERL) $(SOLARENV)$/bin$/sort.pl > $@.$(INPATH) -.ELSE # "$(use_shell)"!="4nt" - $(FIND) $(SOLARSRC)$/$(RSCDEFIMG)/res/commandimagelist -name "*.png" | sed "s/$(SOLARSRC:s/\/./).$(RSCDEFIMG)\/res/%%GLOBALRES%%/" | $(PERL) $(SOLARENV)$/bin$/sort.pl > $@.$(INPATH) -.ENDIF # "$(use_shell)"!="4nt" $(PERL) $(SOLARENV)$/bin$/diffmv.pl $@.$(INPATH) $@ $(COMMONBIN)$/images.zip .PHONY: $(RES)$/img$/commandimagelist.ilst diff --git a/postprocess/checkdeliver/checkdeliver.pl b/postprocess/checkdeliver/checkdeliver.pl index 2baec9d0ef36..d1ec341c6137 100644 --- a/postprocess/checkdeliver/checkdeliver.pl +++ b/postprocess/checkdeliver/checkdeliver.pl @@ -128,12 +128,6 @@ sub get_deliver_lists $pattern .= "$milestoneext" if ( $milestoneext ); $pattern .= "/*/deliver.log"; - if ( $^O =~ /cygwin/i && $ENV{'USE_SHELL'} eq "4nt" ) - { # glob from cygwin's perl needs $pattern to use only slashes. - # (DOS style path are OK as long as slashes are used.) - $pattern =~ s/\\/\//g; - } - @files = glob( $pattern ); # do not check modules not yet built foreach my $exceptionpattern ( @exceptionmodlist ) { diff --git a/postprocess/rebase/rebase.pl b/postprocess/rebase/rebase.pl index 8afe774a8f5e..3ef5c3d4ae8d 100755 --- a/postprocess/rebase/rebase.pl +++ b/postprocess/rebase/rebase.pl @@ -208,8 +208,6 @@ sub rebase_again my $fname = $misc_dir . "rebase_again.txt"; open ( FILES, "> $fname") or die "Error: cannot open file $fname"; my $filesstring = join " ", @$oldfiles_ref; - # For W32-4nt-cygwin-perl: rebase_again.txt needs \. - if ( "$ENV{USE_SHELL}" eq "4nt" ) { $filesstring =~ s/\//\\/g; } print FILES "$filesstring\n"; close FILES; $command .= "\@$fname"; @@ -273,8 +271,6 @@ sub rebase_initially my $fname = $misc_dir . "rebase_new.txt"; open ( FILES, "> $fname") or die "Error: cannot open file $fname"; my $filesstring = join " ", @$files_ref; - # For W32-4nt-cygwin-perl: rebase_new.txt needs \. - if ( "$ENV{USE_SHELL}" eq "4nt" ) { $filesstring =~ s/\//\\/g; } print FILES "$filesstring\n"; close FILES; $command .= "\@$fname"; |