[JVCL-Checkins] CVS: dev/JVCL3/devtools/PackagesGenerator GenerateUtils.pas,1.14,1.15 - Correctly ensures that the path separator stored i

[Olivier S. <ob...@us...>]

Update of /cvsroot/jvcl/dev/JVCL3/devtools/PackagesGenerator
In directory sc8-pr-cvs1:/tmp/cvs-serv14921/dev/JVCL3/devtools/PackagesGenerator

Modified Files:
	GenerateUtils.pas 
Log Message:
Correctly ensures that the path separator stored in the xml file is replaced by the one valid for the target being generated

Index: GenerateUtils.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/devtools/PackagesGenerator/GenerateUtils.pas,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** GenerateUtils.pas	22 Nov 2003 12:34:23 -0000	1.14
--- GenerateUtils.pas	22 Nov 2003 13:00:54 -0000	1.15
***************
*** 237,241 ****
  end;
  
! procedure ApplyFormName(fileNode : TJvSimpleXmlElem; var Lines : string);
  var
    formName : string;
--- 237,256 ----
  end;
  
! procedure EnsureProperSeparator(var Name : string; target : string);
! begin
!   // ensure that the path separator stored in the xml file is
!   // replaced by the one for the system we are targeting
! 
!   target := StrLower(target);
! 
!   // first ensure we only have backslashes
!   StrReplace(Name, '/', '\', [rfReplaceAll]);
! 
!   // and if the target is kylix, replace all them by forward slashes
!   if target[1] = 'k' then
!     StrReplace(Name, '\', '/', [rfReplaceAll]);
! end;
! 
! procedure ApplyFormName(fileNode : TJvSimpleXmlElem; var Lines : string; target : string);
  var
    formName : string;
***************
*** 245,256 ****
    openPos : Integer;
    closePos : Integer;
  begin
    formNameAndType := fileNode.Properties.ItemNamed['FormName'].Value;
    incFileName := fileNode.Properties.ItemNamed['Name'].Value;
  
!   // ensure that the path separator stored in the xml file is
!   // replaced by the one for the system we are running on
!   StrReplace(incFileName, '/', '\', [rfReplaceAll]);
!   StrReplace(incFileName, '\', PathSeparator, [rfReplaceAll]);
  
    if Pos(':', formNameAndType) = 0 then
--- 260,276 ----
    openPos : Integer;
    closePos : Integer;
+   unitname : string;
+   punitname : string;
+   formpathname : string;
  begin
    formNameAndType := fileNode.Properties.ItemNamed['FormName'].Value;
    incFileName := fileNode.Properties.ItemNamed['Name'].Value;
  
!   unitname := GetUnitName(incFileName);
!   punitname := StrProper(unitname);
!   formpathname := StrEnsureSuffix(PathSeparator, ExtractFilePath(incFileName))+GetUnitName(incFileName);
! 
!   EnsureProperSeparator(formpathname, target);
!   EnsureProperSeparator(incfilename, target);
  
    if Pos(':', formNameAndType) = 0 then
***************
*** 266,273 ****
  
    StrReplace(Lines, '%FILENAME%', incFileName, [rfReplaceAll]);
!   StrReplace(Lines, '%UNITNAME%', GetUnitName(incFileName), [rfReplaceAll]);
!   StrReplace(Lines, '%Unitname%',
!              StrProper(GetUnitName(incFileName)),
!              [rfReplaceAll]);
  
    if (formType = '') or (formName = '') then
--- 286,291 ----
  
    StrReplace(Lines, '%FILENAME%', incFileName, [rfReplaceAll]);
!   StrReplace(Lines, '%UNITNAME%', unitname, [rfReplaceAll]);
!   StrReplace(Lines, '%Unitname%', punitname, [rfReplaceAll]);
  
    if (formType = '') or (formName = '') then
***************
*** 299,305 ****
      StrReplace(Lines, '%FORMTYPE%', formType, [rfReplaceAll]);
      StrReplace(Lines, '%FORMNAMEANDTYPE%', formNameAndType, [rfReplaceAll]);
!     StrReplace(Lines, '%FORMPATHNAME%',
!                StrEnsureSuffix(PathSeparator, ExtractFilePath(incFileName))+GetUnitName(incFileName),
!                [rfReplaceAll]);
    end;
  end;
--- 317,321 ----
      StrReplace(Lines, '%FORMTYPE%', formType, [rfReplaceAll]);
      StrReplace(Lines, '%FORMNAMEANDTYPE%', formNameAndType, [rfReplaceAll]);
!     StrReplace(Lines, '%FORMPATHNAME%', formpathname, [rfReplaceAll]);
    end;
  end;
***************
*** 511,515 ****
                tmpStr := repeatLines;
                incFileName := fileNode.Properties.ItemNamed['Name'].Value;
!               ApplyFormName(fileNode, tmpStr);
                containsSomething := True;
                outFile.Text := outFile.Text +
--- 527,531 ----
                tmpStr := repeatLines;
                incFileName := fileNode.Properties.ItemNamed['Name'].Value;
!               ApplyFormName(fileNode, tmpStr, target);
                containsSomething := True;
                outFile.Text := outFile.Text +
***************
*** 555,559 ****
                begin
                  tmpStr := repeatLines;
!                 ApplyFormName(fileNode, tmpStr);
                  outFile.Text := outFile.Text + tmpStr;
                end;
--- 571,575 ----
                begin
                  tmpStr := repeatLines;
!                 ApplyFormName(fileNode, tmpStr, target);
                  outFile.Text := outFile.Text + tmpStr;
                end;