Merge pull request #608 from stonebig/master

stonebig · web-flow · commit b7b79268c79b · 2018-03-31T20:10:19.000+02:00
reduce default path length
diff --git a/make.py b/make.py
@@ -189,7 +189,7 @@ def get_tool_path(relpath, checkfunc):
         python_desc = 'Python programming language with standard library'
         return """## WinPython %s 
 
-The following packages are included in WinPython-%s v%s%s.
+The following packages are included in WinPython-%sbit v%s%s.
 
 ### Tools
 
@@ -220,7 +220,7 @@ def python_dir(self):
     @property
     def winpy_arch(self):
         """Return WinPython architecture"""
-        return '%dbit' % self.distribution.architecture
+        return '%d' % self.distribution.architecture
 
     @property
     def pyqt_arch(self):
diff --git a/portable/installer.nsi b/portable/installer.nsi
@@ -18,6 +18,7 @@ Licensed under the terms of the MIT License
 ;================================================================
 
 !define ID "WinPython"
+!define ID_INSTALL "WinPy"
 !define FILE_DESCRIPTION "${ID} Installer"
 !define COMPANY "${ID}"
 !define BRANDING "${ID}, the portable Python Distribution for Scientists"
@@ -34,8 +35,11 @@ SetCompressorDictSize 16 ; MB
 ; General
 ;------------------------------------------------------------------------------
 Name "${ID} ${ARCH} ${VERSION}${RELEASELEVEL}"
-OutFile "${DISTDIR}\..\${ID}-${ARCH}-${VERSION}${RELEASELEVEL}.exe"
-InstallDir "$EXEDIR\${ID}-${ARCH}-${VERSION}${RELEASELEVEL}"
+OutFile "${DISTDIR}\..\${ID}${ARCH}-${VERSION}${RELEASELEVEL}.exe"
+
+; 2018-03-31 need to minimize path length of installation:
+;InstallDir "$EXEDIR\${ID}${ARCH}-${VERSION}${RELEASELEVEL}"
+InstallDir "$EXEDIR\${ID_INSTALL}${ARCH}-${VERSION}${RELEASELEVEL}"
 BrandingText "${BRANDING}"
 XPStyle on
 RequestExecutionLevel user
diff --git a/winpython/__init__.py b/winpython/__init__.py
@@ -28,6 +28,6 @@
 OTHER DEALINGS IN THE SOFTWARE.
 """
 
-__version__ = '1.9.20180301'
+__version__ = '1.9.20180331'
 __license__ = __doc__
 __project_url__ = 'http://winpython.github.io/'
