Updated Branches: refs/heads/branch-1.4.4 bf8fb9a24 -> bd344a887
AMBARI-4477 - Update build scripts for Ambari SCOM MSI Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bd344a88 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bd344a88 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bd344a88 Branch: refs/heads/branch-1.4.4 Commit: bd344a88711ed77baf2fa7fc889006fe09c3f5e6 Parents: bf8fb9a Author: tbeerbower <[email protected]> Authored: Fri Jan 31 19:37:47 2014 -0500 Committer: tbeerbower <[email protected]> Committed: Fri Jan 31 19:37:47 2014 -0500 ---------------------------------------------------------------------- contrib/ambari-scom/msi/build.cmd | 5 ++++- contrib/ambari-scom/package.bat | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/bd344a88/contrib/ambari-scom/msi/build.cmd ---------------------------------------------------------------------- diff --git a/contrib/ambari-scom/msi/build.cmd b/contrib/ambari-scom/msi/build.cmd index 9b6a655..75a1448 100644 --- a/contrib/ambari-scom/msi/build.cmd +++ b/contrib/ambari-scom/msi/build.cmd @@ -1,3 +1,6 @@ +echo Building Result Messagebox +call %msBuildDir%\msbuild.exe "%cd%\src\Result\Ambari_Result.csproj" || exit /b 1 +mkdir "%cd%\src\bin\" rem Licensed to the Apache Software Foundation (ASF) under one or more rem contributor license agreements. See the NOTICE file distributed with rem this work for additional information regarding copyright ownership. @@ -35,7 +38,7 @@ pushd "%cd%\src" || exit /b 1 start /wait /min candle "%cd%\ambari-scom.wxs" || exit /b 1 start /wait /min light "%cd%\ambari-scom.wixobj" || exit /b 1 popd || exit /b 1 -copy /y "%cd%\src\ambari-scom.msi" "%cd%\ambari-scom.msi" || exit /b 1 +copy /y "..\management-pack\Hadoop_MP\Installer\bin\Debug\en-us\AmbariSCOMManagementPack.msi" "%cd%\ambari-scom.msi" || exit /b 1 echo Cleaning del /f /q "%cd%\src\ambari-scom.wixobj" || exit /b 1 http://git-wip-us.apache.org/repos/asf/ambari/blob/bd344a88/contrib/ambari-scom/package.bat ---------------------------------------------------------------------- diff --git a/contrib/ambari-scom/package.bat b/contrib/ambari-scom/package.bat index 75143f3..ab3ab2b 100644 --- a/contrib/ambari-scom/package.bat +++ b/contrib/ambari-scom/package.bat @@ -48,9 +48,6 @@ copy management-pack\Hadoop_MP\HadoopMp\bin\Debug\*.mpb %MP_DIR% || exit /b 1 copy management-pack\Hadoop_MP\PresentationMp\bin\Debug\*.mpb %MP_DIR% || exit /b 1 copy msi\*.msi %FINAL_ZIPS% || exit /b 1 -copy LICENSE %FINAL_ZIPS% || exit /b 1 -copy MSPL-LICENSE %FINAL_ZIPS% || exit /b 1 -copy NOTICE %FINAL_ZIPS% || exit /b 1 copy README.md %FINAL_ZIPS% || exit /b 1
