Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Installer のx64 対応 #180

Merged
merged 6 commits into from
Jun 27, 2018
Merged

Installer のx64 対応 #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6aef9c9
sakura.iss をコピーして x64 用を作る
m-tmatma Jun 24, 2018
b2943cb
ArchitecturesInstallIn64BitMode, ArchitecturesAllowed を指定する
m-tmatma Jun 24, 2018
f7383c1
出力のインストーラファイル名にアーキテクチャ名をつける
m-tmatma Jun 24, 2018
7da65bc
x64 版と x86 版で使用する iss ファイルを切り替える
m-tmatma Jun 24, 2018
cf44ff5
x86 版と x64 版で iss ファイルを共通化する
m-tmatma Jun 24, 2018
2356e1e
Merge branch 'master' into feature/x64-installer
m-tmatma Jun 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion build-installer.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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%"
2 changes: 2 additions & 0 deletions installer/sakura-Win32.iss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#define MyArchitecture "x86"
#include "sakura-common.iss"
6 changes: 5 additions & 1 deletion installer/sakura.iss → installer/sakura-common.iss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
#define MyAppVerH StringChange(MyAppVer, ".", "-")

[Setup]
#if MyArchitecture != "x86"
ArchitecturesInstallIn64BitMode={#MyArchitecture}
ArchitecturesAllowed={#MyArchitecture}
#endif
AppName=サクラエディタ
AppId=sakura editor
AppVersion={#MyAppVer}
Expand All @@ -28,7 +32,7 @@ DisableStartupPrompt=no
PrivilegesRequired=None

; エディタのバージョンに応じて書き換える場所
OutputBaseFilename=sakura_install{#MyAppVerH}
OutputBaseFilename=sakura_install{#MyAppVerH}-{#MyArchitecture}
VersionInfoVersion={#MyAppVer}
VersionInfoProductVersion={#MyAppVer}

Expand Down
2 changes: 2 additions & 0 deletions installer/sakura-x64.iss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#define MyArchitecture "x64"
#include "sakura-common.iss"