Skip to content

Commit f17e2d0

Browse files
update installer.
1 parent d56e15c commit f17e2d0

File tree

6 files changed

+18
-18
lines changed

6 files changed

+18
-18
lines changed

build.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
::call "C:\Qt\Qt5.7.0-mingw\5.7\mingw53_32\bin\qtenv2.bat"
99
::call "C:\Qt\Qt5.6.2-msvc2015\5.6\msvc2015_64\bin\qtenv2.bat"
1010
::call "C:\Qt\Qt5.7.0-msvc2013\5.7\msvc2013_64\bin\qtenv2.bat"
11-
call "C:\Qt\Qt5.7.0\5.7\msvc2015_64\bin\qtenv2.bat"
11+
call "C:\Qt\Qt5.7.1-msvc2015\5.7\msvc2015_64\bin\qtenv2.bat"
1212

1313
::call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64
1414
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64

installer/create_installer.bat

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

7-
set VERSION=1.14.0
7+
set VERSION=1.15.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
1414
call :build_msi "C:\Qt\Qt5.6.2-mingw\5.6\mingw49_32\bin\qtenv2.bat" 5.6
15-
call :build_msi "C:\Qt\Qt5.7.0-mingw\5.7\mingw53_32\bin\qtenv2.bat" 5.7
15+
call :build_msi "C:\Qt\Qt5.7.1-mingw\5.7\mingw53_32\bin\qtenv2.bat" 5.7
1616
call :build_setup treefrog-%VERSION%-mingw-setup.exe
1717

1818

1919
:: MSVC2013
2020
::call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64
2121
::call :build_msi "C:\Qt\Qt5.6.1-msvc2013\5.6\msvc2013_64\bin\qtenv2.bat" 5.6
22-
::call :build_msi "C:\Qt\Qt5.7.0-msvc2013\5.7\msvc2013_64\bin\qtenv2.bat" 5.7
22+
::call :build_msi "C:\Qt\Qt5.7.1-msvc2013\5.7\msvc2013_64\bin\qtenv2.bat" 5.7
2323
::call :build_setup treefrog-%VERSION%-msvc2013_64-setup.exe
2424

2525

2626
:: MSVC2015
2727
::call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
2828
::call :build_msi "C:\Qt\Qt5.6.2-msvc2015\5.6\msvc2015_64\bin\qtenv2.bat" 5.6
29-
::call :build_msi "C:\Qt\Qt5.7.0\5.7\msvc2015_64\bin\qtenv2.bat" 5.7
29+
::call :build_msi "C:\Qt\Qt5.7.1-msvc2015\5.7\msvc2015_64\bin\qtenv2.bat" 5.7
3030
::call :build_setup treefrog-%VERSION%-msvc2015_64-setup.exe
3131

3232

installer/msi/TreeFrog.wxs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
<!-- *** 基本的に 9行目,10行目,42行目,54行目も修正する (guidgen使用) *** -->
66

77
<!-- プロダクト情報 -->
8-
<Product Name='TreeFrog Framework 1.14.0'
9-
Id="9D14E4B5-85BE-4897-A614-0FFAA5B7AC21"
10-
UpgradeCode="D6F6D721-7E7C-4FF7-803B-EBEE78899E44"
8+
<Product Name='TreeFrog Framework 1.15.0'
9+
Id="72A5A390-E0BC-4E10-AAE5-0786A52895E5"
10+
UpgradeCode="9828E4CB-2C4B-4C16-B645-89CF6C87F310"
1111
Language='1041' Codepage='932'
12-
Version='1.14.0' Manufacturer='TreeFrog Framework Project'>
12+
Version='1.15.0' Manufacturer='TreeFrog Framework Project'>
1313

