Fix line endings when building on Windows

Move the preflight task to the now generic copy-js task
wet-boew · Nov 27, 2012 · 45a6646 · 45a6646
1 parent 6ccb0e1
commit 45a6646
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 37 deletions.
diff --git a/build.xml b/build.xml
@@ -24,8 +24,4 @@
 			<fileset dir="${src.dir}" includes="**/**/build.xml"/>
 		</subant>
 	</target>
-
-	<target name="preflight" description="Sets tabbing and encoding as indicated by the contributor guidelines">
-		<fixcrlf srcdir="${src.dir}" includes="**/*.js" encoding="UTF-8" outputencoding="UTF-8" tab="add" tablength="4" fixlast="yes" />
-	</target>
 </project>
diff --git a/build/build-tasks.xml b/build/build-tasks.xml
@@ -240,6 +240,10 @@
 				<exclude name="**/*.min.js" />
 			</fileset>
 		</delete>
+		<fixcrlf srcdir="${build.dir}" fixlast="false" encoding="UTF-8" outputencoding="UTF-8">
+			<include name="**/*-min.css" />
+			<include name="**/*-min.js" />
+		</fixcrlf>
 	</target>
 
 	<target name="-copy-css" depends="compile.sass">
@@ -264,16 +268,25 @@
 		</concat>
 	</target>
 
-	<target name="-copy-js">
-		<copy todir="${build.dir}/js">
-			<fileset dir="${src.dir}/js"/>
+	<target name="-copy-js" depends="">
+		<fixcrlf srcdir="${src.dir}" includes="**/*.js" encoding="UTF-8" outputencoding="UTF-8" tab="add" tablength="4" fixlast="false"/>
+		<copy todir="${build.dir}" encoding="UTF-8">
+			<fileset dir="${src.dir}">
+				<include name="**/*.js"/>
+				<exclude name="workers/**"/> 
+				<exclude name="pe-ap.js"/> 
+				<exclude name="jquerymobile/jquery.mobile.js"/> 
+			</fileset>
 			<filterchain>
-				<replacetokens>
-					<token key="wet-boew-build.version" value="${wet-boew-build.version}"/>
-					<token key="wet-boew-build.starttime" value="${wet-boew-build.starttime}"/>
-				</replacetokens>
+				<replaceregex byline="false" pattern="^\/(\*)+[^!]" replace="\/\*!" flags="s"/>
 			</filterchain>
 		</copy>
+		<replace dir="${build.dir}">
+			<include name="**/*.js"/>
+			<exclude name="**/*-min.js"/>
+			<exclude name="**/*.min.js"/>
+			<replacefilter token="@wet-boew-build.version@" value="${wet-boew-build.version}"/>
+		</replace>
 	</target>
 
 	<target name="-copy-images">

diff --git a/build/js/jquery.min.js b/build/js/jquery.min.js
diff --git a/src/js/build.xml b/src/js/build.xml
@@ -5,30 +5,10 @@
 	<property file="build.properties"/>
 	<import file="${build.dir}/../build-tasks.xml"/>
 
-	<target name="default" depends="clean,build" description="Performs a clean and build when calling ant without any target"></target>
+	<target name="default" depends="clean,build" description="Performs a clean and build when calling ant without any target"/>
 
-	<target name="copy-all" extensionOf="prepare-files" depends="-copy-css,-copy-images,-copy-js,-copy-binaries"/>
+	<target name="copy-all" extensionOf="prepare-files" depends="-copy-css,-copy-images,-copy-js,-build-pe,-copy-binaries"/>
 
-	<target name="-copy-js" depends="-build-pe">
-		<copy todir="${build.dir}" encoding="UTF-8">
-			<fileset dir="${src.dir}">
-				<include name="**/*.js"/>
-				<exclude name="workers/**"/> 
-				<exclude name="pe-ap.js"/> 
-				<exclude name="jquerymobile/jquery.mobile.js"/> 
-			</fileset>
-			<filterchain>
-				<replaceregex byline="false" pattern="^\/(\*)+[^!]" replace="\/\*!" flags="s"/>
-			</filterchain>
-		</copy>
-		<replace dir="${build.dir}">
-			<include name="**/*.js"/>
-			<exclude name="**/*-min.js"/>
-			<exclude name="**/*.min.js"/>
-			<replacefilter token="@wet-boew-build.version@" value="${wet-boew-build.version}"/>
-		</replace>
-	</target>
-
 	<target name="-copy-binaries">
 		<copy todir="${build.dir}">  
 			<fileset dir="${src.dir}">
@@ -45,7 +25,6 @@
 			<filterchain>
 				<replacetokens>
 					<token key="wet-boew-build.version" value="${wet-boew-build.version}"/>
-					<token key="wet-boew-build.starttime" value="${wet-boew-build.starttime}"/>
 					<token key="wet-boew-build.languagelist" value="${languagelist}"/>
 					<token key="wet-boew-build.validlanguagelist" value="${validlanguagelist}"/>
 					<token key="wet-boew-build.validlanguagemethod" value="${validlanguagemethod}"/>

diff --git a/src/js/jquery.min.js b/src/js/jquery.min.js
diff --git a/src/js/workers/zebra.js b/src/js/workers/zebra.js
@@ -290,7 +290,7 @@
 				//	isSimpleTable = false;
 				// }
 				// console.log('2 Zebra, isSimpleTable:' + isSimpleTable);
-				// console.log($('th[rowspan]', elem).length + '  ' + $('th[colspan]', elem).length + '  ' + $('td[rowspan]', elem).length + '  ' + $('td[colspan]', elem).length + '  ' + $('colgroup[span]', elem).length);
+				// console.log($('th[rowspan]', elem).length + '  ' + $('th[colspan]', elem).length + '  ' + $('td[rowspan]', elem).length + '	' + $('td[colspan]', elem).length + '  ' + $('colgroup[span]', elem).length);
 
 				if (isSimpleTable && (elem.children('tbody').length > 1 || elem.children('thead').children('tr').length > 1 || elem.children('colgroup').length > 2)) {
 					isSimpleTable = false;