Skip to content

Commit 70e92af

Browse files
updated installer.
1 parent 47d9f7d commit 70e92af

File tree

5 files changed

+22
-19
lines changed

5 files changed

+22
-19
lines changed

installer/create_installer.bat

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44
:: Edit this line to run the batch file for Qt environment.
55
::
66

7-
set VERSION=1.27.0
7+
:: 10行目、21行目、22行目を編集
8+
9+
10+
set VERSION=1.28.0
811
set QTBASE=C:\Qt
912
set TFDIR=C:\TreeFrog\%VERSION%
1013

@@ -15,8 +18,8 @@ cd %BASEDIR%
1518
:: MSVC2017
1619
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
1720

21+
call :build_msi "%QTBASE%\5.14.1\msvc2017_64\bin\qtenv2.bat" 5.14
1822
call :build_msi "%QTBASE%\5.13.2\msvc2017_64\bin\qtenv2.bat" 5.13
19-
call :build_msi "%QTBASE%\5.12.6\msvc2017_64\bin\qtenv2.bat" 5.12
2023
call :build_setup treefrog-%VERSION%-msvc2017_64-setup.exe
2124

2225

installer/msi/TreeFrog.wxs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
<!-- *** 基本的に 9行目,10行目,42行目,54行目も修正する (guidgen使用) *** -->
66

77
<!-- プロダクト情報 -->
8-
<Product Name='TreeFrog Framework 1.27.0'
9-
Id="D709F455-43AE-4157-9A31-9A5967C70959"
10-
UpgradeCode="6B5CC596-D8F6-45C3-9B8D-E030EEF128B1"
8+
<Product Name='TreeFrog Framework 1.28.0'
9+
Id="451F22E0-3C2A-48F4-A792-DE0E676DF6EA"
10+
UpgradeCode="6118066B-30F0-4D50-8131-96BE9CCCCF1F"
1111
Language='1041' Codepage='932'
12-
Version='1.27.0' Manufacturer='TreeFrog Framework Project'>
12+
Version='1.28.0' Manufacturer='TreeFrog Framework Project'>
1313

1414
<!-- パッケージ情報 -->
1515
<Package Id='*' Keywords='Installer'
@@ -27,21 +27,21 @@
2727
<Directory Id='TARGETDIR' Name='SourceDir'>
2828
<Directory Id='WINDOWSVOLUME'>
2929
<Directory Id='INSTALLDIR' Name='TreeFrog'>
30-
<Directory Id='VERSIONDIR' Name='1.27.0'>
30+
<Directory Id='VERSIONDIR' Name='1.28.0'>
3131
</Directory>
3232
</Directory>
3333
</Directory>
3434
<Directory Id="DesktopFolder" SourceName="Desktop"/>
3535
<Directory Id="ProgramMenuFolder">
36-
<Directory Id="ApplicationProgramsFolder" Name="TreeFrog Framework 1.27.0"/>
36+
<Directory Id="ApplicationProgramsFolder" Name="TreeFrog Framework 1.28.0"/>
3737
</Directory>
3838
</Directory>
3939

4040
<!-- デスクトップショートカット -->
4141
<DirectoryRef Id="DesktopFolder">
42-
<Component Id="DesktopShortcut" Guid="20B0DAA6-F140-4C43-8C44-C29119F57EFE">
42+
<Component Id="DesktopShortcut" Guid="898B4B90-24BC-4E5A-B616-AD50DFEB33F8">
4343
<Shortcut Id="PromptDesktopShortcut"
44-
Name="TreeFrog Prompt 1.27.0"
44+
Name="TreeFrog Prompt 1.28.0"
4545
Description="TreeFrog Framework Prompt"
4646
Target="[SystemFolder]cmd.exe" Arguments="/K [VERSIONDIR]bin\\tfenv.bat"
4747
WorkingDirectory="PersonalFolder"/>
@@ -51,12 +51,12 @@
5151

