Skip to content

Commit 7fe19e3

Browse files
treefrogframeworktreefrogframework
committed
インストーラ更新
1 parent 6b99cd2 commit 7fe19e3

File tree

8 files changed

+106
-12
lines changed

8 files changed

+106
-12
lines changed

‎build.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
::
55
:: Edit this line to run the batch file for Qt environment.
66
::
7-
::call "C:\Qt\Qt5.4.1-MinGW\5.4\mingw491_32\bin\qtenv2.bat"
87
::call "C:\Qt\Qt5.5.1-MinGW\5.5\mingw492_32\bin\qtenv2.bat"
9-
::call "C:\Qt\Qt5.4.1\5.4\msvc2013_64_opengl\bin\qtenv2.bat"
8+
::call "C:\Qt\Qt5.6.0-MinGW\5.4\mingw492_32\bin\qtenv2.bat"
109
call "C:\Qt\Qt5.5.1\5.5\msvc2013_64\bin\qtenv2.bat"
10+
::call "C:\Qt\Qt5.6.0\5.6\msvc2013_64\bin\qtenv2.bat"
1111

1212
call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64
1313

‎installer/create_installer.bat‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
@ECHO ON
2+
@setlocal
3+
::
4+
:: Edit this line to run the batch file for Qt environment.
5+
::
6+
7+
set VERSION=1.12.0
8+
set TFDIR=C:\TreeFrog\%VERSION%
9+
set BASEDIR=%~dp0
10+
set SLNFILE=%BASEDIR%\treefrog-setup\treefrog-setup.sln
11+
cd %BASEDIR%
12+
13+
:: MinGW
14+
call :build_msi "C:\Qt\Qt5.5.1-MinGW\5.5\mingw492_32\bin\qtenv2.bat" 5.5
15+
call :build_msi "C:\Qt\Qt5.6.0-MinGW\5.6\mingw49_32\bin\qtenv2.bat" 5.6
16+
call :build_setup treefrog-%VERSION%-mingw-setup.exe
17+
18+
19+
:: MSVC
20+
call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64
21+
call :build_msi "C:\Qt\Qt5.5.1\5.5\msvc2013_64\bin\qtenv2.bat" 5.5
22+
call :build_msi "C:\Qt\Qt5.6.0\5.6\msvc2013_64\bin\qtenv2.bat" 5.6
23+
call :build_setup treefrog-%VERSION%-msvc2013_64-setup.exe
24+
25+
26+
echo.
27+
echo.
28+
echo Creating setup files ... Completed
29+
pause
30+
exit /B
31+
32+
33+
:::サブルーチン:::
34+
35+
::===ビルド実行
36+
:build_msi
37+
@setlocal
38+
if not exist %1 (
39+
echo File not found %1
40+
pause
41+
exit /B
42+
)
43+
call %1
44+
if exist "%TFDIR%" rmdir /s /q "%TFDIR%"
45+
cd /D %BASEDIR%
46+
call ..\compile_install.bat
47+
call :create_installer %2
48+
goto :eof
49+
50+
51+
::===インストーラ(msi)作成
52+
:create_installer
53+
@setlocal
54+
set PATH="C:\Program Files (x86)\WiX Toolset v3.10\bin";%PATH%
55+
set MSINAME=TreeFrog-SDK-Qt%1.msi
56+
57+
cd /D msi
58+
59+
mklink /D SourceDir %TFDIR%
60+
if ERRORLEVEL 1 goto :error
61+
62+
:: Creates Fragment file
63+
heat.exe dir %TFDIR% -dr INSTALLDIR -cg TreeFrogFiles -gg -out TreeFrogFiles.wxs
64+
if ERRORLEVEL 1 goto :error
65+
66+
:: Creates installer
67+
candle.exe TreeFrog.wxs TreeFrogFiles.wxs
68+
if ERRORLEVEL 1 goto :error
69+
light.exe -ext WixUIExtension -out %MSINAME% TreeFrog.wixobj TreeFrogFiles.wixobj
70+
if ERRORLEVEL 1 goto :error
71+
72+
rd SourceDir
73+
echo.
74+
echo ----------------------------------------------------
75+
echo Created installer [ %TFDIR% ] --^> %MSINAME%
76+
echo.
77+
goto :eof
78+
79+
80+
::===セットアップEXE作成
81+
:build_setup
82+
@setlocal
83+
"C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\devenv" %SLNFILE% /rebuild release
84+
if ERRORLEVEL 1 goto :error
85+
move %BASEDIR%\treefrog-setup\Release\treefrog-setup.exe %BASEDIR%\treefrog-setup\Release\%1
86+
goto :eof
87+
88+
89+
:error
90+
echo.
91+
echo Bat Error!!!
92+
echo.
93+
pause
94+
exit /b

