[checkmk-commits] [CMK-1890] - minor fixes in build process

Module: check_mk Branch: master Commit: 473bf1f11f51c02113f302e4ebc830905ce307e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=473bf1f11f51c0… Author: Sergey Kipnis &lt;sk(a)mathias-kettner.de&gt; Date: Wed Apr 3 12:05:04 2019 +0200 [CMK-1890] - minor fixes in build process - removed annoying warning(should be ignored) - correctly touched update file Change-Id: Id4cbc39a2f9806041837a0767f02099bdf2d02e5 --- agents/wnx/build_release.cmd | 13 ++++++++----- agents/wnx/install/install.wixproj | 6 ++++++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/agents/wnx/build_release.cmd b/agents/wnx/build_release.cmd index 9dcda5c..7351b85 100644 --- a/agents/wnx/build_release.cmd +++ b/agents/wnx/build_release.cmd @@ -69,7 +69,7 @@ set el=%errorlevel% @del save.tmp > nul git update-index --no-assume-unchanged install/resources/check_mk.dat > nul if not %el% == 0 powershell Write-Host "Failed Install build" -Foreground Red && exit 88 -copy %REMOTE_MACHINE%\check_mk_service.msi %REMOTE_MACHINE%\check_mk_agent_update.msi +move %REMOTE_MACHINE%\check_mk_service.msi %REMOTE_MACHINE%\check_mk_agent_update.msi %msbuild% wamain.sln /t:install /p:Configuration=Release,Platform=x64 @@ -93,11 +93,14 @@ powershell Write-Host "Killing msi in artefacts" -Foreground Red call %cur_dir%\clean_artefacts.cmd exit 100 :end -copy %REMOTE_MACHINE%\check_mk_service.msi %REMOTE_MACHINE%\check_mk_agent.msi -copy %REMOTE_MACHINE%\check_mk_service32.exe %REMOTE_MACHINE%\check_mk_agent.exe -copy %REMOTE_MACHINE%\check_mk_service64.exe %REMOTE_MACHINE%\check_mk_agent-64.exe +pushd %REMOTE_MACHINE% + +copy check_mk_service.msi check_mk_agent.msi +copy check_mk_service32.exe check_mk_agent.exe +copy check_mk_service64.exe check_mk_agent-64.exe rem touching update msi -copy %REMOTE_MACHINE%\check_mk_agent_update.msi /B+ ,,/Y > nul +copy check_mk_agent_update.msi /B+ ,,/Y > nul +popd diff --git a/agents/wnx/install/install.wixproj b/agents/wnx/install/install.wixproj index 23f9c58..df91439 100644 --- a/agents/wnx/install/install.wixproj +++ b/agents/wnx/install/install.wixproj @@ -15,6 +15,9 @@ <DefineConstants>$(Configuration)=1</DefineConstants> <WixVariables>$(Configuration)=1</WixVariables> <SuppressSpecificWarnings>1076</SuppressSpecificWarnings> + <LinkerAdditionalOptions> + </LinkerAdditionalOptions> + <CompilerAdditionalOptions>-sw1091</CompilerAdditionalOptions> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <OutputPath>..\build\install\$(Configuration)\</OutputPath> @@ -23,6 +26,9 @@ <WixVariables>$(Configuration)=1</WixVariables> <SuppressPdbOutput>True</SuppressPdbOutput> <SuppressSpecificWarnings>1076</SuppressSpecificWarnings> + <LinkerAdditionalOptions> + </LinkerAdditionalOptions> + <CompilerAdditionalOptions>-sw1091</CompilerAdditionalOptions> </PropertyGroup> <ItemGroup> <Compile Include="InstallFolderDialog.wxs" />