Skip to content

Commit bd726d6

Browse files
committed
updated install script.
1 parent 728baa9 commit bd726d6

File tree

3 files changed

+13
-14
lines changed

3 files changed

+13
-14
lines changed

build.bat

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
55
:: Edit this line to run the batch file for Qt environment.
66
::
77
::call "C:\Qt\Qt5.6.2-mingw\5.6\mingw49_32\bin\qtenv2.bat"
8-
::call "C:\Qt\Qt5.7.0-mingw\5.7\mingw53_32\bin\qtenv2.bat"
9-
::call "C:\Qt\Qt5.6.2-msvc2015\5.6\msvc2015_64\bin\qtenv2.bat"
10-
::call "C:\Qt\Qt5.7.0-msvc2013\5.7\msvc2013_64\bin\qtenv2.bat"
11-
call "C:\Qt\Qt5.7.1-msvc2015\5.7\msvc2015_64\bin\qtenv2.bat"
8+
::call "C:\Qt\Qt5.7.1-mingw\5.7\mingw53_32\bin\qtenv2.bat"
9+
::call "C:\Qt\Qt5.8.0-msvc2015\5.8\msvc2015_64\bin\qtenv2.bat"
10+
call "C:\Qt\Qt5.9.1\5.9.1\msvc2015_64\bin\qtenv2.bat"
1211

1312
::call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64
1413
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
@@ -17,4 +16,4 @@ cd /D %~dp0
1716
call compile_install.bat
1817

1918
pause
20-
exit /b
19+
exit /b

installer/create_installer.bat

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

7-
set VERSION=1.17.0
7+
set VERSION=1.18.0
88
set TFDIR=C:\TreeFrog\%VERSION%
99
set BASEDIR=%~dp0
1010
set SLNFILE=%BASEDIR%\treefrog-setup\treefrog-setup.sln
1111
cd %BASEDIR%
1212

1313
:: MinGW
14-
call :build_msi "C:\Qt\Qt5.9.1\5.9.1\mingw53_32\bin\qtenv2.bat" 5.9
15-
call :build_msi "C:\Qt\Qt5.8.0-mingw\5.8\mingw53_32\bin\qtenv2.bat" 5.8
16-
call :build_setup treefrog-%VERSION%-mingw-setup.exe
14+
::call :build_msi "C:\Qt\Qt5.9.1\5.9.1\mingw53_32\bin\qtenv2.bat" 5.9
15+
::call :build_msi "C:\Qt\Qt5.8.0-mingw\5.8\mingw53_32\bin\qtenv2.bat" 5.8
16+
::call :build_setup treefrog-%VERSION%-mingw-setup.exe
1717

1818
:: MSVC2015
19-
::call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
20-
::call :build_msi "C:\Qt\Qt5.9.1\5.9.1\msvc2015_64\bin\qtenv2.bat" 5.7
21-
::call :build_msi "C:\Qt\Qt5.8.0-msvc2015\5.8\msvc2015_64\bin\qtenv2.bat" 5.8
22-
::call :build_setup treefrog-%VERSION%-msvc2015_64-setup.exe
19+
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
20+
call :build_msi "C:\Qt\Qt5.9.1\5.9.1\msvc2015_64\bin\qtenv2.bat" 5.7
21+
call :build_msi "C:\Qt\Qt5.8.0-msvc2015\5.8\msvc2015_64\bin\qtenv2.bat" 5.8
22+
call :build_setup treefrog-%VERSION%-msvc2015_64-setup.exe
2323

2424

2525
echo.

installer/msi/TreeFrog.wxs

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

5252
<!-- プログラムメニューショートカット -->
5353
<DirectoryRef Id="ApplicationProgramsFolder">
54-
<Component Id="ApplicationShortcut" Guid="CDA7495B-7C03-460C-B0FB-7ED187739575">
54+
<Component Id="ApplicationShortcut" Guid="36C20F6E-3CE8-46BC-983D-DC0083C667E3">
5555
<CreateFolder Directory="ApplicationProgramsFolder"/>
5656

5757
<!-- Shortcut to TF prompt-->

0 commit comments

Comments
 (0)