Skip to content

Commit 2a43859

Browse files
treefrogframeworktreefrogframework
committed
updated installer.
1 parent 07dd0b4 commit 2a43859

6 files changed

Lines changed: 26 additions & 23 deletions

File tree

‎configure.bat‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,17 +105,14 @@ if "%VisualStudioVersion%" == "18.0" (
105105
:: Visual Studio 2026
106106
set VCVARSOPT=amd64
107107
set CMAKEOPT=-A x64 -T v145
108-
set MSVSVER=2026
109108
) else if "%VisualStudioVersion%" == "17.0" (
110109
:: Visual Studio 2022
111110
set VCVARSOPT=amd64
112111
set CMAKEOPT=-A x64 -T v143
113-
set MSVSVER=2022
114112
) else if "%VisualStudioVersion%" == "16.0" (
115113
:: Visual Studio 2019
116114
set VCVARSOPT=amd64
117115
set CMAKEOPT=-A x64 -T v142
118-
set MSVSVER=2019
119116
) else (
120117
echo Use Visual Studio 2026, 2022 or 2019
121118
pause
@@ -137,7 +134,7 @@ echo set TreeFrog_DIR=%TFDIR%>> %TFENV%
137134
echo set QMAKESPEC=%QMAKESPEC%>> %TFENV%
138135
echo set QTENV="%QTENV%">> %TFENV%
139136
echo set VCVARSBAT="">> %TFENV%
140-
echo set VSVER=%MSVSVER%>> %TFENV%
137+
echo set VSVER=18 2022 2019>> %TFENV%
141138
echo set VSWHERE="%%ProgramFiles(x86)%%\Microsoft Visual Studio\Installer\vswhere.exe">> %TFENV%
142139
echo;>> %TFENV%
143140
echo if exist %%QTENV%% call %%QTENV%%>> %TFENV%
@@ -233,9 +230,9 @@ echo %CMAKECMD%
233230
%CMAKECMD%
234231

235232
if "%DEBUG%" == "yes" (
236-
set BUILDCMD=cmake --build build --config Debug -j
233+
set BUILDCMD=cmake --build build --config Debug --clean-first -j
237234
) else (
238-
set BUILDCMD=cmake --build build --config Release -j
235+
set BUILDCMD=cmake --build build --config Release --clean-first -j
239236
)
240237
echo %BUILDCMD%
241238
%BUILDCMD% >nul 2>&1

‎installer/create_installer.bat‎

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

7-
:: 10行目、28行目、39行目を編集
7+
:: 10行目、27行目、28行目、38行目、39行目を編集
88

99

1010
set VERSION=2.12.0
@@ -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.9.1\msvc2022_64\bin\qtenv2.bat" 6.9
28+
call :build_msi "%QTBASE%\6.11.1\msvc2022_64\bin\qtenv2.bat" 6.11
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.8.3\msvc2022_64\bin\qtenv2.bat" 6.8
39+
call :build_msi "%QTBASE%\6.10.3\msvc2022_64\bin\qtenv2.bat" 6.10
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.11.1'
9-
Id="ED096C58-8C69-407C-B5E8-B1DB5AA01781"
10-
UpgradeCode="530C1070-CBE8-4BEB-9AB6-4BB88B0F797F"
8+
<Product Name='TreeFrog Framework 2.12.0'
9+
Id="9F1DD57C-11E7-4EC3-BA81-D89371A8BAFA"
10+
UpgradeCode="3B4A07B9-61C5-4AFB-B923-B671D8A98EB2"
1111
Language='1041' Codepage='932'
12-
Version='2.11.1' Manufacturer='TreeFrog Framework Project'>
12+
Version='2.12.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.11.1'>
30+
<Directory Id='VERSIONDIR' Name='2.12.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.11.1"/>
36+
<Directory Id="ApplicationProgramsFolder" Name="TreeFrog Framework 2.12.0"/>
3737
</Directory>
3838
</Directory>
3939

4040
<!-- デスクトップショートカット -->
4141
<DirectoryRef Id="DesktopFolder">
42-
<Component Id="DesktopShortcut" Guid="16D5AC4F-C3B0-4176-86FB-ADF14DE00A65">
42+
<Component Id="DesktopShortcut" Guid="40EB68CB-485F-418F-B03F-3CAC0AE79ED3">
4343
<Shortcut Id="PromptDesktopShortcut"
44-
Name="TreeFrog Prompt 2.11.1"
44+
Name="TreeFrog Prompt 2.12.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="13C193EA-09DE-4F2D-A5F0-62490C1C5D64">
54+
<Component Id="ApplicationShortcut" Guid="65DD917E-5878-446F-B0F7-16C89A63311F">
5555
<CreateFolder Directory="ApplicationProgramsFolder"/>
5656

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

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ namespace treefrogsetup {
4747
//
4848
// バージョン
4949
//
50-
static initonly String^ VERSION_STR6_NEW = L"6.9";
51-
static initonly String^ VERSION_STR6_PREV = L"6.8";
50+
static initonly String^ VERSION_STR6_NEW = L"6.11";
51+
static initonly String^ VERSION_STR6_PREV = L"6.10";
5252

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

5656
public:
5757
MainForm(void)

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ IDR_TREEFROG_QT608_MSI TREEFROG_MSI "..\\..\\msi\\TreeFrog-SDK-Qt6.8.msi"
2929
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
3030
IDR_TREEFROG_QT609_MSI TREEFROG_MSI "..\\..\\msi\\TreeFrog-SDK-Qt6.9.msi"
3131

32+
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
33+
IDR_TREEFROG_QT610_MSI TREEFROG_MSI "..\\..\\msi\\TreeFrog-SDK-Qt6.10.msi"
34+
35+
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
36+
IDR_TREEFROG_QT611_MSI TREEFROG_MSI "..\\..\\msi\\TreeFrog-SDK-Qt6.11.msi"
3237

3338
//
3439
// String Table resources

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@
1919
#define IDR_TREEFROG_QT611_MSI 10611
2020
#define IDR_TREEFROG_QT612_MSI 10612
2121
#define IDR_TREEFROG_QT613_MSI 10613
22+
#define IDR_TREEFROG_QT614_MSI 10614

0 commit comments

Comments
 (0)