diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-03-18 11:26:32 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 17:35:01 +0100 |
| commit | d4c24925ecc2ed906cf5e1f6d1147fca7477d849 (patch) | |
| tree | 48265afa0aba37e41f210652cb2e7f6fa30410fb | |
| parent | f5d9c8570d9d98fc7bf0497efe353531dd76359d (diff) | |
Avoid unnecessary PATH manipulation for exes located in OUTDIR/bin
svidl.exe, transex3.exe and xsltproc.exe are themselves in
${OUTDIR}/bin, so no need to add that directory to PATH when running
them. They will find the DLLs they need from there automatically
anyway.
Besides, the PATH manipulation was wrong as OUTDIR here is a Win32
pathname, starting with a drive letter and colon, while PATH is the
Cygwin one that contains Cygwin pathnames with no drive letters and
with colon as the search path separator. Thus a cygpath -u
transformation of OUTDIR would have been needed to actually make it do
what was intended.
| -rwxr-xr-x | solenv/gbuild/platform/windows.mk | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index 551e33616922..07a7dc924fe4 100755 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -567,7 +567,12 @@ endef # CppunitTest class +# cppunittester.exe is in the cppunit subdirectory of ${OUTDIR}/bin, +# thus it won't find its DLLs unless ${OUTDIR}/bin is added to PATH. +# PATH is the Cygwin one while ${OUTDIR} is a Win32 pathname, thus +# cygpath -u. gb_CppunitTest_CPPTESTPRECOMMAND := PATH="`cygpath -u $(OUTDIR)`/bin:$${PATH}" + gb_CppunitTest_SYSPRE := itest_ gb_CppunitTest_EXT := .lib gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT) @@ -636,11 +641,13 @@ endef # SdiTarget class -gb_SdiTarget_SVIDLPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin" +# svidl.exe is in ${OUTDIR}/bin itself, so nothing special needed to have it find +# DLLs in the same directory +gb_SdiTarget_SVIDLPRECOMMAND := # SrsPartMergeTarget - -gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin" +# Ditto for transex3 +gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := # SrsPartTarget class @@ -670,7 +677,9 @@ endif # ComponentTarget -gb_XSLTPROCPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin" +# See comment for svidl.exe +gb_XSLTPROCPRECOMMAND := + gb_Library_COMPONENTPREFIXES := \ OOO:vnd.sun.star.expand:\dBRAND_BASE_DIR/program/ \ URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \ |