Skip to content

Commit

Permalink
updated installer.
Browse files Browse the repository at this point in the history
  • Loading branch information
treefrogframework committed Dec 10, 2023
1 parent b9ef322 commit 55a4458
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions installer/create_installer.bat
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ set LIB=
set PATH=C:\WINDOWS\system32;C:\WINDOWS

call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
call :build_msi "%QTBASE%\6.4.2\msvc2019_64\bin\qtenv2.bat" 6.4
call :build_msi "%QTBASE%\6.6.1\msvc2019_64\bin\qtenv2.bat" 6.6

:: Clear environment variables
set VCToolsVersion=
Expand All @@ -36,7 +36,7 @@ set LIB=
set PATH=C:\WINDOWS\system32;C:\WINDOWS

call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
call :build_msi "%QTBASE%\6.3.2\msvc2019_64\bin\qtenv2.bat" 6.3
call :build_msi "%QTBASE%\6.5.3\msvc2019_64\bin\qtenv2.bat" 6.5

call :build_setup treefrog-%VERSION%-msvc_64-setup.exe

Expand Down
20 changes: 10 additions & 10 deletions installer/msi/TreeFrog.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<!-- *** 基本的に 9行目,10行目,42行目,54行目も修正する (guidgen使用) *** -->

<!-- プロダクト情報 -->
<Product Name='TreeFrog Framework 2.7.1'
Id="F3BE3299-8536-47B5-9874-1CB8DB21102E"
UpgradeCode="D956C004-0F4D-44BE-98D2-A627FAD49C73"
<Product Name='TreeFrog Framework 2.8.0'
Id="E97EAFE9-A79C-4FFF-8A61-2DF8987D03BA"
UpgradeCode="B182CC33-A14B-4B56-9C9F-1E7486A3B4CF"
Language='1041' Codepage='932'
Version='2.7.1' Manufacturer='TreeFrog Framework Project'>
Version='2.8.0' Manufacturer='TreeFrog Framework Project'>

<!-- パッケージ情報 -->
<Package Id='*' Keywords='Installer'
Expand All @@ -27,21 +27,21 @@
<Directory Id='TARGETDIR' Name='SourceDir'>
<Directory Id='WINDOWSVOLUME'>
<Directory Id='INSTALLDIR' Name='TreeFrog'>
<Directory Id='VERSIONDIR' Name='2.7.1'>
<Directory Id='VERSIONDIR' Name='2.8.0'>
</Directory>
</Directory>
</Directory>
<Directory Id="DesktopFolder" SourceName="Desktop"/>
<Directory Id="ProgramMenuFolder">
<Directory Id="ApplicationProgramsFolder" Name="TreeFrog Framework 2.7.1"/>
<Directory Id="ApplicationProgramsFolder" Name="TreeFrog Framework 2.8.0"/>
</Directory>
</Directory>

<!-- デスクトップショートカット -->
<DirectoryRef Id="DesktopFolder">
<Component Id="DesktopShortcut" Guid="46F98BC2-C1EC-4FA9-A093-1397BA47D327">
<Component Id="DesktopShortcut" Guid="03CDB563-5A09-47B3-A5C5-59DA3CAB78F3">
<Shortcut Id="PromptDesktopShortcut"
Name="TreeFrog Prompt 2.7.1"
Name="TreeFrog Prompt 2.8.0"
Description="TreeFrog Framework Prompt"
Target="[SystemFolder]cmd.exe" Arguments="/K [VERSIONDIR]bin\\tfenv.bat"
WorkingDirectory="PersonalFolder"/>
Expand All @@ -51,12 +51,12 @@

<!-- プログラムメニューショートカット -->
<DirectoryRef Id="ApplicationProgramsFolder">
<Component Id="ApplicationShortcut" Guid="209ADB0F-A113-40FD-8D8A-A71CBF6FE464">
<Component Id="ApplicationShortcut" Guid="97B71422-35C6-49DF-85E7-E13C7B2B1C94">
<CreateFolder Directory="ApplicationProgramsFolder"/>

<!-- Shortcut to TF prompt-->
<Shortcut Id="PromptProgramMenuShortcut"
Name="TreeFrog Prompt 2.7.1"
Name="TreeFrog Prompt 2.8.0"
Description="TreeFrog Framework Prompt"
Target="[SystemFolder]cmd.exe" Arguments="/K [VERSIONDIR]bin\\tfenv.bat"
WorkingDirectory="PersonalFolder"/>
Expand Down
16 changes: 8 additions & 8 deletions installer/treefrog-setup/treefrog-setup/MainForm.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#undef GetTempPath

//
// リリースする際は50行目を編集!
// リリースする際は50行目を編集!
//


Expand Down Expand Up @@ -45,13 +45,13 @@ namespace treefrogsetup {
static initonly String^ TF_ENV_BAT = "C:\\TreeFrog\\" + VersionString() + "\\bin\\tfenv.bat"; // Base Directory

//
// バージョン
// バージョン
//
static initonly String^ VERSION_STR6_NEW = L"6.4";
static initonly String^ VERSION_STR6_PREV = L"6.3";
static initonly String^ VERSION_STR6_NEW = L"6.6";
static initonly String^ VERSION_STR6_PREV = L"6.5";

static initonly int RCID_NEW = IDR_TREEFROG_QT604_MSI;
static initonly int RCID_PREV = IDR_TREEFROG_QT603_MSI;
static initonly int RCID_NEW = IDR_TREEFROG_QT606_MSI;
static initonly int RCID_PREV = IDR_TREEFROG_QT605_MSI;

public:
MainForm(void)
Expand Down Expand Up @@ -106,8 +106,8 @@ namespace treefrogsetup {

#pragma region Windows Form Designer generated code
/// <summary>
/// デザイナー サポートに必要なメソッドです。このメソッドの内容を
/// コード エディターで変更しないでください。
/// デザイナー サポートに必要なメソッドです。このメソッドの内容を
/// コード エディターで変更しないでください。
/// </summary>
void InitializeComponent(void)
{
Expand Down

0 comments on commit 55a4458

Please sign in to comment.