update installer.

Author: treefrogframework

compile_install.bat

@@ -12,7 +12,7 @@ if not "%Platform%" == "" (
   set MAKE=nmake
   set CL=/MP
 ) else (
-  set MAKE=mingw32-make -j4
+  set MAKE=mingw32-make -j8
 )
 
 ::

installer/create_installer.bat

@@ -4,21 +4,21 @@
 :: Edit this line to run the batch file for Qt environment.
 ::
 
-set VERSION=1.19.0
+set VERSION=1.20.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\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_msi "D:\Qt\Qt5.10.0\5.10.0\mingw53_32\bin\qtenv2.bat"     5.10
+call :build_msi "D:\Qt\Qt5.9.3\5.9.3\mingw53_32\bin\qtenv2.bat"       5.9
 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\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_msi "D:\Qt\Qt5.10.0\5.10.0\msvc2015_64\bin\qtenv2.bat"      5.10
+call :build_msi "D:\Qt\Qt5.9.3\5.9.3\msvc2015_64\bin\qtenv2.bat"        5.9
 call :build_setup treefrog-%VERSION%-msvc2015_64-setup.exe
 
 

installer/msi/TreeFrog.wxs

@@ -5,11 +5,11 @@
   <!-- *** 基本的に 9行目,10行目,42行目,54行目も修正する (guidgen使用) *** -->
 
   <!-- プロダクト情報 -->
-  <Product Name='TreeFrog Framework 1.19.0'
-           Id="09014453-D3DB-426B-B9A9-634BB37B2E1B"
-           UpgradeCode="46B551A7-1B69-469F-8E90-01C1FF28B364"
+  <Product Name='TreeFrog Framework 1.20.0'
+           Id="BDAAE374-CC84-4FAF-AF55-145895D96281"
+           UpgradeCode="C0690385-DBE9-4218-AFDB-0F6E27AFD4B8"
            Language='1041' Codepage='932'
-           Version='1.19.0' Manufacturer='TreeFrog Framework Project'>
+           Version='1.20.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.19.0'>
+          <Directory Id='VERSIONDIR' Name='1.20.0'>
           </Directory>
         </Directory>
       </Directory>
       <Directory Id="DesktopFolder"  SourceName="Desktop"/>
       <Directory Id="ProgramMenuFolder">
-        <Directory Id="ApplicationProgramsFolder" Name="TreeFrog Framework 1.19.0"/>
+        <Directory Id="ApplicationProgramsFolder" Name="TreeFrog Framework 1.20.0"/>
       </Directory>
     </Directory>
 
     <!-- デスクトップショートカット -->
     <DirectoryRef Id="DesktopFolder">
-      <Component Id="DesktopShortcut" Guid="B03BEE37-B0C0-47A8-8F43-3843B13D694F">
+      <Component Id="DesktopShortcut" Guid="D8989877-E927-4C61-B58B-35FC4EFDDEF8">
         <Shortcut Id="PromptDesktopShortcut"
-                  Name="TreeFrog Prompt 1.19.0"
+                  Name="TreeFrog Prompt 1.20.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="1B9111F0-B389-45BA-B8BA-A39EAA517E57">
+      <Component Id="ApplicationShortcut" Guid="4D6035EF-4306-42A4-BF64-B21912A77AAA">
         <CreateFolder Directory="ApplicationProgramsFolder"/>
 
         <!-- Shortcut to TF prompt-->
         <Shortcut Id="PromptProgramMenuShortcut"
-                  Name="TreeFrog Prompt 1.19.0"
+                  Name="TreeFrog Prompt 1.20.0"
                   Description="TreeFrog Framework Prompt"
                   Target="[SystemFolder]cmd.exe" Arguments="/K [VERSIONDIR]bin\\tfenv.bat"
                   WorkingDirectory="PersonalFolder"/>

installer/msi/old_create_installer.bat

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

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

@@ -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 5.9.";
+            this->label->Text = L"Specify a base folder of Qt version 5.9 or 5.10.";
             // 
             // 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.9.1\\5.9.1\\msvc2015_64";
+            this->label1->Text = L"Example:  C:\\Qt\\Qt5.10.0\\5.10.0\\msvc2015_64";
             // 
             // labeltop
             // 
@@ -379,9 +379,9 @@ namespace treefrogsetup {
             }
 
             // Get msi file from resource
-            int rcid = IDR_TREEFROG_QT59_MSI;
-            if (version->IndexOf("Qt version 5.8", StringComparison::OrdinalIgnoreCase) > 0) {
-                rcid = IDR_TREEFROG_QT58_MSI;
+            int rcid = IDR_TREEFROG_QT510_MSI;
+            if (version->IndexOf("Qt version 5.9", StringComparison::OrdinalIgnoreCase) > 0) {
+                rcid = IDR_TREEFROG_QT59_MSI;
             }
 
             System::Reflection::Module^ mod = System::Reflection::Assembly::GetExecutingAssembly()->GetModules()[0];

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

@@ -21,7 +21,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDR_TREEFROG_QT59_MSI   TREEFROG_MSI   "..\\..\\msi\\TreeFrog-SDK-Qt5.9.msi"
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-IDR_TREEFROG_QT58_MSI   TREEFROG_MSI   "..\\..\\msi\\TreeFrog-SDK-Qt5.8.msi"
+IDR_TREEFROG_QT510_MSI  TREEFROG_MSI   "..\\..\\msi\\TreeFrog-SDK-Qt5.10.msi"
 
 //
 // String Table resources

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

@@ -16,3 +16,4 @@
 #define IDR_TREEFROG_QT57_MSI                   1057
 #define IDR_TREEFROG_QT58_MSI                   1058
 #define IDR_TREEFROG_QT59_MSI                   1059
+#define IDR_TREEFROG_QT510_MSI                  10510