include the 32/64 type in the suggested install path

stonebig · stonebig · commit b2f5be4fc939 · 2018-12-19T22:33:57.000+01:00
diff --git a/portable/installer.nsi b/portable/installer.nsi
@@ -12,7 +12,7 @@ Licensed under the terms of the MIT License
 ; These lines are automatically replaced when creating installer:
 ; (see winpython/make.py)
 !define DISTDIR "D:\Pierre\maketest\winpython-2.7.3.amd64"
-!define ARCH "16bit"
+!define ARCH "64"
 !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"
@@ -49,7 +49,8 @@ OutFile "${DISTDIR}\..\${ID}${ARCH}-${VERSION}${RELEASELEVEL}.exe"
 ;InstallDir "$EXEDIR\${ID_INSTALL}-${VERSION_INSTALL}${RELEASELEVEL}"
 ; 2018-04-20 need to minimize path length of installation:
 ;InstallDir "$EXEDIR\${ID_INSTALL}"
-InstallDir "$EXEDIR\${ID_INSTALL}-${VERSION_INSTALL}${RELEASELEVEL}"
+; 2018-12-10 keep 64 for 7zip similarity
+InstallDir "$EXEDIR\${ID_INSTALL}${ARCH}-${VERSION_INSTALL}${RELEASELEVEL}"
 
 BrandingText "${BRANDING}"
 XPStyle on
diff --git a/portable/installer_INNO.iss b/portable/installer_INNO.iss
@@ -10,7 +10,7 @@
 ; These lines are automatically replaced when creating installer:
 ; (see winpython/make.py)
 #define DISTDIR "C:\WinP\bd36\buPs2\winp64-3.6.x.0"
-#define ARCH "64bit"
+#define ARCH "64"
 #define VERSION "3.6.7.0Ps2"
 ; 2018-04-04 need to minimize path length of installation further: remove flavor in install path
 #define VERSION_INSTALL "3670"
@@ -58,7 +58,10 @@ AppUpdatesURL={#MyAppURL}
 ;non portable mode if ever wanted FLIPFLAP
 ;DefaultDirName={pf}\{#ID_INSTALL}-{#VERSION_INSTALL}{#RELEASELEVEL}
 ;non portable mode
-DefaultDirName={src}\{#ID_INSTALL}-{#VERSION_INSTALL}{#RELEASELEVEL}
+;
+;2018-12-10: making 64 art of the install path (7zip similarity)
+;DefaultDirName={src}\{#ID_INSTALL}-{#VERSION_INSTALL}{#RELEASELEVEL}
+DefaultDirName={src}\{#ID_INSTALL}{#ARCH}-{#VERSION_INSTALL}{#RELEASELEVEL}
 
 DefaultGroupName={#ID}
 DisableProgramGroupPage=yes
