Skip to content

Commit fa0d5ce

Browse files
update bat files. modified output messages.
1 parent 6489b20 commit fa0d5ce

File tree

6 files changed

+23
-21
lines changed

6 files changed

+23
-21
lines changed

build.bat

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
::
55
:: Edit this line to run the batch file for Qt environment.
66
::
7-
::call "C:\Qt\Qt5.9.3\5.9.3\mingw53_32\bin\qtenv2.bat"
8-
::call "C:\Qt\Qt5.9.3\5.9.3\msvc2015_64\bin\qtenv2.bat"
9-
::call "C:\Qt\Qt5.9.3\5.9.3\msvc2017_64\bin\qtenv2.bat"
10-
::call "C:\Qt\Qt5.10.0\5.10.0\mingw53_32\bin\qtenv2.bat"
11-
call "C:\Qt\Qt5.10.0\5.10.0\msvc2015_64\bin\qtenv2.bat"
12-
::call "C:\Qt\Qt5.10.0\5.10.0\msvc2017_64\bin\qtenv2.bat"
13-
14-
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
15-
::call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
7+
::call "C:\Qt\5.9.3\mingw53_32\bin\qtenv2.bat"
8+
::call "C:\Qt\5.9.3\msvc2015_64\bin\qtenv2.bat"
9+
::call "C:\Qt\5.9.3\msvc2017_64\bin\qtenv2.bat"
10+
::call "C:\Qt\5.10.0\mingw53_32\bin\qtenv2.bat"
11+
::call "C:\Qt\5.10.0\msvc2015_64\bin\qtenv2.bat"
12+
call "C:\Qt\5.11.0\msvc2017_64\bin\qtenv2.bat"
13+
::call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
14+
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
1615

1716
cd /D %~dp0
1817
call compile_install.bat

installer/create_installer.bat

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,25 @@
55
::
66

77
set VERSION=1.22.0
8-
set QTBASE=D:\Qt
8+
set QTBASE=C:\Qt
99
set TFDIR=C:\TreeFrog\%VERSION%
1010

1111
set BASEDIR=%~dp0
1212
set SLNFILE=%BASEDIR%\treefrog-setup\treefrog-setup.sln
1313
cd %BASEDIR%
1414

1515
:: MinGW
16-
call :build_msi "%QTBASE%\Qt5.10.0\5.10.0\mingw53_32\bin\qtenv2.bat" 5.10
17-
call :build_msi "%QTBASE%\Qt5.9.3\5.9.3\mingw53_32\bin\qtenv2.bat" 5.9
16+
call :build_msi "%QTBASE%\5.11.0\mingw53_32\bin\qtenv2.bat" 5.11
17+
call :build_msi "%QTBASE%\5.10.1\mingw53_32\bin\qtenv2.bat" 5.10
18+
::call :build_msi "%QTBASE%\5.9.3\mingw53_32\bin\qtenv2.bat" 5.9
1819
call :build_setup treefrog-%VERSION%-mingw-setup.exe
1920

2021
:: MSVC2017
2122
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
2223

23-
call :build_msi "%QTBASE%\Qt5.10.0\5.10.0\msvc2017_64\bin\qtenv2.bat" 5.10
24-
call :build_msi "%QTBASE%\Qt5.9.3\5.9.3\msvc2017_64\bin\qtenv2.bat" 5.9
24+
call :build_msi "%QTBASE%\5.11.0\msvc2017_64\bin\qtenv2.bat" 5.11
25+
call :build_msi "%QTBASE%\5.10.1\msvc2017_64\bin\qtenv2.bat" 5.10
26+
::call :build_msi "%QTBASE%\5.9.3\msvc2017_64\bin\qtenv2.bat" 5.9
2527
call :build_setup treefrog-%VERSION%-msvc2017_64-setup.exe
2628

2729

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ namespace treefrogsetup {
160160
this->label->Name = L"label";
161161
this->label->Size = System::Drawing::Size(309, 15);
162162
this->label->TabIndex = 4;
163-
this->label->Text = L"Specify a base folder of Qt version 5.9 or 5.10.";
163+
this->label->Text = L"Specify a base folder of Qt version 5.10 or 5.11.";
164164
//
165165
// label1
166166
//
@@ -171,7 +171,7 @@ namespace treefrogsetup {
171171
this->label1->Name = L"label1";
172172
this->label1->Size = System::Drawing::Size(162, 15);
173173
this->label1->TabIndex = 5;
174-
this->label1->Text = L"Example: C:\\Qt\\Qt5.10.1\\5.10.1\\msvc2017_64";
174+
this->label1->Text = L"Example: C:\\Qt\\5.11.0\\msvc2017_64";
175175
//
176176
// labeltop
177177
//

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ LANGUAGE 17, SUBLANG_DEFAULT
1818
// User resources
1919
//
2020
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
21-
IDR_TREEFROG_QT59_MSI TREEFROG_MSI "..\\..\\msi\\TreeFrog-SDK-Qt5.9.msi"
21+
IDR_TREEFROG_QT510_MSI TREEFROG_MSI "..\\..\\msi\\TreeFrog-SDK-Qt5.10.msi"
2222

2323
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
24-
IDR_TREEFROG_QT510_MSI TREEFROG_MSI "..\\..\\msi\\TreeFrog-SDK-Qt5.10.msi"
24+
IDR_TREEFROG_QT511_MSI TREEFROG_MSI "..\\..\\msi\\TreeFrog-SDK-Qt5.11.msi"
2525

2626
//
2727
// String Table resources

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@
1717
#define IDR_TREEFROG_QT58_MSI 1058
1818
#define IDR_TREEFROG_QT59_MSI 1059
1919
#define IDR_TREEFROG_QT510_MSI 10510
20+
#define IDR_TREEFROG_QT511_MSI 10511

tools/tspawn/main.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -480,9 +480,9 @@ static void printSuccessMessage(const QString &model)
480480
#else
481481
msg = msg.arg("");
482482
#endif
483-
msg += "\n or\n\ncmake:\n";
484-
msg += " Run `mkdir build; cd build; cmake ..` to generate a Makefile.\n";
485-
msg += " Run `cd build; make cmake` to regenerate the Makefile.";
483+
msg += "\n or\n\ncmake:\n";
484+
msg += " Run `cd build; cmake ..` to generate a Makefile.\n";
485+
msg += " Run `cd build; make cmake` to regenerate the Makefile.";
486486
}
487487

488488
putchar('\n');

0 commit comments

Comments
 (0)