Skip to content

Commit 3d65159

Browse files
treefrogframeworktreefrogframework
committed
updated instaler.
1 parent 3b2f9e7 commit 3d65159

File tree

9 files changed

+47
-38
lines changed

9 files changed

+47
-38
lines changed

‎.editorconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ end_of_line = crlf
3434
indent_size = 2
3535
trim_trailing_whitespace = false
3636

37-
[*.wxs]
38-
end_of_line = crlf
39-
4037
[CMakeLists.txt]
4138
end_of_line = crlf
4239

‎build.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ rem
77

88
set BASEDIR=%~dp0
99

10-
call "C:\Qt\6.7.3\msvc2022_64\bin\qtenv2.bat"
10+
call "C:\Qt\6.9.0\msvc2022_64\bin\qtenv2.bat"
1111
rem call "C:\Qt\6.5.3\msvc2019_64\bin\qtenv2.bat"
1212

1313
set ARCH=amd64

‎installer/.editorconfig

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# EditorConfig is awesome: http://EditorConfig.org
2+
root = true
3+
4+
[*.{cpp,h}]
5+
charset = shift_jis
6+
end_of_line = crlf
7+
indent_style = space
8+
indent_size = 4
9+
10+
[*.wxs]
11+
end_of_line = crlf
12+

‎installer/create_installer.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ set LIB=
2525
set PATH=C:\WINDOWS\system32;C:\WINDOWS
2626

2727
call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
28-
call :build_msi "%QTBASE%\6.8.0\msvc2022_64\bin\qtenv2.bat" 6.8
28+
call :build_msi "%QTBASE%\6.9.0\msvc2022_64\bin\qtenv2.bat" 6.9
2929

3030
:: Clear environment variables
3131
set VCToolsVersion=
@@ -36,7 +36,7 @@ set LIB=
3636
set PATH=C:\WINDOWS\system32;C:\WINDOWS
3737

3838
call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
39-
call :build_msi "%QTBASE%\6.7.3\msvc2022_64\bin\qtenv2.bat" 6.7
39+
call :build_msi "%QTBASE%\6.8.3\msvc2022_64\bin\qtenv2.bat" 6.8
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 2.10.0'
9-
Id="E62F0889-126C-4B96-B216-14A4E5B4409A"
10-
UpgradeCode="EF057FD0-AB58-44D9-AB7F-23138622F72A"
8+
<Product Name='TreeFrog Framework 2.11.0'
9+
Id="DD82BAAA-4965-4FF4-9F87-E072327188F3"
10+
UpgradeCode="74C53679-C4DF-4807-B5C0-EC45BD9FF37C"
1111
Language='1041' Codepage='932'
12-
Version='2.10.0' Manufacturer='TreeFrog Framework Project'>
12+
Version='2.11.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='2.10.0'>
30+
<Directory Id='VERSIONDIR' Name='2.11.0'>
3131
</Directory>
3232
</Directory>
3333
</Directory>
3434
<Directory Id="DesktopFolder" SourceName="Desktop"/>
3535
<Directory Id="ProgramMenuFolder">
36-
<Directory Id="ApplicationProgramsFolder" Name="TreeFrog Framework 2.10.0"/>
36+
<Directory Id="ApplicationProgramsFolder" Name="TreeFrog Framework 2.11.0"/>
3737
</Directory>
3838
</Directory>
3939

4040
<!-- デスクトップショートカット -->
4141
<DirectoryRef Id="DesktopFolder">
42-
<Component Id="DesktopShortcut" Guid="70D025DC-2123-4D90-8F58-94C02E1274D1">
42+
<Component Id="DesktopShortcut" Guid="7E2E4C8F-C960-4C3F-ADFF-4A1FA3CEC283">
4343
<Shortcut Id="PromptDesktopShortcut"
44-
Name="TreeFrog Prompt 2.10.0"
44+
Name="TreeFrog Prompt 2.11.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="29D7EA6D-B7C3-4516-A141-FDB7F307502D">
54+
<Component Id="ApplicationShortcut" Guid="6F9D2891-5B13-4DE8-AD0E-38A8BE947291">
5555
<CreateFolder Directory="ApplicationProgramsFolder"/>
5656

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

‎installer/msi/license.rtf

47.8 KB
Binary file not shown.

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
//
99
// リリースする際は50行目を編集！
10+
// app.rcのIDR_TREEFROG_QTxxx_MSIも修正！
1011
//
1112

