From 839fc6d3f5b123ac732b52230542785a199fef3a Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Wed, 15 Nov 2006 14:55:30 +0000
Subject: [PATCH] Update the build script to ensure that administrative shell scripts have UNIX line separators (LF) and batch files have Windows line separators (CRLF). This will ensure that these files will be handled properly on the target platform, regardless of what type of system was used to check out and build the server.
---
opendj-sdk/opends/build.xml | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/opendj-sdk/opends/build.xml b/opendj-sdk/opends/build.xml
index 65d24a9..889b0ff 100644
--- a/opendj-sdk/opends/build.xml
+++ b/opendj-sdk/opends/build.xml
@@ -370,9 +370,10 @@
<fileset file="${lib.dir}/*.jar" />
</copy>
- <copy todir="${pdir}/bin">
- <fileset file="${scripts.dir}/*" />
- </copy>
+ <fixcrlf srcDir="${scripts.dir}" destDir="${pdir}/bin" excludes="*.bat"
+ eol="lf" />
+ <fixcrlf srcDir="${scripts.dir}" destDir="${pdir}/bin" includes="*.bat"
+ eol="crlf" />
<copy todir="${pdir}/config">
<fileset file="${config.dir}/*" />
@@ -398,13 +399,10 @@
<fileset file="${resource.dir}/README" />
</copy>
- <copy todir="${pdir}">
- <fileset file="${resource.dir}/setup.sh" />
- </copy>
-
- <copy todir="${pdir}">
- <fileset file="${resource.dir}/setup.bat" />
- </copy>
+ <fixcrlf srcDir="${resource.dir}" destDir="${pdir}" includes="setup.sh"
+ eol="lf" />
+ <fixcrlf srcDir="${resource.dir}" destDir="${pdir}" includes="setup.bat"
+ eol="crlf" />
<chmod file="${pdir}/*.sh" perm="755" />
<chmod perm="755">
--
Gitblit v1.10.0