ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tbeerbo...@apache.org
Subject git commit: AMBARI-4525 - Fix Ambari MSI build process
Date Wed, 05 Feb 2014 12:35:45 GMT
Updated Branches:
  refs/heads/trunk 8d5c0b6a8 -> 1dbea4476


AMBARI-4525 - Fix Ambari MSI build process


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1dbea447
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1dbea447
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1dbea447

Branch: refs/heads/trunk
Commit: 1dbea4476dff6600ed741af18b55f7a315246d67
Parents: 8d5c0b6
Author: tbeerbower <tbeerbower@hortonworks.com>
Authored: Wed Feb 5 04:35:27 2014 -0800
Committer: tbeerbower <tbeerbower@hortonworks.com>
Committed: Wed Feb 5 04:35:27 2014 -0800

----------------------------------------------------------------------
 contrib/ambari-scom/msi/build.cmd           | 2 +-
 contrib/ambari-scom/msi/src/ambari-scom.wxs | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/1dbea447/contrib/ambari-scom/msi/build.cmd
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/msi/build.cmd b/contrib/ambari-scom/msi/build.cmd
index d4d2fde..0e2fe9e 100644
--- a/contrib/ambari-scom/msi/build.cmd
+++ b/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

http://git-wip-us.apache.org/repos/asf/ambari/blob/1dbea447/contrib/ambari-scom/msi/src/ambari-scom.wxs
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/msi/src/ambari-scom.wxs b/contrib/ambari-scom/msi/src/ambari-scom.wxs
index a25c7c0..0c50d24 100644
--- a/contrib/ambari-scom/msi/src/ambari-scom.wxs
+++ b/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" />


Mime
View raw message