Hoist common copy tasks

Rename of pe-ap-ns was because it is an import only Sass file, so it doesn't need to be compiled to CSS
wet-boew · Nov 5, 2012 · 9c09776 · 9c09776
1 parent 74676a7
commit 9c09776
Show file tree

Hide file tree

Showing 7 changed files with 71 additions and 204 deletions.
diff --git a/build/build-tasks.xml b/build/build-tasks.xml
@@ -171,4 +171,64 @@
 			</fileset>
 		</delete>
 	</target>
+
+	<target name="-copy-css" depends="compile.sass">
+		<loadfile srcfile="${build.dir}/../build-css-head.txt" property="build.css.head"/>
+		<copy todir="${build.dir}/css">
+			<fileset dir="${src.dir}/css">
+				<include name="*.css"/>
+			</fileset>
+			<filterchain>
+				<concatfilter prepend="${build.dir}/../build-css-head.txt"/>
+				<replacetokens>
+					<token key="wet-boew-build.version" value="${wet-boew-build.version}"/>
+					<token key="wet-boew-build.starttime" value="${wet-boew-build.starttime}"/>
+				</replacetokens>
+			</filterchain>
+		</copy>
+	</target>
+
+	<target name="-copy-jquery-css">
+		<loadfile srcfile="${build.dir}/../build-css-head.txt" property="build.css.head"/>
+		<loadfile srcfile="${src.dir}/../js/jquerymobile/jquery.mobile.structure.min.css" property="jquery.mobile.license">
+			<filterchain>
+				<headfilter lines="1"/>
+			</filterchain>
+		</loadfile>
+		<concat dest="${build.dir}/css/jquery.mobile.css">
+			<header>${build.css.head}
+			${jquery.mobile.license}</header>
+			<fileset dir="${src.dir}/../js/jquerymobile">
+				<include name="*structure.css"/>
+			</fileset>
+			<fileset dir="${src.dir}/jquerymobile">
+				<include name="*theme.css"/>
+			</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>
+			</filterchain>
+		</concat>
+	</target>
+
+	<target name="-copy-js">
+		<copy todir="${build.dir}/js">
+			<fileset dir="${src.dir}/js"/>
+			<filterchain>
+				<concatfilter prepend="${build.dir}/../build-js-head.txt"/>
+				<replacetokens>
+					<token key="wet-boew-build.version" value="${wet-boew-build.version}"/>
+					<token key="wet-boew-build.starttime" value="${wet-boew-build.starttime}"/>
+				</replacetokens>
+			</filterchain>
+		</copy>
+	</target>
+
+	<target name="-copy-images">
+		<copy todir="${build.dir}/images">
+			<fileset dir="${src.dir}/images" />
+		</copy>
+	</target>
 </project>
diff --git a/src/grids/build.xml b/src/grids/build.xml
@@ -9,25 +9,5 @@
 
 	<target name="compress-all" extensionOf="compress" depends="-minify"/>	
 
-	<target name="-copy-css" extensionOf="prepare-files" depends="compile.sass">
-		<copy todir="${build.dir}/css">
-			<filelist dir="${src.dir}/css">
-				<file name="util.css"/>
-				<file name="util-ie.css"/>
-			</filelist>
-			<filterchain>
-				<concatfilter prepend="${build.dir}/../build-css-head.txt"/>
-				<replacetokens>
-					<token key="wet-boew-build.version" value="${wet-boew-build.version}"/>
-					<token key="wet-boew-build.starttime" value="${wet-boew-build.starttime}"/>
-				</replacetokens>
-			</filterchain>
-		</copy>
-	</target>
-
-	<target name="-copy-images" extensionOf="prepare-files">
-		<copy todir="${build.dir}/images">
-			<fileset dir="${src.dir}/images" />
-		</copy>
-	</target>
+	<target name="copy-all" extensionOf="prepare-files" depends="-copy-css,-copy-images"/>
 </project>
diff --git a/src/js/build.xml b/src/js/build.xml
@@ -7,15 +7,16 @@
 
 	<target name="default" depends="clean,build" description="Performs a clean and build when calling ant without any target"></target>
 
-	<target name="-encode-css" extensionOf="encode-images" depends="-base64-encode"/>	
+	<target name="encode-css" extensionOf="encode-images" depends="-base64-encode"/>	
 
 	<target name="compress-all" extensionOf="compress" depends="-minify"/>	
 
-	<target name="build-js" extensionOf="prepare-files" depends="-build-pe">
+	<target name="copy-all" extensionOf="prepare-files" depends="-copy-css,-copy-images,-copy-js"/>
+
+	<target name="-copy-js" depends="-build-pe">
 		<copy todir="${build.dir}">  
 			<resources>
 				<fileset dir="${src.dir}">
-					<include name="images/**"/>
 					<include name="binary/**"/>
 					<include name="jquerymobile/*.min.js"/>
 					<include name="*.js"/>
@@ -97,28 +98,6 @@
 		<replaceregexp flags="gis" file="${build.dir}/workers.js" match="/\*.*?\*/" replace="" encoding="utf8" />
 	</target>
 
