mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Gaetan Boismal
03.50.2015 3dec4af1034c5542c602d835ef584e58a1513bd3
OPENDJ-2388 Removes msi package resources

Pull Request #133
This commit also removes ant logical to build the msi package.
3 files deleted
1 files modified
143 ■■■■■ changed files
opendj-server-legacy/build.xml 75 ●●●●● patch | view | raw | blame | history
opendj-server-legacy/resource/msi/opendjbanner.bmp patch | view | raw | blame | history
opendj-server-legacy/resource/msi/opendjdialog.bmp patch | view | raw | blame | history
opendj-server-legacy/resource/msi/package.wxs 68 ●●●●● patch | view | raw | blame | history
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.">
opendj-server-legacy/resource/msi/opendjbanner.bmp
Binary files differ
opendj-server-legacy/resource/msi/opendjdialog.bmp
Binary files differ
opendj-server-legacy/resource/msi/package.wxs
File was deleted