Commits

Anonymous committed 5ba7469

CWS-TOOLING: integrate CWS bserver48
2009-09-24 19:44:37 +0200 kz r276428 : #160697# use source_config

  • Participants
  • Parent commits 3d82efe

Comments (0)

Files changed (2)

soldep/bootstrp/prj.cxx

 									aEntry += DirEntry( ssAddPath );
 								}
 							}
+							sPath = rVersion;
+							sPath += "/settings/SHORTPATH";
+							GenericInformation *pShortPath = pStandLst->GetInfo( sPath, TRUE );
+							BOOL bShortPath = FALSE;
+							if (pShortPath && (pShortPath->GetValue() == "_TRUE"))
+								bShortPath = TRUE;
 							sSourceRoot = aEntry.GetFull();
 							GenericInformationList *pProjects = pProjectsKey->GetSubList();
 							if ( pProjects ) {
 									GenericInformation * pDir = pProject->GetSubInfo (aDirStr);
 									if (pDir) {
 										ByteString aDir = pDir->GetValue();
-										DirEntry aRootEntry = aEntry.GetPath() + DirEntry(aDir);
+										DirEntry aRootEntry;
+										if (bShortPath)
+											aRootEntry = aEntry + DirEntry(aDir);
+										else
+											aRootEntry = aEntry.GetPath() + DirEntry(aDir);
 										sLocalSourceRoot = aRootEntry.GetFull();
 									}
 
 }
 
 /*****************************************************************************/
+void Star::FullReload( GenericInformationList *pStandLst, ByteString &rVersion,
+	BOOL bRead, BOOL bLocal, const char *pSourceRoot )
+/*****************************************************************************/
+{
+	ClearAvailableDeps();
+	ClearCurrentDeps();
+	ClearLoadedFilesList();
+	RemoveAllPrj();
+	UpdateFileList( pStandLst, rVersion, bRead, bLocal, pSourceRoot );
+}
+
+/*****************************************************************************/
 BOOL Star::CheckFileLoadList(SolarFileList *pSolarFiles)
 /*****************************************************************************/
 {
 									aEntry += DirEntry( ssAddPath );
 								}
 							}
+							sPath = rVersion;
+							sPath += "/settings/SHORTPATH";
+							GenericInformation *pShortPath = pStandLst->GetInfo( sPath, TRUE );
+							BOOL bShortPath = FALSE;
+							if (pShortPath && (pShortPath->GetValue() == "_TRUE"))
+								bShortPath = TRUE;
 							sSourceRoot = aEntry.GetFull();
 							GenericInformationList *pProjects = pProjectsKey->GetSubList();
 							if ( pProjects ) {
 									GenericInformation * pDir = pProject->GetSubInfo (aDirStr);
 									if (pDir) {
 										ByteString aDir = pDir->GetValue();
-										aPrjEntry = aEntry.GetPath() + DirEntry(aDir);
+										if (bShortPath)
+											aPrjEntry = aEntry;
+										else
+											aPrjEntry = aEntry.GetPath();
+										aPrjEntry += DirEntry(aDir);
 									}
 
 									aPrjEntry += DirEntry( ssProject );

soldep/inc/soldep/prj.hxx

 	void			ReplaceFileEntry( StarFileList *pStarFiles, StarFile* pFile );
 	void			UpdateFileList( GenericInformationList *pStandLst, ByteString &rVersion, BOOL bRead = FALSE,
 						BOOL bLocal = FALSE, const char *pSourceRoot = NULL  );
+	void			FullReload( GenericInformationList *pStandLst, ByteString &rVersion, BOOL bRead = FALSE,
+						BOOL bLocal = FALSE, const char *pSourceRoot = NULL  );
 	void			GenerateFileLoadList( SolarFileList *pSolarFiles );
 	BOOL			CheckFileLoadList(SolarFileList *pSolarFiles);