1414
<!-- パッケージ情報 -->
1515
<Package Id='*' Keywords='Installer'
@@ -27,21 +27,21 @@
2727
<Directory Id='TARGETDIR' Name='SourceDir'>
2828
<Directory Id='WINDOWSVOLUME'>
2929
<Directory Id='INSTALLDIR' Name='TreeFrog'>
30-
<Directory Id='VERSIONDIR' Name='1.14.0'>
30+
<Directory Id='VERSIONDIR' Name='1.15.0'>
3131
</Directory>
3232
</Directory>
3333
</Directory>
3434
<Directory Id="DesktopFolder" SourceName="Desktop"/>
3535
<Directory Id="ProgramMenuFolder">
36-
<Directory Id="ApplicationProgramsFolder" Name="TreeFrog Framework 1.14.0"/>
36+
<Directory Id="ApplicationProgramsFolder" Name="TreeFrog Framework 1.15.0"/>
3737
</Directory>
3838
</Directory>
3939

4040
<!-- デスクトップショートカット -->
4141
<DirectoryRef Id="DesktopFolder">
42-
<Component Id="DesktopShortcut" Guid="8F5ADFCA-896C-4191-BFF2-878B98F50D52">
42+
<Component Id="DesktopShortcut" Guid="B177482D-E4B2-4298-90DB-ED9C38C46A8B">
4343
<Shortcut Id="PromptDesktopShortcut"
44-
Name="TreeFrog Prompt 1.14.0"
44+
Name="TreeFrog Prompt 1.15.0"
4545
Description="TreeFrog Framework Prompt"
4646
Target="[SystemFolder]cmd.exe" Arguments="/K [VERSIONDIR]bin\\tfenv.bat"
4747
WorkingDirectory="PersonalFolder"/>
@@ -51,12 +51,12 @@
5151

5252
<!-- プログラムメニューショートカット -->
5353
<DirectoryRef Id="ApplicationProgramsFolder">
54-
<Component Id="ApplicationShortcut" Guid="FD985A10-4C60-47E0-976C-7C191DC1FAB9">
54+
<Component Id="ApplicationShortcut" Guid="A7EC8DFB-AE32-4E6C-AA6C-B4EEE3E7F143">
5555
<CreateFolder Directory="ApplicationProgramsFolder"/>
5656

5757
<!-- Shortcut to TF prompt-->
5858
<Shortcut Id="PromptProgramMenuShortcut"
59-
Name="TreeFrog Prompt 1.14.0"
59+
Name="TreeFrog Prompt 1.15.0"
6060
Description="TreeFrog Framework Prompt"
6161
Target="[SystemFolder]cmd.exe" Arguments="/K [VERSIONDIR]bin\\tfenv.bat"
6262
WorkingDirectory="PersonalFolder"/>

installer/msi/license.rtf

2 Bytes
Binary file not shown.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ using namespace System::Security::Permissions;
1616
[assembly:AssemblyConfigurationAttribute("")];
1717
[assembly:AssemblyCompanyAttribute("")];
1818
[assembly:AssemblyProductAttribute("treefrogsetup")];
19-
[assembly:AssemblyCopyrightAttribute("Copyright (c) 2010-2016")];
19+
[assembly:AssemblyCopyrightAttribute("Copyright (c) 2010-2017")];
2020
[assembly:AssemblyTrademarkAttribute("")];
2121
[assembly:AssemblyCultureAttribute("")];
2222

@@ -31,7 +31,7 @@ using namespace System::Security::Permissions;
3131
// すべての値を指定するか、下のように '*' を使ってリビジョンおよびビルド番号を
3232
// 既定値にすることができます:
3333

34-
[assembly:AssemblyVersionAttribute("1.14.0")];
34+
[assembly:AssemblyVersionAttribute("1.15.0")];
3535

3636
[assembly:ComVisible(false)];
3737

tools/test/releasetest/releasetest.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@ECHO OFF
22
@setlocal
33

4-
::call "C:\TreeFrog\1.7.9\bin\tfenv.bat"
4+
::call "C:\TreeFrog\1.15.0\bin\tfenv.bat"
55

66
set APPNAME=blogapp
77
set DBFILE=%APPNAME%\db\dbfile

0 commit comments

Comments
 (0)