Skip to content

Commit 497f6b2

Browse files
treefrogframeworktreefrogframework
committed
update configure.bat and INSTALL file.
1 parent 8405f69 commit 497f6b2

File tree

6 files changed

+96
-37
lines changed

6 files changed

+96
-37
lines changed

‎INSTALL

Lines changed: 33 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,39 @@ Installation
2323
Windows:
2424
Build binaries of two modes, release and debug.
2525
Run the following commands in Qt Command Prompt.
26-
> cd treefrog-x.x.x
27-
> configure --enable-debug
28-
> cd src
29-
> mingw32-make install
30-
> cd ..\tools
31-
> mingw32-make instal
32-
> cd ..
33-
> configure
34-
> cd src
35-
> mingw32-make install
36-
> cd ..\tools
37-
> mingw32-make instal
38-
26+
MinGW:
27+
> cd (treefrog-x.x.x)
28+
> configure --enable-debug
29+
> cd src
30+
> mingw32-make install
31+
> cd ..\tools
32+
> mingw32-make install
33+
> cd ..
34+
> configure
35+
> cd src
36+
> mingw32-make install
37+
> cd ..\tools
38+
> mingw32-make install
39+
40+
Visual Studio:
41+
Call vcvarsall.bat to complete environment setup in Qt Command Prompt.
42+
e.g.
43+
> cd "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\amd64"
44+
> vcvars64.bat
45+
46+
> cd (treefrog-x.x.x)
47+
> configure --enable-debug
48+
> cd src
49+
> nmake install
50+
> cd ..\tools
51+
> nmake install
52+
> cd ..
53+
> configure
54+
> cd src
55+
> nmake install
56+
> cd ..\tools
57+
> nmake install
58+
3959
Or, double-click to run the build.bat after editing it for your Qt
4060
environment.
4161

‎build.bat

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,22 @@
44
::
55
:: Edit this line to run the batch file for Qt environment.
66
::
7-
::call "C:\Qt\Qt5.2.1\5.2.1\mingw48_32\bin\qtenv2.bat"
87
::call "C:\Qt\Qt5.3.2-mingw\5.3\mingw482_32\bin\qtenv2.bat"
9-
call "C:\Qt\Qt5.3.2\5.3\msvc2013_64\bin\qtenv2.bat"
8+
::call "C:\Qt\Qt5.4.1-mingw\5.4\mingw491_32\bin\qtenv2.bat"
9+
::call "C:\Qt\Qt5.3.2\5.3\msvc2013_64\bin\qtenv2.bat"
10+
call "C:\Qt\Qt5.4.1\5.4\msvc2013_64_opengl\bin\qtenv2.bat"
1011

12+
call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64
1113

1214

1315
if "%Platform%" == "X64" (
1416
set MAKE=nmake
1517
set CL=/MP
16-
) else if "%DevEnvDir%" == "" (
17-
set MAKE=mingw32-make -j4
18-
) else (
18+
) else if not "%DevEnvDir%" == "" (
1919
set MAKE=nmake
2020
set CL=/MP
21+
) else (
22+
set MAKE=mingw32-make -j4
2123
)
2224

2325
::

‎configure.bat

Lines changed: 47 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,6 @@
44
set VERSION=1.8.0
55
set TFDIR=C:\TreeFrog\%VERSION%
66

