Skip to content

Commit 0337aca

Browse files
treefrogframeworktreefrogframework
committed
updated installer.
1 parent cd618e8 commit 0337aca

File tree

7 files changed

+29
-42
lines changed

7 files changed

+29
-42
lines changed

‎installer/create_installer.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ set LIB=
3636
set PATH=C:\WINDOWS\system32;C:\WINDOWS
3737

3838
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
39-
call :build_msi "%QTBASE%\5.15.2\msvc2019_64\bin\qtenv2.bat" 5.15
39+
call :build_msi "%QTBASE%\6.0.4\msvc2019_64\bin\qtenv2.bat" 6.0
4040

4141
call :build_setup treefrog-%VERSION%-msvc_64-setup.exe
4242

‎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.31.0'
9-
Id="77529635-0B05-4823-A743-1F2ED54B9FE5"
10-
UpgradeCode="82407DAE-8BA2-4371-9A38-B9D25A294014"
8+
<Product Name='TreeFrog Framework 2.0.1'
9+
Id="43A746F5-087B-412E-BCAF-35E9C9640F56"
10+
UpgradeCode="A8AEF838-23A0-4A07-A7CD-BCA05C1BE09A"
1111
Language='1041' Codepage='932'
12-
Version='1.31.0' Manufacturer='TreeFrog Framework Project'>
12+
Version='2.0.1' 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.31.0'>
30+
<Directory Id='VERSIONDIR' Name='2.0.1'>
3131
</Directory>
3232
</Directory>
3333
</Directory>
3434
<Directory Id="DesktopFolder" SourceName="Desktop"/>
3535
<Directory Id="ProgramMenuFolder">
36-
<Directory Id="ApplicationProgramsFolder" Name="TreeFrog Framework 1.31.0"/>
36+
<Directory Id="ApplicationProgramsFolder" Name="TreeFrog Framework 2.0.1"/>
3737
</Directory>
3838
</Directory>
3939

4040
<!-- デスクトップショートカット -->
4141
<DirectoryRef Id="DesktopFolder">
42-
<Component Id="DesktopShortcut" Guid="576E6A21-546F-4347-B53C-4A67C03A5ABA">
42+
<Component Id="DesktopShortcut" Guid="59AFEA0F-365F-4DF5-B50E-F2379B3FA511">
4343
<Shortcut Id="PromptDesktopShortcut"
44-
Name="TreeFrog Prompt 1.31.0"
44+
Name="TreeFrog Prompt 2.0.1"
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="E8B69356-BA91-4691-9783-30FEC828B382">
54+
<Component Id="ApplicationShortcut" Guid="28FCB4B4-C71B-4E06-BF03-CE6F964039A4">
5555
<CreateFolder Directory="ApplicationProgramsFolder"/>
5656

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

‎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.31.0")];
34+
[assembly:AssemblyVersionAttribute("2.0.1")];
3535