-	<target name="-copy-css" extensionOf="prepare-files" depends="compile.sass">
-		<copy todir="${build.dir}/css">
-			<filelist dir="${src.dir}/css">
-				<file name="pe-ap.css"/>
-				<file name="pe-ap-ie.css"/>
-			</filelist>
-			<filterchain>
-				<concatfilter prepend="${build.dir}/../build-css-head.txt"/>
-				<replacetokens>
-					<token key="wet-boew-build.version" value="${wet-boew-build.version}"/>
-					<token key="wet-boew-build.starttime" value="${wet-boew-build.starttime}"/>
-				</replacetokens>
-			</filterchain>
-		</copy>
-	</target>
-
-	<target name="-copy-images" extensionOf="prepare-files">
-		<copy todir="${build.dir}/images">
-			<fileset dir="${src.dir}/images" />
-		</copy>
-	</target>
-
 	<target name="-jshint" extensionOf="test">
 		<jshint dir="${src.dir}" fail="${jshint.failbuild}" globalsFile="${jshint.globals.file}" options="strict:false">
 			<report type="xml" destfile="${build.dir}/jshint.out.xml" />

diff --git a/src/js/sass/pe-ap-ns.scss → src/js/sass/_pe-ap-ns.scss b/src/js/sass/pe-ap-ns.scss → src/js/sass/_pe-ap-ns.scss
diff --git a/src/theme-clf2-nsi2/build.xml b/src/theme-clf2-nsi2/build.xml
@@ -7,43 +7,11 @@
 
 	<target name="default" depends="clean,build" description="Performs a clean and build when calling ant without any target"></target>
 
-	<target name="-encode-css" extensionOf="encode-images" depends="-base64-encode"/>	
+	<target name="encode-css" extensionOf="encode-images" depends="-base64-encode"/>	
 
 	<target name="compress-all" extensionOf="compress" depends="-minify"/>
 
-	<target name="-copy-css" depends="compile.sass" extensionOf="prepare-files">
-		<copy todir="${build.dir}/css">
-			<fileset dir="${src.dir}/css">
-				<include name="*.css"/>
-			</fileset>
-			<filterchain>
-				<concatfilter prepend="${build.dir}/../build-css-head.txt"/>
-				<replacetokens>
-					<token key="wet-boew-build.version" value="${wet-boew-build.version}"/>
-					<token key="wet-boew-build.starttime" value="${wet-boew-build.starttime}"/>
-				</replacetokens>
-			</filterchain>
-		</copy>
-	</target>
-
-	<target name="-copy-js" extensionOf="prepare-files">
-		<copy todir="${build.dir}/js">
-			<fileset dir="${src.dir}/js"/>
-			<filterchain>
-				<concatfilter prepend="${build.dir}/../build-js-head.txt"/>
-				<replacetokens>
-					<token key="wet-boew-build.version" value="${wet-boew-build.version}"/>
-					<token key="wet-boew-build.starttime" value="${wet-boew-build.starttime}"/>
-				</replacetokens>
-			</filterchain>
-		</copy>
-	</target>
-
-	<target name="-copy-images" extensionOf="prepare-files">
-		<copy todir="${build.dir}/images">
-			<fileset dir="${src.dir}/images" />
-		</copy>
-	</target>
+	<target name="copy-all" extensionOf="prepare-files" depends="-copy-css,-copy-images,-copy-js"/>
 
 	<target name="lint" extensionOf="test" depends="-jshint"/>
 </project>
diff --git a/src/theme-gcwu-fegc/build.xml b/src/theme-gcwu-fegc/build.xml
@@ -7,71 +7,11 @@
 
 	<target name="default" depends="clean,build" description="Performs a clean and build when calling ant without any target"></target>
 
-	<target name="-encode-css" extensionOf="encode-images" depends="-base64-encode,-base64-encode-jquery"/>
+	<target name="encode-css" extensionOf="encode-images" depends="-base64-encode,-base64-encode-jquery"/>
 
 	<target name="compress-all" extensionOf="compress" depends="-minify"/>
 
