Kaydet (Commit) 8e0bc401 authored tarafından Kurt Zenker's avatar Kurt Zenker

#158443# use module name as prefix to get an uniqe alias

üst 3ea95386
...@@ -1639,7 +1639,8 @@ void Star::InsertToken ( char *yytext ) ...@@ -1639,7 +1639,8 @@ void Star::InsertToken ( char *yytext )
pStaticDepList = 0; pStaticDepList = 0;
break; break;
case 1: case 1:
aDirName = yytext; aDirName = yytext;
aProjectName = aDirName.GetToken ( 0, 0x5c);
break; break;
case 2: case 2:
if ( !strcmp( yytext, ":" )) if ( !strcmp( yytext, ":" ))
...@@ -1674,7 +1675,6 @@ void Star::InsertToken ( char *yytext ) ...@@ -1674,7 +1675,6 @@ void Star::InsertToken ( char *yytext )
} }
if (bPrjDep) if (bPrjDep)
{ {
aProjectName = aDirName.GetToken ( 0, 0x5c);
if ( HasProject( aProjectName )) if ( HasProject( aProjectName ))
{ {
RemovePrj(GetPrj(aProjectName)); RemovePrj(GetPrj(aProjectName));
...@@ -1708,7 +1708,7 @@ void Star::InsertToken ( char *yytext ) ...@@ -1708,7 +1708,7 @@ void Star::InsertToken ( char *yytext )
case 5: case 5:
if ( !bPrjDep ) if ( !bPrjDep )
{ {
aLogFileName = yytext; aLogFileName = (ByteString(aProjectName).Append("_")).Append(yytext);
} }
break; break;
default: default:
...@@ -1725,7 +1725,8 @@ void Star::InsertToken ( char *yytext ) ...@@ -1725,7 +1725,8 @@ void Star::InsertToken ( char *yytext )
// ggfs. Dependency liste anlegen und ergaenzen // ggfs. Dependency liste anlegen und ergaenzen
if ( !pStaticDepList ) if ( !pStaticDepList )
pStaticDepList = new SByteStringList; pStaticDepList = new SByteStringList;
pStaticDepList->PutString( new ByteString( aItem )); ByteString* pStr = new ByteString ((ByteString (aProjectName).Append("_")).Append(aItem));
pStaticDepList->PutString( pStr );
} }
} }
else else
...@@ -1748,7 +1749,6 @@ void Star::InsertToken ( char *yytext ) ...@@ -1748,7 +1749,6 @@ void Star::InsertToken ( char *yytext )
bHasModes = TRUE; bHasModes = TRUE;
} }
aProjectName = aDirName.GetToken ( 0, 0x5c);
if ( HasProject( aProjectName )) if ( HasProject( aProjectName ))
{ {
pPrj = GetPrj( aProjectName ); pPrj = GetPrj( aProjectName );
...@@ -1782,7 +1782,6 @@ void Star::InsertToken ( char *yytext ) ...@@ -1782,7 +1782,6 @@ void Star::InsertToken ( char *yytext )
der Solar-Projekte einfuegen */ der Solar-Projekte einfuegen */
if ( i == -1 ) if ( i == -1 )
{ {
aProjectName = aDirName.GetToken ( 0, 0x5c);
if ( HasProject( aProjectName )) if ( HasProject( aProjectName ))
{ {
pPrj = GetPrj( aProjectName ); pPrj = GetPrj( aProjectName );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment