Procházet zdrojové kódy

AMBARI-4525 - Fix Ambari MSI build process

tbeerbower před 11 roky
rodič
revize
1dbea4476d

+ 1 - 1
contrib/ambari-scom/msi/build.cmd

@@ -35,7 +35,7 @@ copy /y "%cd%\src\Result\bin\Debug\Ambari_Result.exe" "%cd%\src\bin\Ambari_Resul
 echo Building MSI
 pushd "%cd%\src" || exit /b 1
 candle "%cd%\ambari-scom.wxs"  2>&1 || exit /b 1
-light "%cd%\ambari-scom.wixobj" 2>&1 || exit /b 1
+light "%cd%\ambari-scom.wixobj" -ext WixUtilExtension.dll 2>&1 || exit /b 1
 if not exist "%cd%\ambari-scom.msi" (
 echo MSI build failed
 exit /b 1

+ 0 - 1
contrib/ambari-scom/msi/src/ambari-scom.wxs

@@ -16,7 +16,6 @@ limitations under the License. -->
     <Product Id="{C627953F-1C50-4520-AB91-A938F7E01B58}" Codepage="1252" Language="1033" Manufacturer="Apache" Name="Ambari-SCOM" UpgradeCode="{CD3CAC20-F0A9-4EF7-9C75-CF660D0697AA}" Version="1.3.0.0">
         <Package Comments="This installer database contains the logic and data required to install Apache Ambari-SCOM." Compressed="yes" Description="Ambari-SCOM" InstallerVersion="100" Languages="1033" Manufacturer="Apache" Platform="x86" />
 		<Binary Id="GUI" SourceFile="SourceDir\bin\GUI_Ambari.exe" />
-		<Binary Id="WixCA" SourceFile="SourceDir\bin\wixca" />
 		<Condition Message="You need to be an administrator to install this product.">Privileged</Condition>
 		<CustomAction Id="INSTINTERRUPT" Error="Installation interrupted by user" />
         <CustomAction Id="INSTSUCCESS" Error="Installation completed succesfully" />