MWS_SRX644: migrate branch mws_srx644 -> HEAD

9 files changed, 63 insertions, 170 deletions

diff --git a/tools/bootstrp/addexes/makefile.mk b/tools/bootstrp/addexes/makefile.mk
index 982c8f0d183b..a9da7f6439ab 100644
--- a/tools/bootstrp/addexes/makefile.mk
+++ b/tools/bootstrp/addexes/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.5 $
+#   $Revision: 1.6 $
 #
-#   last change: $Author: vg $ $Date: 2001-12-21 15:43:24 $
+#   last change: $Author: hr $ $Date: 2003-03-27 17:03:18 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -122,6 +122,7 @@ APP6STDLIBS=\
     $(SALLIB)
 
 #APP7TARGET= replace
+APP7TARGET= txtrepl
 APP7OBJS= $(OBJ)$/replace.obj
 APP7STDLIBS=$(STATIC_LIBS)
 APP7DEPN=   $(LB)$/atools.lib 
diff --git a/tools/bootstrp/addexes/replace.cxx b/tools/bootstrp/addexes/replace.cxx
index 3c2eb23f7f60..147ca1d1b260 100644
--- a/tools/bootstrp/addexes/replace.cxx
+++ b/tools/bootstrp/addexes/replace.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: replace.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: hjs $ $Date: 2000-12-18 13:13:20 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 17:03:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -99,7 +99,7 @@ int _cdecl main( int argc, char *argv[] )
     {
         aText.Replace( nIndex, aSearch.Len(), aReplace.GetBuffer());
         aUpperText.Replace( nIndex, aSearch.Len(), aReplace.GetBuffer());
-        nIndex = aUpperText.Search( aSearch.GetBuffer(), 0);
+        nIndex = aUpperText.Search( aSearch.GetBuffer(), nIndex + aReplace.Len());
     }
 
     fprintf( stdout, "%s\n", aText.GetBuffer());
