From 3dec4af1034c5542c602d835ef584e58a1513bd3 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Tue, 10 Nov 2015 16:43:55 +0000
Subject: [PATCH] OPENDJ-2388 Removes msi package resources
---
/dev/null | 68 ----------------------
opendj-server-legacy/build.xml | 75 -------------------------
2 files changed, 0 insertions(+), 143 deletions(-)
diff --git a/opendj-server-legacy/build.xml b/opendj-server-legacy/build.xml
index 758cf2a..df650d2 100644
--- a/opendj-server-legacy/build.xml
+++ b/opendj-server-legacy/build.xml
@@ -1360,81 +1360,6 @@
<echo message="Package Built: ${package.built.ts}"/>
</target>
- <!-- Package the Directory Server for the MSI distribution. -->
- <target name="package-MSI"
- description="Package the Directory Server for MSI distribution.">
- <fail unless="build.windows">MSI packages can only be built on Windows.</fail>
- <taskdef name="getversionnumber"
- classname="org.opends.build.tools.CreateVersionString">
- <classpath>
- <fileset dir="${build.dir}/build-tools">
- <include name="*.jar" />
- </fileset>
- </classpath>
- </taskdef>
-
- <getversionnumber property="VERSION_NUMBER_STRING" />
-
- <mkdir dir="${build.dir}/msi/files" />
- <copy toDir="${build.dir}/msi/files">
- <fileset dir="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}">
- <!-- Exclude Mac apps -->
- <exclude name="QuickSetup.app/**"/>
- <exclude name="Uninstall.app/**"/>
- <!-- Exclude shell scripts -->
- <exclude name="bin/**"/>
- <exclude name="setup"/>
- <exclude name="uninstall"/>
- <exclude name="upgrade"/>
- <exclude name="**/*.sh"/>
- </fileset>
- </copy>
-
- <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 -->
- <exec executable="heat.exe" dir="${build.dir}/msi/files">
- <arg value="dir"/>
- <arg value="."/>
- <arg value="-nologo"/>
- <arg value="-cg"/> <arg value="all"/>
- <arg value="-gg"/>
- <arg value="-sfrag"/>
- <arg value="-srd"/>
- <arg value="-dr"/> <arg value="OPENDJ"/>
- <arg value="-var"/> <arg value="var.src"/>
- <arg value="-template"/> <arg value="fragment"/>
- <arg value="-o"/> <arg value="${build.dir}/msi/build/payload.wxs"/>
- </exec>
-
- <!-- Compile all .wxs files into .wixobj files (fast) -->
- <exec executable="candle.exe" dir="${build.dir}/msi">
- <arg value="-nologo"/>
- <arg value="-out"/> <arg value="${build.dir}/msi/build/"/>
- <arg value="-dsrc=files"/>
- <arg value="-dname=${SHORT_NAME}"/>
- <arg value="-dmajor=${MAJOR_VERSION}"/>
- <arg value="-dminor=${MINOR_VERSION}"/>
- <arg value="-dpoint=${POINT_VERSION}"/>
- <arg value="build/package.wxs"/>
- <arg value="build/payload.wxs"/>
- </exec>
-
- <!-- Build the package (slow) -->
- <exec executable="light.exe" dir="${build.dir}/msi">
- <arg value="-nologo"/>
- <arg value="-ext"/> <arg value="WixUIExtension"/>
- <arg value="-out"/> <arg value="dist/${SHORT_NAME}-${MAJOR_VERSION}.${MINOR_VERSION}.${POINT_VERSION}.msi"/>
- <arg value="build/package.wixobj"/>
- <arg value="build/payload.wixobj"/>
- </exec>
-
- </target>
-
<!-- Prepare the Directory Server DSML library. -->
<target name="predsml" depends="prepackage"
description="Prepare the Directory Server DSML library.">
diff --git a/opendj-server-legacy/resource/msi/opendjbanner.bmp b/opendj-server-legacy/resource/msi/opendjbanner.bmp
deleted file mode 100644
index 332b89c..0000000
--- a/opendj-server-legacy/resource/msi/opendjbanner.bmp
+++ /dev/null
Binary files differ
diff --git a/opendj-server-legacy/resource/msi/opendjdialog.bmp b/opendj-server-legacy/resource/msi/opendjdialog.bmp
deleted file mode 100644
index d99ed06..0000000
--- a/opendj-server-legacy/resource/msi/opendjdialog.bmp
+++ /dev/null
Binary files differ
diff --git a/opendj-server-legacy/resource/msi/package.wxs b/opendj-server-legacy/resource/msi/package.wxs
deleted file mode 100644
index 95b1faf..0000000
--- a/opendj-server-legacy/resource/msi/package.wxs
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ! CDDL HEADER START
- !
- ! The contents of this file are subject to the terms of the
- ! Common Development and Distribution License, Version 1.0 only
- ! (the "License"). You may not use this file except in compliance
- ! with the License.
- !
- ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- ! or http://forgerock.org/license/CDDLv1.0.html.
- ! See the License for the specific language governing permissions
- ! and limitations under the License.
- !
- ! When distributing Covered Code, include this CDDL HEADER in each
- ! file and include the License file at legal-notices/CDDLv1_0.txt.
- ! If applicable, add the following below this CDDL HEADER, with the
- ! fields enclosed by brackets "[]" replaced with your own identifying
- ! information:
- ! Portions Copyright [yyyy] [name of copyright owner]
- !
- ! CDDL HEADER END
- !
- !
- ! Copyright 2013-2015 ForgeRock AS
- ! -->
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Product Id="*" Codepage="1252" Language="1033" Manufacturer="ForgeRock"
- Name="ForgeRock $(var.name) $(var.major).$(var.minor)" Version="$(var.major).$(var.minor).$(var.point).0"
- UpgradeCode="A3E82AC0-88E6-4DEE-9D8C-5AE3B7853274">
- <Package Id="*" Comments="This package contains ForgeRock $(var.name) $(var.major).$(var.minor).$(var.point)."
- Description="ForgeRock products" InstallerVersion="300" Languages="1033" Manufacturer="ForgeRock"
- Platform="x86" Compressed="yes"/>
- <Media Id="1" Cabinet="opendj.cab" DiskPrompt="Disk 1" EmbedCab="yes" CompressionLevel="high"/>
- <Property Id="DiskPrompt" Value="ForgeRock $(var.name) $(var.major).$(var.minor).$(var.point) Installation"/>
-
- <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."/>
-
- <Directory Id="TARGETDIR" Name="SourceDir">
- <Directory Id="ProgramFilesFolder" Name="PFiles">
- <Directory Id="OPENDJ" Name="$(var.name)">
- </Directory>
- </Directory>
- </Directory>
-
- <Feature Id="All" Title="Server and tools" Level="1" ConfigurableDirectory="OPENDJ">
- <ComponentGroupRef Id="all"/>
- </Feature>
-
- <!-- User interface -->
- <Property Id="WIXUI_INSTALLDIR" Value="OPENDJ"/>
- <UI Id="OpenDJ_Install">
- <UIRef Id="WixUI_InstallDir"/>
- <UIRef Id="WixUI_ErrorProgressText"/>
- <!-- Don't show the license agreement in the install, just in setup -->
- <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg">1</Publish>
- <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
- </UI>
- </Product>
-</Wix>
--
Gitblit v1.10.0