Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BB80710DB8 for ; Tue, 4 Feb 2014 20:35:48 +0000 (UTC) Received: (qmail 15193 invoked by uid 500); 4 Feb 2014 20:35:48 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 15149 invoked by uid 500); 4 Feb 2014 20:35:48 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 15142 invoked by uid 99); 4 Feb 2014 20:35:47 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Feb 2014 20:35:47 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9D7B1824713; Tue, 4 Feb 2014 20:35:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tbeerbower@apache.org To: commits@ambari.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: AMBARI-4525 - Fix Ambari MSI build process Date: Tue, 4 Feb 2014 20:35:47 +0000 (UTC) Updated Branches: refs/heads/trunk 1d80ca0bc -> aeb36c36e 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/aeb36c36 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/aeb36c36 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/aeb36c36 Branch: refs/heads/trunk Commit: aeb36c36e4dffa6ea1082b5298ff7b07e17352f1 Parents: 1d80ca0 Author: tbeerbower Authored: Tue Feb 4 12:35:29 2014 -0800 Committer: tbeerbower Committed: Tue Feb 4 12:35:29 2014 -0800 ---------------------------------------------------------------------- contrib/ambari-scom/msi/build.cmd | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/aeb36c36/contrib/ambari-scom/msi/build.cmd ---------------------------------------------------------------------- diff --git a/contrib/ambari-scom/msi/build.cmd b/contrib/ambari-scom/msi/build.cmd index 40b7f5b..b52e1c3 100644 --- a/contrib/ambari-scom/msi/build.cmd +++ b/contrib/ambari-scom/msi/build.cmd @@ -36,8 +36,12 @@ echo Building MSI 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 +if not exist "%cd%\ambari-scom.msi" ( +echo MSI build failed +exit /b 1 +) popd || exit /b 1 -copy /y "..\management-pack\Hadoop_MP\Installer\bin\Debug\en-us\AmbariSCOMManagementPack.msi" "%cd%\ambari-scom.msi" || exit /b 1 +copy /y "..\management-pack\Hadoop_MP\Installer\bin\Debug\en-us\AmbariSCOMManagementPack.msi" "%cd%\ambari-scom-mp.msi" || exit /b 1 echo Cleaning del /f /q "%cd%\src\ambari-scom.wixobj" || exit /b 1