From 5af5ef6620fe83beb42772217660fd5be39e8d57 Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Mon, 7 Jan 2008 08:55:06 +0000 Subject: INTEGRATION: CWS sb80 (1.5.498); FILE MERGED 2007/11/20 14:56:09 sb 1.5.498.1: #i82064# On Windows, testtool must be loaded through the testtool.exe = guiloader.exe calls testtool.bin chain, so that OOo-wo-URE testtool has a correct PATH. --- scp2/source/testtool/file_testtool.scp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'scp2') diff --git a/scp2/source/testtool/file_testtool.scp b/scp2/source/testtool/file_testtool.scp index 676d03a397c6..43665bcc8d9c 100644 --- a/scp2/source/testtool/file_testtool.scp +++ b/scp2/source/testtool/file_testtool.scp @@ -4,9 +4,9 @@ * * $RCSfile: file_testtool.scp,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: ihi $ $Date: 2006-08-04 10:25:33 $ + * last change: $Author: obo $ $Date: 2008-01-07 09:55:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -38,15 +38,20 @@ STD_LIB_FILE( gid_File_Lib_Communi, communi ) STD_LIB_FILE( gid_File_Lib_Simplecm, simplecm ) +#if defined WNT +File gid_File_Exe_Testtool + BIN_FILE_BODY; + Dir = gid_Dir_Program; + Styles = (PACKED); + Name = "testtool.exe"; +End +#endif + File gid_File_Bin_Testtool BIN_FILE_BODY; Dir = gid_Dir_Program; Styles = (PACKED); - #ifdef UNX Name = "testtool.bin"; - #else - Name = "testtool.exe"; - #endif End File gid_File_Hid_Testtool -- cgit