diff options
-rw-r--r-- | packimages/pack/makefile.mk | 4 | ||||
-rw-r--r-- | postprocess/checkdeliver/checkdeliver.pl | 6 | ||||
-rw-r--r-- | postprocess/prj/build.lst | 2 | ||||
-rwxr-xr-x | postprocess/rebase/rebase.pl | 4 |
4 files changed, 1 insertions, 15 deletions
diff --git a/packimages/pack/makefile.mk b/packimages/pack/makefile.mk index b9b574cec1c8..c8feef308e2b 100644 --- a/packimages/pack/makefile.mk +++ b/packimages/pack/makefile.mk @@ -57,11 +57,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 44c46ac7ebf9..d72aeb41e8c9 100644 --- a/postprocess/checkdeliver/checkdeliver.pl +++ b/postprocess/checkdeliver/checkdeliver.pl @@ -124,12 +124,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/prj/build.lst b/postprocess/prj/build.lst index e025835b6b69..45a38d6503fa 100644 --- a/postprocess/prj/build.lst +++ b/postprocess/prj/build.lst @@ -1,4 +1,4 @@ -po postprocess :: accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NULL +po postprocess :: accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NULL po postprocess usr1 - all po_mkout NULL po postprocess\checkxml nmake - all po_checkxml NULL po postprocess\checkdeliver nmake - all po_checkdlv NULL diff --git a/postprocess/rebase/rebase.pl b/postprocess/rebase/rebase.pl index 01b6e361bfdf..5d40668dec73 100755 --- a/postprocess/rebase/rebase.pl +++ b/postprocess/rebase/rebase.pl @@ -204,8 +204,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"; @@ -269,8 +267,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"; |