summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/bootstrp/command.cxx8
-rw-r--r--tools/bootstrp/rscdep.cxx8
-rw-r--r--tools/inc/bootstrp/command.hxx4
-rw-r--r--tools/inc/tools/debug.hxx31
-rw-r--r--tools/qa/makefile.mk1
-rw-r--r--tools/source/debug/debug.cxx32
-rw-r--r--tools/test/export.map2
-rw-r--r--tools/test/makefile.mk2
8 files changed, 39 insertions, 49 deletions
diff --git a/tools/bootstrp/command.cxx b/tools/bootstrp/command.cxx
index 605965339b0e..2ab0cc8dc4a6 100644
--- a/tools/bootstrp/command.cxx
+++ b/tools/bootstrp/command.cxx
@@ -355,7 +355,7 @@ CCommand::CCommand( ByteString &rString )
{
rString.SearchAndReplace( '\t', ' ' );
aCommand = rString.GetToken( 0, ' ' );
- aCommandLine = Search();
+ aCommandLine = Search( "PATH" );
#ifndef UNX
aCommandLine += " /c ";
#else
@@ -365,7 +365,7 @@ CCommand::CCommand( ByteString &rString )
ByteString sCmd( rString.GetToken( 0, ' ' ));
ByteString sParam( rString.Copy( sCmd.Len()));
- aCommandLine += Search( thePath, sCmd );
+ aCommandLine += Search( "PATH", sCmd );
aCommandLine += sParam;
ImplInit();
@@ -379,7 +379,7 @@ CCommand::CCommand( const char *pChar )
aString.SearchAndReplace( '\t', ' ' );
aCommand = aString.GetToken( 0, ' ' );
- aCommandLine = Search();
+ aCommandLine = Search( "PATH" );
#ifndef UNX
aCommandLine += " /c ";
#else
@@ -390,7 +390,7 @@ CCommand::CCommand( const char *pChar )
ByteString sCmd( rString.GetToken( 0, ' ' ));
ByteString sParam( rString.Copy( sCmd.Len()));
- aCommandLine += Search( thePath, sCmd );
+ aCommandLine += Search( "PATH", sCmd );
aCommandLine += sParam;
ImplInit();
diff --git a/tools/bootstrp/rscdep.cxx b/tools/bootstrp/rscdep.cxx
index 35968654b5cd..5c18793c9833 100644
--- a/tools/bootstrp/rscdep.cxx
+++ b/tools/bootstrp/rscdep.cxx
@@ -36,6 +36,7 @@
#include <string.h>
#include "bootstrp/prj.hxx"
+#include "sal/main.h"
#include <tools/string.hxx>
#include <tools/list.hxx>
@@ -78,12 +79,7 @@ static int optopt = 0;
static int opterr = 0;
#endif
-
-int
-#ifdef WNT
-_cdecl
-#endif
-main( int argc, char **argv )
+SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
{
int c;
char aBuf[255];
diff --git a/tools/inc/bootstrp/command.hxx b/tools/inc/bootstrp/command.hxx
index e0d8f1e39aeb..638beb6cce1f 100644
--- a/tools/inc/bootstrp/command.hxx
+++ b/tools/inc/bootstrp/command.hxx
@@ -92,8 +92,6 @@ public:
void Print();
};
-static ByteString thePath( "PATH" );
-
/** Declares and spawns a child process.
The spawned programm could be a native executable or a schell script.
*/
@@ -127,7 +125,7 @@ public:
@param sItem specifies the system shell
@return the Location (when programm was found)
*/
- static ByteString Search( ByteString sEnv = thePath,
+ static ByteString Search( ByteString sEnv,
ByteString sItem = COMMAND_SHELL );
/** Spawns the Process
diff --git a/tools/inc/tools/debug.hxx b/tools/inc/tools/debug.hxx
index e764ed2fc79a..b8aa1c8b59fe 100644
--- a/tools/inc/tools/debug.hxx
+++ b/tools/inc/tools/debug.hxx
@@ -125,19 +125,18 @@ struct DbgDataType
#define DBG_FUNC_SAVEDATA 5
#define DBG_FUNC_SETPRINTMSGBOX 6
#define DBG_FUNC_SETPRINTWINDOW 7
-#define DBG_FUNC_SETPRINTSHELL 8
-#define DBG_FUNC_SETPRINTTESTTOOL 9
-#define DBG_FUNC_MEMTEST 10
-#define DBG_FUNC_XTORINFO 11
-#define DBG_FUNC_MEMINFO 12
-#define DBG_FUNC_COREDUMP 13
-#define DBG_FUNC_ALLERROROUT 14
-#define DBG_FUNC_SETTESTSOLARMUTEX 15
-#define DBG_FUNC_TESTSOLARMUTEX 16
-#define DBG_FUNC_PRINTFILE 17
-#define DBG_FUNC_GETPRINTMSGBOX 18
-#define DBG_FUNC_FILTERMESSAGE 19 // new for #i38967
-#define DBG_FUNC_UPDATEOSLHOOK 20
+#define DBG_FUNC_SETPRINTTESTTOOL 8
+#define DBG_FUNC_MEMTEST 9
+#define DBG_FUNC_XTORINFO 10
+#define DBG_FUNC_MEMINFO 11
+#define DBG_FUNC_COREDUMP 12
+#define DBG_FUNC_ALLERROROUT 13
+#define DBG_FUNC_SETTESTSOLARMUTEX 14
+#define DBG_FUNC_TESTSOLARMUTEX 15
+#define DBG_FUNC_PRINTFILE 16
+#define DBG_FUNC_GETPRINTMSGBOX 17
+#define DBG_FUNC_FILTERMESSAGE 18 // new for #i38967
+#define DBG_FUNC_UPDATEOSLHOOK 19
TOOLS_DLLPUBLIC void* DbgFunc( USHORT nAction, void* pData = NULL );
@@ -176,11 +175,6 @@ inline void DbgSetPrintWindow( DbgPrintLine pProc )
DbgFunc( DBG_FUNC_SETPRINTWINDOW, (void*)(long)pProc );
}
-inline void DbgSetPrintShell( DbgPrintLine pProc )
-{
- DbgFunc( DBG_FUNC_SETPRINTSHELL, (void*)(long)pProc );
-}
-
inline void DbgSetPrintTestTool( DbgPrintLine pProc )
{
DbgFunc( DBG_FUNC_SETPRINTTESTTOOL, (void*)(long)pProc );
@@ -344,6 +338,7 @@ void DbgPrintStackTree( void* p );
TOOLS_DLLPUBLIC void DbgOut( const sal_Char* pMsg, USHORT nOutType = DBG_OUT_TRACE,
const sal_Char* pFile = NULL, USHORT nLine = 0 );
+TOOLS_DLLPUBLIC void DbgPrintShell(char const * message);
TOOLS_DLLPUBLIC void DbgOutTypef( USHORT nOutType, const sal_Char* pFStr, ... );
TOOLS_DLLPUBLIC void DbgOutf( const sal_Char* pFStr, ... );
TOOLS_DLLPUBLIC void ImpDbgOutfBuf( sal_Char* pBuf, const sal_Char* pFStr, ... );
diff --git a/tools/qa/makefile.mk b/tools/qa/makefile.mk
index 66ed19e20737..abaea848c1db 100644
--- a/tools/qa/makefile.mk
+++ b/tools/qa/makefile.mk
@@ -32,6 +32,7 @@ ENABLE_EXCEPTIONS = TRUE
.INCLUDE: settings.mk
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
DLLPRE = # no leading "lib" on .so files
SHL1TARGET = test_pathutils
diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index 62f36e662ea9..e17457c60525 100644
--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.cxx
@@ -151,7 +151,6 @@ struct DebugData
USHORT bInit;
DbgPrintLine pDbgPrintMsgBox;
DbgPrintLine pDbgPrintWindow;
- DbgPrintLine pDbgPrintShell;
DbgPrintLine pDbgPrintTestTool;
::std::vector< DbgPrintLine >
aDbgPrintUserChannels;
@@ -166,7 +165,6 @@ struct DebugData
:bInit( FALSE )
,pDbgPrintMsgBox( FALSE )
,pDbgPrintWindow( NULL )
- ,pDbgPrintShell( NULL )
,pDbgPrintTestTool( NULL )
,pProfList( NULL )
,pXtorList( NULL )
@@ -1037,9 +1035,7 @@ static void DebugDeInit()
pData->aDbgData.nTestFlags &= (DBG_TEST_MEM | DBG_TEST_PROFILING);
pData->aDbgPrintUserChannels.clear();
pData->pDbgPrintTestTool = NULL;
- pData->pDbgPrintShell = NULL;
pData->pDbgPrintWindow = NULL;
- pData->pDbgPrintShell = NULL;
pData->pOldDebugMessageFunc = NULL;
ImplDbgDeInitLock();
}
@@ -1199,10 +1195,6 @@ void* DbgFunc( USHORT nAction, void* pParam )
pDebugData->pDbgPrintWindow = (DbgPrintLine)(long)pParam;
break;
- case DBG_FUNC_SETPRINTSHELL:
- pDebugData->pDbgPrintShell = (DbgPrintLine)(long)pParam;
- break;
-
case DBG_FUNC_SETPRINTTESTTOOL:
pDebugData->pDbgPrintTestTool = (DbgPrintLine)(long)pParam;
break;
@@ -1739,14 +1731,6 @@ void DbgOut( const sal_Char* pMsg, USHORT nDbgOut, const sal_Char* pFile, USHORT
if ( pData->pDbgPrintMsgBox )
pData->pDbgPrintMsgBox( aBufOut );
else
- nOut = DBG_OUT_SHELL;
- }
-
- if ( nOut == DBG_OUT_SHELL )
- {
- if ( pData->pDbgPrintShell )
- pData->pDbgPrintShell( aBufOut );
- else
nOut = DBG_OUT_WINDOW;
}
@@ -1758,14 +1742,28 @@ void DbgOut( const sal_Char* pMsg, USHORT nDbgOut, const sal_Char* pFile, USHORT
nOut = DBG_OUT_FILE;
}
- if ( nOut == DBG_OUT_FILE )
+ switch ( nOut )
+ {
+ case DBG_OUT_SHELL:
+ DbgPrintShell( aBufOut );
+ break;
+ case DBG_OUT_FILE:
ImplDbgPrintFile( aBufOut );
+ break;
+ }
ImplDbgUnlock();
bIn = FALSE;
}
+void DbgPrintShell(char const * message) {
+ fprintf(stderr, "%s\n", message);
+#if defined WNT
+ OutputDebugStringA(message);
+#endif
+}
+
// -----------------------------------------------------------------------
void DbgOutTypef( USHORT nDbgOut, const sal_Char* pFStr, ... )
diff --git a/tools/test/export.map b/tools/test/export.map
index 709047ae63e5..7321bbca16ad 100644
--- a/tools/test/export.map
+++ b/tools/test/export.map
@@ -25,7 +25,7 @@
#
#*************************************************************************
-UDK_3.1 {
+UDK_3_0_0 {
global:
registerAllTestFunction;
diff --git a/tools/test/makefile.mk b/tools/test/makefile.mk
index 5dea8ce6f960..ab2cfd8e6676 100644
--- a/tools/test/makefile.mk
+++ b/tools/test/makefile.mk
@@ -36,6 +36,8 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
+
# --- Common ----------------------------------------------------------
SHL1OBJS= \
generated by cgit (git 2.34.1) at 2025-03-10 12:43:10 +0000