Merge pull request sakura-editor#180 from m-tmatma/feature/x64-installer

Installer のx64 対応
HoppingTappy · Jun 27, 2018 · c76ac75 · c76ac75
2 parents e7346a1 + e8e7e90
commit c76ac75
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/build-installer.bat b/build-installer.bat
@@ -39,7 +39,8 @@ copy help\macro\macro.chm                        %INSTALLER_WORK%\
 copy %platform%\%configuration%\*.exe            %INSTALLER_WORK%\
 copy %platform%\%configuration%\*.dll            %INSTALLER_WORK%\
 
-"C:\Program Files (x86)\Inno Setup 5\ISCC.exe" installer\sakura.iss || (echo error && exit /b 1)
+set SAKURA_ISS=installer\sakura-%platform%.iss
+"C:\Program Files (x86)\Inno Setup 5\ISCC.exe" %SAKURA_ISS% || (echo error && exit /b 1)
 
 if exist "%INSTALLER_RESOURCES%" rmdir /s /q "%INSTALLER_RESOURCES%"
 if exist "%INSTALLER_WORK%"      rmdir /s /q "%INSTALLER_WORK%"
diff --git a/installer/sakura-Win32.iss b/installer/sakura-Win32.iss
@@ -0,0 +1,2 @@
+#define MyArchitecture "x86"
+#include "sakura-common.iss"
diff --git a/installer/sakura.iss → installer/sakura-common.iss b/installer/sakura.iss → installer/sakura-common.iss
@@ -7,6 +7,10 @@
 #define MyAppVerH StringChange(MyAppVer, ".", "-")
 
 [Setup]
+#if MyArchitecture != "x86"
+ArchitecturesInstallIn64BitMode={#MyArchitecture}
+ArchitecturesAllowed={#MyArchitecture}
+#endif
 AppName=サクラエディタ
 AppId=sakura editor
 AppVersion={#MyAppVer}
@@ -28,7 +32,7 @@ DisableStartupPrompt=no
 PrivilegesRequired=None
 
 ; エディタのバージョンに応じて書き換える場所
-OutputBaseFilename=sakura_install{#MyAppVerH}
+OutputBaseFilename=sakura_install{#MyAppVerH}-{#MyArchitecture}
 VersionInfoVersion={#MyAppVer}
 VersionInfoProductVersion={#MyAppVer}
 

diff --git a/installer/sakura-x64.iss b/installer/sakura-x64.iss
@@ -0,0 +1,2 @@
+#define MyArchitecture "x64"
+#include "sakura-common.iss"