Fix home path environment variable in Eclipse project on Windows // R…

…esolve #270
platformio · Aug 20, 2015 · 1b41ffb · 1b41ffb
1 parent 3393d81
commit 1b41ffb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/platformio/ide/projectgenerator.py b/platformio/ide/projectgenerator.py
@@ -115,5 +115,6 @@ def _gather_tplvars(self):
                         if build_data and "defines" in build_data else []),
             "srcfiles": self.get_srcfiles(),
             "user_home_dir": abspath(expanduser("~")),
-            "project_dir": self.project_dir
+            "project_dir": self.project_dir,
+            "systype": util.get_systype()
         })
diff --git a/platformio/ide/tpls/eclipse/.cproject.tpl b/platformio/ide/tpls/eclipse/.cproject.tpl
@@ -25,7 +25,11 @@
 								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.239157887" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
 									% for include in includes:
                                     % if include.startswith(user_home_dir):
+                                    % if "windows" in systype:
+									<listOptionValue builtIn="false" value="${USERPROFILE}{{include.replace(user_home_dir, '')}}"/>
+									% else:
 									<listOptionValue builtIn="false" value="${HOME}{{include.replace(user_home_dir, '')}}"/>
+									% end
                                     % else:
 									<listOptionValue builtIn="false" value="{{include}}"/>
 									% end
@@ -42,7 +46,11 @@
 								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.1096940598" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
 									% for include in includes:
                                     % if include.startswith(user_home_dir):
+                                    % if "windows" in systype:
+									<listOptionValue builtIn="false" value="${USERPROFILE}{{include.replace(user_home_dir, '')}}"/>
+									% else:
 									<listOptionValue builtIn="false" value="${HOME}{{include.replace(user_home_dir, '')}}"/>
+                                    % end
                                     % else:
 									<listOptionValue builtIn="false" value="{{include}}"/>
 									% end
@@ -59,7 +67,11 @@
 								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.41298875" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
 									% for include in includes:
                                     % if include.startswith(user_home_dir):
+                                    % if "windows" in systype:
+									<listOptionValue builtIn="false" value="${USERPROFILE}{{include.replace(user_home_dir, '')}}"/>
+									% else:
 									<listOptionValue builtIn="false" value="${HOME}{{include.replace(user_home_dir, '')}}"/>
+                                    % end
                                     % else:
 									<listOptionValue builtIn="false" value="{{include}}"/>
 									% end