[ofw] [WinOF] Trunk svn commits 2440 - 2441

[Smith, Stan]

Signed off by stan.smith at intel.com

Revision: 2441
Author: stansmith
Date: 2:54:33 PM, Wednesday, September 16, 2009
Message:
[WinOF] Identify platform processor architecture [32/64 bit] for which the installer is targeted.
Use the new include file WinOF\Wix\common\UserInterface.inc to define the WIX UI for all installer variants.
----
Added : /gen1/trunk/WinOF/WIX/common/UserInterface.inc
Modified : /gen1/trunk/WinOF/WIX/win7/ia64/wof.wxs
Modified : /gen1/trunk/WinOF/WIX/win7/x64/wof.wxs
Modified : /gen1/trunk/WinOF/WIX/win7/x86/wof.wxs
Modified : /gen1/trunk/WinOF/WIX/wlh/ia64/wof.wxs
Modified : /gen1/trunk/WinOF/WIX/wlh/x64/wof.wxs
Modified : /gen1/trunk/WinOF/WIX/wlh/x86/wof.wxs
Modified : /gen1/trunk/WinOF/WIX/wnet/ia64/wof.wxs
Modified : /gen1/trunk/WinOF/WIX/wnet/x64/wof.wxs
Modified : /gen1/trunk/WinOF/WIX/wnet/x86/wof.wxs
Modified : /gen1/trunk/WinOF/WIX/wxp/x86/wof.wxs


# mods applied to all wof.wxs files

--- C:/Documents and Settings/scsmith/Local Settings/Temp/wof.wxs-revBASE.svn000.tmp.wxs        Wed Sep 16 14:47:33 2009
+++ C:/Documents and Settings/scsmith/My Documents/openIB-windows/SVN/gen1/trunk/WinOF/WIX/wlh/x86/wof.wxs      Tue Sep 15 15:11:32 2009
@@ -23,7 +23,8 @@
      Description="WinOF Installer"
      Comments="Windows OpenFabrics Alliance InfiniBand stack"
      Manufacturer="OpenFabrics Alliance" InstallerVersion="200"
-     Languages="1033" Compressed="yes" SummaryCodepage="1252" />
+     Platforms="$(var.ARCHP)" Languages="1033"
+     Compressed="yes" SummaryCodepage="1252" />

     <Condition Message="Administrator required to install [ProductName].">
      Privileged
@@ -104,9 +105,7 @@

     <?include ..\..\common\InstallExecuteSeq.inc ?>

-    <UIRef Id="WixUI_FeatureTree" />
-      <UIRef Id="WixUI_ErrorProgressText" />
-      <Icon Id="openfabrics" SourceFile="..\..\openfabrics.ico" />
-    <UI />
+    <?include ..\..\common\UserInterface.inc ?>
+
   </Product>
 </Wix>


=====================================================================================================================

Revision: 2440
Author: stansmith
Date: 2:45:05 PM, Wednesday, September 16, 2009
Message:
[WinOF] reduce Wix installer (.msi file generation) complexity & redundancy by moving
the bulk of Makefile to a parameterized WinOF\Wix\common\Makefile.inc
----
Added : /gen1/trunk/WinOF/WIX/common/Makefile.inc
Modified : /gen1/trunk/WinOF/WIX/win7/ia64/Makefile
Modified : /gen1/trunk/WinOF/WIX/win7/x64/Makefile
Modified : /gen1/trunk/WinOF/WIX/win7/x86/Makefile
Modified : /gen1/trunk/WinOF/WIX/wlh/ia64/Makefile
Modified : /gen1/trunk/WinOF/WIX/wlh/x64/Makefile
Modified : /gen1/trunk/WinOF/WIX/wlh/x86/Makefile
Modified : /gen1/trunk/WinOF/WIX/wnet/ia64/Makefile
Modified : /gen1/trunk/WinOF/WIX/wnet/x64/Makefile
Modified : /gen1/trunk/WinOF/WIX/wnet/x86/Makefile
Modified : /gen1/trunk/WinOF/WIX/wxp/x86/Makefile


# basic changes applied to all WIX makefiles

--- C:/Documents and Settings/scsmith/Local Settings/Temp/Makefile-revBASE.svn000.tmp   Wed Sep 16 14:40:31 2009
+++ C:/Documents and Settings/scsmith/My Documents/openIB-windows/SVN/gen1/trunk/WinOF/WIX/wlh/x86/Makefile     Tue Sep 15 15:00:33 2009
@@ -2,56 +2,7 @@
 # makefile targets
 #
 S=WOF
-P=$(S)_wlh_x86
-
-#WIX 2.0
-# L=..\..\WIX_tools\wix-2.0.5325.0-binaries
-L=..\..\WIX_tools\wix-2.0.5805.0-binaries
-
-# WIX 3.0 L=..\WIX_tools\wix-3.0.2925.0-binaries
-
-WIX_UI="$(L)\wixui.wixlib" -loc "$(L)\WixUI_en-us.wxl"
-
-DFX=DIFxApp.wixlib
-# Since makebin.bat knows correct WDK version, it copies the DIFX APP files
-# to the bin\ tree; eliminates Makefiles having to know about WDK versions.
-DFXP=..\bin\Misc\x86
-
-full: clean $(P).msi
-
-clean:
-       @del /q $(S).wixobj 2>nul
-       @del /q $(P).msi 2>nul
-       @del /q license.rtf 2>nul
-       @del /q/f DIFxA*.* 2>nul
-
-MySetup: $(P).msi
-
-license.rtf: ..\..\license.rtf
-       @copy ..\..\license.rtf .\license.rtf
-
-# .dlls need to be in the current folder
-$(DFX) : $(DFXP)\$(DFX) $(DFXP)\DIFxApp.dll $(DFXP)\DIFxAppA.dll
-       @copy /B/Y $(DFXP)\DIFxApp.dll .
-       @copy /B/Y $(DFXP)\DIFxAppA.dll .
-       @copy /B/Y $(DFXP)\$(DFX) .
-
-$(S).wixobj: $(S).wxs
-
-$(P).msi: $(S).wixobj license.rtf $(DFX)
-       @echo --
-       @echo Building $(P).msi
-       $(L)\light.exe /nologo -out $(P).msi $(S).wixobj $(DFX) $(WIX_UI)
-       @del /q $(S).wixobj 2>nul
-       @del /q license.rtf 2>nul
-       @del /q/f DIFxA*.* 2>nul
-
-
-###################
-# makefile inference rules
-#
-.SUFFIXES: .wxs .wixobj
-
-.wxs.wixobj::
-       @$(L)\candle.exe /nologo -trace -v $<
+A=x86
+P=$(S)_wlh_$(A)

+!include ..\..\common\Makefile.inc