Merge pull request #1041 from stonebig/master

stonebig · web-flow · commit db9973eee4fb · 2021-12-04T16:39:08.000+01:00
reduce default path length
diff --git a/make.py b/make.py
@@ -507,17 +507,17 @@ def prepath(self):
             "DLLs",
             "Scripts",
             r"..\t",
-            r"..\t\mingw32\bin",
+            #r"..\t\mingw32\bin",
         ]
-        if (
-            self.distribution.architecture == 32
-            and osp.isdir(self.winpydir + self.MINGW32_PATH)
-        ):
-            path += [r".." + self.MINGW32_PATH]
-        if self.distribution.architecture == 32:
-            path += [r".." + self.R_PATH + r"\i386"]
-        if self.distribution.architecture == 64:
-            path += [r".." + self.R_PATH + r"\x64"]
+        #if (
+        #    self.distribution.architecture == 32
+        #    and osp.isdir(self.winpydir + self.MINGW32_PATH)
+        #):
+        #    path += [r".." + self.MINGW32_PATH]
+        #if self.distribution.architecture == 32:
+        #    path += [r".." + self.R_PATH + r"\i386"]
+        #if self.distribution.architecture == 64:
+        #    path += [r".." + self.R_PATH + r"\x64"]
         path += [r".." + self.JULIA_PATH]
 
         path += [r".." + self.NODEJS_PATH]
@@ -1020,7 +1020,7 @@ def _create_batch_scripts_initial(self):
 rem get a normalize path
 set WINPYDIRBASETMP=%~dp0..
 pushd %WINPYDIRBASETMP%
-set WINPYDIRBASE=%__CD__%
+set WINPYDIRBASE=%CD%
 set WINPYDIRBASETMP=
 popd
 
@@ -1375,8 +1375,8 @@ def _create_batch_scripts_initial(self):
 	  )
    )
 ) else (
-rem if it it launched from another directory , we keep it that one echo %__CD__%
-if not "%__CD__%\"=="%~dp0" set  WINPYWORKDIR1="%__CD__%"
+rem if it it launched from another directory , we keep it that one echo %CD%
+if not "%CD%\"=="%~dp0" set  WINPYWORKDIR1="%CD%"
 )
 
 rem remove some potential last \
diff --git a/winpython/__init__.py b/winpython/__init__.py
@@ -28,6 +28,6 @@
 OTHER DEALINGS IN THE SOFTWARE.
 """
 
-__version__ = '4.6.20211106'
+__version__ = '4.6.20211204'
 __license__ = __doc__
 __project_url__ = 'http://winpython.github.io/'