-	<target name="-copy-css" extensionOf="prepare-files" depends="compile.sass">
-		<loadfile srcfile="${build.dir}/../build-css-head.txt" property="build.css.head"/>
-		<loadfile srcfile="${src.dir}/../js/jquerymobile/jquery.mobile.structure.min.css" property="jquery.mobile.license">
-			<filterchain>
-				<headfilter lines="1"/>
-			</filterchain>
-		</loadfile>
-		<concat dest="${build.dir}/css/jquery.mobile.css">
-			<header>${build.css.head}
-			${jquery.mobile.license}</header>
-			<fileset dir="${src.dir}/../js/jquerymobile">
-				<include name="*structure.css"/>
-			</fileset>
-			<fileset dir="${src.dir}/jquerymobile">
-				<include name="*theme.css"/>
-			</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>
-			</filterchain>
-		</concat>
-		<copy todir="${build.dir}/css">
-			<filelist dir="${src.dir}/css">
-				<file name="theme.css"/>
-				<file name="theme-ie.css"/>
-				<file name="theme-sp-pe.css"/>
-				<file name="theme-sp-pe-ie.css"/>
-				<file name="theme-serv.css"/>
-				<file name="theme-serv-ie.css"/>
-				<file name="theme-ns.css"/>
-			</filelist>
-			<filterchain>
-				<concatfilter prepend="${build.dir}/../build-css-head.txt"/>
-				<replacetokens>
-					<token key="wet-boew-build.version" value="${wet-boew-build.version}"/>
-					<token key="wet-boew-build.starttime" value="${wet-boew-build.starttime}"/>
-				</replacetokens>
-			</filterchain>
-		</copy>
-	</target>
-
-	<target name="-copy-js" extensionOf="prepare-files">
-		<copy todir="${build.dir}/js">
-			<fileset dir="${src.dir}/js"/>
-			<filterchain>
-				<concatfilter prepend="${build.dir}/../build-js-head.txt"/>
-				<replacetokens>
-					<token key="wet-boew-build.version" value="${wet-boew-build.version}"/>
-					<token key="wet-boew-build.starttime" value="${wet-boew-build.starttime}"/>
-				</replacetokens>
-			</filterchain>
-		</copy>
-	</target>
-
-	<target name="-copy-images" extensionOf="prepare-files">
-		<copy todir="${build.dir}/images">
-			<fileset dir="${src.dir}/images" />
-		</copy>
-	</target>
+	<target name="copy-all" extensionOf="prepare-files" depends="-copy-css,-copy-images,-copy-js,-copy-jquery-css"/>
 
 	<target name="lint" extensionOf="test" depends="-jshint"/>
 </project>
diff --git a/src/theme-gcwu-intranet/build.xml b/src/theme-gcwu-intranet/build.xml
@@ -7,71 +7,11 @@
 
 	<target name="default" depends="clean,build" description="Performs a clean and build when calling ant without any target"></target>
 
-	<target name="-encode-css" extensionOf="encode-images" depends="-base64-encode,-base64-encode-jquery"/>	
+	<target name="encode-css" extensionOf="encode-images" depends="-base64-encode,-base64-encode-jquery"/>	
 
 	<target name="compress-all" extensionOf="compress" depends="-minify"/>
 
-	<target name="-copy-css" extensionOf="prepare-files" depends="compile.sass">
-		<loadfile srcfile="${build.dir}/../build-css-head.txt" property="build.css.head"/>
-		<loadfile srcfile="${src.dir}/../js/jquerymobile/jquery.mobile.structure.min.css" property="jquery.mobile.license">
-			<filterchain>
-				<headfilter lines="1"/>
-			</filterchain>
-		</loadfile>
-		<concat dest="${build.dir}/css/jquery.mobile.css">
-			<header>${build.css.head}
-			${jquery.mobile.license}</header>
-			<fileset dir="${src.dir}/../js/jquerymobile">
-				<include name="*structure.css"/>
-			</fileset>
-			<fileset dir="${src.dir}/jquerymobile">
-				<include name="*theme.css"/>
-			</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>
-			</filterchain>
-		</concat>
-		<copy todir="${build.dir}/css">
-			<filelist dir="${src.dir}/css">
-				<file name="theme.css"/>
-				<file name="theme-ie.css"/>
-				<file name="theme-sp-pe.css"/>
-				<file name="theme-sp-pe-ie.css"/>
-				<file name="theme-serv.css"/>
-				<file name="theme-serv-ie.css"/>
-				<file name="theme-ns.css"/>
-			</filelist>
-			<filterchain>
-				<concatfilter prepend="${build.dir}/../build-css-head.txt"/>
-				<replacetokens>
-					<token key="wet-boew-build.version" value="${wet-boew-build.version}"/>
-					<token key="wet-boew-build.starttime" value="${wet-boew-build.starttime}"/>
-				</replacetokens>
-			</filterchain>
-		</copy>
-	</target>
-
-	<target name="-copy-js" extensionOf="prepare-files">
-		<copy todir="${build.dir}/js">
-			<fileset dir="${src.dir}/js"/>
-			<filterchain>
-				<concatfilter prepend="${build.dir}/../build-js-head.txt"/>
-				<replacetokens>
-					<token key="wet-boew-build.version" value="${wet-boew-build.version}"/>
-					<token key="wet-boew-build.starttime" value="${wet-boew-build.starttime}"/>
-				</replacetokens>
-			</filterchain>
-		</copy>
-	</target>
-
-	<target name="-copy-images" extensionOf="prepare-files">
-		<copy todir="${build.dir}/images">
-			<fileset dir="${src.dir}/images" />
-		</copy>
-	</target>
+	<target name="copy-all" extensionOf="prepare-files" depends="-copy-css,-copy-images,-copy-js,-copy-jquery-css,-copy-gcwu-images"/>
 
 	<target name="-copy-gcwu-images" extensionOf="prepare-files">
 		<copy todir="${build.dir}/images">