Merge pull request #10016 from keymanapp/fix/developer/project-intern…

…al-paths

fix(developer): projects 2.0 internal path enumeration 🦕

common/windows/delphi/general/utildir.pas

@@ -45,13 +45,19 @@ function KGetTempPath: string;
 
 function GetLongFileName(const fname: string): string;
 
+function DosSlashes(const filename: string): string;
+
 implementation
 
 uses
+  System.StrUtils,
   System.SysUtils,
   Winapi.Windows;
 
-
+function DosSlashes(const filename: string): string;
+begin
+  Result := ReplaceStr(filename, '/', '\');
+end;
 
 function DirectoryEmpty(dir: WideString): Boolean;
 var

developer/src/tike/project/Keyman.Developer.System.Project.ProjectFile.pas

@@ -134,8 +134,8 @@   TProjectOptions = class
   ProjectType: ptKeyboard;
   Version: pv10
 ), ( // 2.0
-  BuildPath: '$PROJECTPATH/build';
-  SourcePath: '$PROJECTPATH/source';
+  BuildPath: '$PROJECTPATH\build';
+  SourcePath: '$PROJECTPATH\source';
   CompilerWarningsAsErrors: False;
   WarnDeprecatedCode: True;
   CheckFilenameConventions: False;
@@ -621,8 +621,8 @@ function TProjectFile.IsSourceFile: Boolean;
     Exit(True);
 
   // Only return true if the file is directly in the ProjectOptions.SourcePath folder
-  SourcePath := ReplaceStr(IncludeTrailingPathDelimiter(FProject.ResolveProjectPath(FProject.Options.SourcePath)), '/', '\');
-  FilePath := ReplaceStr(ExtractFilePath(FFileName), '/', '\');
+  SourcePath := DosSlashes(FProject.ResolveProjectPath(FProject.Options.SourcePath));
+  FilePath := DosSlashes(ExtractFilePath(FFileName));
   Result := SameFileName(SourcePath, FilePath);
 end;
 
@@ -662,7 +662,7 @@ procedure TProjectFile.Save(node: IXMLNode);   // I4698
 begin
   node.AddChild('ID').NodeValue := FID;
   node.AddChild('Filename').NodeValue := ExtractFileName(FFileName);
-  node.AddChild('Filepath').NodeValue := ExtractRelativePath(FProject.FileName, FFileName);
+  node.AddChild('Filepath').NodeValue := ExtractRelativePath(FProject.FileName, DosSlashes(FFileName));
   node.AddChild('FileVersion').NodeValue := FFileVersion;   // I4701
 
   // Note: FileType is only ever written in Delphi code; it is used by xsl
@@ -978,18 +978,21 @@ function TProject.IsDefaultProject(Version: TProjectVersion): Boolean;
 ///
 function TProject.PopulateFiles: Boolean;
 var
-  ProjectPath: string;
+  SourcePath, ProjectPath: string;
 begin
   if FOptions.Version <> pv20 then
     raise EProjectLoader.Create('PopulateFiles can only be called on a v2.0 project');
 
   FFiles.Clear;
 
-  ProjectPath := ExtractFilePath(FileName);
+  ProjectPath := ExpandFileName(ExtractFilePath(FileName));
   if not DirectoryExists(ProjectPath) then
     Exit(False);
 
   PopulateFolder(ProjectPath);
+  SourcePath := ResolveProjectPath(FOptions.SourcePath);
+  if not SameFileName(ProjectPath, SourcePath) and DirectoryExists(SourcePath) then
+    PopulateFolder(SourcePath);
 
   Result := True;
 end;
@@ -999,7 +1002,7 @@ procedure TProject.PopulateFolder(const path: string);
   ff: string;
   f: TSearchRec;
 begin
-  if FindFirst(path + '*', faDirectory, f) = 0 then
+  if FindFirst(path + '*', 0, f) = 0 then
   begin
     repeat
       ff := path + f.Name;
@@ -1009,12 +1012,6 @@ procedure TProject.PopulateFolder(const path: string);
         Continue;
       end;
 
-      if (f.Attr and faDirectory) = faDirectory then
-      begin
-        PopulateFolder(ff + '\');
-        Continue;
-      end;
-
       CreateProjectFile(Self, ff, nil);
     until FindNext(f) <> 0;
     System.SysUtils.FindClose(f);
@@ -1231,7 +1228,7 @@ function TProject.GetUserFileName: string;
 
 function TProject.ResolveProjectPath(APath: string): string;
 begin
-  Result := ReplaceText(APath, '$PROJECTPATH', ExtractFileDir(ExpandFileName(FFileName)));
+  Result := IncludeTrailingPathDelimiter(ReplaceText(APath, '$PROJECTPATH', ExtractFileDir(ExpandFileName(FFileName))));
 end;
 
 function TProject.GetTargetFilename10(ATargetFile, ASourceFile, AVersion: string): string;   // I4688
@@ -1256,7 +1253,6 @@ function TProject.GetTargetFilename20(ATargetFile, ASourceFile, AVersion: string
     Exit(ExtractFilePath(ExpandFileName(ASourceFile)) + ExtractFileName(ATargetFile));
   end;
 
-  Result := IncludeTrailingPathDelimiter(Result);
   Result := ResolveProjectPath(Result);
   Result := Result + ExtractFileName(ATargetFile);
 end;

developer/src/tike/project/Keyman.Developer.System.Project.ProjectLoader.pas

@@ -66,6 +66,7 @@ implementation
   Keyman.Developer.System.Project.ProjectFiles,
   Keyman.Developer.System.Project.ProjectFileType,
 
+  utildir,
   utilfiletypes;
 
 { TProjectLoader }
@@ -131,10 +132,10 @@ procedure TProjectLoader.LoadProjectFromFile;
     FProject.Options.Assign(DefaultProjectOptions[FProject.Options.Version]);
 
     if not VarIsNull(node.ChildValues['BuildPath']) then
-      FProject.Options.BuildPath := VarToStr(node.ChildValues['BuildPath']);
+      FProject.Options.BuildPath := DosSlashes(VarToStr(node.ChildValues['BuildPath']));
 
     if not VarIsNull(node.ChildValues['SourcePath']) then
-      FProject.Options.SourcePath := VarToStr(node.ChildValues['SourcePath']);
+      FProject.Options.SourcePath := DosSlashes(VarToStr(node.ChildValues['SourcePath']));
 
     if not VarIsNull(node.ChildValues['CompilerWarningsAsErrors']) then
       FProject.Options.CompilerWarningsAsErrors := node.ChildValues['CompilerWarningsAsErrors'];

developer/src/tike/project/Keyman.Developer.UI.Project.UfrmProjectSettings20.pas

@@ -1,22 +1,22 @@
 (*
   Name:             Keyman.Developer.UI.Project.UfrmProjectSettings
   Copyright:        Copyright (C) SIL International.
-  Documentation:    
-  Description:      
+  Documentation:
+  Description:
   Create Date:      4 May 2015
 
   Modified Date:    24 Aug 2015
   Authors:          mcdurdin
-  Related Files:    
-  Dependencies:     
+  Related Files:
+  Dependencies:
 
-  Bugs:             
-  Todo:             
-  Notes:            
+  Bugs:
+  Todo:
+  Notes:
   History:          04 May 2015 - mcdurdin - I4688 - V9.0 - Add build path to project settings
                     24 Aug 2015 - mcdurdin - I4865 - Add treat hints and warnings as errors into project
                     24 Aug 2015 - mcdurdin - I4866 - Add warn on deprecated features to project and compile
-                    
+
 *)
 unit Keyman.Developer.UI.Project.UfrmProjectSettings20;   // I4688
 
@@ -54,12 +54,13 @@ implementation
 {$R *.dfm}
 
 uses
-  Keyman.Developer.System.Project.Project;
+  Keyman.Developer.System.Project.Project,
+  utildir;
 
 procedure TfrmProjectSettings20.cmdOKClick(Sender: TObject);
 begin
-  FGlobalProject.Options.BuildPath := Trim(editOutputPath.Text);
-  FGlobalProject.Options.SourcePath := Trim(editSourcePath.Text);
+  FGlobalProject.Options.BuildPath := Trim(DosSlashes(editOutputPath.Text));
+  FGlobalProject.Options.SourcePath := Trim(DosSlashes(editSourcePath.Text));
   FGlobalProject.Options.SkipMetadataFiles := not chkBuildMetadataFiles.Checked;
   FGlobalProject.Options.CompilerWarningsAsErrors := chkCompilerWarningsAsErrors.Checked;   // I4865
   FGlobalProject.Options.WarnDeprecatedCode := chkWarnDeprecatedCode.Checked;   // I4866

developer/src/tike/xml/project/distribution.xsl

@@ -83,6 +83,7 @@
             <xsl:call-template name="file">
               <xsl:with-param name="file_description"></xsl:with-param>
               <xsl:with-param name="file_has_details">false</xsl:with-param>
+              <xsl:with-param name="file_relative_path">true</xsl:with-param>
             </xsl:call-template>
           </xsl:for-each>
         </div>

developer/src/tike/xml/project/elements.xsl

@@ -76,6 +76,7 @@
     <xsl:param name="file_description" />
     <xsl:param name="file_has_details" />
     <xsl:param name="file_has_no_options" />
+    <xsl:param name="file_relative_path" />
 
     <span tabindex="1" class="file" onmousedown="javascript:this.focus();">
       <xsl:attribute name="id">file<xsl:value-of select="ID"/></xsl:attribute>
@@ -103,7 +104,10 @@
       <div class="filename">
         <a tabindex="-1">
           <xsl:attribute name="href">keyman:editfile?id=<xsl:value-of select="ID"/></xsl:attribute>
-          <xsl:value-of select="Filename" />
+          <xsl:choose>
+            <xsl:when test="$file_relative_path = 'true'"><xsl:value-of select="Filepath" /></xsl:when>
+            <xsl:otherwise><xsl:value-of select="Filename" /></xsl:otherwise>
+          </xsl:choose>
         </a>
       </div>
       <div class="filedescription"><xsl:value-of select="$file_description"/></div>