diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-01-25 11:58:19 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-01-25 11:58:19 +0000 |
| commit | 64ebf752b14c13f27e7336d9a65ea2d38ec6663c (patch) | |
| tree | 672abe8a175ddaf7560f9f1aac330c361f487506 /solenv/inc/unitools.mk | |
| parent | INTEGRATION: CWS ause069 (1.31.2); FILE MERGED (diff) | |
| download | core-64ebf752b14c13f27e7336d9a65ea2d38ec6663c.tar.gz core-64ebf752b14c13f27e7336d9a65ea2d38ec6663c.zip | |
INTEGRATION: CWS ause069 (1.49.2); FILE MERGED
2006/12/01 17:44:50 hjs 1.49.2.2: #i69872# cleanup
2006/10/11 12:36:27 hjs 1.49.2.1: #i70359#: removing + sign in targets; adding to tool macro if required
Diffstat (limited to 'solenv/inc/unitools.mk')
| -rw-r--r-- | solenv/inc/unitools.mk | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk index 447bf7419e43..ab8932ffdf22 100644 --- a/solenv/inc/unitools.mk +++ b/solenv/inc/unitools.mk @@ -4,9 +4,9 @@ # # $RCSfile: unitools.mk,v $ # -# $Revision: 1.49 $ +# $Revision: 1.50 $ # -# last change: $Author: kz $ $Date: 2006-10-05 16:22:24 $ +# last change: $Author: obo $ $Date: 2007-01-25 12:58:19 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -91,7 +91,7 @@ USQ:= NULLDEV:=nul # iz29609 helpmacro to check if file exists 4nt style -IFEXIST:=if exist +IFEXIST:=+if exist THEN:= FI:= PIPEERROR=|& @@ -99,6 +99,9 @@ PIPEERROR=|& # iz31658 CHECKZIPRESULT:=^ iff errorlevel == 12 .and. errorlevel == 12 then ( echo Nothing to update for zip ^ set somedummyvar=%somedummyvar) +# try the same for 4nt "copy /u" +CHECKCOPYURESULT:=^ iff errorlevel == 2 then ( echo Nothing to update for copy ^ set somedummyvar=%somedummyvar) + # tell makedepend to write windows native format MKDEPFLAGS=-n @@ -131,13 +134,13 @@ RENAME*=mv TOUCH*=touch TYPE*=cat .ELSE # "$(USE_SHELL)"!="4nt" -CDD=cdd -COPY*=copy +CDD=+cdd +COPY*=+copy COPYRECURSE=/s COPYUPDATE=/u -DELAY=delay -ECHON*=echos -ECHONL=echo. +DELAY=+delay +ECHON*=+echos +ECHONL=+echo. FIND*=$(BUILD_TOOLS)$/find.exe .IF "$(use_cygcp)"!="" GNUCOPY=$(BUILD_TOOLS)$/gnucp.exe @@ -147,12 +150,13 @@ GNUMAKE*=$(BUILD_TOOLS)$/gnumake.exe GREP*=$(BUILD_TOOLS)$/grep.exe LS*=$(BUILD_TOOLS)$/ls.exe #wraper for solenv\bin\mkdir.pl to fix mkdir /p problem -MKDIR=+$(SOLARENV)$/bin$/mkdir.btm -MKDIRHIER=$(MKDIR) -PERL*:=call perl5.btm -RENAME*=ren +MKDIR=+mkdir +MKDIRHIER=$(MKDIR) /sn +PERL*:=+call perl5.btm +RENAME*=+ren TOUCH*=$(BUILD_TOOLS)$/touch.exe -TYPE*=type +TYPE*=+type +4nt_force_shell:=+ .ENDIF "$(USE_SHELL)"!="4nt" DUMPBIN*=$(WRAPCMD) dumpbin |