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

Mark Craig
06.50.2013 e61e5b13df1992795e8f63f02642a7b8db6b969f
CR-2281 Fix for OPENDJ-1021: Remove obsolete opendj/bin/README_Windows.txt
1 files deleted
3 files modified
41 ■■■■■ changed files
opends/build.xml 8 ●●●● patch | view | raw | blame | history
opends/resource/bin/README_WINDOWS.txt 28 ●●●●● patch | view | raw | blame | history
opends/src/svr4/OpenDJ/layout.xml 2 ●●●●● patch | view | raw | blame | history
opends/src/svr4/OpenDS/layout.xml 3 ●●●● patch | view | raw | blame | history
opends/build.xml
@@ -1160,7 +1160,6 @@
    <fixcrlf srcDir="${scripts.dir}" destDir="${pdir}/bin" excludes="*.bat,_client-script.sh,_server-script.sh,_mixed-script.sh,_script-util.sh" eol="lf" />
    <fixcrlf srcDir="${scripts.dir}" destDir="${pdir}/lib" includes="_client-script.sh,_server-script.sh,_mixed-script.sh,_script-util.sh" eol="lf" />
    <fixcrlf srcDir="${scripts.dir}" destDir="${pdir}/bin" includes="README_WINDOWS.txt" eol="crlf" />
    <fixcrlf srcDir="${scripts.dir}" destDir="${pdir}/bat" excludes="_client-script.bat,_server-script.bat,_mixed-script.bat,_script-util.bat,setcp.bat" includes="*.bat" eol="crlf" />
    <fixcrlf srcDir="${scripts.dir}" destDir="${pdir}/lib" includes="_client-script.bat,_server-script.bat,_mixed-script.bat,_script-util.bat,setcp.bat" eol="crlf" />
@@ -1303,10 +1302,7 @@
           includes="lib/_client-script.sh,lib/_script-util.sh,lib/_server-script.sh,lib/_mixed-script.sh"
           filemode="755" dirmode="755" prefix="opendj" />
      <zipfileset dir="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}" includes="bin/*"
           excludes="bin/README_WINDOWS.txt"
           filemode="755" dirmode="755" prefix="opendj" />
      <zipfileset dir="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}" includes="bin/README_WINDOWS.txt"
           filemode="644" dirmode="755" prefix="opendj" />
      <zipfileset dir="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}" includes="setup,uninstall,upgrade,QuickSetup.app/Contents/MacOS/JavaApplicationStub,Uninstall.app/Contents/MacOS/JavaApplicationStub,bin/ControlPanel.app/Contents/MacOS/JavaApplicationStub"
           filemode="755" dirmode="755" prefix="opendj" />
      <zipfileset dir="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}" includes="template/**/*"
@@ -1525,12 +1521,12 @@
                  control="${build.dir}/deb/control" verbose="false">
      <tarfileset dir="${build.deb.dir}"
                  includes="**/*"
                  excludes="**/bat/**, **/*.app/**, **/*.bat*, **/*.exe*, bin/*, template/**/*, lib/*.sh, setup, uninstall, upgrade, legal-notices/**, copyright, README, bin/README_WINDOWS.txt, example-plugin.zip, opendj, changelog.Debian.gz"
                  excludes="**/bat/**, **/*.app/**, **/*.bat*, **/*.exe*, bin/*, template/**/*, lib/*.sh, setup, uninstall, upgrade, legal-notices/**, copyright, README, example-plugin.zip, opendj, changelog.Debian.gz"
                  prefix="${prefix}" filemode="644" dirmode="755" />
      <tarfileset dir="${build.deb.dir}" includes="lib/*.sh"
                  prefix="${prefix}" filemode="755" dirmode="755" />
      <tarfileset dir="${build.deb.dir}" includes="bin/*"
                  excludes="bin/README_WINDOWS.txt, **/bin/ControlPanel.app/"
                  excludes="**/bin/ControlPanel.app/"
                  prefix="${prefix}" filemode="755" dirmode="755" />
      <tarfileset dir="${build.deb.dir}" includes="setup,uninstall,upgrade"
                  prefix="${prefix}" filemode="755" dirmode="755" />
opends/resource/bin/README_WINDOWS.txt
File was deleted
opends/src/svr4/OpenDJ/layout.xml
@@ -89,8 +89,6 @@
       <fileset dir="${svr4.layout.pkg.dir}" includes="**/*.exe"/>
       <fileset dir="${svr4.layout.pkg.dir}" includes="**/*.bat"/>
       <fileset dir="${svr4.layout.pkg.dir}" includes="**/bat/"/>
       <fileset dir="${svr4.layout.pkg.dir}"
               includes="**/README_WINDOWS.txt"/>
    </delete>
    <!-- Remove MacOS specific files  -->
    <delete includeemptydirs="true">
opends/src/svr4/OpenDS/layout.xml
@@ -23,6 +23,7 @@
 !
 !
 !      Copyright 2006-2009 Sun Microsystems, Inc.
 !      Portions Copyright 2013 ForgeRock AS.
 ! -->
<project name="OpenDS SVR4 layout" basedir=".">
@@ -87,8 +88,6 @@
       <fileset dir="${svr4.layout.pkg.dir}" includes="**/*.exe"/>
       <fileset dir="${svr4.layout.pkg.dir}" includes="**/*.bat"/>
       <fileset dir="${svr4.layout.pkg.dir}" includes="**/bat/"/>
       <fileset dir="${svr4.layout.pkg.dir}"
               includes="**/README_WINDOWS.txt"/>
    </delete>
    <!-- Remove MacOS specific files  -->
    <delete includeemptydirs="true">