Fix translation to Windows paths; CodeLite expects Unix path separators.

premake · Apr 15, 2016 · 138ba6c · 138ba6c
1 parent bb078ad
commit 138ba6c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/codelite_workspace.lua b/codelite_workspace.lua
@@ -42,7 +42,7 @@
 
 				-- Build a relative path from the workspace file to the project file
 				local prjpath = p.filename(prj, ".project")
-				prjpath = path.translate(path.getrelative(prj.workspace.location, prjpath))
+				prjpath = path.getrelative(prj.workspace.location, prjpath)
 
 				local active  = iif(prj.name == wks.startproject, ' Active="Yes"', '')
 				_x(1, '<Project Name="%s" Path="%s"%s/>', prj.name, prjpath, active)

diff --git a/tests/test_codelite_workspace.lua b/tests/test_codelite_workspace.lua
@@ -98,7 +98,7 @@
 		test.capture([[
 <?xml version="1.0" encoding="UTF-8"?>
 <CodeLite_Workspace Name="MyWorkspace" Database="" SWTLW="No">
-  <Project Name="MyProject" Path="]] .. path.translate("MyProject\\MyProject.project") .. [["/>
+  <Project Name="MyProject" Path="]] .. path.translate("MyProject/MyProject.project") .. [["/>
   <BuildMatrix>
     <WorkspaceConfiguration Name="Debug" Selected="yes">
       <Project Name="MyProject" ConfigName="Debug"/>
@@ -117,7 +117,7 @@
 		test.capture([[
 <?xml version="1.0" encoding="UTF-8"?>
 <CodeLite_Workspace Name="MyWorkspace" Database="" SWTLW="No">
-  <Project Name="MyProject" Path="]] .. path.translate("..\\MyProject\\MyProject.project") .. [["/>
+  <Project Name="MyProject" Path="]] .. path.translate("../MyProject/MyProject.project") .. [["/>
   <BuildMatrix>
     <WorkspaceConfiguration Name="Debug" Selected="yes">
       <Project Name="MyProject" ConfigName="Debug"/>