1213

@@ -28,30 +29,29 @@ namespace treefrogsetup {
2829
/// <summary>
2930
/// MainForm class
3031
/// </summary>
31-
public ref class MainForm : public System::Windows::Forms::Form
32-
{
33-
private: String^ msiName;
34-
private: System::Windows::Forms::Button^ browseButton;
35-
private: System::Windows::Forms::Button^ okButton;
36-
private: System::Windows::Forms::Button^ cancelButton;
37-
private: System::Windows::Forms::TextBox^ forderTextBox;
38-
private: System::Windows::Forms::Label^ labeltop;
39-
private: System::Windows::Forms::Label^ label;
40-
private: System::Windows::Forms::Label^ label1;
41-
private: System::Windows::Forms::PictureBox^ loadingImg;
42-
private: System::ComponentModel::BackgroundWorker^ bgWorker;
32+
public ref class MainForm : public System::Windows::Forms::Form {
33+
private: String^ msiName;
34+
private: System::Windows::Forms::Button^ browseButton;
35+
private: System::Windows::Forms::Button^ okButton;
36+
private: System::Windows::Forms::Button^ cancelButton;
37+
private: System::Windows::Forms::TextBox^ forderTextBox;
38+
private: System::Windows::Forms::Label^ labeltop;
39+
private: System::Windows::Forms::Label^ label;
40+
private: System::Windows::Forms::Label^ label1;
41+
private: System::Windows::Forms::PictureBox^ loadingImg;
42+
private: System::ComponentModel::BackgroundWorker^ bgWorker;
4343

4444
private:
4545
static initonly String^ TF_ENV_BAT = "C:\\TreeFrog\\" + VersionString() + "\\bin\\tfenv.bat"; // Base Directory
4646

4747
//
4848
// バージョン
4949
//
50-
static initonly String^ VERSION_STR6_NEW = L"6.8";
51-
static initonly String^ VERSION_STR6_PREV = L"6.7";
50+
static initonly String^ VERSION_STR6_NEW = L"6.9";
51+
static initonly String^ VERSION_STR6_PREV = L"6.8";
5252

53-
static initonly int RCID_NEW = IDR_TREEFROG_QT608_MSI;
54-
static initonly int RCID_PREV = IDR_TREEFROG_QT607_MSI;
53+
static initonly int RCID_NEW = IDR_TREEFROG_QT609_MSI;
54+
static initonly int RCID_PREV = IDR_TREEFROG_QT608_MSI;
5555

5656
public:
5757
MainForm(void)
@@ -474,5 +474,5 @@ namespace treefrogsetup {
474474
{
475475
Application::Exit();
476476
}
477-
};
477+
};
478478
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ LANGUAGE 17, SUBLANG_DEFAULT
1717
//
1818
// User resources
1919
//
20-
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
21-
IDR_TREEFROG_QT605_MSI TREEFROG_MSI "..\\..\\msi\\TreeFrog-SDK-Qt6.5.msi"
22-
2320
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
2421
IDR_TREEFROG_QT606_MSI TREEFROG_MSI "..\\..\\msi\\TreeFrog-SDK-Qt6.6.msi"
2522

@@ -29,6 +26,9 @@ IDR_TREEFROG_QT607_MSI TREEFROG_MSI "..\\..\\msi\\TreeFrog-SDK-Qt6.7.msi"
2926
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
3027
IDR_TREEFROG_QT608_MSI TREEFROG_MSI "..\\..\\msi\\TreeFrog-SDK-Qt6.8.msi"
3128

29+
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
30+
IDR_TREEFROG_QT609_MSI TREEFROG_MSI "..\\..\\msi\\TreeFrog-SDK-Qt6.9.msi"
31+
3232

3333
//
3434
// String Table resources

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@
1717
#define IDR_TREEFROG_QT609_MSI 10609
1818
#define IDR_TREEFROG_QT610_MSI 10610
1919
#define IDR_TREEFROG_QT611_MSI 10611
20-
#define IDR_TREEFROG_QT612_MSI 10612
21-
#define IDR_TREEFROG_QT613_MSI 10613
20+
#define IDR_TREEFROG_QT612_MSI 10612
21+
#define IDR_TREEFROG_QT613_MSI 10613

0 commit comments

Comments
 (0)