From eaa6a6f17df404995b40ae6c4caebfd7947be7bb Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Thu, 26 Apr 2007 14:43:23 +0000
Subject: [PATCH] Complete fix for 1252 restrict installed bin files to relevant platform.
---
opends/build.xml | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/opends/build.xml b/opends/build.xml
index ca0d689..eae249f 100644
--- a/opends/build.xml
+++ b/opends/build.xml
@@ -689,10 +689,11 @@
<antcall target="example-plugin" />
- <fixcrlf srcDir="${scripts.dir}" destDir="${pdir}/bin" excludes="*.bat" eol="lf" />
- <fixcrlf srcDir="${scripts.dir}" destDir="${pdir}/bin" includes="*.bat,README_WINDOWS.txt" eol="crlf" />
- <fixcrlf srcDir="${scripts.dir}" destDir="${pdir}/bat" includes="*.bat"
- eol="crlf" />
+ <fixcrlf srcDir="${scripts.dir}" destDir="${pdir}/bin" excludes="*.bat,_client-script.sh,_server-script.sh" eol="lf" />
+ <fixcrlf srcDir="${scripts.dir}" destDir="${pdir}/lib" includes="_client-script.sh,_server-script.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,setcp.bat" includes="*.bat" eol="crlf" />
+ <fixcrlf srcDir="${scripts.dir}" destDir="${pdir}/lib" includes="_client-script.bat,_server-script.bat,setcp.bat" eol="crlf" />
<copy todir="${pdir}/config">
<fileset file="${config.dir}/*" />
@@ -742,7 +743,6 @@
<chmod file="${pdir}/uninstall" perm="755" />
<chmod perm="755">
<fileset dir="${pdir}/bin">
- <exclude name="*.bat"/>
</fileset>
</chmod>
</target>
@@ -755,14 +755,16 @@
description="Package the Directory Server for distribution.">
<zip destfile="${package.dir}/OpenDS-${pkgversion}.zip">
<zipfileset dir="${package.dir}" includes="OpenDS-${pkgversion}/**/*"
- excludes="OpenDS-${pkgversion}/bin/*,OpenDS-${pkgversion}/setup,OpenDS-${pkgversion}/uninstall"
+ excludes="OpenDS-${pkgversion}/bin/*,OpenDS-${pkgversion}/lib/_client-script.sh,OpenDS-${pkgversion}/lib/_server-script.sh,OpenDS-${pkgversion}/setup,OpenDS-${pkgversion}/uninstall"
filemode="644" dirmode="755" />
<zipfileset dir="${package.dir}"
- includes="OpenDS-${pkgversion}/bin/*.bat"
- filemode="644" dirmode="755" />
- <zipfileset dir="${package.dir}" includes="OpenDS-${pkgversion}/bin/*"
- excludes="OpenDS-${pkgversion}/bin/*.bat"
+ includes="OpenDS-${pkgversion}/lib/_client-script.sh,OpenDS-${pkgversion}/lib/_server-script.sh"
filemode="755" dirmode="755" />
+ <zipfileset dir="${package.dir}" includes="OpenDS-${pkgversion}/bin/*"
+ excludes="OpenDS-${pkgversion}/bin/README_WINDOWS.txt"
+ filemode="755" dirmode="755" />
+ <zipfileset dir="${package.dir}" includes="OpenDS-${pkgversion}/bin/README_WINDOWS.txt"
+ filemode="644" dirmode="755" />
<zipfileset dir="${package.dir}" includes="OpenDS-${pkgversion}/setup,OpenDS-${pkgversion}/uninstall"
filemode="755" dirmode="755" />
</zip>
--
Gitblit v1.10.0