Kaydet (Commit) df4418ae authored tarafından sb's avatar sb

sb118: #i108269# first step of removing tcsh support

üst bf42f773
...@@ -61,11 +61,7 @@ $(SORTED_LIST) : image-sort.lst ...@@ -61,11 +61,7 @@ $(SORTED_LIST) : image-sort.lst
$(RES)$/img$/commandimagelist.ilst .PHONY : $(SORTED_LIST) $(RES)$/img$/commandimagelist.ilst .PHONY : $(SORTED_LIST)
@@-$(MKDIR) $(RES)$/img @@-$(MKDIR) $(RES)$/img
#+-$(RM) $@ $@.$(INPATH) #+-$(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) $(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) $@ $(PERL) $(SOLARENV)$/bin$/diffmv.pl $@.$(INPATH) $@
$(COMMONBIN)$/images.zip .PHONY: $(RES)$/img$/commandimagelist.ilst $(COMMONBIN)$/images.zip .PHONY: $(RES)$/img$/commandimagelist.ilst
......
...@@ -128,12 +128,6 @@ sub get_deliver_lists ...@@ -128,12 +128,6 @@ sub get_deliver_lists
$pattern .= "$milestoneext" if ( $milestoneext ); $pattern .= "$milestoneext" if ( $milestoneext );
$pattern .= "/*/deliver.log"; $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 ); @files = glob( $pattern );
# do not check modules not yet built # do not check modules not yet built
foreach my $exceptionpattern ( @exceptionmodlist ) { foreach my $exceptionpattern ( @exceptionmodlist ) {
......
...@@ -208,8 +208,6 @@ sub rebase_again ...@@ -208,8 +208,6 @@ sub rebase_again
my $fname = $misc_dir . "rebase_again.txt"; my $fname = $misc_dir . "rebase_again.txt";
open ( FILES, "> $fname") or die "Error: cannot open file $fname"; open ( FILES, "> $fname") or die "Error: cannot open file $fname";
my $filesstring = join " ", @$oldfiles_ref; 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"; print FILES "$filesstring\n";
close FILES; close FILES;
$command .= "\@$fname"; $command .= "\@$fname";
...@@ -273,8 +271,6 @@ sub rebase_initially ...@@ -273,8 +271,6 @@ sub rebase_initially
my $fname = $misc_dir . "rebase_new.txt"; my $fname = $misc_dir . "rebase_new.txt";
open ( FILES, "> $fname") or die "Error: cannot open file $fname"; open ( FILES, "> $fname") or die "Error: cannot open file $fname";
my $filesstring = join " ", @$files_ref; 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"; print FILES "$filesstring\n";
close FILES; close FILES;
$command .= "\@$fname"; $command .= "\@$fname";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment