Browse Source

AMBARI-4477 - Update build scripts for Ambari SCOM MSI

tbeerbower 11 years ago
parent
commit
2fcd093ec5
2 changed files with 2 additions and 4 deletions
  1. 2 1
      contrib/ambari-scom/msi/build.cmd
  2. 0 3
      contrib/ambari-scom/package.bat

+ 2 - 1
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
 echo Building Result Messagebox
 call %msBuildDir%\msbuild.exe "%cd%\src\Result\Ambari_Result.csproj"  || exit /b 1
 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
 copy /y "%cd%\src\Result\bin\Debug\Ambari_Result.exe" "%cd%\src\bin\Ambari_Result.exe" || exit /b 1
 
 
 echo Building MSI
 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 candle "%cd%\ambari-scom.wxs"  || exit /b 1
 start /wait /min light "%cd%\ambari-scom.wixobj"  || exit /b 1
 start /wait /min light "%cd%\ambari-scom.wixobj"  || exit /b 1
 popd || 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 
 echo Cleaning 
 del /f /q "%cd%\src\ambari-scom.wixobj"  || exit /b 1
 del /f /q "%cd%\src\ambari-scom.wixobj"  || exit /b 1

+ 0 - 3
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 management-pack\Hadoop_MP\PresentationMp\bin\Debug\*.mpb %MP_DIR% || exit /b 1
 
 
 copy msi\*.msi %FINAL_ZIPS% || 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
 copy README.md %FINAL_ZIPS% || exit /b 1