diff options
author | sb <sb@openoffice.org> | 2010-04-22 10:19:10 +0200 |
---|---|---|
committer | sb <sb@openoffice.org> | 2010-04-22 10:19:10 +0200 |
commit | d8c24296cc80403ffe4ed35fda0afc5691d7c342 (patch) | |
tree | cb16e0602572aadc7e7979e5292e9fc1a844ec37 /postprocess | |
parent | 6f4696c53913e5ddff0d8433ee3e552a8c584e48 (diff) | |
parent | 3254d3c1fbb77433128c528129038ac57234fd07 (diff) |
sb121: merged in DEV300_m77
Diffstat (limited to 'postprocess')
-rw-r--r-- | postprocess/checkdeliver/checkdeliver.pl | 6 | ||||
-rw-r--r-- | postprocess/checkdeliver/makefile.mk | 2 | ||||
-rw-r--r-- | postprocess/packregistry/makefile.mk | 2 | ||||
-rw-r--r-- | postprocess/prj/build.lst | 2 | ||||
-rwxr-xr-x | postprocess/rebase/rebase.pl | 4 |
5 files changed, 3 insertions, 13 deletions
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/checkdeliver/makefile.mk b/postprocess/checkdeliver/makefile.mk index a98a84fc8398..7f5665e7585b 100644 --- a/postprocess/checkdeliver/makefile.mk +++ b/postprocess/checkdeliver/makefile.mk @@ -38,5 +38,5 @@ TARGET=checkdeliver ALLTAR : $(MISC)$/checkdeliver.done $(MISC)$/checkdeliver.done .PHONY: - $(PERL) checkdeliver.pl > $@ || cat $@ + $(PERL) checkdeliver.pl && $(TOUCH) $@ diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk index fd936b99edc6..863c31677a4c 100644 --- a/postprocess/packregistry/makefile.mk +++ b/postprocess/packregistry/makefile.mk @@ -469,7 +469,7 @@ MY_FILES_ogltrans = \ .END .IF "$(GUIBASE)" == "WIN" -MX_XCDS += $(MISC)/forcedefaultlanguage.xcd +MY_XCDS += $(MISC)/forcedefaultlanguage.xcd MY_DEPS_forcedefaultlanguage = main MY_FILES_forcedefaultlanguage = \ $(MY_MOD)/org/openoffice/Office/Linguistic-ForceDefaultLanguage.xcu diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst index 4c30df96f2c6..28b3dcd659d9 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"; |