From 3eda2cfb75c8bc483d8377a1fac24974b1864440 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 6 May 2010 15:13:08 +0200 Subject: CWS gnumake2: don't create static libs in tools --- tools/inc/bootstrp/command.hxx | 165 ------------------------ tools/inc/bootstrp/listmacr.hxx | 60 --------- tools/inc/bootstrp/mkcreate.hxx | 4 +- tools/inc/bootstrp/prj.hxx | 273 ---------------------------------------- tools/inc/bootstrp/sstring.hxx | 105 ---------------- 5 files changed, 3 insertions(+), 604 deletions(-) delete mode 100644 tools/inc/bootstrp/command.hxx delete mode 100644 tools/inc/bootstrp/listmacr.hxx delete mode 100644 tools/inc/bootstrp/sstring.hxx (limited to 'tools/inc/bootstrp') diff --git a/tools/inc/bootstrp/command.hxx b/tools/inc/bootstrp/command.hxx deleted file mode 100644 index e0d8f1e39aeb..000000000000 --- a/tools/inc/bootstrp/command.hxx +++ /dev/null @@ -1,165 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef COMMAND_HXX -#define COMMAND_HXX - -#include - -#include -#define STRLEN 100 -#ifndef UNX -#define TMPNAME "\\command.tmp" -#else -#define TMPNAME "/tmp/command.tmp" -#endif - -/** Different types of spawnable programs -*/ -enum ExeType -{ - EXE, /// programm is a native executable - BAT, /// programm is a DOS-Batch - BTM /// programm is a 4DOS-Batch -}; - -#define COMMAND_NOTFOUND 0x0001 -#define COMMAND_TOOBIG 0x0002 -#define COMMAND_INVALID 0x0004 -#define COMMAND_NOEXEC 0x0008 -#define COMMAND_NOMEM 0x0010 -#define COMMAND_UNKNOWN 0x0020 - -#ifdef WNT -#define COMMAND_SHELL "4nt.exe" -#endif -#ifdef OS2 -#define COMMAND_SHELL "4os2.exe" -#endif -#ifdef UNX -#define COMMAND_SHELL "csh" -#endif - -class CommandLine; -class LogWindow; - -class CommandLine -{ -friend class ChildProcess; -private: - char *CommandBuffer; - char *ComShell; - char **ppArgv; - BOOL bTmpWrite; - -public: - CommandLine(BOOL bTmpWrite = FALSE); - CommandLine(const char *, BOOL bTmpWrite = FALSE); - CommandLine(const CommandLine&, BOOL bTmpWrite = FALSE); - virtual ~CommandLine(); - - int nArgc; - - CommandLine& operator=(const CommandLine&); - CommandLine& operator=(const char *); - void BuildCommand(const char *); - char** GetCommand(void) { return ppArgv; } - void Strtokens(const char *); - void Print(); -}; - -static ByteString thePath( "PATH" ); - -/** Declares and spawns a child process. - The spawned programm could be a native executable or a schell script. -*/ -class CCommand -{ -private: - ByteString aCommandLine; - ByteString aCommand; - char *pArgv; - char **ppArgv; - ULONG nArgc; - int nError; - -protected: - void ImplInit(); - void Initpp( ULONG nCount, ByteString &rStr ); - -public: - /** Creates the process specified without spawning it - @param rString specifies the programm or shell scrip - */ - CCommand( ByteString &rString ); - - /** Creates the process specified without spawning it - @param pChar specifies the programm or shell scrip - */ - CCommand( const char *pChar ); - - /** Try to find the given programm in specified path - @param sEnv specifies the current search path, defaulted by environment - @param sItem specifies the system shell - @return the Location (when programm was found) - */ - static ByteString Search( ByteString sEnv = thePath, - ByteString sItem = COMMAND_SHELL ); - - /** Spawns the Process - @return 0 when spawned without errors, otherwise a error code - */ - operator int(); - - ByteString GetCommandLine_() { return aCommandLine; } - ByteString GetCommand() { return aCommand; } - - char** GetCommandStr() { return ppArgv; } -}; - -#define COMMAND_EXECUTE_WINDOW 0x0000001 -#define COMMAND_EXECUTE_CONSOLE 0x0000002 -#define COMMAND_EXECUTE_HIDDEN 0x0000004 -#define COMMAND_EXECUTE_START 0x0000008 -#define COMMAND_EXECUTE_WAIT 0x0000010 -#define COMMAND_EXECUTE_REMOTE 0x1000000 - -typedef ULONG CommandBits; - -/** Allowes to spawn programms hidden, waiting etc. - @see CCommand -*/ -class CCommandd : public CCommand -{ - CommandBits nFlag; -public: - CCommandd( ByteString &rString, CommandBits nBits ); - CCommandd( const char *pChar, CommandBits nBits ); - operator int(); -}; - -#endif diff --git a/tools/inc/bootstrp/listmacr.hxx b/tools/inc/bootstrp/listmacr.hxx deleted file mode 100644 index 8c678ff32275..000000000000 --- a/tools/inc/bootstrp/listmacr.hxx +++ /dev/null @@ -1,60 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _LISTMACR_HXX -#define _LISTMACR_HXX - -#define DECL_DEST_LIST( TmpListType, ListType, PointerType ) \ -DECLARE_LIST(TmpListType, PointerType) \ -class ListType : public TmpListType \ -{ \ -public: \ - void ClearAndDelete() \ - { \ - while ( Count()) { \ - PointerType pTmp = GetObject(( ULONG ) 0 ); \ - delete pTmp; \ - Remove(( ULONG ) 0 ); \ - } \ - } \ - ~ListType() \ - { \ - ClearAndDelete(); \ - } \ -}; \ - -#endif - - - - - - - - - - diff --git a/tools/inc/bootstrp/mkcreate.hxx b/tools/inc/bootstrp/mkcreate.hxx index 991b5961a096..5510fb87f7b9 100644 --- a/tools/inc/bootstrp/mkcreate.hxx +++ b/tools/inc/bootstrp/mkcreate.hxx @@ -29,7 +29,9 @@ #define _MK_CREATE_HXX #include -#include "bootstrp/sstring.hxx" +//#include "bootstrp/sstring.hxx" + +DECLARE_LIST( UniStringList, UniString* ) #include #include "bootstrp/prj.hxx" diff --git a/tools/inc/bootstrp/prj.hxx b/tools/inc/bootstrp/prj.hxx index 2d7664b8b69f..4b1ff91feb7b 100644 --- a/tools/inc/bootstrp/prj.hxx +++ b/tools/inc/bootstrp/prj.hxx @@ -30,98 +30,6 @@ #include #include -#include "bootstrp/listmacr.hxx" -#include - -#define OS_NONE 0x0000 -#define OS_WIN16 0x0001 -#define OS_WIN32 0x0002 -#define OS_OS2 0x0004 -#define OS_UNX 0x0008 -#define OS_ALL ( OS_WIN16 | OS_WIN32 | OS_OS2 | OS_UNX ) - -#define COMMAND_PROJECTROOT 0x0000 -#define COMMAND_NMAKE 0x0001 -#define COMMAND_GET 0x0002 -#define COMMAND_USER_START 0x0003 -#define COMMAND_USER_END 0xFFFE -#define COMMAND_ALLDIRS 0xFFFF - -class SByteStringList; -class GenericInformationList; - -/* -// Pfade auf Konfigurationsdateien des Build-Servers - -#define REQUEST_DIR \\src\data4\source\b_server\server\newjob -*/ -/********************************************************************* -* -* Die Klasse CommandData haelte alle Informationen, die fuer die -* Abarbeitung eines Kommandos (nmake, get) noetig sind -* -*********************************************************************/ - -class CommandData -{ - ByteString aPrj; - ByteString aLogFileName; - ByteString aInpath; - ByteString aUpd; - ByteString aUpdMinor; - ByteString aProduct; - ByteString aCommand; - ByteString aPath; - ByteString aPrePath; - ByteString aPreFix; - ByteString aCommandPara; - ByteString aComment; - ByteString sClientRestriction; - SByteStringList *pDepList; - USHORT nOSType; - USHORT nCommand; - - ULONG nDepth; // Tiefe der Abhaenigkeit - -public: - CommandData(); - ~CommandData(); - ByteString GetProjectName(){return aPrj;} - void SetProjectName( ByteString aName ){aPrj = aName;} - ByteString GetLogFile(){return aLogFileName;} - void SetLogFile( ByteString aName ){aLogFileName = aName;} - ByteString GetInpath(){return aInpath;} - void SetInpath( ByteString aName ){aInpath = aName;} - ByteString GetUpd(){return aUpd;} - void SetUpd( ByteString aName ){aUpd = aName;} - ByteString GetUpdMinor(){return aUpdMinor;} - void SetUpdMinor( ByteString aName ){aUpdMinor = aName;} - ByteString GetProduct(){return aProduct;} - void SetProduct( ByteString aName ){aProduct = aName;} - ByteString GetCommand(){return aCommand;} - void SetCommand ( ByteString aName ){aCommand = aName;} - ByteString GetCommandPara(){return aCommandPara;} - void SetCommandPara ( ByteString aName ){aCommandPara = aName;} - ByteString GetComment(){return aComment;} - void SetComment ( ByteString aCommentString ){aComment = aCommentString;} - ByteString GetPath(){return aPath;} - void SetPath( ByteString aName ){aPath = aName;} - ByteString GetPrePath(){return aPrePath;} - void SetPrePath( ByteString aName ){aPrePath = aName;} - USHORT GetOSType(){return nOSType;} - ByteString GetOSTypeString(); - void SetOSType( USHORT nType ){nOSType = nType;} - USHORT GetCommandType(){return nCommand;} - ByteString GetCommandTypeString(); - void SetCommandType( USHORT nCommandType ){nCommand = nCommandType;} - SByteStringList* GetDependencies(){return pDepList;} - void SetDependencies( SByteStringList *pList ){pDepList = pList;} - ByteString GetClientRestriction() { return sClientRestriction; } - void SetClientRestriction( ByteString sRestriction ) { sClientRestriction = sRestriction; } - - void AddDepth(){nDepth++;} - ULONG GetDepth(){return nDepth;} -}; /********************************************************************* * @@ -147,185 +55,4 @@ public: ByteString GetCleanedNextLine( BOOL bReadComments = FALSE ); }; -#define ENV_GUI 0x00000000 -#define ENV_OS 0x00000001 -#define ENV_UPD 0x00000002 -#define ENV_UPDMIN 0x00000004 -#define ENV_INPATH 0x00000008 -#define ENV_OUTPATH 0x00000010 -#define ENV_GUIBASE 0x00000020 -#define ENV_CVER 0x00000040 -#define ENV_GVER 0x00000080 -#define ENV_GUIENV 0x00000100 -#define ENV_CPU 0x00000200 -#define ENV_CPUNAME 0x00000400 -#define ENV_DLLSUFF 0x00000800 -#define ENV_COMEX 0x00001000 -#define ENV_COMPATH 0x00002000 -#define ENV_INCLUDE 0x00004000 -#define ENV_LIB 0x00008000 -#define ENV_PATH 0x00010000 -#define ENV_SOLVER 0x00020000 -#define ENV_SOLENV 0x00040000 -#define ENV_SOLROOT 0x00080000 -#define ENV_DEVROOT 0x00100000 -#define ENV_EMERG 0x00200000 -#define ENV_STAND 0x00400000 - -/********************************************************************* -* -* class Prj -* alle Daten eines Projektes werden hier gehalten -* -*********************************************************************/ - -DECL_DEST_LIST ( PrjList_tmp, PrjList, CommandData * ) - -class Star; -class Prj : public PrjList -{ -friend class Star; -private: - BOOL bVisited; - - ByteString aPrjPath; - ByteString aProjectName; - ByteString aProjectPrefix; // max. 2-buchstabige Abk. - SByteStringList* pPrjInitialDepList; - SByteStringList* pPrjDepList; - BOOL bHardDependencies; - BOOL bSorted; - -public: - Prj(); - Prj( ByteString aName ); - ~Prj(); - void SetPreFix( ByteString aPre ){aProjectPrefix = aPre;} - ByteString GetPreFix(){return aProjectPrefix;} - ByteString GetProjectName() - {return aProjectName;} - void SetProjectName(ByteString aName) - {aProjectName = aName;} - BOOL InsertDirectory( ByteString aDirName , USHORT aWhat, - USHORT aWhatOS, ByteString aLogFileName, - const ByteString &rClientRestriction ); - CommandData* RemoveDirectory( ByteString aLogFileName ); - CommandData* GetDirectoryList ( USHORT nWhatOs, USHORT nCommand ); - CommandData* GetDirectoryData( ByteString aLogFileName ); - inline CommandData* GetData( ByteString aLogFileName ) - { return GetDirectoryData( aLogFileName ); }; - - SByteStringList* GetDependencies( BOOL bExpanded = TRUE ); - void AddDependencies( ByteString aStr ); - void HasHardDependencies( BOOL bHard ) { bHardDependencies = bHard; } - BOOL HasHardDependencies() { return bHardDependencies; } -}; - -/********************************************************************* -* -* class Star -* Diese Klasse liest die Projectstruktur aller StarDivision Projekte -* aus \\dev\data1\upenv\data\config\solar.lst aus -* -*********************************************************************/ - -DECL_DEST_LIST ( StarList_tmp, StarList, Prj* ) -DECLARE_LIST ( SolarFileList, String* ) - -class StarFile -{ -private: - String aFileName; - Date aDate; - Time aTime; - - BOOL bExists; - -public: - StarFile( const String &rFile ); - const String &GetName() { return aFileName; } - Date GetDate() { return aDate; } - Time GetTime() { return aTime; } - - BOOL NeedsUpdate(); - BOOL Exists() { return bExists; } -}; - -DECLARE_LIST( StarFileList, StarFile * ) - -#define STAR_MODE_SINGLE_PARSE 0x0000 -#define STAR_MODE_RECURSIVE_PARSE 0x0001 -#define STAR_MODE_MULTIPLE_PARSE 0x0002 - -class Star : public StarList -{ -private: - ByteString aStarName; - - static Link aDBNotFoundHdl; -protected: - NAMESPACE_VOS( OMutex ) aMutex; - - USHORT nStarMode; - SolarFileList aFileList; - StarFileList aLoadedFilesList; - String sSourceRoot; - - void InsertSolarList( String sProject ); - String CreateFileName( String sProject ); - - void Expand_Impl(); - void ExpandPrj_Impl( Prj *pPrj, Prj *pDepPrj ); - -private: - void Read( String &rFileName ); - void Read( SolarFileList *pSOlarFiles ); - -public: - Star(); - Star( String aFileName, USHORT nMode = STAR_MODE_SINGLE_PARSE ); - Star( SolarFileList *pSolarFiles ); - Star( GenericInformationList *pStandLst, ByteString &rVersion, BOOL bLocal = FALSE, - const char *pSourceRoot = NULL ); - - ~Star(); - - static void SetDBNotFoundHdl( const Link &rLink ) { aDBNotFoundHdl = rLink; } - - ByteString GetName(){ return aStarName; }; - - BOOL HasProject( ByteString aProjectName ); - Prj* GetPrj( ByteString aProjectName ); - ByteString GetPrjName( DirEntry &rPath ); - - void InsertToken( char *pChar ); - BOOL NeedsUpdate(); - - USHORT GetMode() { return nStarMode; } -}; - -class StarWriter : public Star -{ -private: - USHORT WritePrj( Prj *pPrj, SvFileStream& rStream ); - -public: - StarWriter( String aFileName, BOOL bReadComments = FALSE, USHORT nMode = STAR_MODE_SINGLE_PARSE ); - StarWriter( SolarFileList *pSolarFiles, BOOL bReadComments = FALSE ); - StarWriter( GenericInformationList *pStandLst, ByteString &rVersion, BOOL bLocal = FALSE, - const char *pSourceRoot = NULL ); - - void CleanUp(); - - BOOL InsertProject ( Prj* pNewPrj ); - Prj* RemoveProject ( ByteString aProjectName ); - - USHORT Read( String aFileName, BOOL bReadComments = FALSE, USHORT nMode = STAR_MODE_SINGLE_PARSE ); - USHORT Read( SolarFileList *pSolarFiles, BOOL bReadComments = FALSE ); - USHORT Write( String aFileName ); - USHORT WriteMultiple( String rSourceRoot ); - - void InsertTokenLine( ByteString& rString ); -}; - #endif diff --git a/tools/inc/bootstrp/sstring.hxx b/tools/inc/bootstrp/sstring.hxx deleted file mode 100644 index 933770887e37..000000000000 --- a/tools/inc/bootstrp/sstring.hxx +++ /dev/null @@ -1,105 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SSTRING_HXX -#define _SSTRING_HXX - -#include -#include - -#define NOT_THERE LIST_ENTRY_NOTFOUND - -#define SStringList SUniStringList -#define StringList UniStringList - -DECLARE_LIST( ByteStringList, ByteString* ) -DECLARE_LIST( UniStringList, UniString* ) - -class SvStream; - -// --------------------- -// - class SStringList - -// --------------------- - -class SByteStringList : public ByteStringList -{ -public: - SByteStringList(); - ~SByteStringList(); - - // neuen ByteString in Liste einfuegen - ULONG PutString( ByteString* ); - ByteString* RemoveString( const ByteString& rName ); - - // Position des ByteString in Liste, wenn nicht enthalten, dann - // return = NOT_THERE - ULONG IsString( ByteString* ); - - // Vorgaenger ermitteln ( auch wenn selbst noch nicht in - // Liste enthalten - ULONG GetPrevString( ByteString* ); - void CleanUp(); - - SByteStringList& operator<< ( SvStream& rStream ); - SByteStringList& operator>> ( SvStream& rStream ); -}; - -// --------------------- -// - class SUniStringList - -// --------------------- - -class SUniStringList : public UniStringList -{ -public: - SUniStringList(); - ~SUniStringList(); - - // neuen UniString in Liste einfuegen - ULONG PutString( UniString* ); - UniString* RemoveString( const UniString& rName ); - - // Position des UniString in Liste, wenn nicht enthalten, dann - // return = NOT_THERE - ULONG IsString( UniString* ); - - // Vorgaenger ermitteln ( auch wenn selbst noch nicht in - // Liste enthalten - ULONG GetPrevString( UniString* ); -}; - -class Text -{ -protected: - String aString; - -public: - Text( char* pChar ); - Text( String &rStr ) { aString = rStr; } - void Stderr(); -}; - -#endif -- cgit From 839a386cb51ba43988142957c091140885a5d3f7 Mon Sep 17 00:00:00 2001 From: Malte Timmermann Date: Thu, 1 Jul 2010 09:13:15 +0200 Subject: codecleanup02: #i52551# Removed old stuff: VOS_NAMESPACE, use vos:: directly --- tools/inc/bootstrp/prj.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/inc/bootstrp') diff --git a/tools/inc/bootstrp/prj.hxx b/tools/inc/bootstrp/prj.hxx index 2d7664b8b69f..994418bae4b5 100644 --- a/tools/inc/bootstrp/prj.hxx +++ b/tools/inc/bootstrp/prj.hxx @@ -264,7 +264,7 @@ private: static Link aDBNotFoundHdl; protected: - NAMESPACE_VOS( OMutex ) aMutex; + vos:: OMutex aMutex; USHORT nStarMode; SolarFileList aFileList; -- cgit From d210c6ccc30466e98240c1409df0550514668d68 Mon Sep 17 00:00:00 2001 From: Xiaofei Zhang Date: Thu, 29 Jul 2010 10:56:19 +0800 Subject: #i112600#: clean up l10ntools, rsc, sot, svl, tools and unotools --- tools/inc/bootstrp/command.hxx | 14 ++++---- tools/inc/bootstrp/inimgr.hxx | 2 +- tools/inc/bootstrp/listmacr.hxx | 4 +-- tools/inc/bootstrp/mkcreate.hxx | 54 +++++++++++++++---------------- tools/inc/bootstrp/prj.hxx | 72 ++++++++++++++++++++--------------------- tools/inc/bootstrp/sstring.hxx | 12 +++---- 6 files changed, 79 insertions(+), 79 deletions(-) (limited to 'tools/inc/bootstrp') diff --git a/tools/inc/bootstrp/command.hxx b/tools/inc/bootstrp/command.hxx index 638beb6cce1f..50781e1679a9 100644 --- a/tools/inc/bootstrp/command.hxx +++ b/tools/inc/bootstrp/command.hxx @@ -74,12 +74,12 @@ private: char *CommandBuffer; char *ComShell; char **ppArgv; - BOOL bTmpWrite; + sal_Bool bTmpWrite; public: - CommandLine(BOOL bTmpWrite = FALSE); - CommandLine(const char *, BOOL bTmpWrite = FALSE); - CommandLine(const CommandLine&, BOOL bTmpWrite = FALSE); + CommandLine(sal_Bool bTmpWrite = sal_False); + CommandLine(const char *, sal_Bool bTmpWrite = sal_False); + CommandLine(const CommandLine&, sal_Bool bTmpWrite = sal_False); virtual ~CommandLine(); int nArgc; @@ -102,12 +102,12 @@ private: ByteString aCommand; char *pArgv; char **ppArgv; - ULONG nArgc; + sal_uIntPtr nArgc; int nError; protected: void ImplInit(); - void Initpp( ULONG nCount, ByteString &rStr ); + void Initpp( sal_uIntPtr nCount, ByteString &rStr ); public: /** Creates the process specified without spawning it @@ -146,7 +146,7 @@ public: #define COMMAND_EXECUTE_WAIT 0x0000010 #define COMMAND_EXECUTE_REMOTE 0x1000000 -typedef ULONG CommandBits; +typedef sal_uIntPtr CommandBits; /** Allowes to spawn programms hidden, waiting etc. @see CCommand diff --git a/tools/inc/bootstrp/inimgr.hxx b/tools/inc/bootstrp/inimgr.hxx index 7be00ce14d48..d72df34f19af 100644 --- a/tools/inc/bootstrp/inimgr.hxx +++ b/tools/inc/bootstrp/inimgr.hxx @@ -39,7 +39,7 @@ Source and Destination Dir is used. Otherwise ForceUpdate has to be used class IniManager { private: - BOOL bUpdate; + sal_Bool bUpdate; ByteString sGlobalDir; /// holds the org. ini dir ByteString sLocalPath; /// holds path of local ini dir diff --git a/tools/inc/bootstrp/listmacr.hxx b/tools/inc/bootstrp/listmacr.hxx index 8c678ff32275..a27f51cfdd4c 100644 --- a/tools/inc/bootstrp/listmacr.hxx +++ b/tools/inc/bootstrp/listmacr.hxx @@ -36,9 +36,9 @@ public: \ void ClearAndDelete() \ { \ while ( Count()) { \ - PointerType pTmp = GetObject(( ULONG ) 0 ); \ + PointerType pTmp = GetObject(( sal_uIntPtr ) 0 ); \ delete pTmp; \ - Remove(( ULONG ) 0 ); \ + Remove(( sal_uIntPtr ) 0 ); \ } \ } \ ~ListType() \ diff --git a/tools/inc/bootstrp/mkcreate.hxx b/tools/inc/bootstrp/mkcreate.hxx index 991b5961a096..be3183d042d0 100644 --- a/tools/inc/bootstrp/mkcreate.hxx +++ b/tools/inc/bootstrp/mkcreate.hxx @@ -44,14 +44,14 @@ class SourceDirectoryList; class CodedDependency : public ByteString { private: - USHORT nOSType; // operating systems where dependeny exists + sal_uInt16 nOSType; // operating systems where dependeny exists public: /* create a dependency instance with given coded directory name */ CodedDependency( const ByteString &rCodedIdentifier, // the coded name of the directory - USHORT nOperatingSystems // the operating systems where this dependency exists + sal_uInt16 nOperatingSystems // the operating systems where this dependency exists ) : ByteString( rCodedIdentifier ), nOSType( nOperatingSystems ) @@ -60,29 +60,29 @@ public: /* returns the operating system */ - USHORT GetOperatingSystem() + sal_uInt16 GetOperatingSystem() { return nOSType; } /* set operating system */ - void SetOperatingSystem( USHORT nOperatingSystems ) + void SetOperatingSystem( sal_uInt16 nOperatingSystems ) { nOSType = nOperatingSystems; } /* add operating systems if same dependency */ - BOOL TryToMerge( + sal_Bool TryToMerge( const ByteString &rCodedIdentifier, // the coded name of the directory - USHORT nOperatingSystems // the operating systems where this dependency exists + sal_uInt16 nOperatingSystems // the operating systems where this dependency exists ) { if ( rCodedIdentifier != *this ) - return FALSE; + return sal_False; nOSType |= nOperatingSystems; - return TRUE; + return sal_True; } }; @@ -93,14 +93,14 @@ public: class Dependency : public ByteString { private: - USHORT nOSType; // operating systems where dependecy exists + sal_uInt16 nOSType; // operating systems where dependecy exists public: /* create a dependency instance with given directory name */ Dependency( const ByteString &rDirectoryName, // the coded name of the directory - USHORT nOperatingSystems // the operating systems where this dependency exists + sal_uInt16 nOperatingSystems // the operating systems where this dependency exists ) : ByteString( rDirectoryName ), nOSType( nOperatingSystems ) @@ -109,7 +109,7 @@ public: /* returns the operating system */ - USHORT GetOperatingSystem() + sal_uInt16 GetOperatingSystem() { return nOSType; } @@ -124,8 +124,8 @@ class SourceDirectory : public ByteString private: SourceDirectory *pParent; // the parent directory SourceDirectoryList *pSubDirectories; // list of sub directories - USHORT nOSType; // operating systems where this directory is used - USHORT nDepth; // depth of directory structure (root is 0) + sal_uInt16 nOSType; // operating systems where this directory is used + sal_uInt16 nDepth; // depth of directory structure (root is 0) SByteStringList *pDependencies; // dependencies on other directories in this depth @@ -140,13 +140,13 @@ private: /* returns the operating systems of a coded dependency */ - static USHORT GetOSType( + static sal_uInt16 GetOSType( const ByteString &sDependExt // the corresponding dependency extension (see also prj.hxx) ); /* removes this and all sub directories with all dependencies */ - BOOL RemoveDirectoryTreeAndAllDependencies(); + sal_Bool RemoveDirectoryTreeAndAllDependencies(); public: @@ -155,7 +155,7 @@ public: */ SourceDirectory( const ByteString &rDirectoryName, // name without parent - USHORT nOperatingSystem, // the operating systems where this directory is used + sal_uInt16 nOperatingSystem, // the operating systems where this directory is used SourceDirectory *pParentDirectory = NULL // parent (if not root) ); ~SourceDirectory(); @@ -170,20 +170,20 @@ public: /* returns the Operating systems where this directory is used */ - USHORT GetOperatingSystems() { return nOSType; } + sal_uInt16 GetOperatingSystems() { return nOSType; } /* returns the given directory */ SourceDirectory *GetDirectory( const ByteString &rDirectoryName, // full path - USHORT nOperatingSystem // the operating systems where this directory is used + sal_uInt16 nOperatingSystem // the operating systems where this directory is used ); /* create the directory and all mandatory parents */ SourceDirectory *InsertFull( const ByteString &rDirectoryName, // full path - USHORT nOperatingSystem // the operating systems where this directory is used + sal_uInt16 nOperatingSystem // the operating systems where this directory is used ) { return GetDirectory( rDirectoryName, nOperatingSystem ); @@ -193,7 +193,7 @@ public: */ SourceDirectory *Insert( const ByteString &rDirectoryName, // name without parent - USHORT nOperatingSystem // the operating systems where this directory is used + sal_uInt16 nOperatingSystem // the operating systems where this directory is used ); /* get the root directory @@ -204,14 +204,14 @@ public: */ SourceDirectory *GetSubDirectory( const ByteString &rDirectoryPath, // full sub path - USHORT nOperatingSystem // the operating systems where this directory is used + sal_uInt16 nOperatingSystem // the operating systems where this directory is used ); /* add a dependency for several platforms */ CodedDependency *AddCodedDependency( const ByteString &rCodedIdentifier, // the coded name of the directory - USHORT nOperatingSystems // the operating systems where this dependency exists + sal_uInt16 nOperatingSystems // the operating systems where this dependency exists ); /* returns the dependency list @@ -225,7 +225,7 @@ public: */ CodedDependency *AddCodedIdentifier( const ByteString &rCodedIdentifier, // the coded name of the directory - USHORT nOperatingSystems // the operating systems where this dependency exists + sal_uInt16 nOperatingSystems // the operating systems where this dependency exists ); /* returns the identifier list @@ -252,13 +252,13 @@ public: static SourceDirectory *CreateRootDirectory( const ByteString &rRoot, // the root directory in file system const ByteString &rVersion, // the solar verion (r.g. SRC590, SRC591 etc.) - BOOL bAll = FALSE // add all directories or only buildable ones + sal_Bool bAll = sal_False // add all directories or only buildable ones ); /* create the makefile.rc in file system */ - BOOL CreateRecursiveMakefile( - BOOL bAllChilds = FALSE // create rcursive for all sub directories + sal_Bool CreateRecursiveMakefile( + sal_Bool bAllChilds = sal_False // create rcursive for all sub directories ); }; @@ -284,7 +284,7 @@ public: /* insert a new directory */ - ULONG InsertSorted( + sal_uIntPtr InsertSorted( SourceDirectory *pDirectory // directory ) { diff --git a/tools/inc/bootstrp/prj.hxx b/tools/inc/bootstrp/prj.hxx index 2d7664b8b69f..6c61492b3bb7 100644 --- a/tools/inc/bootstrp/prj.hxx +++ b/tools/inc/bootstrp/prj.hxx @@ -78,10 +78,10 @@ class CommandData ByteString aComment; ByteString sClientRestriction; SByteStringList *pDepList; - USHORT nOSType; - USHORT nCommand; + sal_uInt16 nOSType; + sal_uInt16 nCommand; - ULONG nDepth; // Tiefe der Abhaenigkeit + sal_uIntPtr nDepth; // Tiefe der Abhaenigkeit public: CommandData(); @@ -108,19 +108,19 @@ public: void SetPath( ByteString aName ){aPath = aName;} ByteString GetPrePath(){return aPrePath;} void SetPrePath( ByteString aName ){aPrePath = aName;} - USHORT GetOSType(){return nOSType;} + sal_uInt16 GetOSType(){return nOSType;} ByteString GetOSTypeString(); - void SetOSType( USHORT nType ){nOSType = nType;} - USHORT GetCommandType(){return nCommand;} + void SetOSType( sal_uInt16 nType ){nOSType = nType;} + sal_uInt16 GetCommandType(){return nCommand;} ByteString GetCommandTypeString(); - void SetCommandType( USHORT nCommandType ){nCommand = nCommandType;} + void SetCommandType( sal_uInt16 nCommandType ){nCommand = nCommandType;} SByteStringList* GetDependencies(){return pDepList;} void SetDependencies( SByteStringList *pList ){pDepList = pList;} ByteString GetClientRestriction() { return sClientRestriction; } void SetClientRestriction( ByteString sRestriction ) { sClientRestriction = sRestriction; } void AddDepth(){nDepth++;} - ULONG GetDepth(){return nDepth;} + sal_uIntPtr GetDepth(){return nDepth;} }; /********************************************************************* @@ -144,7 +144,7 @@ public: SimpleConfig(DirEntry& rDirEntry); ~SimpleConfig(); ByteString GetNext(); - ByteString GetCleanedNextLine( BOOL bReadComments = FALSE ); + ByteString GetCleanedNextLine( sal_Bool bReadComments = sal_False ); }; #define ENV_GUI 0x00000000 @@ -186,15 +186,15 @@ class Prj : public PrjList { friend class Star; private: - BOOL bVisited; + sal_Bool bVisited; ByteString aPrjPath; ByteString aProjectName; ByteString aProjectPrefix; // max. 2-buchstabige Abk. SByteStringList* pPrjInitialDepList; SByteStringList* pPrjDepList; - BOOL bHardDependencies; - BOOL bSorted; + sal_Bool bHardDependencies; + sal_Bool bSorted; public: Prj(); @@ -206,19 +206,19 @@ public: {return aProjectName;} void SetProjectName(ByteString aName) {aProjectName = aName;} - BOOL InsertDirectory( ByteString aDirName , USHORT aWhat, - USHORT aWhatOS, ByteString aLogFileName, + sal_Bool InsertDirectory( ByteString aDirName , sal_uInt16 aWhat, + sal_uInt16 aWhatOS, ByteString aLogFileName, const ByteString &rClientRestriction ); CommandData* RemoveDirectory( ByteString aLogFileName ); - CommandData* GetDirectoryList ( USHORT nWhatOs, USHORT nCommand ); + CommandData* GetDirectoryList ( sal_uInt16 nWhatOs, sal_uInt16 nCommand ); CommandData* GetDirectoryData( ByteString aLogFileName ); inline CommandData* GetData( ByteString aLogFileName ) { return GetDirectoryData( aLogFileName ); }; - SByteStringList* GetDependencies( BOOL bExpanded = TRUE ); + SByteStringList* GetDependencies( sal_Bool bExpanded = sal_True ); void AddDependencies( ByteString aStr ); - void HasHardDependencies( BOOL bHard ) { bHardDependencies = bHard; } - BOOL HasHardDependencies() { return bHardDependencies; } + void HasHardDependencies( sal_Bool bHard ) { bHardDependencies = bHard; } + sal_Bool HasHardDependencies() { return bHardDependencies; } }; /********************************************************************* @@ -239,7 +239,7 @@ private: Date aDate; Time aTime; - BOOL bExists; + sal_Bool bExists; public: StarFile( const String &rFile ); @@ -247,8 +247,8 @@ public: Date GetDate() { return aDate; } Time GetTime() { return aTime; } - BOOL NeedsUpdate(); - BOOL Exists() { return bExists; } + sal_Bool NeedsUpdate(); + sal_Bool Exists() { return bExists; } }; DECLARE_LIST( StarFileList, StarFile * ) @@ -266,7 +266,7 @@ private: protected: NAMESPACE_VOS( OMutex ) aMutex; - USHORT nStarMode; + sal_uInt16 nStarMode; SolarFileList aFileList; StarFileList aLoadedFilesList; String sSourceRoot; @@ -283,9 +283,9 @@ private: public: Star(); - Star( String aFileName, USHORT nMode = STAR_MODE_SINGLE_PARSE ); + Star( String aFileName, sal_uInt16 nMode = STAR_MODE_SINGLE_PARSE ); Star( SolarFileList *pSolarFiles ); - Star( GenericInformationList *pStandLst, ByteString &rVersion, BOOL bLocal = FALSE, + Star( GenericInformationList *pStandLst, ByteString &rVersion, sal_Bool bLocal = sal_False, const char *pSourceRoot = NULL ); ~Star(); @@ -294,36 +294,36 @@ public: ByteString GetName(){ return aStarName; }; - BOOL HasProject( ByteString aProjectName ); + sal_Bool HasProject( ByteString aProjectName ); Prj* GetPrj( ByteString aProjectName ); ByteString GetPrjName( DirEntry &rPath ); void InsertToken( char *pChar ); - BOOL NeedsUpdate(); + sal_Bool NeedsUpdate(); - USHORT GetMode() { return nStarMode; } + sal_uInt16 GetMode() { return nStarMode; } }; class StarWriter : public Star { private: - USHORT WritePrj( Prj *pPrj, SvFileStream& rStream ); + sal_uInt16 WritePrj( Prj *pPrj, SvFileStream& rStream ); public: - StarWriter( String aFileName, BOOL bReadComments = FALSE, USHORT nMode = STAR_MODE_SINGLE_PARSE ); - StarWriter( SolarFileList *pSolarFiles, BOOL bReadComments = FALSE ); - StarWriter( GenericInformationList *pStandLst, ByteString &rVersion, BOOL bLocal = FALSE, + StarWriter( String aFileName, sal_Bool bReadComments = sal_False, sal_uInt16 nMode = STAR_MODE_SINGLE_PARSE ); + StarWriter( SolarFileList *pSolarFiles, sal_Bool bReadComments = sal_False ); + StarWriter( GenericInformationList *pStandLst, ByteString &rVersion, sal_Bool bLocal = sal_False, const char *pSourceRoot = NULL ); void CleanUp(); - BOOL InsertProject ( Prj* pNewPrj ); + sal_Bool InsertProject ( Prj* pNewPrj ); Prj* RemoveProject ( ByteString aProjectName ); - USHORT Read( String aFileName, BOOL bReadComments = FALSE, USHORT nMode = STAR_MODE_SINGLE_PARSE ); - USHORT Read( SolarFileList *pSolarFiles, BOOL bReadComments = FALSE ); - USHORT Write( String aFileName ); - USHORT WriteMultiple( String rSourceRoot ); + sal_uInt16 Read( String aFileName, sal_Bool bReadComments = sal_False, sal_uInt16 nMode = STAR_MODE_SINGLE_PARSE ); + sal_uInt16 Read( SolarFileList *pSolarFiles, sal_Bool bReadComments = sal_False ); + sal_uInt16 Write( String aFileName ); + sal_uInt16 WriteMultiple( String rSourceRoot ); void InsertTokenLine( ByteString& rString ); }; diff --git a/tools/inc/bootstrp/sstring.hxx b/tools/inc/bootstrp/sstring.hxx index 933770887e37..08eb1da71a09 100644 --- a/tools/inc/bootstrp/sstring.hxx +++ b/tools/inc/bootstrp/sstring.hxx @@ -52,16 +52,16 @@ public: ~SByteStringList(); // neuen ByteString in Liste einfuegen - ULONG PutString( ByteString* ); + sal_uIntPtr PutString( ByteString* ); ByteString* RemoveString( const ByteString& rName ); // Position des ByteString in Liste, wenn nicht enthalten, dann // return = NOT_THERE - ULONG IsString( ByteString* ); + sal_uIntPtr IsString( ByteString* ); // Vorgaenger ermitteln ( auch wenn selbst noch nicht in // Liste enthalten - ULONG GetPrevString( ByteString* ); + sal_uIntPtr GetPrevString( ByteString* ); void CleanUp(); SByteStringList& operator<< ( SvStream& rStream ); @@ -79,16 +79,16 @@ public: ~SUniStringList(); // neuen UniString in Liste einfuegen - ULONG PutString( UniString* ); + sal_uIntPtr PutString( UniString* ); UniString* RemoveString( const UniString& rName ); // Position des UniString in Liste, wenn nicht enthalten, dann // return = NOT_THERE - ULONG IsString( UniString* ); + sal_uIntPtr IsString( UniString* ); // Vorgaenger ermitteln ( auch wenn selbst noch nicht in // Liste enthalten - ULONG GetPrevString( UniString* ); + sal_uIntPtr GetPrevString( UniString* ); }; class Text -- cgit From 91e34e4ccc6c61d0b64d250817af7f0d2263b89e Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 29 Oct 2010 15:36:30 +0200 Subject: CWS gnumake2: resolve conflicts and make sources buildable on Linux --- tools/inc/bootstrp/prj.hxx | 184 --------------------------------------------- 1 file changed, 184 deletions(-) (limited to 'tools/inc/bootstrp') diff --git a/tools/inc/bootstrp/prj.hxx b/tools/inc/bootstrp/prj.hxx index a6ef7338472b..4b1ff91feb7b 100644 --- a/tools/inc/bootstrp/prj.hxx +++ b/tools/inc/bootstrp/prj.hxx @@ -55,188 +55,4 @@ public: ByteString GetCleanedNextLine( BOOL bReadComments = FALSE ); }; -<<<<<<< local -======= -#define ENV_GUI 0x00000000 -#define ENV_OS 0x00000001 -#define ENV_UPD 0x00000002 -#define ENV_UPDMIN 0x00000004 -#define ENV_INPATH 0x00000008 -#define ENV_OUTPATH 0x00000010 -#define ENV_GUIBASE 0x00000020 -#define ENV_CVER 0x00000040 -#define ENV_GVER 0x00000080 -#define ENV_GUIENV 0x00000100 -#define ENV_CPU 0x00000200 -#define ENV_CPUNAME 0x00000400 -#define ENV_DLLSUFF 0x00000800 -#define ENV_COMEX 0x00001000 -#define ENV_COMPATH 0x00002000 -#define ENV_INCLUDE 0x00004000 -#define ENV_LIB 0x00008000 -#define ENV_PATH 0x00010000 -#define ENV_SOLVER 0x00020000 -#define ENV_SOLENV 0x00040000 -#define ENV_SOLROOT 0x00080000 -#define ENV_DEVROOT 0x00100000 -#define ENV_EMERG 0x00200000 -#define ENV_STAND 0x00400000 - -/********************************************************************* -* -* class Prj -* alle Daten eines Projektes werden hier gehalten -* -*********************************************************************/ - -DECL_DEST_LIST ( PrjList_tmp, PrjList, CommandData * ) - -class Star; -class Prj : public PrjList -{ -friend class Star; -private: - BOOL bVisited; - - ByteString aPrjPath; - ByteString aProjectName; - ByteString aProjectPrefix; // max. 2-buchstabige Abk. - SByteStringList* pPrjInitialDepList; - SByteStringList* pPrjDepList; - BOOL bHardDependencies; - BOOL bSorted; - -public: - Prj(); - Prj( ByteString aName ); - ~Prj(); - void SetPreFix( ByteString aPre ){aProjectPrefix = aPre;} - ByteString GetPreFix(){return aProjectPrefix;} - ByteString GetProjectName() - {return aProjectName;} - void SetProjectName(ByteString aName) - {aProjectName = aName;} - BOOL InsertDirectory( ByteString aDirName , USHORT aWhat, - USHORT aWhatOS, ByteString aLogFileName, - const ByteString &rClientRestriction ); - CommandData* RemoveDirectory( ByteString aLogFileName ); - CommandData* GetDirectoryList ( USHORT nWhatOs, USHORT nCommand ); - CommandData* GetDirectoryData( ByteString aLogFileName ); - inline CommandData* GetData( ByteString aLogFileName ) - { return GetDirectoryData( aLogFileName ); }; - - SByteStringList* GetDependencies( BOOL bExpanded = TRUE ); - void AddDependencies( ByteString aStr ); - void HasHardDependencies( BOOL bHard ) { bHardDependencies = bHard; } - BOOL HasHardDependencies() { return bHardDependencies; } -}; - -/********************************************************************* -* -* class Star -* Diese Klasse liest die Projectstruktur aller StarDivision Projekte -* aus \\dev\data1\upenv\data\config\solar.lst aus -* -*********************************************************************/ - -DECL_DEST_LIST ( StarList_tmp, StarList, Prj* ) -DECLARE_LIST ( SolarFileList, String* ) - -class StarFile -{ -private: - String aFileName; - Date aDate; - Time aTime; - - BOOL bExists; - -public: - StarFile( const String &rFile ); - const String &GetName() { return aFileName; } - Date GetDate() { return aDate; } - Time GetTime() { return aTime; } - - BOOL NeedsUpdate(); - BOOL Exists() { return bExists; } -}; - -DECLARE_LIST( StarFileList, StarFile * ) - -#define STAR_MODE_SINGLE_PARSE 0x0000 -#define STAR_MODE_RECURSIVE_PARSE 0x0001 -#define STAR_MODE_MULTIPLE_PARSE 0x0002 - -class Star : public StarList -{ -private: - ByteString aStarName; - - static Link aDBNotFoundHdl; -protected: - vos:: OMutex aMutex; - - USHORT nStarMode; - SolarFileList aFileList; - StarFileList aLoadedFilesList; - String sSourceRoot; - - void InsertSolarList( String sProject ); - String CreateFileName( String sProject ); - - void Expand_Impl(); - void ExpandPrj_Impl( Prj *pPrj, Prj *pDepPrj ); - -private: - void Read( String &rFileName ); - void Read( SolarFileList *pSOlarFiles ); - -public: - Star(); - Star( String aFileName, USHORT nMode = STAR_MODE_SINGLE_PARSE ); - Star( SolarFileList *pSolarFiles ); - Star( GenericInformationList *pStandLst, ByteString &rVersion, BOOL bLocal = FALSE, - const char *pSourceRoot = NULL ); - - ~Star(); - - static void SetDBNotFoundHdl( const Link &rLink ) { aDBNotFoundHdl = rLink; } - - ByteString GetName(){ return aStarName; }; - - BOOL HasProject( ByteString aProjectName ); - Prj* GetPrj( ByteString aProjectName ); - ByteString GetPrjName( DirEntry &rPath ); - - void InsertToken( char *pChar ); - BOOL NeedsUpdate(); - - USHORT GetMode() { return nStarMode; } -}; - -class StarWriter : public Star -{ -private: - USHORT WritePrj( Prj *pPrj, SvFileStream& rStream ); - -public: - StarWriter( String aFileName, BOOL bReadComments = FALSE, USHORT nMode = STAR_MODE_SINGLE_PARSE ); - StarWriter( SolarFileList *pSolarFiles, BOOL bReadComments = FALSE ); - StarWriter( GenericInformationList *pStandLst, ByteString &rVersion, BOOL bLocal = FALSE, - const char *pSourceRoot = NULL ); - - void CleanUp(); - - BOOL InsertProject ( Prj* pNewPrj ); - Prj* RemoveProject ( ByteString aProjectName ); - - USHORT Read( String aFileName, BOOL bReadComments = FALSE, USHORT nMode = STAR_MODE_SINGLE_PARSE ); - USHORT Read( SolarFileList *pSolarFiles, BOOL bReadComments = FALSE ); - USHORT Write( String aFileName ); - USHORT WriteMultiple( String rSourceRoot ); - - void InsertTokenLine( ByteString& rString ); -}; - ->>>>>>> other #endif -- cgit