Updated Branches: refs/heads/trunk 2585f9b51 -> 2fcd093ec
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/2fcd093e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2fcd093e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2fcd093e Branch: refs/heads/trunk Commit: 2fcd093ec58b9e4ec79db6bfb4a23e14360a99e4 Parents: 2585f9b Author: tbeerbower <[email protected]> Authored: Thu Jan 30 18:41:56 2014 -0500 Committer: tbeerbower <[email protected]> Committed: Thu Jan 30 18:42:22 2014 -0500 ---------------------------------------------------------------------- contrib/ambari-scom/msi/build.cmd | 3 ++- contrib/ambari-scom/package.bat | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/2fcd093e/contrib/ambari-scom/msi/build.cmd ---------------------------------------------------------------------- diff --git a/contrib/ambari-scom/msi/build.cmd b/contrib/ambari-scom/msi/build.cmd index e5a28b8..cc5b08a 100644 --- a/contrib/ambari-scom/msi/build.cmd +++ b/contrib/ambari-scom/msi/build.cmd @@ -32,6 +32,7 @@ copy /y "%cd%\src\GUI\bin\Debug\GUI_Ambari.exe" "%cd%\src\bin\GUI_Ambari.exe" || echo Building Result Messagebox call %msBuildDir%\msbuild.exe "%cd%\src\Result\Ambari_Result.csproj" || exit /b 1 +mkdir "%cd%\src\bin\" copy /y "%cd%\src\Result\bin\Debug\Ambari_Result.exe" "%cd%\src\bin\Ambari_Result.exe" || exit /b 1 echo Building MSI @@ -39,7 +40,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/2fcd093e/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
