From 3b3229401ac19120e7da8de0aea1a727ab0dc5cf Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Tue, 6 Oct 2009 08:58:50 +0000 Subject: #100000# some catch-up fixes for bserver48 --- soldep/bootstrp/makefile.mk | 10 ++-------- soldep/bootstrp/prj.cxx | 34 ++++++++++++++-------------------- soldep/inc/soldep/prj.hxx | 16 +++++++--------- soldep/inc/soldep/soldep.hxx | 1 - soldep/source/soldep.cxx | 19 ++----------------- 5 files changed, 25 insertions(+), 55 deletions(-) (limited to 'soldep') diff --git a/soldep/bootstrp/makefile.mk b/soldep/bootstrp/makefile.mk index f65a2ff88836..d38b25982b86 100644 --- a/soldep/bootstrp/makefile.mk +++ b/soldep/bootstrp/makefile.mk @@ -50,8 +50,7 @@ all: # --- Files -------------------------------------------------------- EXCEPTIONSFILES= \ - $(SLO)$/prj.obj \ - $(SLO)$/XmlBuildList.obj + $(SLO)$/prj.obj SLOFILES=\ $(SLO)$/dep.obj \ @@ -61,10 +60,6 @@ SLOFILES=\ $(SLO)$/hashtbl.obj \ $(SLO)$/prj.obj \ - -# $(SLO)$/XmlBuildList.obj - - SHL1TARGET =$(TARGET)$(DLLPOSTFIX) SHL1IMPLIB =$(TARGET) SHL1LIBS =$(SLB)$/$(TARGET).lib @@ -74,8 +69,7 @@ SHL1STDLIBS=\ $(TOOLSLIB) \ $(BTSTRPLIB) \ $(VOSLIB) \ - $(SALLIB) \ - $(PERL_LIB) + $(SALLIB) DEF1NAME =$(SHL1TARGET) DEF1DEPN =$(MISC)$/$(SHL1TARGET).flt diff --git a/soldep/bootstrp/prj.cxx b/soldep/bootstrp/prj.cxx index 14f966469e6f..f81e03c5a7a3 100644 --- a/soldep/bootstrp/prj.cxx +++ b/soldep/bootstrp/prj.cxx @@ -37,8 +37,6 @@ #include #include #include -#include -#include "XmlBuildListDef.hxx" #ifndef MACOSX #pragma hdrstop @@ -1105,46 +1103,42 @@ Prj& Prj::operator<< ( SvStream& rStream ) // /*****************************************************************************/ -Star::Star(XmlBuildList* pXmlBuildListObj) +Star::Star() /*****************************************************************************/ : pDepMode (NULL), - pAllDepMode (NULL), - mpXmlBuildList (pXmlBuildListObj) + pAllDepMode (NULL) { // this ctor is only used by StarWriter } /*****************************************************************************/ -Star::Star(XmlBuildList* pXmlBuildListObj, String aFileName, USHORT nMode ) +Star::Star(String aFileName, USHORT nMode ) /*****************************************************************************/ : nStarMode( nMode ), sFileName( aFileName ), pDepMode (NULL), - pAllDepMode (NULL), - mpXmlBuildList (pXmlBuildListObj) + pAllDepMode (NULL) { Read( aFileName ); } /*****************************************************************************/ -Star::Star(XmlBuildList* pXmlBuildListObj, SolarFileList *pSolarFiles ) +Star::Star(SolarFileList *pSolarFiles ) /*****************************************************************************/ : nStarMode( STAR_MODE_MULTIPLE_PARSE ), pDepMode (NULL), - pAllDepMode (NULL), - mpXmlBuildList (pXmlBuildListObj) + pAllDepMode (NULL) { // this ctor is used by StarBuilder to get the information for the whole workspace Read( pSolarFiles ); } /*****************************************************************************/ -Star::Star(XmlBuildList* pXmlBuildListObj, GenericInformationList *pStandLst, ByteString &rVersion, +Star::Star(GenericInformationList *pStandLst, ByteString &rVersion, BOOL bLocal, const char *pSourceRoot ) /*****************************************************************************/ : pDepMode (NULL), - pAllDepMode (NULL), - mpXmlBuildList (pXmlBuildListObj) + pAllDepMode (NULL) { UpdateFileList (pStandLst, rVersion, TRUE, bLocal, pSourceRoot); } @@ -2299,27 +2293,27 @@ Star& Star::operator<< ( SvStream& rStream ) // /*****************************************************************************/ -StarWriter::StarWriter( XmlBuildList* pXmlBuildListObj, String aFileName, BOOL bReadComments, USHORT nMode ) +StarWriter::StarWriter( String aFileName, BOOL bReadComments, USHORT nMode ) /*****************************************************************************/ - : Star (pXmlBuildListObj) + : Star () { sFileName = aFileName; Read ( aFileName, bReadComments, nMode ); } /*****************************************************************************/ -StarWriter::StarWriter( XmlBuildList* pXmlBuildListObj, SolarFileList *pSolarFiles, BOOL bReadComments ) +StarWriter::StarWriter( SolarFileList *pSolarFiles, BOOL bReadComments ) /*****************************************************************************/ - : Star (pXmlBuildListObj) + : Star () { Read( pSolarFiles, bReadComments ); } /*****************************************************************************/ -StarWriter::StarWriter( XmlBuildList* pXmlBuildListObj, GenericInformationList *pStandLst, ByteString &rVersion, +StarWriter::StarWriter( GenericInformationList *pStandLst, ByteString &rVersion, ByteString &rMinor, BOOL bReadComments, BOOL bLocal, const char *pSourceRoot ) /*****************************************************************************/ - : Star (pXmlBuildListObj) + : Star () { ByteString sPath( rVersion ); if ( pSourceRoot ) diff --git a/soldep/inc/soldep/prj.hxx b/soldep/inc/soldep/prj.hxx index 0d0e3c270997..858afac2d56a 100644 --- a/soldep/inc/soldep/prj.hxx +++ b/soldep/inc/soldep/prj.hxx @@ -58,7 +58,6 @@ class SByteStringList; class GenericInformationList; -class XmlBuildList; /* // Pfade auf Konfigurationsdateien des Build-Servers @@ -377,7 +376,6 @@ protected: String sFileName; SByteStringList* pDepMode; SByteStringList* pAllDepMode; - XmlBuildList* mpXmlBuildList; Link aFileIOErrorHdl; // called with &String as parameter!!! @@ -389,10 +387,10 @@ protected: ULONG SearchFileEntry( StarFileList *pStarFiles, StarFile* pFile ); public: - Star( XmlBuildList* pXmlBuildListObj ); - Star( XmlBuildList* pXmlBuildListObj, String aFileName, USHORT nMode = STAR_MODE_SINGLE_PARSE ); - Star( XmlBuildList* pXmlBuildListObj, SolarFileList *pSolarFiles ); - Star( XmlBuildList* pXmlBuildListObj, GenericInformationList *pStandLst, ByteString &rVersion, BOOL bLocal = FALSE, + 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(); @@ -448,9 +446,9 @@ private: USHORT WritePrj( Prj *pPrj, SvFileStream& rStream ); public: - StarWriter( XmlBuildList* pXmlBuildListObj, String aFileName, BOOL bReadComments = FALSE, USHORT nMode = STAR_MODE_SINGLE_PARSE ); - StarWriter( XmlBuildList* pXmlBuildListObj, SolarFileList *pSolarFiles, BOOL bReadComments = FALSE ); - StarWriter( XmlBuildList* pXmlBuildListObj, GenericInformationList *pStandLst, ByteString &rVersion, ByteString &rMinor, + StarWriter( String aFileName, BOOL bReadComments = FALSE, USHORT nMode = STAR_MODE_SINGLE_PARSE ); + StarWriter( SolarFileList *pSolarFiles, BOOL bReadComments = FALSE ); + StarWriter( GenericInformationList *pStandLst, ByteString &rVersion, ByteString &rMinor, BOOL bReadComments = FALSE, BOOL bLocal = FALSE, const char *pSourceRoot = NULL ); void CleanUp(); diff --git a/soldep/inc/soldep/soldep.hxx b/soldep/inc/soldep/soldep.hxx index cca9ccbc6721..8c65e9ca08eb 100644 --- a/soldep/inc/soldep/soldep.hxx +++ b/soldep/inc/soldep/soldep.hxx @@ -55,7 +55,6 @@ class SolDep : public Depper ByteString msProject; ObjectWin* mpFocusWin; BOOL mbIsHide; - XmlBuildList* mpXmlBuildList; GenericInformationList *mpStandLst; diff --git a/soldep/source/soldep.cxx b/soldep/source/soldep.cxx index aa9608c0363d..6c6abf80c33b 100644 --- a/soldep/source/soldep.cxx +++ b/soldep/source/soldep.cxx @@ -43,7 +43,6 @@ #include #include #include -//#include #include "dtsodcmp.hrc" IMPLEMENT_HASHTABLE_OWNER( SolIdMapper, ByteString, ULONG* ); @@ -67,19 +66,7 @@ SolDep::SolDep( Window* pBaseWindow ) mbBServer(FALSE), mpTravellerList( NULL ), mbIsHide( FALSE ) -// , -// mpXmlBuildList (NULL) { - /* - ByteString sModulPath ("."); // wo soll das Perlmodul stehen??? - try - { - mpXmlBuildList = new XmlBuildList (sModulPath); - } - catch (XmlBuildListException& Exception) { - const char* Message = Exception.getMessage(); - } - */ mnSolWinCount = 0; mnSolLastId = 0; // mpPrjIdMapper = new SolIdMapper( 63997 ); @@ -104,8 +91,6 @@ SolDep::~SolDep() delete mpSolIdMapper; delete mpStarWriter; delete mpStandLst; -// if (mpXmlBuildList) -// delete mpXmlBuildList; } /*****************************************************************************/ @@ -572,12 +557,12 @@ USHORT SolDep::ReadSource(BOOL bUpdater) mpSolIdMapper = new SolIdMapper( 63997 ); if (mpStandLst && bUpdater) { - mpStarWriter = new StarWriter( mpXmlBuildList, mpStandLst, msVersionMajor, msVersionMinor, TRUE ); + mpStarWriter = new StarWriter( mpStandLst, msVersionMajor, msVersionMinor, TRUE ); } else { SolarFileList* pSolarFileList; pSolarFileList = GetPrjListFromDir(); - mpStarWriter = new StarWriter( mpXmlBuildList, pSolarFileList, TRUE ); + mpStarWriter = new StarWriter( pSolarFileList, TRUE ); } ByteString sTitle( SOLDEPL_NAME ); if ( mpStarWriter->GetMode() == STAR_MODE_SINGLE_PARSE ) { -- cgit