[389-commits] win/Console.wxs win/VERSION.mak
Richard Allen Megginson
rmeggins at fedoraproject.org
Fri May 14 02:16:25 UTC 2010
win/Console.wxs | 22 +++++++++++-----------
win/VERSION.mak | 4 ++--
2 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit bf48af6c71e2803dee2722cb1919a4035970d0d9
Author: Rich Megginson <rmeggins at redhat.com>
Date: Thu May 13 19:59:42 2010 -0600
Bug 592120 - console for 64bit Window2008 can not be installed
https://bugzilla.redhat.com/show_bug.cgi?id=592120
Resolves: bug 592120
Bug Description: console for 64bit Window2008 can not be installed
Reviewed by: self
Branch: HEAD
Fix Description: Needed to set the InstallerVersion to 200 (or greater)
which is required for 64-bit packages. Needed to mark all of the
components as 64-bit in the 64-bit package, even for "noarch" components
such as jar files and scripts, or the installer would think it is not a
real 64-bit package.
Bumped the GUID and the version to 1.1.6.
Confirmed using Orca validation and summary properties checking.
Platforms tested: Windows 2008 64-bit
Flag Day: no
Doc impact: no
diff --git a/win/Console.wxs b/win/Console.wxs
index 004bda1..8e9043d 100644
--- a/win/Console.wxs
+++ b/win/Console.wxs
@@ -54,7 +54,7 @@
<Package Id='????????-????-????-????-????????????' Keywords='Installer'
Description="$(var.PRODUCTNAME) Installer"
Manufacturer='$(var.VENDOR)' Platforms='$(var.Property_Platform)'
- InstallerVersion='100' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
+ InstallerVersion='200' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
<!-- previous versions of this package were installed using the per-user context -->
<!-- explicitly set this and future packages to be per-machine (All Users) -->
@@ -203,39 +203,39 @@
<File Id='JSSLIB' LongName='jss4.dll' Name='jss4.dll' DiskId='1' src='jss4.dll' Vital='yes' />
</Component>
- <Component Id='JSSJar' Guid='064A960B-4D7E-45cc-895B-19DE1D9AEF77'>
+ <Component Id='JSSJar' Guid='064A960B-4D7E-45cc-895B-19DE1D9AEF77' Win64='$(var.Property_Win64)'>
<File Id='JSSJAR' LongName='jss4.jar' Name='jss4.jar' DiskId='1' src='jss4.jar' Vital='yes' />
</Component>
- <Component Id='LDAPJar' Guid='E6D5B3AE-11F5-427f-85D3-D7A6A6A0A55D'>
+ <Component Id='LDAPJar' Guid='E6D5B3AE-11F5-427f-85D3-D7A6A6A0A55D' Win64='$(var.Property_Win64)'>
<File Id='LDAPJAR' LongName='ldapjdk.jar' Name='ldapjdk.jar' DiskId='1' src='ldapjdk.jar' Vital='yes' />
</Component>
- <Component Id='IDMBaseJar' Guid='F45C344F-A3C2-4ffd-9CC6-22D36AA5E69E'>
+ <Component Id='IDMBaseJar' Guid='F45C344F-A3C2-4ffd-9CC6-22D36AA5E69E' Win64='$(var.Property_Win64)'>
<File Id='IDMBASEJAR' LongName='idm-console-base.jar' Name='idmbase.jar' DiskId='1' src='idm-console-base.jar' Vital='yes' />
</Component>
- <Component Id='IDMMCCJar' Guid='1DB26BB6-56AF-4e7e-BD55-8F1364B7A55B'>
+ <Component Id='IDMMCCJar' Guid='1DB26BB6-56AF-4e7e-BD55-8F1364B7A55B' Win64='$(var.Property_Win64)'>
<File Id='IDMMCCJAR' LongName='idm-console-mcc.jar' Name='idmmcc.jar' DiskId='1' src='idm-console-mcc.jar' Vital='yes' />
</Component>
- <Component Id='IDMMCCENJar' Guid='71FF3A08-C895-4648-A8CC-08F0CD2AD4D6'>
+ <Component Id='IDMMCCENJar' Guid='71FF3A08-C895-4648-A8CC-08F0CD2AD4D6' Win64='$(var.Property_Win64)'>
<File Id='IDMMCCENJAR' LongName='idm-console-mcc_en.jar' Name='idmmccen.jar' DiskId='1' src='idm-console-mcc_en.jar' Vital='yes' />
</Component>
- <Component Id='IDMNMCLFJar' Guid='2F118B1B-3413-4740-A99A-1B22E79AB232'>
+ <Component Id='IDMNMCLFJar' Guid='2F118B1B-3413-4740-A99A-1B22E79AB232' Win64='$(var.Property_Win64)'>
<File Id='IDMNMCLFJAR' LongName='idm-console-nmclf.jar' Name='idmnmclf.jar' DiskId='1' src='idm-console-nmclf.jar' Vital='yes' />
</Component>
- <Component Id='IDMNMCLFENJar' Guid='EB4F2170-BFDC-4c5f-8A12-9812CAADB740'>
+ <Component Id='IDMNMCLFENJar' Guid='EB4F2170-BFDC-4c5f-8A12-9812CAADB740' Win64='$(var.Property_Win64)'>
<File Id='IDMNMCLFENJAR' LongName='idm-console-nmclf_en.jar' Name='idmnmcen.jar' DiskId='1' src='idm-console-nmclf_en.jar' Vital='yes' />
</Component>
- <Component Id='ConsoleJar' Guid='BE426443-1A07-406e-97FA-103D518BE233'>
+ <Component Id='ConsoleJar' Guid='BE426443-1A07-406e-97FA-103D518BE233' Win64='$(var.Property_Win64)'>
<File Id='CONSOLEJAR' LongName='$(var.FILEPREF)-console_en.jar' Name='conen.jar' DiskId='1' src='$(var.FILEPREF)-console_en.jar' Vital='yes' />
</Component>
- <Component Id='ConsoleBat' Guid='00DEC033-5D77-49a2-9478-FA67E8D4EFEA'>
+ <Component Id='ConsoleBat' Guid='00DEC033-5D77-49a2-9478-FA67E8D4EFEA' Win64='$(var.Property_Win64)'>
<File Id='CONSOLEBAT' LongName='$(var.FILEPREF)-console.bat' Name='con.bat' DiskId='1' src='$(var.FILEPREF)-console.bat' Vital='yes' >
<Shortcut Id="startmenuConsole" Directory="ProgramMenuDir" Name="CONFLDR"
LongName="$(var.SHORTCUT)" WorkingDirectory='INSTALLDIR' Show="minimized"
@@ -246,7 +246,7 @@
</File>
</Component>
- <Component Id='License.rtf' Guid='D40977B8-BB2B-4796-B855-3503AF5FF881'>
+ <Component Id='License.rtf' Guid='D40977B8-BB2B-4796-B855-3503AF5FF881' Win64='$(var.Property_Win64)'>
<File Id='LICENSERTF' LongName='License.rtf' Name='License.rtf' DiskId='1' src='License.rtf' Vital='yes' />
</Component>
diff --git a/win/VERSION.mak b/win/VERSION.mak
index ad14b22..6ca3bc6 100644
--- a/win/VERSION.mak
+++ b/win/VERSION.mak
@@ -7,14 +7,14 @@ BRANDNOSPACE=389
# this is the vendor or manufacturer
VENDOR=389 Project
# the version
-VERSION=1.1.5
+VERSION=1.1.6
# the name of the product - this is used in the title of the
# installer, in the name of the folder, and in the name
# of the shortcuts
PRODUCTNAME=$(BRAND) Management Console
# this is the GUID of the package - must be changed
# when the version is changed - use uuidgen -n1
-PKGGUID=e9874937-a842-4396-bb5a-71cd89d4b5ba
+PKGGUID=FD65E7CA-6D18-419a-9296-0224F81229EC
# the upgrade GUID should usually not be changed
UPGRADEGUID=7EA828C0-C219-438d-9BB3-3418DC900D60
# guid of old version to be removed
More information about the 389-commits
mailing list