From e61e5b13df1992795e8f63f02642a7b8db6b969f Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Fri, 06 Sep 2013 14:50:32 +0000
Subject: [PATCH] CR-2281 Fix for OPENDJ-1021: Remove obsolete opendj/bin/README_Windows.txt
---
opends/build.xml | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/opends/build.xml b/opends/build.xml
index 2fb9ddd..fe00757 100644
--- a/opends/build.xml
+++ b/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" />
--
Gitblit v1.10.0