updated installer.

Author: aoym

build.bat

@@ -5,12 +5,11 @@
 :: Edit this line to run the batch file for Qt environment.
 ::
 ::call "C:\Qt\Qt5.6.2-mingw\5.6\mingw49_32\bin\qtenv2.bat"
-::call "C:\Qt\Qt5.7.1-mingw\5.7\mingw53_32\bin\qtenv2.bat"
-::call "C:\Qt\Qt5.8.0-msvc2015\5.8\msvc2015_64\bin\qtenv2.bat"
-call "C:\Qt\Qt5.9.1\5.9.1\msvc2015_64\bin\qtenv2.bat"
+call "C:\Qt\Qt5.9.1\5.9.1\mingw53_32\bin\qtenv2.bat"
+::call "C:\Qt\Qt5.9.1\5.9.1\msvc2015_64\bin\qtenv2.bat"
 
 ::call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64
-call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+::call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
 
 cd /D %~dp0
 call compile_install.bat

compile_install.bat

@@ -1,8 +1,9 @@
 @ECHO OFF
 @setlocal
 
-:: Requires Qt environment.
+cd /D %~dp0
 
+:: Requires Qt environment.
 
 if "%Platform%" == "X64" (
   set MAKE=nmake

configure.bat

@@ -115,6 +115,7 @@ echo cd /D %%HOMEDRIVE%%%%HOMEPATH%%>> %TFENV%
 
 
 set TFDIR=%TFDIR:\=/%
+del 3rdparty\mongo-c-driver\.qmake.stash src\.qmake.stash tools\.qmake.stash >nul 2>&1
 :: Builds MongoDB driver
 echo Compiling MongoDB driver library ...
 cd 3rdparty\mongo-c-driver

installer/create_installer.bat

@@ -4,22 +4,22 @@
 :: Edit this line to run the batch file for Qt environment.
 ::
 
-set VERSION=1.18.0
+set VERSION=1.19.0
 set TFDIR=C:\TreeFrog\%VERSION%
 set BASEDIR=%~dp0
 set SLNFILE=%BASEDIR%\treefrog-setup\treefrog-setup.sln
 cd %BASEDIR%
 
 :: MinGW
-::call :build_msi "C:\Qt\Qt5.9.1-mingw\5.9.1\mingw53_32\bin\qtenv2.bat"   5.9
-::call :build_msi "C:\Qt\Qt5.8.0-mingw\5.8\mingw53_32\bin\qtenv2.bat"   5.8
-::call :build_setup treefrog-%VERSION%-mingw-setup.exe
+call :build_msi "C:\Qt\Qt5.9.1\5.9.1\mingw53_32\bin\qtenv2.bat"       5.9
+call :build_msi "C:\Qt\Qt5.8.0-mingw\5.8\mingw53_32\bin\qtenv2.bat"   5.8
+call :build_setup treefrog-%VERSION%-mingw-setup.exe
 
 :: MSVC2015
-call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
-call :build_msi "C:\Qt\Qt5.9.1-msvc2015\5.9.1\msvc2015_64\bin\qtenv2.bat"  5.9
-call :build_msi "C:\Qt\Qt5.8.0-msvc2015\5.8\msvc2015_64\bin\qtenv2.bat"  5.8
-call :build_setup treefrog-%VERSION%-msvc2015_64-setup.exe
+::call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+::call :build_msi "C:\Qt\Qt5.9.1\5.9.1\msvc2015_64\bin\qtenv2.bat"        5.9
+::call :build_msi "C:\Qt\Qt5.8.0-msvc2015\5.8\msvc2015_64\bin\qtenv2.bat" 5.8
+::call :build_setup treefrog-%VERSION%-msvc2015_64-setup.exe
 
 
 echo.

installer/msi/TreeFrog.wxs

@@ -5,11 +5,11 @@
   <!-- *** 基本的に 9行目,10行目,42行目,54行目も修正する (guidgen使用) *** -->
 
   <!-- プロダクト情報 -->
-  <Product Name='TreeFrog Framework 1.18.0'
-           Id="FED11633-2CEF-4896-B728-2DCBD6A03BC8"
-           UpgradeCode="6AE5DED8-FEED-400B-9FA0-FD58A5E8BC61"
+  <Product Name='TreeFrog Framework 1.19.0'
+           Id="09014453-D3DB-426B-B9A9-634BB37B2E1B"
+           UpgradeCode="46B551A7-1B69-469F-8E90-01C1FF28B364"
            Language='1041' Codepage='932'
-           Version='1.18.0' Manufacturer='TreeFrog Framework Project'>
+           Version='1.19.0' Manufacturer='TreeFrog Framework Project'>
 
     <!-- パッケージ情報 -->
     <Package Id='*' Keywords='Installer'
@@ -27,21 +27,21 @@
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='WINDOWSVOLUME'>
         <Directory Id='INSTALLDIR' Name='TreeFrog'>
-          <Directory Id='VERSIONDIR' Name='1.18.0'>
+          <Directory Id='VERSIONDIR' Name='1.19.0'>
           </Directory>
         </Directory>
       </Directory>
       <Directory Id="DesktopFolder"  SourceName="Desktop"/>
       <Directory Id="ProgramMenuFolder">
-        <Directory Id="ApplicationProgramsFolder" Name="TreeFrog Framework 1.18.0"/>
+        <Directory Id="ApplicationProgramsFolder" Name="TreeFrog Framework 1.19.0"/>
       </Directory>
     </Directory>
 
     <!-- デスクトップショートカット -->
     <DirectoryRef Id="DesktopFolder">
-      <Component Id="DesktopShortcut" Guid="CDA7495B-7C03-460C-B0FB-7ED187739575">
+      <Component Id="DesktopShortcut" Guid="B03BEE37-B0C0-47A8-8F43-3843B13D694F">
         <Shortcut Id="PromptDesktopShortcut"
-                  Name="TreeFrog Prompt 1.18.0"
+                  Name="TreeFrog Prompt 1.19.0"
                   Description="TreeFrog Framework Prompt"
                   Target="[SystemFolder]cmd.exe" Arguments="/K [VERSIONDIR]bin\\tfenv.bat"
                   WorkingDirectory="PersonalFolder"/>
@@ -51,12 +51,12 @@
 
     <!-- プログラムメニューショートカット -->
     <DirectoryRef Id="ApplicationProgramsFolder">
-      <Component Id="ApplicationShortcut" Guid="36C20F6E-3CE8-46BC-983D-DC0083C667E3">
+      <Component Id="ApplicationShortcut" Guid="1B9111F0-B389-45BA-B8BA-A39EAA517E57">
         <CreateFolder Directory="ApplicationProgramsFolder"/>
 
         <!-- Shortcut to TF prompt-->
         <Shortcut Id="PromptProgramMenuShortcut"
-                  Name="TreeFrog Prompt 1.18.0"
+                  Name="TreeFrog Prompt 1.19.0"
                   Description="TreeFrog Framework Prompt"
                   Target="[SystemFolder]cmd.exe" Arguments="/K [VERSIONDIR]bin\\tfenv.bat"
                   WorkingDirectory="PersonalFolder"/>

installer/treefrog-setup/treefrog-setup/AssemblyInfo.cpp

@@ -31,7 +31,7 @@ using namespace System::Security::Permissions;
 // すべての値を指定するか、下のように '*' を使ってリビジョンおよびビルド番号を
 // 既定値にすることができます:
 
-[assembly:AssemblyVersionAttribute("1.18.0")];
+[assembly:AssemblyVersionAttribute("1.19.0")];
 
 [assembly:ComVisible(false)];
 

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

@@ -160,7 +160,7 @@ namespace treefrogsetup {
             this->label->Name = L"label";
             this->label->Size = System::Drawing::Size(309, 15);
             this->label->TabIndex = 4;
-            this->label->Text = L"Specify a base folder of Qt version 5.8 or later.";
+            this->label->Text = L"Specify a base folder of Qt version 5.8 or 5.9.";
             // 
             // label1
             // 
@@ -171,7 +171,7 @@ namespace treefrogsetup {
             this->label1->Name = L"label1";
             this->label1->Size = System::Drawing::Size(162, 15);
             this->label1->TabIndex = 5;
-            this->label1->Text = L"Example:  C:\\Qt\\Qt5.8.0";
+            this->label1->Text = L"Example:  C:\\Qt\\Qt5.9.1\\5.9.1\\msvc2015_64";
             // 
             // labeltop
             // 
@@ -338,6 +338,11 @@ namespace treefrogsetup {
             if (forderTextBox->Text != L"C:\\") {
                 bins->AddRange(searchSubDirectories(L"bin", searchSubDirectories(L"mingw*", forderTextBox->Text, excludes), excludes));
                 bins->AddRange(searchSubDirectories(L"bin", searchSubDirectories(L"msvc20*", forderTextBox->Text, excludes), excludes));
+
+                // Qt 5.9 or later
+                if (bins->Count == 0) {
+                    bins->AddRange(searchSubDirectories(L"bin", forderTextBox->Text, excludes));
+                }
             }
 
             if (bins->Count == 0) {