[Fedora-directory-commits] fedora-idm-console/win Console.wxs, 1.1, 1.2 FedoraLogo.ico, 1.1, 1.2 Makefile, 1.1, 1.2

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/fedora-idm-console/win
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19127

Modified Files:
	Console.wxs FedoraLogo.ico Makefile 
Log Message:
added UI and graphics


Index: Console.wxs
===================================================================
RCS file: /cvs/dirsec/fedora-idm-console/win/Console.wxs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Console.wxs	31 Aug 2007 23:34:32 -0000	1.1
+++ Console.wxs	4 Sep 2007 21:30:54 -0000	1.2
@@ -37,7 +37,7 @@
  END COPYRIGHT BLOCK -->
 <Wix xmlns='http://schemas.microsoft.com/wix/2003/01/wi'>
   <Product Name='Fedora Identity Management Console' Id='5B5D4E30-55E2-49c1-84B3-10C1CE56907F'
-    Language='1033' Codepage='1252'
+    Language='1033' Codepage='1252' UpgradeCode='7EA828C0-C219-438d-9BB3-3418DC900D60'
     Version='1.1.0' Manufacturer='Fedora Project'>
 
     <Package Id='????????-????-????-????-????????????' Keywords='Installer'
@@ -141,6 +141,10 @@
             </File>
           </Component>
 
+          <Component Id='License.rtf' Guid='D40977B8-BB2B-4796-B855-3503AF5FF881'>
+            <File Id='LICENSERTF' LongName='License.rtf' Name='License.rtf' DiskId='1' src='License.rtf' Vital='yes' />
+          </Component>
+
         </Directory>
 
       </Directory>
@@ -178,9 +182,15 @@
  	    <ComponentRef Id='IDMNMCLFENJar' />
  	    <ComponentRef Id='FedoraConsoleJar' />
  	    <ComponentRef Id='FedoraConsoleBat' />
+ 	    <ComponentRef Id='License.rtf' />
      </Feature>
     </Feature>
 
+    <Property Id="INSTALLLEVEL">3</Property>
+
+    <UIRef Id="WixUI_Mondo" />
+    <UIRef Id="WixUI_ErrorProgressText" />
+
     <Icon Id="FedoraLogo.ico" SourceFile="FedoraLogo.ico" />
 
   </Product>


Index: FedoraLogo.ico
===================================================================
RCS file: /cvs/dirsec/fedora-idm-console/win/FedoraLogo.ico,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
Binary files /tmp/cvsF9PNFX and /tmp/cvsKPALUH differ


Index: Makefile
===================================================================
RCS file: /cvs/dirsec/fedora-idm-console/win/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	31 Aug 2007 23:34:32 -0000	1.1
+++ Makefile	4 Sep 2007 21:30:54 -0000	1.2
@@ -43,7 +43,7 @@
 PKGDIR=.
 WXSDIR=.
 
-BASEDIR=E:\cygwin\home\rich
+#BASEDIR=E:\cygwin\home\rich
 # where to find nspr dlls
 NSPRLIBDIR=$(BASEDIR)\nspr-4.6.7
 # where to find nss dlls
@@ -75,11 +75,27 @@
 	copy /Y $(JSSDIR)\jss4.dll $(PKGDIR)
 	copy /Y $(LDAPDIR)\ldapjdk.jar $(PKGDIR)
 	copy /Y $(IDMDIR)\*.jar $(PKGDIR)
-#	copy /Y $(FEDORACONSOLEDIR)\*.jar $(PKGDIR)
+	copy /Y $(FEDORACONSOLEDIR)\*.jar $(PKGDIR)
+# directory should already contain the bat file, icon, and bitmaps
 #	copy /Y $(FEDORACONSOLEDIR)\*.bat $(PKGDIR)
 #	copy /Y $(FEDORACONSOLEDIR)\*.ico $(PKGDIR)
 
 $(PKGNAME).msi : LAYOUT
 	cd "$(PKGDIR)"
 	$(CANDLE) "$(WXSDIR)\$(PKGNAME).wxs"
-	$(LIGHT) $(PKGNAME).wixobj
+	$(LIGHT) -out $(PKGNAME).msi $(PKGNAME).wixobj $(WIXDIR)\wixui.wixlib -loc $(WIXDIR)\WixUI_en-us.wxl
+
+clean:
+	del /F /Q $(PKGNAME).wixobj $(PKGNAME).msi
+
+help:
+	@echo You must define the following paths:
+	@echo NSPRLIBDIR - directory containing the NSPR dlls
+	@echo NSSLIBDIR - directory containing the NSS dlls
+	@echo NSSBINDIR - directory containing certutil.exe and pk12util.exe
+	@echo JSSDIR - directory containing jss4.jar and jss4.dll
+	@echo LDAPDIR - directory containing ldapjdk.jar
+	@echo IDMDIR - directory containing the IDM Console Framework jar files
+	@echo FEDORACONSOLEDIR - directory containing the Fedora console jar file
+	@echo WIXDIR - directory containing the WiX candle.exe, light.exe, and library files
+	@echo Type 'nmake NSPRLIBDIR=... NSSLIBDIR=... etc.' to build the Console.msi package