Commits

Anonymous committed d0058b5

#100000# some catch-up fixes for bserver48

Comments (0)

Files changed (5)

soldep/bootstrp/makefile.mk

 # --- Files --------------------------------------------------------
 
 EXCEPTIONSFILES= \
-		  $(SLO)$/prj.obj	\
-		  $(SLO)$/XmlBuildList.obj
+		  $(SLO)$/prj.obj	
 
 SLOFILES=\
 		  $(SLO)$/dep.obj \
  		  $(SLO)$/hashtbl.obj		\
 		  $(SLO)$/prj.obj \
 
-		  
-#          $(SLO)$/XmlBuildList.obj
-
-
 SHL1TARGET	=$(TARGET)$(DLLPOSTFIX)
 SHL1IMPLIB	=$(TARGET)
 SHL1LIBS	=$(SLB)$/$(TARGET).lib
 			$(TOOLSLIB) \
 			$(BTSTRPLIB)		\
 			$(VOSLIB)			\
-			$(SALLIB)   \
-       		$(PERL_LIB)
+			$(SALLIB)
 
 DEF1NAME    =$(SHL1TARGET)
 DEF1DEPN	=$(MISC)$/$(SHL1TARGET).flt

soldep/bootstrp/prj.cxx

 #include <tools/geninfo.hxx>
 #include <soldep/prj.hxx>
 #include <bootstrp/inimgr.hxx>
-#include <soldep/XmlBuildList.hxx>
-#include "XmlBuildListDef.hxx"
 
 #ifndef MACOSX
 #pragma hdrstop
 //
 
 /*****************************************************************************/
-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);
 }
 //
 
 /*****************************************************************************/
-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 )

soldep/inc/soldep/prj.hxx

 
 class SByteStringList;
 class GenericInformationList;
-class XmlBuildList;
 
 /*
 // Pfade auf Konfigurationsdateien des Build-Servers
 	String 			sFileName;
 	SByteStringList* pDepMode;
 	SByteStringList* pAllDepMode;
-	XmlBuildList*	mpXmlBuildList;
 
 	Link aFileIOErrorHdl; // called with &String as parameter!!!
 
 	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();
 	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();

soldep/inc/soldep/soldep.hxx

 	ByteString  msProject;
 	ObjectWin*	mpFocusWin;
     BOOL        mbIsHide;
-	XmlBuildList*   mpXmlBuildList;
 
 	GenericInformationList *mpStandLst;
 

soldep/source/soldep.cxx

 #include <soldep/depper.hxx>
 #include <soldep/soldep.hxx>
 #include <soldep/soldlg.hxx>
-//#include <soldep/XmlBuildList.hxx>
 #include "dtsodcmp.hrc"
 
 IMPLEMENT_HASHTABLE_OWNER( SolIdMapper, ByteString, ULONG* );
                 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 );
 	delete mpSolIdMapper;
 	delete mpStarWriter;
 	delete mpStandLst;
-//	if (mpXmlBuildList)
-//		delete mpXmlBuildList;
 }
 
 /*****************************************************************************/
     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 ) {
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.