From 39a9b3557cac997d26f3bb22def239b431ad57e6 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Thu, 29 Jan 2015 09:26:08 +0000
Subject: [PATCH] Fix for OPENDJ-1754 - Add ForgeRock branded graphics to Windows packages. Added the 2 required BMP files and update factory to take them into account.
---
opendj3-server-dev/resource/msi/opendjbanner.bmp | 0
opendj3-server-dev/resource/msi/opendjdialog.bmp | 0
opendj3-server-dev/build.xml | 2 ++
opendj3-server-dev/resource/msi/package.wxs | 6 +++++-
4 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/opendj3-server-dev/build.xml b/opendj3-server-dev/build.xml
index f639dad..14d348e 100644
--- a/opendj3-server-dev/build.xml
+++ b/opendj3-server-dev/build.xml
@@ -1394,6 +1394,8 @@
<mkdir dir="${build.dir}/msi/build" />
<copy file="${resource.dir}/msi/package.wxs" toDir="${build.dir}/msi/build"/>
+ <copy file="${resource.dir}/msi/opendjbanner.bmp" toDir="${build.dir}/msi/build"/>
+ <copy file="${resource.dir}/msi/opendjdialog.bmp" toDir="${build.dir}/msi/build"/>
<mkdir dir="${build.dir}/msi/dist" />
<!-- Construct a .wxs file from the directory structure -->
diff --git a/opendj3-server-dev/resource/msi/opendjbanner.bmp b/opendj3-server-dev/resource/msi/opendjbanner.bmp
new file mode 100644
index 0000000..332b89c
--- /dev/null
+++ b/opendj3-server-dev/resource/msi/opendjbanner.bmp
Binary files differ
diff --git a/opendj3-server-dev/resource/msi/opendjdialog.bmp b/opendj3-server-dev/resource/msi/opendjdialog.bmp
new file mode 100644
index 0000000..d99ed06
--- /dev/null
+++ b/opendj3-server-dev/resource/msi/opendjdialog.bmp
Binary files differ
diff --git a/opendj3-server-dev/resource/msi/package.wxs b/opendj3-server-dev/resource/msi/package.wxs
index 3778ed3..ae2ac5f 100644
--- a/opendj3-server-dev/resource/msi/package.wxs
+++ b/opendj3-server-dev/resource/msi/package.wxs
@@ -37,6 +37,10 @@
<Property Id="ALLUSERS" Value="1"/>
<Property Id="ARPHELPLINK" Value="http://forgerock.com"/>
+ <!-- UI customization -->
+ <WixVariable Id="WixUIBannerBmp" Value="opendjbanner.bmp" />
+ <WixVariable Id="WixUIDialogBmp" Value="opendjdialog.bmp" />
+
<!-- Upgrading -->
<MajorUpgrade DowngradeErrorMessage="A newer version of $(var.name) is already installed."/>
@@ -61,4 +65,4 @@
<Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
</UI>
</Product>
-</Wix>
\ No newline at end of file
+</Wix>
--
Gitblit v1.10.0