updated installer for Windows.

Author: aoym

installer/create_installer.bat

@@ -11,14 +11,14 @@ 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 "C:\Qt\Qt5.7.1-mingw\5.7\mingw53_32\bin\qtenv2.bat"   5.7
 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.7
 ::call :build_msi "C:\Qt\Qt5.8.0-msvc2015\5.8\msvc2015_64\bin\qtenv2.bat"  5.8
-::call :build_msi "C:\Qt\Qt5.7.1-msvc2015\5.7\msvc2015_64\bin\qtenv2.bat"  5.7
 ::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.17.0'
-           Id="26ED0210-2197-4E8A-9010-613D8637FEFE"
-           UpgradeCode="26CA5D72-5950-4491-99F4-FD917CFED74B"
+  <Product Name='TreeFrog Framework 1.18.0'
+           Id="FED11633-2CEF-4896-B728-2DCBD6A03BC8"
+           UpgradeCode="6AE5DED8-FEED-400B-9FA0-FD58A5E8BC61"
            Language='1041' Codepage='932'
-           Version='1.17.0' Manufacturer='TreeFrog Framework Project'>
+           Version='1.18.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.17.0'>
+          <Directory Id='VERSIONDIR' Name='1.18.0'>
           </Directory>
         </Directory>
       </Directory>
       <Directory Id="DesktopFolder"  SourceName="Desktop"/>
       <Directory Id="ProgramMenuFolder">
-        <Directory Id="ApplicationProgramsFolder" Name="TreeFrog Framework 1.17.0"/>
+        <Directory Id="ApplicationProgramsFolder" Name="TreeFrog Framework 1.18.0"/>
       </Directory>
     </Directory>
 
     <!-- デスクトップショートカット -->
     <DirectoryRef Id="DesktopFolder">
-      <Component Id="DesktopShortcut" Guid="C3C47016-19CE-4BBD-8DC9-99312314C5F2">
+      <Component Id="DesktopShortcut" Guid="CDA7495B-7C03-460C-B0FB-7ED187739575">
         <Shortcut Id="PromptDesktopShortcut"
-                  Name="TreeFrog Prompt 1.17.0"
+                  Name="TreeFrog Prompt 1.18.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="3290F062-8FB4-439C-BD93-1C84E6AF949D">
+      <Component Id="ApplicationShortcut" Guid="CDA7495B-7C03-460C-B0FB-7ED187739575">
         <CreateFolder Directory="ApplicationProgramsFolder"/>
 
         <!-- Shortcut to TF prompt-->
         <Shortcut Id="PromptProgramMenuShortcut"
-                  Name="TreeFrog Prompt 1.17.0"
+                  Name="TreeFrog Prompt 1.18.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.17.0")];
+[assembly:AssemblyVersionAttribute("1.18.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.7 or later.";
+            this->label->Text = L"Specify a base folder of Qt version 5.8 or later.";
             // 
             // label1
             // 
@@ -374,9 +374,9 @@ namespace treefrogsetup {
             }
 
             // Get msi file from resource
-            int rcid = IDR_TREEFROG_QT58_MSI;
-            if (version->IndexOf("Qt version 5.7", StringComparison::OrdinalIgnoreCase) > 0) {
-                rcid = IDR_TREEFROG_QT57_MSI;
+            int rcid = IDR_TREEFROG_QT59_MSI;
+            if (version->IndexOf("Qt version 5.8", StringComparison::OrdinalIgnoreCase) > 0) {
+                rcid = IDR_TREEFROG_QT58_MSI;
             }
 
             System::Reflection::Module^ mod = System::Reflection::Assembly::GetExecutingAssembly()->GetModules()[0];

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

@@ -17,16 +17,15 @@ LANGUAGE 17, SUBLANG_DEFAULT
 //
 // User resources
 //
+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"
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDR_TREEFROG_QT57_MSI   TREEFROG_MSI   "..\\..\\msi\\TreeFrog-SDK-Qt5.7.msi"
 
-//LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-//IDR_TREEFROG_QT56_MSI   TREEFROG_MSI   "..\\..\\msi\\TreeFrog-SDK-Qt5.6.msi"
-
 //
 // String Table resources
 //