‎installer/msi/TreeFrog.wxs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
Id="838A4A29-D8CB-4474-909B-17A1F45D05C7"
1010
UpgradeCode="36CA699E-4E01-4CEA-B95D-C2598B54C3BB"
1111
Language='1041' Codepage='932'
12-
Version='1.11.0' Manufacturer='TreeFrog Framework Project'>
12+
Version='1.12.0' Manufacturer='TreeFrog Framework Project'>
1313

1414
<!-- パッケージ情報 -->
1515
<Package Id='*' Keywords='Installer'

‎installer/msi/create_installer.bat‎ renamed to ‎installer/msi/old_create_installer.bat‎

File renamed without changes.

‎installer/treefrog-setup/treefrog-setup/AssemblyInfo.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ using namespace System::Security::Permissions;
3131
// すべての値を指定するか、下のように '*' を使ってリビジョンおよびビルド番号を
3232
// 既定値にすることができます:
3333

34-
[assembly:AssemblyVersionAttribute("1.11.0")];
34+
[assembly:AssemblyVersionAttribute("1.12.0")];
3535

3636
[assembly:ComVisible(false)];
3737

‎installer/treefrog-setup/treefrog-setup/MainForm.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -374,9 +374,9 @@ namespace treefrogsetup {
374374
}
375375

376376
// Get msi file from resource
377-
int rcid = IDR_TREEFROG_QT55_MSI;
378-
if (version->IndexOf("Qt version 5.4", StringComparison::OrdinalIgnoreCase) > 0) {
379-
rcid = IDR_TREEFROG_QT54_MSI;
377+
int rcid = IDR_TREEFROG_QT56_MSI;
378+
if (version->IndexOf("Qt version 5.5", StringComparison::OrdinalIgnoreCase) > 0) {
379+
rcid = IDR_TREEFROG_QT55_MSI;
380380
}
381381

382382
System::Reflection::Module^ mod = System::Reflection::Assembly::GetExecutingAssembly()->GetModules()[0];

‎installer/treefrog-setup/treefrog-setup/app.rc‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ LANGUAGE 17, SUBLANG_DEFAULT
1919
//
2020

2121
//LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
22-
//IDR_TREEFROG_QT57_MSI TREEFROG_MSI "..\\..\\msi\\TreeFrog-SDK-Qt5.7.msi"
22+
//IDR_TREEFROG_QT58_MSI TREEFROG_MSI "..\\..\\msi\\TreeFrog-SDK-Qt5.8.msi"
2323

2424
//LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
25-
//IDR_TREEFROG_QT56_MSI TREEFROG_MSI "..\\..\\msi\\TreeFrog-SDK-Qt5.6.msi"
25+
//IDR_TREEFROG_QT57_MSI TREEFROG_MSI "..\\..\\msi\\TreeFrog-SDK-Qt5.7.msi"
2626

2727
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
28-
IDR_TREEFROG_QT55_MSI TREEFROG_MSI "..\\..\\msi\\TreeFrog-SDK-Qt5.5.msi"
28+
IDR_TREEFROG_QT56_MSI TREEFROG_MSI "..\\..\\msi\\TreeFrog-SDK-Qt5.6.msi"
2929

3030
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
31-
IDR_TREEFROG_QT54_MSI TREEFROG_MSI "..\\..\\msi\\TreeFrog-SDK-Qt5.4.msi"
31+
IDR_TREEFROG_QT55_MSI TREEFROG_MSI "..\\..\\msi\\TreeFrog-SDK-Qt5.5.msi"
3232

3333
//
3434
// String Table resources
@@ -38,4 +38,3 @@ STRINGTABLE
3838
BEGIN
3939
IDS_APP_TITLE "treefrogsetup"
4040
END
41-

‎installer/treefrog-setup/treefrog-setup/resource.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@
1414
#define IDR_TREEFROG_QT55_MSI 1055
1515
#define IDR_TREEFROG_QT56_MSI 1056
1616
#define IDR_TREEFROG_QT57_MSI 1057
17+
#define IDR_TREEFROG_QT58_MSI 1058

0 commit comments

Comments
 (0)