diff --git a/tools/bootstrp/addexes2/mkfilt.cxx b/tools/bootstrp/addexes2/mkfilt.cxx
index 1feccb2576f0..58e589925edd 100644
--- a/tools/bootstrp/addexes2/mkfilt.cxx
+++ b/tools/bootstrp/addexes2/mkfilt.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: mkfilt.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: hjs $ $Date: 2002-04-05 12:26:58 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 17:03:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -241,9 +241,7 @@ void MkFilter::Filter()
                 {
                     MkLine *pMkLine = pLine->pPrivateTnrLst->GetObject(i);
                     ByteString aLine = pMkLine->aLine;
-//                  maybe once used to filter comments??? trailing ';'
-//                  makes it useless.
-//                  if ( pMkLine->bOut );
+                    if ( pMkLine->bOut );
                     {
                         while( aLine.SearchAndReplace( aTnr, ByteString::CreateFromInt32( n )) != (USHORT)-1 );
                         fputs( aLine.GetBuffer(), pOut );
diff --git a/tools/bootstrp/command.cxx b/tools/bootstrp/command.cxx
index 2069b92a8c7a..0e58ffbc144b 100644
--- a/tools/bootstrp/command.cxx
+++ b/tools/bootstrp/command.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: command.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: mh $ $Date: 2001-10-17 10:02:07 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 17:02:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
diff --git a/tools/bootstrp/cppdep.cxx b/tools/bootstrp/cppdep.cxx
index 35003bd0aec7..242a91e93386 100644
--- a/tools/bootstrp/cppdep.cxx
+++ b/tools/bootstrp/cppdep.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cppdep.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: hjs $ $Date: 2001-06-13 13:43:51 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 17:02:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -191,23 +191,25 @@ BOOL CppDep::Search( ByteString aFileName )
 
 ByteString CppDep::Exists( ByteString aFileName )
 {
+    char pFullName[1023];
+    ByteString aString;
+
 #ifdef DEBUG_VERBOSE
-            fprintf( stderr, "Searching %s \n", aFileName.GetBuffer() );
+    fprintf( stderr, "Searching %s \n", aFileName.GetBuffer() );
 #endif
-    ByteString aString;
+
     ULONG nCount = pSearchPath->Count();
     for ( ULONG n=0; n<nCount; n++)
     {
         struct stat aBuf;
         ByteString *pPathName = pSearchPath->GetObject(n);
 
-        char *pFullName = new char[1023];
         strcpy( pFullName, pPathName->GetBuffer());
         strcat( pFullName, DIR_SEP );
         strcat( pFullName, aFileName.GetBuffer());
 
 #ifdef DEBUG_VERBOSE
-            fprintf( stderr, "looking for %s\t ", pFullName );
+        fprintf( stderr, "looking for %s\t ", pFullName );
 #endif
         if ( stat( pFullName, &aBuf ) == 0 )
         {
@@ -220,7 +222,6 @@ ByteString CppDep::Exists( ByteString aFileName )
 
             return ByteString(pFullName);
         }
-        delete pFullName;
     }
     return aString;
 }
diff --git a/tools/bootstrp/inimgr.cxx b/tools/bootstrp/inimgr.cxx
index 61523dcd9434..8e8d792da117 100644
--- a/tools/bootstrp/inimgr.cxx
+++ b/tools/bootstrp/inimgr.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: inimgr.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: nf $ $Date: 2002-01-24 14:16:43 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 17:03:00 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -154,7 +154,6 @@ ByteString IniManager::ToLocal( ByteString &rPath )
 #endif
 #else
     sTmp.SearchAndReplace( sGlobalDir, sLocalPath );
-    sTmp.SearchAndReplace( sGlobalDir, _INIROOT );
 
     ByteString sOldGlobalDir( GetIniRootOld() );
     sTmp.SearchAndReplace( sOldGlobalDir, sLocalPath );
@@ -195,7 +194,7 @@ ByteString IniManager::GetLocalIni()
 ByteString IniManager::GetGlobalIni()
 /****************************************************************************/
 {
-    ByteString sGlobalPath = ByteString( getenv( "GLOBALINI" ));
+    ByteString sGlobalPath = ByteString( GetEnv( "GLOBALINI" ));
 
     if ( !sGlobalPath.Len())
         sGlobalPath = ByteString( _INIROOT );
diff --git a/tools/bootstrp/makefile.mk b/tools/bootstrp/makefile.mk
index aa0037be2376..79cd8ac43718 100644
--- a/tools/bootstrp/makefile.mk
+++ b/tools/bootstrp/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.14 $
+#   $Revision: 1.15 $
 #
-#   last change: $Author: nf $ $Date: 2002-01-30 13:09:20 $
+#   last change: $Author: hr $ $Date: 2003-03-27 17:03:01 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -83,35 +83,21 @@ dummy:
     @echo No bootstrp for Mac OS
 .ELSE	# "$(OS)"=="MACOS"
 
-OBJFILES=                       \
-    $(OBJ)$/sstring.obj     \
-    $(OBJ)$/appdef.obj      \
-    $(OBJ)$/cppdep.obj      \
-    $(OBJ)$/command.obj     \
-    $(OBJ)$/prj.obj         \
-    $(OBJ)$/inimgr.obj      \
-    $(OBJ)$/revision.obj    \
-    $(OBJ)$/shellprp.obj 	\
-    $(OBJ)$/fattr.obj 		\
-    $(OBJ)$/minormk.obj 	\
-    $(OBJ)$/prodmap.obj 	\
-    $(OBJ)$/xmlparse.obj 	\
-    $(OBJ)$/mkcreate.obj
-
-SLOFILES=                   \
-    $(SLO)$/sstring.obj     \
-    $(SLO)$/appdef.obj      \
-    $(SLO)$/cppdep.obj      \
-    $(SLO)$/command.obj     \
-    $(SLO)$/prj.obj         \
-    $(SLO)$/inimgr.obj      \
-    $(SLO)$/revision.obj    \
-    $(SLO)$/shellprp.obj 	\
-    $(SLO)$/fattr.obj 		\
-    $(SLO)$/minormk.obj 	\
-    $(SLO)$/prodmap.obj 	\
-    $(SLO)$/xmlparse.obj 	\
-    $(SLO)$/mkcreate.obj
+OBJFILES=                       $(OBJ)$/cppdep.obj\
+                                $(OBJ)$/prj.obj \
+                                $(OBJ)$/command.obj \
+                                $(OBJ)$/mkcreate.obj \
+                                $(OBJ)$/sstring.obj \
+                                $(OBJ)$/inimgr.obj\
+                                $(OBJ)$/appdef.obj
+
+SLOFILES=                   $(SLO)$/cppdep.obj\
+                            $(SLO)$/prj.obj\
+                            $(SLO)$/command.obj\
+                            $(SLO)$/mkcreate.obj\
+                            $(SLO)$/sstring.obj\
+                            $(SLO)$/inimgr.obj\
+                            $(SLO)$/appdef.obj
 
 LIB1TARGET= $(LB)$/btstrp.lib
 LIB1ARCHIV= $(LB)$/libbtstrp.a
@@ -121,11 +107,6 @@ LIB2TARGET= $(SLB)$/btstrpsh.lib
 LIB2ARCHIV= $(SLB)$/libbtstrpsh.a
 LIB2FILES=  $(SLB)$/bootstrp.lib
 
-LIB3TARGET=$(LB)$/bsvermap.lib
-LIB3ARCHIV= $(LB)$/libbsvermap.a
-LIB3OBJFILES=\
-    $(OBJ)$/vermap.obj
-
 APP1TARGET=     i_server
 APP1STACK=      16000
 APP1OBJS=   $(OBJ)$/iserver.obj
@@ -133,36 +114,6 @@ APP1STDLIBS=$(STATIC_LIBS)
 APP1LIBS=       $(LB)$/bootstrp.lib
 APP1DEPN=   $(LB)$/atools.lib $(LB)$/bootstrp.lib
 
-#APP2TARGET=     copyprj
-#APP2OBJS=   $(OBJ)$/cprjexe.obj $(OBJ)$/copyprj.obj
-#APP2STDLIBS=$(STATIC_LIBS)
-#APP2LIBS=       $(LB)$/bootstrp.lib
-#APP2DEPN=   $(LB)$/atools.lib $(LB)$/bootstrp.lib
-
-#APP3TARGET=mkcreate
-#APP3OBJS=   $(OBJ)$/mkcrexe.obj 
-#APP3STDLIBS=$(STATIC_LIBS)
-#APP3LIBS=   $(LB)$/bootstrp.lib
-#APP3DEPN=   $(LB)$/atools.lib $(LB)$/bootstrp.lib
-
-#APP4TARGET=	setsolar
-#APP4OBJS=   $(OBJ)$/setsolar.obj $(OBJ)$/envset.obj $(OBJ)$/vermap.obj
-#APP4STDLIBS=$(STATIC_LIBS)
-#APP4LIBS=	$(LB)$/bootstrp.lib
-#APP4DEPN=   $(LB)$/atools.lib $(LB)$/bootstrp.lib
-
-#APP5TARGET=	zipdep
-#APP5OBJS=	$(OBJ)$/zipdep.obj
-#APP5LIBS=	$(LB)$/bootstrp.lib
-#APP5STDLIBS=$(STATIC_LIBS) 
-#APP5DEPN=   $(LB)$/atools.lib $(LB)$/bootstrp.lib $(OBJ)$/zipdep.obj
-
-#APP5TARGET=	saxophon
-#APP5OBJS=	$(OBJ)$/xmlparse.obj
-#APP5LIBS=	$(LB)$/bootstrp.lib
-#APP5STDLIBS=$(STATIC_LIBS) 
-#APP5DEPN=   $(LB)$/atools.lib $(LB)$/bootstrp.lib $(OBJ)$/zipdep.obj
-
 APP6TARGET= sspretty
 APP6OBJS=	$(OBJ)$/sspretty.obj
 APP6LIBS=	$(LB)$/bootstrp.lib
@@ -175,13 +126,7 @@ APP7LIBS=	$(LB)$/bootstrp.lib
 APP7STDLIBS=$(STATIC_LIBS) 
 APP7DEPN=   $(LB)$/atools.lib $(LB)$/bootstrp.lib $(OBJ)$/rscdep.obj
 
-#APP8TARGET=	getsolar
-#APP8OBJS=   $(OBJ)$/getsolar.obj 
-#APP8STDLIBS=$(STATIC_LIBS)
-#APP8LIBS=	$(LB)$/bootstrp.lib
-#APP8DEPN=   $(LB)$/atools.lib $(LB)$/bootstrp.lib
-
-DEPOBJFILES		=	$(APP1OBJS) $(APP2OBJS) $(APP3OBJS) $(APP4OBJS) $(APP5OBJS) $(APP6OBJS) $(APP7OBJS) $(APP8OBJS)
+DEPOBJFILES		=	$(APP1OBJS) $(APP2OBJS) $(APP3OBJS) $(APP4OBJS) $(APP5OBJS) $(APP6OBJS) 
 
 .ENDIF	# "$(OS)"=="MACOS"
 
diff --git a/tools/bootstrp/mkcreate.cxx b/tools/bootstrp/mkcreate.cxx
index 9261cf84d87f..c4d0d1aaa9e3 100644
--- a/tools/bootstrp/mkcreate.cxx
+++ b/tools/bootstrp/mkcreate.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: mkcreate.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: nf $ $Date: 2001-06-12 10:39:45 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 17:03:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -801,9 +801,9 @@ BOOL SourceDirectory::CreateRecursiveMakefile( BOOL bAllChilds )
         "#\n"
         "#   $RCSfile: mkcreate.cxx,v $\n"
         "#\n"
-        "#   $Revision: 1.10 $\n"
+        "#   $Revision: 1.11 $\n"
         "#\n"
-        "#   last change: $Author: nf $ $Date: 2001-06-12 10:39:45 $\n"
+        "#   last change: $Author: hr $ $Date: 2003-03-27 17:03:02 $\n"
         "#\n"
         "#   The Contents of this file are made available subject to the terms of\n"
         "#   either of the following licenses\n"
diff --git a/tools/bootstrp/prj.cxx b/tools/bootstrp/prj.cxx
index 517b1910fc90..cfda4c2441ae 100644
--- a/tools/bootstrp/prj.cxx
+++ b/tools/bootstrp/prj.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: prj.cxx,v $
  *
- *  $Revision: 1.19 $
+ *  $Revision: 1.20 $
  *
- *  last change: $Author: nf $ $Date: 2001-11-05 12:23:48 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 17:03:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -100,6 +100,8 @@
 #endif
 #endif
 
+Link Star::aDBNotFoundHdl;
+
 //
 //  class SimpleConfig
 //
@@ -350,7 +352,6 @@ Prj::Prj() :
     pPrjInitialDepList(0),
     bSorted( FALSE ),
     bHardDependencies( FALSE ),
-    bFixedDependencies( FALSE ),
     bVisited( FALSE )
 /*****************************************************************************/
 {
@@ -363,7 +364,6 @@ Prj::Prj( ByteString aName ) :
     pPrjInitialDepList(0),
     bSorted( FALSE ),
     bHardDependencies( FALSE ),
-    bFixedDependencies( FALSE ),
     bVisited( FALSE )
 /*****************************************************************************/
 {
@@ -501,8 +501,7 @@ Star::Star()
 /*****************************************************************************/
 Star::Star(String aFileName, USHORT nMode )
 /*****************************************************************************/
-                : nStarMode( nMode ),
-                sFileName( aFileName )
+                : nStarMode( nMode )
 {
     Read( aFileName );
 }
@@ -522,8 +521,9 @@ Star::Star( GenericInformationList *pStandLst, ByteString &rVersion,
 /*****************************************************************************/
 {
     ByteString sPath( rVersion );
+    String sSrcRoot;
     if ( pSourceRoot )
-        sSourceRoot = String::CreateFromAscii( pSourceRoot );
+        sSrcRoot = String::CreateFromAscii( pSourceRoot );
 
 #ifdef UNX
     sPath += "/settings/UNXSOLARLIST";
@@ -556,8 +556,8 @@ Star::Star( GenericInformationList *pStandLst, ByteString &rVersion,
                 if ( pDrive ) {
                     DirEntry aEntry;
                     BOOL bOk = FALSE;
-                    if ( sSourceRoot.Len()) {
-                        aEntry = DirEntry( sSourceRoot );
+                    if ( sSrcRoot.Len()) {
+                        aEntry = DirEntry( sSrcRoot );
                         bOk = TRUE;
                     }
                     else {
@@ -580,7 +580,7 @@ Star::Star( GenericInformationList *pStandLst, ByteString &rVersion,
                         sPath = "projects";
                         GenericInformation *pProjectsKey = pDrive->GetSubInfo( sPath, TRUE );
                         if ( pProjectsKey ) {
-                            if ( !sSourceRoot.Len()) {
+                            if ( !sSrcRoot.Len()) {
                                 sPath = rVersion;
                                 sPath += "/settings/PATH";
                                 GenericInformation *pPath = pStandLst->GetInfo( sPath, TRUE );
@@ -595,7 +595,6 @@ Star::Star( GenericInformationList *pStandLst, ByteString &rVersion,
                                     aEntry += DirEntry( ssAddPath );
                                 }
                             }
-                            sSourceRoot = aEntry.GetFull();
                             GenericInformationList *pProjects = pProjectsKey->GetSubList();
                             if ( pProjects ) {
                                 String sPrjDir( String::CreateFromAscii( "prj" ));
@@ -792,7 +791,6 @@ void Star::InsertToken ( char *yytext )
         sClientRestriction, aLogFileName, aProjectName, aPrefix, aCommandPara;
     static BOOL bPrjDep = FALSE;
     static BOOL bHardDep = FALSE;
-    static BOOL bFixedDep = FALSE;
     static int nCommandType, nOSType;
     CommandData* pCmdData;
     static SByteStringList *pStaticDepList;
@@ -812,28 +810,18 @@ void Star::InsertToken ( char *yytext )
                 {
                     bPrjDep = TRUE;
                     bHardDep = FALSE;
-                    bFixedDep = FALSE;
                     i = 9;
                 }
                 else if ( !strcmp( yytext, "::" ))
                 {
                     bPrjDep = TRUE;
                     bHardDep = TRUE;
-                    bFixedDep = FALSE;
-                    i = 9;
-                }
-                else if ( !strcmp( yytext, ":::" ))
-                {
-                    bPrjDep = TRUE;
-                    bHardDep = TRUE;
-                    bFixedDep = TRUE;
                     i = 9;
                 }
                 else
                 {
                     bPrjDep = FALSE;
                     bHardDep = FALSE;
-                    bFixedDep = FALSE;
 
                     aWhat = yytext;
                     if ( aWhat == "nmake" )
@@ -933,7 +921,6 @@ void Star::InsertToken ( char *yytext )
                         }
                         pPrj->AddDependencies( aItem );
                         pPrj->HasHardDependencies( bHardDep );
-                        pPrj->HasFixedDependencies( bFixedDep );
 
                         if ( nStarMode == STAR_MODE_RECURSIVE_PARSE ) {
                             String sItem( aItem, RTL_TEXTENCODING_ASCII_US );
@@ -1050,7 +1037,6 @@ ByteString Star::GetPrjName( DirEntry &aPath )
 StarWriter::StarWriter( String aFileName, BOOL bReadComments, USHORT nMode )
 /*****************************************************************************/
 {
-    sFileName = aFileName;
     Read ( aFileName, bReadComments, nMode );
 }
 
@@ -1063,12 +1049,13 @@ StarWriter::StarWriter( SolarFileList *pSolarFiles, BOOL bReadComments )
 
 /*****************************************************************************/
 StarWriter::StarWriter( GenericInformationList *pStandLst, ByteString &rVersion,
-    BOOL bReadComments, BOOL bLocal, const char *pSourceRoot )
+    BOOL bLocal, const char *pSourceRoot )
 /*****************************************************************************/
 {
     ByteString sPath( rVersion );
+    String sSrcRoot;
     if ( pSourceRoot )
-        sSourceRoot = String::CreateFromAscii( pSourceRoot );
+        sSrcRoot = String::CreateFromAscii( pSourceRoot );
 
 #ifdef UNX
     sPath += "/settings/UNXSOLARLIST";
@@ -1085,7 +1072,7 @@ StarWriter::StarWriter( GenericInformationList *pStandLst, ByteString &rVersion,
         }
         String sFileName( sFile, RTL_TEXTENCODING_ASCII_US );
         nStarMode = STAR_MODE_SINGLE_PARSE;
-        Read( sFileName, bReadComments );
+        Read( sFileName );
     }
     else {
         SolarFileList *pFileList = new SolarFileList();
@@ -1101,8 +1088,8 @@ StarWriter::StarWriter( GenericInformationList *pStandLst, ByteString &rVersion,
                 if ( pDrive ) {
                     DirEntry aEntry;
                     BOOL bOk = FALSE;
-                    if ( sSourceRoot.Len()) {
-                        aEntry = DirEntry( sSourceRoot );
+                    if ( sSrcRoot.Len()) {
+                        aEntry = DirEntry( sSrcRoot );
                         bOk = TRUE;
                     }
                     else {
@@ -1125,7 +1112,7 @@ StarWriter::StarWriter( GenericInformationList *pStandLst, ByteString &rVersion,
                         sPath = "projects";
                         GenericInformation *pProjectsKey = pDrive->GetSubInfo( sPath, TRUE );
                         if ( pProjectsKey ) {
-                            if ( !sSourceRoot.Len()) {
+                            if ( !sSrcRoot.Len()) {
                                 sPath = rVersion;
                                 sPath += "/settings/PATH";
                                 GenericInformation *pPath = pStandLst->GetInfo( sPath, TRUE );
@@ -1140,7 +1127,6 @@ StarWriter::StarWriter( GenericInformationList *pStandLst, ByteString &rVersion,
                                     aEntry += DirEntry( ssAddPath );
                                 }
                             }
-                            sSourceRoot = aEntry.GetFull();
                             GenericInformationList *pProjects = pProjectsKey->GetSubList();
                             if ( pProjects ) {
                                 String sPrjDir( String::CreateFromAscii( "prj" ));
@@ -1167,7 +1153,7 @@ StarWriter::StarWriter( GenericInformationList *pStandLst, ByteString &rVersion,
                 }
             }
         }
-        Read( pFileList, bReadComments );
+        Read( pFileList );
     }
 }
 
@@ -1182,8 +1168,6 @@ void StarWriter::CleanUp()
 USHORT StarWriter::Read( String aFileName, BOOL bReadComments, USHORT nMode  )
 /*****************************************************************************/
 {
-    sFileName = aFileName;
-
     nStarMode = nMode;
 
     ByteString aString;
@@ -1265,9 +1249,7 @@ USHORT StarWriter::WritePrj( Prj *pPrj, SvFileStream& rStream )
             aDataString += aTab;
             aDataString += pPrj->GetProjectName();
             aDataString += aTab;
-            if ( pPrj->HasFixedDependencies())
-                aDataString+= ByteString(":::");
-            else if ( pPrj->HasHardDependencies())
+            if ( pPrj->HasHardDependencies())
                 aDataString+= ByteString("::");
             else
                 aDataString+= ByteString(":");
@@ -1339,19 +1321,9 @@ USHORT StarWriter::WritePrj( Prj *pPrj, SvFileStream& rStream )
 USHORT StarWriter::Write( String aFileName )
 /*****************************************************************************/
 {
-    sFileName = aFileName;
-
-    FileStat::SetReadOnlyFlag( DirEntry( aFileName ), FALSE );
-
     SvFileStream aFileStream;
 
     aFileStream.Open( aFileName, STREAM_WRITE | STREAM_TRUNC);
-    if ( !aFileStream.IsOpen() && aFileIOErrorHdl.IsSet()) {
-        String sError( String::CreateFromAscii( "Error: Unable to open \"" ));
-        sError += aFileName;
-        sError += String::CreateFromAscii( "for writing!" );
-        aFileIOErrorHdl.Call( &sError );
-    }
 
     if ( Count() > 0 )
     {
@@ -1372,8 +1344,6 @@ USHORT StarWriter::Write( String aFileName )
 USHORT StarWriter::WriteMultiple( String rSourceRoot )
 /*****************************************************************************/
 {
-    sSourceRoot = rSourceRoot;
-
     if ( Count() > 0 )
     {
         String sPrjDir( String::CreateFromAscii( "prj" ));
@@ -1389,18 +1359,9 @@ USHORT StarWriter::WriteMultiple( String rSourceRoot )
             aEntry += DirEntry( sPrjDir );
             aEntry += DirEntry( sSolarFile );
 
-            FileStat::SetReadOnlyFlag( aEntry, FALSE );
-
             SvFileStream aFileStream;
             aFileStream.Open( aEntry.GetFull(), STREAM_WRITE | STREAM_TRUNC);
 
-            if ( !aFileStream.IsOpen() && aFileIOErrorHdl.IsSet()) {
-                String sError( String::CreateFromAscii( "Error: Unable to open \"" ));
-                sError += aEntry.GetFull();
-                sError += String::CreateFromAscii( "for writing!" );
-                aFileIOErrorHdl.Call( &sError );
-            }
-
               WritePrj( pPrj, aFileStream );
 
             aFileStream.Close();
@@ -1422,7 +1383,6 @@ void StarWriter::InsertTokenLine ( ByteString& rString )
     static  ByteString aDirName;
     BOOL bPrjDep = FALSE;
     BOOL bHardDep = FALSE;
-    BOOL bFixedDep = FALSE;
     int nCommandType, nOSType;
     CommandData* pCmdData;
     SByteStringList *pDepList2 = NULL;
@@ -1459,28 +1419,18 @@ void StarWriter::InsertTokenLine ( ByteString& rString )
                     {
                         bPrjDep = TRUE;
                         bHardDep = FALSE;
-                        bFixedDep = FALSE;
                         i = 9;
                     }
                     else if ( !strcmp( yytext, "::" ))
                     {
                         bPrjDep = TRUE;
                         bHardDep = TRUE;
-                        bFixedDep = FALSE;
-                        i = 9;
-                    }
-                    else if ( !strcmp( yytext, ":::" ))
-                    {
-                        bPrjDep = TRUE;
-                        bHardDep = TRUE;
-                        bFixedDep = TRUE;
                         i = 9;
                     }
                     else
                     {
                         bPrjDep = FALSE;
                         bHardDep = FALSE;
-                        bFixedDep = FALSE;
 
                         aWhat = yytext;
                         if ( aWhat == "nmake" )
@@ -1581,7 +1531,6 @@ void StarWriter::InsertTokenLine ( ByteString& rString )
                             }
                             pPrj->AddDependencies( aItem );
                             pPrj->HasHardDependencies( bHardDep );
-                            pPrj->HasFixedDependencies( bFixedDep );
 
                             if ( nStarMode == STAR_MODE_RECURSIVE_PARSE ) {
                                 String sItem( aItem, RTL_TEXTENCODING_ASCII_US );