* Optimized project integration templates to address the issue of lon…

…g paths on Windows // Resolve #4652
platformio · Jun 8, 2023 · 355f5af · 355f5af
1 parent 2b36c70
commit 355f5af
Show file tree

Hide file tree

Showing 40 changed files with 7 additions and 6 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -19,6 +19,7 @@ PlatformIO Core 6
 ~~~~~~~~~~~~~~~~~~
 
 * Enhanced the parsing of the |PIOCONF| to provide comprehensive diagnostic information
+* Optimized project integration templates to address the issue of long paths on Windows (`issue #4652 <https://github.com/platformio/platformio-core/issues/4652>`_)
 
 6.1.7 (2023-05-08)
 ~~~~~~~~~~~~~~~~~~

diff --git a/platformio/project/integration/generator.py b/platformio/project/integration/generator.py
@@ -52,7 +52,7 @@ def get_best_envname(self, boards=None):
 
     @staticmethod
     def get_ide_tpls_dir():
-        return os.path.join(fs.get_assets_dir(), "templates", "ide-projects")
+        return os.path.join(os.path.dirname(__file__), "tpls")
 
     @classmethod
     def get_supported_ides(cls):

diff --git a/...tes/ide-projects/atom/.clang_complete.tpl → ...integration/tpls/atom/.clang_complete.tpl b/...tes/ide-projects/atom/.clang_complete.tpl → ...integration/tpls/atom/.clang_complete.tpl
diff --git a/...tes/ide-projects/atom/.gcc-flags.json.tpl → ...integration/tpls/atom/.gcc-flags.json.tpl b/...tes/ide-projects/atom/.gcc-flags.json.tpl → ...integration/tpls/atom/.gcc-flags.json.tpl
diff --git a/...emplates/ide-projects/atom/.gitignore.tpl → ...ject/integration/tpls/atom/.gitignore.tpl b/...emplates/ide-projects/atom/.gitignore.tpl → ...ject/integration/tpls/atom/.gitignore.tpl
diff --git a/...mplates/ide-projects/clion/.gitignore.tpl → ...ect/integration/tpls/clion/.gitignore.tpl b/...mplates/ide-projects/clion/.gitignore.tpl → ...ect/integration/tpls/clion/.gitignore.tpl
diff --git a/...tes/ide-projects/clion/CMakeLists.txt.tpl → ...integration/tpls/clion/CMakeLists.txt.tpl b/...tes/ide-projects/clion/CMakeLists.txt.tpl → ...integration/tpls/clion/CMakeLists.txt.tpl
diff --git a/...-projects/clion/CMakeListsPrivate.txt.tpl → ...tion/tpls/clion/CMakeListsPrivate.txt.tpl b/...-projects/clion/CMakeListsPrivate.txt.tpl → ...tion/tpls/clion/CMakeListsPrivate.txt.tpl
diff --git a/...de-projects/codeblocks/platformio.cbp.tpl → ...ration/tpls/codeblocks/platformio.cbp.tpl b/...de-projects/codeblocks/platformio.cbp.tpl → ...ration/tpls/codeblocks/platformio.cbp.tpl
diff --git a/...plates/ide-projects/eclipse/.cproject.tpl → ...ct/integration/tpls/eclipse/.cproject.tpl b/...plates/ide-projects/eclipse/.cproject.tpl → ...ct/integration/tpls/eclipse/.cproject.tpl
diff --git a/...mplates/ide-projects/eclipse/.project.tpl → ...ect/integration/tpls/eclipse/.project.tpl b/...mplates/ide-projects/eclipse/.project.tpl → ...ect/integration/tpls/eclipse/.project.tpl
diff --git a/.../.settings/PlatformIO Debugger.launch.tpl → .../.settings/PlatformIO Debugger.launch.tpl b/.../.settings/PlatformIO Debugger.launch.tpl → .../.settings/PlatformIO Debugger.launch.tpl
diff --git a/...lipse/.settings/language.settings.xml.tpl → ...lipse/.settings/language.settings.xml.tpl b/...lipse/.settings/language.settings.xml.tpl → ...lipse/.settings/language.settings.xml.tpl
diff --git a/.../.settings/org.eclipse.cdt.core.prefs.tpl → .../.settings/org.eclipse.cdt.core.prefs.tpl b/.../.settings/org.eclipse.cdt.core.prefs.tpl → .../.settings/org.eclipse.cdt.core.prefs.tpl
diff --git a/...ts/templates/ide-projects/emacs/.ccls.tpl → .../project/integration/tpls/emacs/.ccls.tpl b/...ts/templates/ide-projects/emacs/.ccls.tpl → .../project/integration/tpls/emacs/.ccls.tpl
diff --git a/...mplates/ide-projects/emacs/.gitignore.tpl → ...ect/integration/tpls/emacs/.gitignore.tpl b/...mplates/ide-projects/emacs/.gitignore.tpl → ...ect/integration/tpls/emacs/.gitignore.tpl
diff --git a/...netbeans/nbproject/configurations.xml.tpl → ...netbeans/nbproject/configurations.xml.tpl b/...netbeans/nbproject/configurations.xml.tpl → ...netbeans/nbproject/configurations.xml.tpl
diff --git a/.../nbproject/private/configurations.xml.tpl → .../nbproject/private/configurations.xml.tpl b/.../nbproject/private/configurations.xml.tpl → .../nbproject/private/configurations.xml.tpl
diff --git a/...nbproject/private/launcher.properties.tpl → ...nbproject/private/launcher.properties.tpl b/...nbproject/private/launcher.properties.tpl → ...nbproject/private/launcher.properties.tpl
diff --git a/...etbeans/nbproject/private/private.xml.tpl → ...etbeans/nbproject/private/private.xml.tpl b/...etbeans/nbproject/private/private.xml.tpl → ...etbeans/nbproject/private/private.xml.tpl
diff --git a/...ojects/netbeans/nbproject/project.xml.tpl → ...n/tpls/netbeans/nbproject/project.xml.tpl b/...ojects/netbeans/nbproject/project.xml.tpl → ...n/tpls/netbeans/nbproject/project.xml.tpl
diff --git a/...tes/ide-projects/qtcreator/.gitignore.tpl → ...integration/tpls/qtcreator/.gitignore.tpl b/...tes/ide-projects/qtcreator/.gitignore.tpl → ...integration/tpls/qtcreator/.gitignore.tpl
diff --git a/...lates/ide-projects/qtcreator/Makefile.tpl → ...t/integration/tpls/qtcreator/Makefile.tpl b/...lates/ide-projects/qtcreator/Makefile.tpl → ...t/integration/tpls/qtcreator/Makefile.tpl
diff --git a/...-projects/qtcreator/platformio.cflags.tpl → ...tion/tpls/qtcreator/platformio.cflags.tpl b/...-projects/qtcreator/platformio.cflags.tpl → ...tion/tpls/qtcreator/platformio.cflags.tpl
diff --git a/...-projects/qtcreator/platformio.config.tpl → ...tion/tpls/qtcreator/platformio.config.tpl b/...-projects/qtcreator/platformio.config.tpl → ...tion/tpls/qtcreator/platformio.config.tpl
diff --git a/...projects/qtcreator/platformio.creator.tpl → ...ion/tpls/qtcreator/platformio.creator.tpl b/...projects/qtcreator/platformio.creator.tpl → ...ion/tpls/qtcreator/platformio.creator.tpl
diff --git a/...rojects/qtcreator/platformio.cxxflags.tpl → ...on/tpls/qtcreator/platformio.cxxflags.tpl b/...rojects/qtcreator/platformio.cxxflags.tpl → ...on/tpls/qtcreator/platformio.cxxflags.tpl
diff --git a/...e-projects/qtcreator/platformio.files.tpl → ...ation/tpls/qtcreator/platformio.files.tpl b/...e-projects/qtcreator/platformio.files.tpl → ...ation/tpls/qtcreator/platformio.files.tpl
diff --git a/...rojects/qtcreator/platformio.includes.tpl → ...on/tpls/qtcreator/platformio.includes.tpl b/...rojects/qtcreator/platformio.includes.tpl → ...on/tpls/qtcreator/platformio.includes.tpl
diff --git a/...plates/ide-projects/sublimetext/.ccls.tpl → ...ct/integration/tpls/sublimetext/.ccls.tpl b/...plates/ide-projects/sublimetext/.ccls.tpl → ...ct/integration/tpls/sublimetext/.ccls.tpl
diff --git a/...ublimetext/platformio.sublime-project.tpl → ...ublimetext/platformio.sublime-project.tpl b/...ublimetext/platformio.sublime-project.tpl → ...ublimetext/platformio.sublime-project.tpl
diff --git a/...sets/templates/ide-projects/vim/.ccls.tpl → ...io/project/integration/tpls/vim/.ccls.tpl b/...sets/templates/ide-projects/vim/.ccls.tpl → ...io/project/integration/tpls/vim/.ccls.tpl
diff --git a/...templates/ide-projects/vim/.gitignore.tpl → ...oject/integration/tpls/vim/.gitignore.tpl b/...templates/ide-projects/vim/.gitignore.tpl → ...oject/integration/tpls/vim/.gitignore.tpl
diff --git a/...sualstudio/platformio.vcxproj.filters.tpl → ...sualstudio/platformio.vcxproj.filters.tpl b/...sualstudio/platformio.vcxproj.filters.tpl → ...sualstudio/platformio.vcxproj.filters.tpl
diff --git a/...jects/visualstudio/platformio.vcxproj.tpl → .../tpls/visualstudio/platformio.vcxproj.tpl b/...jects/visualstudio/platformio.vcxproj.tpl → .../tpls/visualstudio/platformio.vcxproj.tpl
diff --git a/...plates/ide-projects/vscode/.gitignore.tpl → ...ct/integration/tpls/vscode/.gitignore.tpl b/...plates/ide-projects/vscode/.gitignore.tpl → ...ct/integration/tpls/vscode/.gitignore.tpl
diff --git a/.../vscode/.vscode/c_cpp_properties.json.tpl → .../vscode/.vscode/c_cpp_properties.json.tpl b/.../vscode/.vscode/c_cpp_properties.json.tpl → .../vscode/.vscode/c_cpp_properties.json.tpl
diff --git a/...ojects/vscode/.vscode/extensions.json.tpl → ...n/tpls/vscode/.vscode/extensions.json.tpl b/...ojects/vscode/.vscode/extensions.json.tpl → ...n/tpls/vscode/.vscode/extensions.json.tpl
diff --git a/...e-projects/vscode/.vscode/launch.json.tpl → ...ation/tpls/vscode/.vscode/launch.json.tpl b/...e-projects/vscode/.vscode/launch.json.tpl → ...ation/tpls/vscode/.vscode/launch.json.tpl
diff --git a/setup.py b/setup.py
@@ -65,11 +65,11 @@
     package_data={
         "platformio": [
             "assets/system/99-platformio-udev.rules",
-            "assets/templates/ide-projects/*/*.tpl",
-            "assets/templates/ide-projects/*/.*.tpl",  # include hidden files
-            "assets/templates/ide-projects/*/.*/*.tpl",  # include hidden folders
-            "assets/templates/ide-projects/*/*/*.tpl",  # NetBeans
-            "assets/templates/ide-projects/*/*/*/*.tpl", # NetBeans
+            "project/integration/tpls/*/*.tpl",
+            "project/integration/tpls/*/.*.tpl",  # include hidden files
+            "project/integration/tpls/*/.*/*.tpl",  # include hidden folders
+            "project/integration/tpls/*/*/*.tpl",  # NetBeans
+            "project/integration/tpls/*/*/*/*.tpl", # NetBeans
         ]
     },
     entry_points={