3636
[assembly:ComVisible(false)];
3737

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ namespace treefrogsetup {
4747
//
4848
// バージョン
4949
//
50-
static initonly String^ VERSION_STR514 = L"5.14";
51-
static initonly String^ VERSION_STR515 = L"5.15";
50+
static initonly String^ VERSION_STR600 = L"6.0";
51+
static initonly String^ VERSION_STR601 = L"6.1";
5252

5353
public:
5454
MainForm(void)
@@ -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_STR515 + " or " + VERSION_STR514 + ".";
172+
this->label->Text = L"Specify a base folder of Qt version " + VERSION_STR601 + " or " + VERSION_STR600 + ".";
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_STR515 + ".0\\msvc2019_64";
183+
this->label1->Text = L"Example: C:\\Qt\\" + VERSION_STR601 + ".0\\msvc2019_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_STR515, StringComparison::OrdinalIgnoreCase) > 0) {
393-
rcid = IDR_TREEFROG_QT515_MSI;
394-
} else if (version->IndexOf("Qt version " + VERSION_STR514, StringComparison::OrdinalIgnoreCase) > 0) {
395-
rcid = IDR_TREEFROG_QT514_MSI;
392+
if (version->IndexOf("Qt version " + VERSION_STR601, StringComparison::OrdinalIgnoreCase) > 0) {
393+
rcid = IDR_TREEFROG_QT601_MSI;
394+
} else if (version->IndexOf("Qt version " + VERSION_STR600, StringComparison::OrdinalIgnoreCase) > 0) {
395+
rcid = IDR_TREEFROG_QT600_MSI;
396396
} else {
397-
abort("Not found Qt version " + VERSION_STR515 + " or " + VERSION_STR514 + ".", "Abort");
397+
abort("Not found Qt version " + VERSION_STR601 + " or " + VERSION_STR600 + ".", "Abort");
398398
return;
399399
}
400400

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@ LANGUAGE 17, SUBLANG_DEFAULT
1818
// User resources
1919
//
2020
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
21-
IDR_TREEFROG_QT514_MSI TREEFROG_MSI "..\\..\\msi\\TreeFrog-SDK-Qt5.14.msi"
21+
IDR_TREEFROG_QT600_MSI TREEFROG_MSI "..\\..\\msi\\TreeFrog-SDK-Qt6.0.msi"
2222

2323
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
24-
IDR_TREEFROG_QT515_MSI TREEFROG_MSI "..\\..\\msi\\TreeFrog-SDK-Qt5.15.msi"
25-
24+
IDR_TREEFROG_QT601_MSI TREEFROG_MSI "..\\..\\msi\\TreeFrog-SDK-Qt6.1.msi"
2625

2726
//
2827
// String Table resources

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

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,10 @@
66
#define IDC_BROWSE1 1003
77
#define IDS_APP_TITLE 1004
88

9-
#define IDR_TREEFROG_QT50_MSI 1050
10-
#define IDR_TREEFROG_QT51_MSI 1051
11-
#define IDR_TREEFROG_QT52_MSI 1052
12-
#define IDR_TREEFROG_QT53_MSI 1053
13-
#define IDR_TREEFROG_QT54_MSI 1054
14-
#define IDR_TREEFROG_QT55_MSI 1055
15-
#define IDR_TREEFROG_QT56_MSI 1056
16-
#define IDR_TREEFROG_QT57_MSI 1057
17-
#define IDR_TREEFROG_QT58_MSI 1058
18-
#define IDR_TREEFROG_QT59_MSI 1059
19-
#define IDR_TREEFROG_QT510_MSI 10510
20-
#define IDR_TREEFROG_QT511_MSI 10511
21-
#define IDR_TREEFROG_QT512_MSI 10512
22-
#define IDR_TREEFROG_QT513_MSI 10513
239
#define IDR_TREEFROG_QT514_MSI 10514
2410
#define IDR_TREEFROG_QT515_MSI 10515
25-
#define IDR_TREEFROG_QT516_MSI 10516
26-
#define IDR_TREEFROG_QT517_MSI 10517
27-
#define IDR_TREEFROG_QT518_MSI 10518
11+
#define IDR_TREEFROG_QT600_MSI 10600
12+
#define IDR_TREEFROG_QT601_MSI 10601
13+
#define IDR_TREEFROG_QT602_MSI 10602
14+
#define IDR_TREEFROG_QT603_MSI 10603
15+
#define IDR_TREEFROG_QT604_MSI 10604

‎src/tglobal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22
constexpr auto TF_VERSION_STR = "2.0.1";
33
constexpr auto TF_VERSION_NUMBER = 0x020001;
4-
constexpr auto TF_SRC_REVISION = 2321;
4+
constexpr auto TF_SRC_REVISION = 2349;
55

66
#include <QMetaType>
77
#include <QIODevice>

0 commit comments

Comments
 (0)