[Gpg4win-commits] r1225 - trunk/src

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2009-08-04 12:13:34 +0200 (Tue, 04 Aug 2009)
New Revision: 1225

Modified:
   trunk/src/make-msi.bat
   trunk/src/make-msi.pl
Log:
Revert accidental commit.


Modified: trunk/src/make-msi.bat
===================================================================
--- trunk/src/make-msi.bat	2009-08-03 13:44:56 UTC (rev 1224)
+++ trunk/src/make-msi.bat	2009-08-04 10:13:34 UTC (rev 1225)
@@ -1,7 +1,7 @@
 REM Usage: make-msi.bat [-L{de|en}] [FILE]
 REM Defaults: -Len gpg4win.wix
 REM 
-set WIXPATH=%ProgramFiles%\"Windows Installer XML v3"\bin
+set WIXPATH=C:\"Program Files"\"Windows Installer XML v3"\bin
 
 set LANG=en-us
 IF NOT "%1"=="-Lde" GOTO langde
@@ -23,21 +23,5 @@
   set FILE=%1
 :nofile
 
-
-REM We want to catch error, so always clean.
-del msi-custom-license.wixobj
-del msi-custom-ui.wixobj
-del %FILE%.wixobj
-del %FILE%.msi
-
-%WIXPATH%\candle.exe msi-custom-license.wxs
-IF ERRORLEVEL 1 GOTO End
-%WIXPATH%\candle.exe msi-custom-ui.wxs
-IF ERRORLEVEL 1 GOTO End
-%WIXPATH%\candle.exe %FILE%.wxs
-IF ERRORLEVEL 1 GOTO End
-REM Validity tests disabled with -sval due to non-advertised shortcuts.
-%WIXPATH%\light.exe -sval -ext WixUIExtension -ext WixUtilExtension -cultures:%LANG% msi-custom-license.wixobj msi-custom-ui.wixobj %FILE%.wixobj -out %FILE%.msi
-IF ERRORLEVEL 1 GOTO End
-
-:End
+%WIXPATH%\candle.exe %FILE%
+%WIXPATH%\light.exe -ext WixUIExtension -cultures:%LANG% %FILE%obj

Modified: trunk/src/make-msi.pl
===================================================================
--- trunk/src/make-msi.pl	2009-08-03 13:44:56 UTC (rev 1224)
+++ trunk/src/make-msi.pl	2009-08-04 10:13:34 UTC (rev 1225)
@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 # make-msi.pl - MSI Installer for GnuPG 4 Windows.
-# Copyright (C) 2007, 2008 g10 Code GmbH
+# Copyright (C) 2007 g10 Code GmbH
 # 
 # This file is part of Gpg4win.
 # 
@@ -1591,23 +1591,11 @@
 # Removed this, because it is not localized:
 #    <UIRef Id='WixUI_ErrorProgressText' />
 
-# We could do this, but we how to select on language?
-# Probably some conditional can be used.
-#    <CustomAction Id="ShowReadMe" BinaryKey="WixCA" DllEntry="WixShellExec"
-#                  Execute="immediate" Return="check" Impersonate="yes" />
-#    <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Show README" />
-#    <Property Id="WixShellExecTarget" Value="[#f_Kontact_0]" />
-#    <UI>
-#      <Publish Dialog="ExitDialog" Control="Finish" Event="DoAction"
-#               Value="ShowReadMe"
-#               Order="1">WIXUI_EXITDIALOGOPTIONALCHECKBOX</Publish>
-#    </UI>
-
 print <<EOF;
     </Feature>
 
     <WixVariable Id='WixUILicenseRtf' Value='gpl.rtf'/>
-    <UIRef Id='WixUI_Gpg4Win' />
+    <UIRef Id='WixUI_Mondo' />
 
   </Product>
 </Wix>