Skip to content

Commit

Permalink
update installer for windows.
Browse files Browse the repository at this point in the history
  • Loading branch information
@treefrogframework
treefrogframework committed Jun 15, 2024
1 parent e39a9c5 commit 80348a7
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 29 deletions.
2 changes: 1 addition & 1 deletion build.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ rem

set BASEDIR=%~dp0

call "C:\Qt\6.6.1\msvc2019_64\bin\qtenv2.bat"
call "C:\Qt\6.6.3\msvc2019_64\bin\qtenv2.bat"
rem call "C:\Qt\5.13.0\msvc2017\bin\qtenv2.bat"

set ARCH=amd64
Expand Down
11 changes: 8 additions & 3 deletions configure.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,19 @@ if "%QMAKE%" == "" (
echo Qt environment not found
exit /b
)
qmake --version

if "%CMAKE%" == "" (
echo CMake not found
exit /b
)
cmake --version

if "%MAKE%" == "" (
echo Make not found
exit /b
)

if "%MSCOMPILER%" == "" if "%DEVENV%" == "" (
echo Visual Studio compiler not found
exit /b
Expand Down Expand Up @@ -170,7 +175,7 @@ cd %BASEDIR%3rdparty
rd /s /q lz4 >nul 2>&1
del /f /q lz4 >nul 2>&1
mklink /j lz4 lz4-%LZ4_VERSION% >nul 2>&1
del /f /q lz4\build\cmake\build >nul 2>&1
rmdir /s /q lz4\build\cmake\build >nul 2>&1
cmake %CMAKEOPT% -S lz4\build\cmake -B lz4\build\cmake\build -DBUILD_STATIC_LIBS=ON
set BUILDCMD=cmake --build lz4\build\cmake\build --config Release --clean-first -j
echo %BUILDCMD%
Expand All @@ -191,10 +196,10 @@ rd /s /q glog >nul 2>&1
del /f /q glog >nul 2>&1
mklink /j glog glog-%GLOG_VERSION% >nul 2>&1
cd %BASEDIR%3rdparty\glog
del /f /q build >nul 2>&1
rmdir /s /q build >nul 2>&1
set CMAKECMD=cmake -S . -B build %CMAKEOPT%
echo %CMAKECMD%
%CMAKECMD% >nul 2>&1
%CMAKECMD%
set CMAKECMD=cmake --build build -j
echo %CMAKECMD%
%CMAKECMD% >nul 2>&1
Expand Down
8 changes: 4 additions & 4 deletions installer/create_installer.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ set INCLUDE=
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.6.1\msvc2019_64\bin\qtenv2.bat" 6.6
call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
call :build_msi "%QTBASE%\6.7.1\msvc2019_64\bin\qtenv2.bat" 6.7

:: Clear environment variables
set VCToolsVersion=
Expand All @@ -35,8 +35,8 @@ set INCLUDE=
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.5.3\msvc2019_64\bin\qtenv2.bat" 6.5
call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
call :build_msi "%QTBASE%\6.6.3\msvc2019_64\bin\qtenv2.bat" 6.6

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

Expand Down
20 changes: 10 additions & 10 deletions installer/msi/TreeFrog.wxs
View file
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.8.0'
Id="9B2CAB7C-ECF7-468A-9AE9-4E13003C83E5"
UpgradeCode="DFB3D407-86B9-4F17-AE38-85FD61588772"
<Product Name='TreeFrog Framework 2.9.0'
Id="DDB2A2E5-ECD1-4C0F-998F-533149FB3637"
UpgradeCode="39124F5E-CBB3-4A79-90A0-C47729C9F506"
Language='1041' Codepage='932'
Version='2.8.0' Manufacturer='TreeFrog Framework Project'>
Version='2.9.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.8.0'>
<Directory Id='VERSIONDIR' Name='2.9.0'>
</Directory>
</Directory>
</Directory>
<Directory Id="DesktopFolder" SourceName="Desktop"/>
<Directory Id="ProgramMenuFolder">
<Directory Id="ApplicationProgramsFolder" Name="TreeFrog Framework 2.8.0"/>
<Directory Id="ApplicationProgramsFolder" Name="TreeFrog Framework 2.9.0"/>
</Directory>
</Directory>

<!-- デスクトップショートカット -->
<DirectoryRef Id="DesktopFolder">
<Component Id="DesktopShortcut" Guid="4F293293-9950-4927-8D88-E36FCF3D3FD9">
<Component Id="DesktopShortcut" Guid="4CA80893-F007-4E29-A3B5-530ACE94C7EB">
<Shortcut Id="PromptDesktopShortcut"
Name="TreeFrog Prompt 2.8.0"
Name="TreeFrog Prompt 2.9.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="ACD6162C-9E89-4753-9142-D1E6F4ADF8DA">
<Component Id="ApplicationShortcut" Guid="BE257E94-EA18-477F-B585-49E9D1B0E0C5">
<CreateFolder Directory="ApplicationProgramsFolder"/>

<!-- Shortcut to TF prompt-->
<Shortcut Id="PromptProgramMenuShortcut"
Name="TreeFrog Prompt 2.8.0"
Name="TreeFrog Prompt 2.9.0"
Description="TreeFrog Framework Prompt"
Target="[SystemFolder]cmd.exe" Arguments="/K [VERSIONDIR]bin\\tfenv.bat"
WorkingDirectory="PersonalFolder"/>
Expand Down
14 changes: 7 additions & 7 deletions installer/treefrog-setup/treefrog-setup/AssemblyInfo.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,29 @@ using namespace System::Runtime::InteropServices;
using namespace System::Security::Permissions;

//
// アセンブリに関する一般情報は以下の属性セットをとおして制御されます。
// アセンブリに関連付けられている情報を変更するには、
// これらの属性値を変更してください。
// アセンブリに関する一般情報は以下の属性セットをとおして制御されます。
// アセンブリに関連付けられている情報を変更するには、
// これらの属性値を変更してください。
//
[assembly:AssemblyTitleAttribute("treefrogsetup")];
[assembly:AssemblyDescriptionAttribute("")];
[assembly:AssemblyConfigurationAttribute("")];
[assembly:AssemblyCompanyAttribute("")];
[assembly:AssemblyProductAttribute("treefrogsetup")];
[assembly:AssemblyCopyrightAttribute("Copyright (c) 2010-2023")];
[assembly:AssemblyCopyrightAttribute("Copyright (c) 2010-2024")];
[assembly:AssemblyTrademarkAttribute("")];
[assembly:AssemblyCultureAttribute("")];

//
// アセンブリのバージョン情報は、以下の 4 つの値で構成されています:
// アセンブリのバージョン情報は、以下の 4 つの値で構成されています:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// すべての値を指定するか、下のように '*' を使ってリビジョンおよびビルド番号を
// 既定値にすることができます:
// すべての値を指定するか、下のように '*' を使ってリビジョンおよびビルド番号を
// 既定値にすることができます:

[assembly:AssemblyVersionAttribute("2.9.0")];

Expand Down
8 changes: 4 additions & 4 deletions installer/treefrog-setup/treefrog-setup/MainForm.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ namespace treefrogsetup {
//
// バージョン
//
static initonly String^ VERSION_STR6_NEW = L"6.6";
static initonly String^ VERSION_STR6_PREV = L"6.5";
static initonly String^ VERSION_STR6_NEW = L"6.7";
static initonly String^ VERSION_STR6_PREV = L"6.6";

static initonly int RCID_NEW = IDR_TREEFROG_QT606_MSI;
static initonly int RCID_PREV = IDR_TREEFROG_QT605_MSI;
static initonly int RCID_NEW = IDR_TREEFROG_QT607_MSI;
static initonly int RCID_PREV = IDR_TREEFROG_QT606_MSI;

public:
MainForm(void)
Expand Down
6 changes: 6 additions & 0 deletions installer/treefrog-setup/treefrog-setup/resource.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,9 @@
#define IDR_TREEFROG_QT605_MSI 10605
#define IDR_TREEFROG_QT606_MSI 10606
#define IDR_TREEFROG_QT607_MSI 10607
#define IDR_TREEFROG_QT608_MSI 10608
#define IDR_TREEFROG_QT609_MSI 10609
#define IDR_TREEFROG_QT610_MSI 10610
#define IDR_TREEFROG_QT611_MSI 10611
#define IDR_TREEFROG_QT612_MSI 10612
#define IDR_TREEFROG_QT613_MSI 10613

0 comments on commit 80348a7

Please sign in to comment.