rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

configure qt version automatically in installer script

This commit is contained in:
walker0643 2018-02-10 13:44:33 -05:00
parent 3023f9b469
commit f30fe8775c
2 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
clean_build.bat
View File

@ -2,40 +2,45 @@
REM defaults - override them by creating a winbuild_env.bat file REM defaults - override them by creating a winbuild_env.bat file
set B_BUILD_TYPE=Debug set B_BUILD_TYPE=Debug
set B_QT_ROOT=C:\Qt\5.6.3\msvc2015_64 set B_QT_ROOT=C:\Qt
set B_QT_VER=5.6.3
set B_QT_MSVC=msvc2015_64
set B_BONJOUR=C:\Program Files\Bonjour SDK set B_BONJOUR=C:\Program Files\Bonjour SDK
REM needed by cmake to set bonjour include dir
set BONJOUR_SDK_HOME=%B_BONJOUR%
set savedir=%cd% set savedir=%cd%
cd /d %~dp0 cd /d %~dp0
if exist winbuild_env.bat call winbuild_env.bat if exist winbuild_env.bat call winbuild_env.bat
REM needed by cmake to set bonjour include dir
set BONJOUR_SDK_HOME=%B_BONJOUR%
REM full path to Qt stuff we need
set B_QT_FULLPATH=%B_QT_ROOT%\%B_QT_VER%\%B_QT_MSVC%
rmdir /q /s build rmdir /q /s build
mkdir build mkdir build
if ERRORLEVEL 1 goto failed if ERRORLEVEL 1 goto failed
cd build cd build
cmake -G "Visual Studio 15 2017 Win64" -D CMAKE_BUILD_TYPE=%B_BUILD_TYPE% -D CMAKE_PREFIX_PATH="%B_QT_ROOT%" -D DNSSD_LIB="%B_BONJOUR%\Lib\x64\dnssd.lib" .. cmake -G "Visual Studio 15 2017 Win64" -D CMAKE_BUILD_TYPE=%B_BUILD_TYPE% -D CMAKE_PREFIX_PATH="%B_QT_FULLPATH%" -D DNSSD_LIB="%B_BONJOUR%\Lib\x64\dnssd.lib" -D QT_VERSION=%B_QT_VER% ..
if ERRORLEVEL 1 goto failed if ERRORLEVEL 1 goto failed
echo @msbuild barrier.sln /p:Platform="x64" /p:Configuration=%B_BUILD_TYPE% /m > make.bat echo @msbuild barrier.sln /p:Platform="x64" /p:Configuration=%B_BUILD_TYPE% /m > make.bat
call make.bat call make.bat
if ERRORLEVEL 1 goto failed if ERRORLEVEL 1 goto failed
if exist bin\Debug ( if exist bin\Debug (
copy %B_QT_ROOT%\bin\Qt5Cored.dll bin\Debug\ > NUL copy %B_QT_FULLPATH%\bin\Qt5Cored.dll bin\Debug\ > NUL
copy %B_QT_ROOT%\bin\Qt5Guid.dll bin\Debug\ > NUL copy %B_QT_FULLPATH%\bin\Qt5Guid.dll bin\Debug\ > NUL
copy %B_QT_ROOT%\bin\Qt5Networkd.dll bin\Debug\ > NUL copy %B_QT_FULLPATH%\bin\Qt5Networkd.dll bin\Debug\ > NUL
copy %B_QT_ROOT%\bin\Qt5Widgetsd.dll bin\Debug\ > NUL copy %B_QT_FULLPATH%\bin\Qt5Widgetsd.dll bin\Debug\ > NUL
copy %B_QT_ROOT%\bin\Qt5Cored.dll bin\Debug\ > NUL copy %B_QT_FULLPATH%\bin\Qt5Cored.dll bin\Debug\ > NUL
copy ..\ext\openssl\windows\x64\bin\* bin\Debug\ > NUL copy ..\ext\openssl\windows\x64\bin\* bin\Debug\ > NUL
copy ..\res\openssl\barrier.conf bin\Debug\ > NUL copy ..\res\openssl\barrier.conf bin\Debug\ > NUL
) else if exist bin\Release ( ) else if exist bin\Release (
copy %B_QT_ROOT%\bin\Qt5Core.dll bin\Release\ > NUL copy %B_QT_FULLPATH%\bin\Qt5Core.dll bin\Release\ > NUL
copy %B_QT_ROOT%\bin\Qt5Gui.dll bin\Release\ > NUL copy %B_QT_FULLPATH%\bin\Qt5Gui.dll bin\Release\ > NUL
copy %B_QT_ROOT%\bin\Qt5Network.dll bin\Release\ > NUL copy %B_QT_FULLPATH%\bin\Qt5Network.dll bin\Release\ > NUL
copy %B_QT_ROOT%\bin\Qt5Widgets.dll bin\Release\ > NUL copy %B_QT_FULLPATH%\bin\Qt5Widgets.dll bin\Release\ > NUL
copy %B_QT_ROOT%\bin\Qt5Core.dll bin\Release\ > NUL copy %B_QT_FULLPATH%\bin\Qt5Core.dll bin\Release\ > NUL
copy ..\ext\openssl\windows\x64\bin\* bin\Release\ > NUL copy ..\ext\openssl\windows\x64\bin\* bin\Release\ > NUL
copy ..\res\openssl\barrier.conf bin\Release\ > NUL copy ..\res\openssl\barrier.conf bin\Release\ > NUL
) else ( ) else (
@ -51,8 +56,11 @@ echo Build failed
:done :done
cd /d %savedir% cd /d %savedir%
set BONJOUR_SDK_HOME=
set B_BUILD_TYPE= set B_BUILD_TYPE=
set B_QT_ROOT= set B_QT_ROOT=
set B_QT_VER=
set B_QT_MSVC=
set B_BONJOUR= set B_BONJOUR=
set BONJOUR_SDK_HOME=
set B_QT_FULLPATH=
set savedir= set savedir=

2
dist/wix/Include.wxi.in vendored
View File

@ -2,7 +2,7 @@
<Include> <Include>
<?define Name="Barrier" ?> <?define Name="Barrier" ?>
<?define Version="@BARRIER_VERSION@" ?> <?define Version="@BARRIER_VERSION@" ?>
<?define QtVersion="5.6.3" ?> <!-- TODO: Configure this externally //--> <?define QtVersion="@QT_VERSION@" ?>
<?define Author="Debauchee Open Source Group" ?> <?define Author="Debauchee Open Source Group" ?>
<?define BinPath="@CMAKE_RUNTIME_OUTPUT_DIRECTORY@/$(var.Configuration)" ?> <?define BinPath="@CMAKE_RUNTIME_OUTPUT_DIRECTORY@/$(var.Configuration)" ?>
<?define ResPath="@CMAKE_CURRENT_SOURCE_DIR@/res" ?> <?define ResPath="@CMAKE_CURRENT_SOURCE_DIR@/res" ?>