ISIS-1287: further fixes for EOL on copied over files
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/3c5203b7
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/3c5203b7
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/3c5203b7
Branch: refs/heads/master
Commit: 3c5203b7ff289211f92bf8893f43166e6b7a2837
Parents: 1dcb8f9
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Mar 29 08:42:43 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Mar 29 08:42:43 2016 +0100
----------------------------------------------------------------------
adocs/documentation/pom.xml | 54 ++++++++++++++++++++--------------------
1 file changed, 27 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/3c5203b7/adocs/documentation/pom.xml
----------------------------------------------------------------------
diff --git a/adocs/documentation/pom.xml b/adocs/documentation/pom.xml
index 0e486c5..bd46ce2 100644
--- a/adocs/documentation/pom.xml
+++ b/adocs/documentation/pom.xml
@@ -278,7 +278,7 @@
<echo message=""/>
<echo message=""/>
- <echo message="copying from ${build.dir} to ${isis-site.dir} (ignoring PDFs)"/>
+ <echo message="copying from ${build.dir} to ${isis-site.dir}"/>
<echo message=""/>
<copy todir="${isis-site.dir}" overwrite="true" force="true">
<fileset dir="${build.dir}"/>
@@ -288,87 +288,87 @@
<echo message=""/>
<echo message="converting CRLF to LF for all text files under ${isis-site.dir}"/>
- <echo message=""/>
<echo message="... .html files"/>
- <echo message=""/>
<fixcrlf srcdir="${isis-site.dir}"
includes="**/*.html"
eol="lf"
eof="remove"
fixlast="true"/>
- <echo message=""/>
<echo message="... .xml files"/>
- <echo message=""/>
<fixcrlf srcdir="${isis-site.dir}"
includes="**/*.xml"
eol="lf"
eof="remove"
- fixlast="true"/>
+ fixlast="false"/>
- <echo message=""/>
<echo message="... .xsd files"/>
- <echo message=""/>
<fixcrlf srcdir="${isis-site.dir}"
includes="**/*.xsd"
eol="lf"
eof="remove"
- fixlast="true"/>
+ fixlast="false"/>
- <echo message=""/>
<echo message="... .css files"/>
- <echo message=""/>
<fixcrlf srcdir="${isis-site.dir}"
includes="**/*.css"
eol="lf"
eof="remove"
- fixlast="true"/>
+ fixlast="false"/>
- <echo message=""/>
<echo message="... .svg files"/>
- <echo message=""/>
<fixcrlf srcdir="${isis-site.dir}"
includes="**/*.svg"
eol="lf"
eof="remove"
- fixlast="true"/>
+ fixlast="false"/>
- <echo message=""/>
<echo message="... .less files"/>
- <echo message=""/>
<fixcrlf srcdir="${isis-site.dir}"
includes="**/*.less"
eol="lf"
eof="remove"
- fixlast="true"/>
+ fixlast="false"/>
- <echo message=""/>
<echo message="... .scss files"/>
- <echo message=""/>
<fixcrlf srcdir="${isis-site.dir}"
includes="**/*.scss"
eol="lf"
eof="remove"
- fixlast="true"/>
+ fixlast="false"/>
- <echo message=""/>
<echo message="... .js files"/>
- <echo message=""/>
<fixcrlf srcdir="${isis-site.dir}"
includes="**/*.js"
eol="lf"
eof="remove"
- fixlast="true"/>
+ fixlast="false"/>
- <echo message=""/>
<echo message="... .sh files"/>
- <echo message=""/>
<fixcrlf srcdir="${isis-site.dir}"
includes="**/*.sh"
eol="lf"
eof="remove"
- fixlast="true"/>
+ fixlast="false"/>
+
+ <echo message="... .rdf files"/>
+ <fixcrlf srcdir="${isis-site.dir}"
+ includes="**/*.rdf"
+ eol="lf"
+ eof="remove"
+ fixlast="false"/>
+
+ <!-- for these files, encoding seems to go from UTF8 to ASCII when
+ apply fixcrlf, so just copy over again... -->
+ <echo message=""/>
+ <echo message=""/>
+ <echo message="copying over slick CSS and SCSS from ${build.dir} to ${isis-site.dir}"/>
+ <echo message=""/>
+ <copy todir="${isis-site.dir}" overwrite="true" force="true">
+ <fileset dir="${build.dir}" includes="**/css/slick/**/*"/>
+ </copy>
+
</target>
</configuration>
<goals>