5252
<!-- プログラムメニューショートカット -->
5353
<DirectoryRef Id="ApplicationProgramsFolder">
54-
<Component Id="ApplicationShortcut" Guid="92249B48-5F80-4528-8F45-FA20388A860D">
54+
<Component Id="ApplicationShortcut" Guid="504BB7D0-10FF-442E-B5D8-9D0B9E872016">
5555
<CreateFolder Directory="ApplicationProgramsFolder"/>
5656

5757
<!-- Shortcut to TF prompt-->
5858
<Shortcut Id="PromptProgramMenuShortcut"
59-
Name="TreeFrog Prompt 1.27.0"
59+
Name="TreeFrog Prompt 1.28.0"
6060
Description="TreeFrog Framework Prompt"
6161
Target="[SystemFolder]cmd.exe" Arguments="/K [VERSIONDIR]bin\\tfenv.bat"
6262
WorkingDirectory="PersonalFolder"/>

installer/msi/license.rtf

0 Bytes
Binary file not shown.

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ namespace treefrogsetup {
4747
//
4848
// バージョン
4949
//
50-
static initonly String^ VERSION_STR512 = L"5.12";
50+
static initonly String^ VERSION_STR514 = L"5.14";
5151
static initonly String^ VERSION_STR513 = L"5.13";
5252

5353
public:
@@ -169,7 +169,7 @@ namespace treefrogsetup {
169169
this->label->Name = L"label";
170170
this->label->Size = System::Drawing::Size(309, 15);
171171
this->label->TabIndex = 4;
172-
this->label->Text = L"Specify a base folder of Qt version " + VERSION_STR512 + " or " + VERSION_STR513 + ".";
172+
this->label->Text = L"Specify a base folder of Qt version " + VERSION_STR513 + " or " + VERSION_STR514 + ".";
173173
//
174174
// label1
175175
//
@@ -180,7 +180,7 @@ namespace treefrogsetup {
180180
this->label1->Name = L"label1";
181181
this->label1->Size = System::Drawing::Size(162, 15);
182182
this->label1->TabIndex = 5;
183-
this->label1->Text = L"Example: C:\\Qt\\" + VERSION_STR513 + ".0\\msvc2017_64";
183+
this->label1->Text = L"Example: C:\\Qt\\" + VERSION_STR514 + ".0\\msvc2017_64";
184184
//
185185
// labeltop
186186
//
@@ -389,12 +389,12 @@ namespace treefrogsetup {
389389

390390
// Get msi file from resource
391391
int rcid = 0;
392-
if (version->IndexOf("Qt version " + VERSION_STR513, StringComparison::OrdinalIgnoreCase) > 0) {
392+
if (version->IndexOf("Qt version " + VERSION_STR514, StringComparison::OrdinalIgnoreCase) > 0) {
393393
rcid = IDR_TREEFROG_QT513_MSI;
394-
} else if (version->IndexOf("Qt version " + VERSION_STR512, StringComparison::OrdinalIgnoreCase) > 0) {
394+
} else if (version->IndexOf("Qt version " + VERSION_STR513, StringComparison::OrdinalIgnoreCase) > 0) {
395395
rcid = IDR_TREEFROG_QT512_MSI;
396396
} else {
397-
abort("Not found Qt version " + VERSION_STR513 + " or " + VERSION_STR512 + ".", "Abort");
397+
abort("Not found Qt version " + VERSION_STR514 + " or " + VERSION_STR513 + ".", "Abort");
398398
return;
399399
}
400400

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ LANGUAGE 17, SUBLANG_DEFAULT
1818
// User resources
1919
//
2020
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
21-
IDR_TREEFROG_QT512_MSI TREEFROG_MSI "..\\..\\msi\\TreeFrog-SDK-Qt5.12.msi"
21+
IDR_TREEFROG_QT514_MSI TREEFROG_MSI "..\\..\\msi\\TreeFrog-SDK-Qt5.14.msi"
2222

2323
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
2424
IDR_TREEFROG_QT513_MSI TREEFROG_MSI "..\\..\\msi\\TreeFrog-SDK-Qt5.13.msi"

0 commit comments

Comments
 (0)