[Libreoffice-commits] .: sal/prj

Caolán McNamara caolan at kemper.freedesktop.org
Mon Feb 21 13:10:43 PST 2011


 sal/prj/d.lst |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 33e0109fcd97a513d8f501eafdc4c39cee1cfd76
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Feb 21 19:51:39 2011 +0000

    deliver cppunittester into a different dir than the stock solver/bin
    
    This means that under windows the dlls found in PATH will be found, in the
    order set by PATH, and not any dlls that happen be side-by-side with it,
    which compromises the test local .dlls before deliver concept.

diff --git a/sal/prj/d.lst b/sal/prj/d.lst
index 3639f86..ca55d38 100644
--- a/sal/prj/d.lst
+++ b/sal/prj/d.lst
@@ -3,6 +3,7 @@ mkdir: %_DEST%\inc%_EXT%\osl
 mkdir: %_DEST%\inc%_EXT%\rtl
 mkdir: %_DEST%\inc%_EXT%\systools
 mkdir: %_DEST%\inc%_EXT%\systools\win32
+mkdir: %_DEST%\bin%_EXT%\cppunit
 
 ..\%__SRC%\inc\rtlbootstrap.mk %_DEST%\inc%_EXT%\rtlbootstrap.mk
 ..\inc\sal\*.h %_DEST%\inc%_EXT%\sal\*.h
@@ -31,5 +32,5 @@ symlink: %_DEST%\lib%_EXT%\libuno_sal.dylib.3 %_DEST%\lib%_EXT%\libuno_sal.dylib
 
 ..\%__SRC%\inc\udkversion.h %_DEST%\inc%_EXT%\sal\udkversion.h
 
-..\%__SRC%\bin\cppunittester %_DEST%\bin%_EXT%\cppunittester
-..\%__SRC%\bin\cppunittester.exe %_DEST%\bin%_EXT%\cppunittester.exe
+..\%__SRC%\bin\cppunittester %_DEST%\bin%_EXT%\cppunit\cppunittester
+..\%__SRC%\bin\cppunittester.exe %_DEST%\bin%_EXT%\cppunit\cppunittester.exe


More information about the Libreoffice-commits mailing list