updated installer.

Author: treefrogframework

.editorconfig

@@ -35,3 +35,6 @@ trim_trailing_whitespace = true
 indent_size = 2
 trim_trailing_whitespace = false
 
+[*.wxs]
+end_of_line = crlf
+

build.bat

@@ -7,7 +7,7 @@ rem
 
 set BASEDIR=%~dp0
 
-call "C:\Qt\5.13.0\msvc2017_64\bin\qtenv2.bat"
+call "C:\Qt\5.13.2\msvc2017_64\bin\qtenv2.bat"
 rem call "C:\Qt\5.13.0\msvc2017\bin\qtenv2.bat"
 rem call "C:\Qt\5.13.0\msvc2015_64\bin\qtenv2.bat"
 rem call "C:\Qt\5.12.4\msvc2017_64\bin\qtenv2.bat"

installer/create_installer.bat

@@ -4,24 +4,19 @@
 :: Edit this line to run the batch file for Qt environment.
 ::
 
-set VERSION=1.26.0
+set VERSION=1.27.0
 set QTBASE=C:\Qt
 set TFDIR=C:\TreeFrog\%VERSION%
 
 set BASEDIR=%~dp0
 set SLNFILE=%BASEDIR%\treefrog-setup\treefrog-setup.sln
 cd %BASEDIR%
 
-:: MinGW
-::call :build_msi "%QTBASE%\5.13.0\mingw73_64\bin\qtenv2.bat"     5.13
-::call :build_msi "%QTBASE%\5.12.3\mingw73_64\bin\qtenv2.bat"     5.12
-::call :build_setup treefrog-%VERSION%-mingw73_64-setup.exe
-
 :: MSVC2017
 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
 
-call :build_msi "%QTBASE%\5.13.0\msvc2017_64\bin\qtenv2.bat"      5.13
-call :build_msi "%QTBASE%\5.12.3\msvc2017_64\bin\qtenv2.bat"      5.12
+call :build_msi "%QTBASE%\5.13.2\msvc2017_64\bin\qtenv2.bat"      5.13
+call :build_msi "%QTBASE%\5.12.6\msvc2017_64\bin\qtenv2.bat"      5.12
 call :build_setup treefrog-%VERSION%-msvc2017_64-setup.exe
 
 

installer/msi/TreeFrog.wxs

@@ -5,11 +5,11 @@
   <!-- *** 基本的に 9行目,10行目,42行目,54行目も修正する (guidgen使用) *** -->
 
   <!-- プロダクト情報 -->
-  <Product Name='TreeFrog Framework 1.26.0'
-           Id="5AB900BA-042F-413C-BE12-C0C27BDA9D4A"
-           UpgradeCode="6AF34635-8D46-4021-B159-3025EAA6B945"
+  <Product Name='TreeFrog Framework 1.27.0'
+           Id="D709F455-43AE-4157-9A31-9A5967C70959"
+           UpgradeCode="6B5CC596-D8F6-45C3-9B8D-E030EEF128B1"
            Language='1041' Codepage='932'
-           Version='1.26.0' Manufacturer='TreeFrog Framework Project'>
+           Version='1.27.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.26.0'>
+          <Directory Id='VERSIONDIR' Name='1.27.0'>
           </Directory>
         </Directory>
       </Directory>
       <Directory Id="DesktopFolder"  SourceName="Desktop"/>
       <Directory Id="ProgramMenuFolder">
-        <Directory Id="ApplicationProgramsFolder" Name="TreeFrog Framework 1.26.0"/>
+        <Directory Id="ApplicationProgramsFolder" Name="TreeFrog Framework 1.27.0"/>
       </Directory>
     </Directory>
 
     <!-- デスクトップショートカット -->
     <DirectoryRef Id="DesktopFolder">
-      <Component Id="DesktopShortcut" Guid="541EDC61-2DC7-47CD-B66F-65DCB57738FC">
+      <Component Id="DesktopShortcut" Guid="20B0DAA6-F140-4C43-8C44-C29119F57EFE">
         <Shortcut Id="PromptDesktopShortcut"
-                  Name="TreeFrog Prompt 1.26.0"
+                  Name="TreeFrog Prompt 1.27.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="10C73D88-0DC0-4AD8-868F-5A98F1F03CA0">
+      <Component Id="ApplicationShortcut" Guid="92249B48-5F80-4528-8F45-FA20388A860D">
         <CreateFolder Directory="ApplicationProgramsFolder"/>
 
         <!-- Shortcut to TF prompt-->
         <Shortcut Id="PromptProgramMenuShortcut"
-                  Name="TreeFrog Prompt 1.26.0"
+                  Name="TreeFrog Prompt 1.27.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.26.0")];
+[assembly:AssemblyVersionAttribute("1.27.0")];
 
 [assembly:ComVisible(false)];
 

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

@@ -47,8 +47,8 @@ namespace treefrogsetup {
         //
         // バージョン
         //
-        static initonly String^ VERSION_STR1 = L"5.12";
-        static initonly String^ VERSION_STR2 = L"5.13";
+        static initonly String^ VERSION_STR512 = L"5.12";
+        static initonly String^ VERSION_STR513 = L"5.13";
 
     public:
         MainForm(void)
@@ -169,7 +169,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 " + VERSION_STR1 + " or " + VERSION_STR2 + ".";
+            this->label->Text = L"Specify a base folder of Qt version " + VERSION_STR512 + " or " + VERSION_STR513 + ".";
             // 
             // label1
             // 
@@ -180,7 +180,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\\Qt" + VERSION_STR2 + ".0\\msvc2017_64";
+            this->label1->Text = L"Example:  C:\\Qt\\" + VERSION_STR513 + ".0\\msvc2017_64";
             // 
             // labeltop
             // 
@@ -389,12 +389,12 @@ namespace treefrogsetup {
 
             // Get msi file from resource
             int rcid = 0;
-            if (version->IndexOf("Qt version " + VERSION_STR2, StringComparison::OrdinalIgnoreCase) > 0) {
+            if (version->IndexOf("Qt version " + VERSION_STR513, StringComparison::OrdinalIgnoreCase) > 0) {
+                rcid = IDR_TREEFROG_QT513_MSI;
+            } else if (version->IndexOf("Qt version " + VERSION_STR512, StringComparison::OrdinalIgnoreCase) > 0) {
                 rcid = IDR_TREEFROG_QT512_MSI;
-            } else if (version->IndexOf("Qt version " + VERSION_STR1, StringComparison::OrdinalIgnoreCase) > 0) {
-                rcid = IDR_TREEFROG_QT511_MSI;
             } else {
-                abort("Not found Qt version " + VERSION_STR2 + " or " + VERSION_STR1 + ".", "Abort");
+                abort("Not found Qt version " + VERSION_STR513 + " or " + VERSION_STR512 + ".", "Abort");
                 return;
             }
 

installer/treefrog-setup/treefrog-setup/treefrog-setup.vcxproj

@@ -12,7 +12,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{A9BABE2B-85A5-45EF-8950-1A5A68E55B36}</ProjectGuid>
-    <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <Keyword>ManagedCProj</Keyword>
     <RootNamespace>treefrogsetup</RootNamespace>
   </PropertyGroup>
@@ -22,13 +22,14 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <CLRSupport>Pure</CLRSupport>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v90</PlatformToolset>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CLRSupport>Pure</CLRSupport>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">