7-
if "%Platform%" == "X64" (
8-
set MAKE=nmake
9-
) else if "%DevEnvDir%" == "" (
10-
set MAKE=mingw32-make
11-
) else (
12-
set MAKE=nmake
13-
)
14-
157
:parse_loop
168
if "%1" == "" goto :start
179
if /i "%1" == "--prefix" goto :prefix
@@ -61,8 +53,38 @@ if "%DEBUG%" == "yes" (
6153
::
6254
:: Generates tfenv.bat
6355
::
64-
for %%I in (qtenv2.bat) do if exist %%~$path:I set QTENV=%%~$path:I
56+
for %%I in (qmake.exe) do if exist %%~$path:I set QMAKE=%%~$path:I
57+
for %%I in (cl.exe) do if exist %%~$path:I set MSCOMPILER=%%~$path:I
58+
for %%I in (g++.exe) do if exist %%~$path:I set GNUCOMPILER=%%~$path:I
59+
60+
if "%QMAKE%" == "" (
61+
echo Qt environment not found
62+
exit /b
63+
)
64+
if "%MSCOMPILER%" == "" if "%GNUCOMPILER%" == "" (
65+
echo compiler not found
66+
exit /b
67+
)
68+
69+
:: vcvarsall.bat setup
70+
if not "%MSCOMPILER%" == "" (
71+
set MAKE=nmake
72+
if "%Platform%" == "X64" (
73+
set VCVARSOPT=amd64
74+
set ENVSTR=Environment to build for 64-bit executable MSVC / Qt
75+
) else (
76+
set VCVARSOPT=x86
77+
set ENVSTR=Environment to build for 32-bit executable MSVC / Qt
78+
)
79+
) else (
80+
set MAKE=mingw32-make
81+
set ENVSTR=Environment to build for 32-bit executable MinGW / Qt
82+
)
83+
SET /P X="%ENVSTR%"<NUL
84+
qtpaths.exe --qt-version
85+
6586

87+
for %%I in (qtenv2.bat) do if exist %%~$path:I set QTENV=%%~$path:I
6688
set TFENV=tfenv.bat
6789
echo @echo OFF> %TFENV%
6890
echo ::>> %TFENV%
@@ -73,10 +95,25 @@ echo set TFDIR=%TFDIR%>> %TFENV%
7395
echo set QTENV="%QTENV%">> %TFENV%
7496
echo set QMAKESPEC=%QMAKESPEC%>> %TFENV%
7597
echo if exist %%QTENV%% ( call %%QTENV%% )>> %TFENV%
98+
if not "%VCVARSOPT%" == "" (
99+
echo if not "%%VS120COMNTOOLS%%" == "" ^(>> %TFENV%
100+
echo set VCVARSBAT="%%VS120COMNTOOLS%%..\..\VC\vcvarsall.bat">> %TFENV%
101+
echo ^) else if not "%%VS110COMNTOOLS%%" == "" ^(>> %TFENV%
102+
echo set VCVARSBAT="%%VS110COMNTOOLS%%..\..\VC\vcvarsall.bat">> %TFENV%
103+
echo ^) else if not "%%VS100COMNTOOLS%%" == "" ^(>> %TFENV%
104+
echo set VCVARSBAT="%%VS100COMNTOOLS%%..\..\VC\vcvarsall.bat">> %TFENV%
105+
echo ^) else ^(>> %TFENV%
106+
echo set VCVARSBAT="">> %TFENV%
107+
echo ^)>> %TFENV%
108+
echo if exist %%VCVARSBAT%% ^(>> %TFENV%
109+
echo echo Setting up environment for MSVC usage...>> %TFENV%
110+
echo call %%VCVARSBAT%% %VCVARSOPT%>> %TFENV%
111+
echo ^)>> %TFENV%
112+
)
76113
echo set PATH=%%TFDIR^%%\bin;%%PATH%%>> %TFENV%
77114
echo echo Setup a TreeFrog/Qt environment.>> %TFENV%
78-
echo ::echo -- QMAKESPEC set to %%QMAKESPEC%%>> %TFENV%
79115
echo echo -- TFDIR set to %%TFDIR%%>> %TFENV%
116+
echo cd /D %%HOMEDRIVE%%%%HOMEPATH%%>> %TFENV%
80117

81118

82119
set TFDIR=%TFDIR:\=/%

‎installer/msi/TreeFrog.wxs

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

77
<!-- プロダクト情報 -->
8-
<Product Name='TreeFrog Framework 1.7.9'
9-
Id="9F749D63-BC1A-4870-A92C-E4E318888CC8"
10-
UpgradeCode="D8C262D6-7B81-419A-9DFF-E15763DBA8A0"
8+
<Product Name='TreeFrog Framework 1.8.0'
9+
Id="CB36BA0D-3D32-47AD-8485-F3EC479C9D41"
10+
UpgradeCode="17243FFE-9DA7-47B9-B4AD-8D76E99F7881"
1111
Language='1041' Codepage='932'
12-
Version='1.7.9' Manufacturer='TreeFrog Framework Project'>
12+
Version='1.8.0' Manufacturer='TreeFrog Framework Project'>
1313

1414
<!-- パッケージ情報 -->
1515
<Package Id='*' Keywords='Installer'
@@ -27,18 +27,18 @@
2727
<Directory Id='TARGETDIR' Name='SourceDir'>
2828
<Directory Id='WINDOWSVOLUME'>
2929
<Directory Id='INSTALLDIR' Name='TreeFrog'>
30-
<Directory Id='VERSIONDIR' Name='1.7.9'>
30+
<Directory Id='VERSIONDIR' Name='1.8.0'>
3131
</Directory>
3232
</Directory>
3333
</Directory>
3434

3535
<Directory Id="ProgramMenuFolder">
36-
<Directory Id="ApplicationProgramsFolder" Name="TreeFrog Framework 1.7.9"/>
36+
<Directory Id="ApplicationProgramsFolder" Name="TreeFrog Framework 1.8.0"/>
3737
</Directory>
3838
</Directory>
3939

4040
<DirectoryRef Id="ApplicationProgramsFolder">
41-
<Component Id="ApplicationShortcut" Guid="F9BDE0CC-B856-4A23-A152-E343AF2C518F">
41+
<Component Id="ApplicationShortcut" Guid="6013EDA4-759A-4F8D-A4E3-596ACF448128">
4242
<CreateFolder Directory="ApplicationProgramsFolder"/>
4343

4444
<!-- Shortcut to TF prompt-->

‎installer/msi/create_installer.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
:: - Requires WiX Toolset
77
::
88

9-
set VERSION=1.7.9
9+
set VERSION=1.8.0
1010
set TFDIR=C:\TreeFrog\%VERSION%
1111
set PATH="C:\Program Files (x86)\WiX Toolset v3.7\bin";%PATH%
1212

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ namespace treefrogsetup {
370370
}
371371

372372
// Get msi file from resource
373-
int rcid = IDR_TREEFROG_QT52_MSI;
373+
int rcid = IDR_TREEFROG_QT54_MSI;
374374
if (version->IndexOf("Qt version 5.3", StringComparison::OrdinalIgnoreCase) > 0) {
375375
rcid = IDR_TREEFROG_QT53_MSI;
376376
}

0 commit comments

Comments
 (0)