From: Youness Alaoui <kakaroto@kakaroto.homelinux.net>
Date: Fri, 11 Dec 2015 21:05:34 +0000 (-0500)
Subject: Add -E argument to python interpreter on windows.
X-Git-Tag: lulzbot-18.03
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=8bedeb7dd30e77cf0d4d4f67c7f933035b286888;p=cura.git

Add -E argument to python interpreter on windows.

This will make sure python ignores PYTHONPATH and PYTHONHOME variables
that could be set if another application using python was installed
on the system such as CollabNet's subversion Edge.
See https://forum.lulzbot.com/viewtopic.php?f=8&t=3029&p=18892#p18892
---

diff --git a/scripts/win32/cura.bat b/scripts/win32/cura.bat
index 3f105418..b9633b19 100644
--- a/scripts/win32/cura.bat
+++ b/scripts/win32/cura.bat
@@ -1,2 +1,2 @@
-@python\python.exe -m Cura.cura %*
+@python\python.exe -E -m Cura.cura %*
 
diff --git a/scripts/win32/installer.nsi b/scripts/win32/installer.nsi
index 2f474d97..d8919bf9 100644
--- a/scripts/win32/installer.nsi
+++ b/scripts/win32/installer.nsi
@@ -149,7 +149,7 @@ Section "Cura ${VERSION}"
   
   CreateDirectory "$SMPROGRAMS\Cura ${VERSION}"
   CreateShortCut "$SMPROGRAMS\Cura ${VERSION}\Uninstall Cura ${VERSION}.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
-  CreateShortCut "$SMPROGRAMS\Cura ${VERSION}\Cura ${VERSION}.lnk" "$INSTDIR\python\pythonw.exe" '-m "Cura.cura"' "$INSTDIR\resources\cura.ico" 0
+  CreateShortCut "$SMPROGRAMS\Cura ${VERSION}\Cura ${VERSION}.lnk" "$INSTDIR\python\pythonw.exe" '-E -m "Cura.cura"' "$INSTDIR\resources\cura.ico" 0
   
 SectionEnd