remove architecture and flavor from install directory

stonebig · stonebig · commit 41169d3e7ea0 · 2018-04-04T19:44:56.000+02:00
diff --git a/make.py b/make.py
@@ -381,6 +381,8 @@ def create_installer(self):
                 ('ARCH', self.winpy_arch),
                 ('VERSION', '%s.%d%s' % (self.python_fullversion,
                                        self.build_number, self.flavor)),
+                ('VERSION_INSTALL', '%s.%d' % (self.python_fullversion,
+                                       self.build_number)),
                 ('RELEASELEVEL', self.release_level),)
         build_nsis('installer.nsi', fname, data)
         self._print_done()
diff --git a/portable/installer.nsi b/portable/installer.nsi
@@ -14,6 +14,8 @@ Licensed under the terms of the MIT License
 !define DISTDIR "D:\Pierre\maketest\winpython-2.7.3.amd64"
 !define ARCH "16bit"
 !define VERSION "2.7.3.0"
+; 2018-04-04 need to minimize path length of installation further: remove flavor in install path
+!define VERSION_INSTALL "2.7.3.0"
 !define RELEASELEVEL "beta2" ; empty means final release
 ;================================================================
 
@@ -39,7 +41,9 @@ 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}"
+; 2018-04-04 need to minimize path length of installation further: remove arch + flavor
+;InstallDir "$EXEDIR\${ID_INSTALL}${ARCH}-${VERSION}${RELEASELEVEL}"
+InstallDir "$EXEDIR\${ID_INSTALL}-${VERSION_INSTALL}${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.20180331'
+__version__ = '1.10.20180404'
 __license__ = __doc__
 __project_url__ = 'http://winpython.github.io/'
