Moved the output of the SASS compile to the build folder (instead of …

…the source folder) Removed the clean-css tasks sicne they are no longer needed.
wet-boew · Nov 14, 2012 · 38e4600 · 38e4600
1 parent d9227c8
commit 38e4600
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 21 deletions.
diff --git a/build.xml b/build.xml
@@ -5,19 +5,13 @@
 	<property name="src.dir" value="src"/>
 	<property name="build.dir" value="build"/>
 
-	<target name="default" depends="clean,build,clean-css" 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>
 
 	<target name="build" depends="">
 		<subant target="build">
 			<fileset dir="${src.dir}" includes="**/build.xml"/>
 		</subant>
 	</target>
-
-	<target name="clean-css">
-		<subant target="clean-css">
-			<fileset dir="${src.dir}" includes="**/build.xml"/>
-		</subant>
-	</target>
 
 	<target name="clean">
 		<subant target="clean">

diff --git a/build/build-tasks.xml b/build/build-tasks.xml
@@ -93,6 +93,7 @@
 			<arg path="${lib.dir}/vendors-${jruby.depends}/gems/"/>
 			<arg value="${command}"/>
 			<arg path="${src.dir}"/>
+			<arg value="${build.dir}/_css"/>
 		</java>
 	</target>
 
@@ -171,10 +172,6 @@
 			<srcfile/>
 		</apply>
 	</target>
-
-	<target name="clean-css">
-		<delete dir="${src.dir}/css" />
-	</target>
 
 	<target name="clean">
 		<delete dir="${build.dir}" />
@@ -193,7 +190,7 @@
 
 	<extension-point name="test" />
 
-	<target name="lint" extensionOf="test" depends="-jshint, csslint, clean-css"/>
+	<target name="lint" extensionOf="test" depends="-jshint, csslint"/>
 
 	<target name="-base64-encode">
 		<property name="image.dir" location="${build.dir}/images"/>
@@ -240,8 +237,8 @@
 
 	<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">
+		<move todir="${build.dir}/css">
+			<fileset dir="${build.dir}/_css">
 				<include name="*.css"/>
 			</fileset>
 			<filterchain>
@@ -251,7 +248,7 @@
 					<token key="wet-boew-build.starttime" value="${wet-boew-build.starttime}"/>
 				</replacetokens>
 			</filterchain>
-		</copy>
+		</move>
 	</target>
 
 	<target name="-copy-jquery-css">

diff --git a/build/config.rb b/build/config.rb
@@ -8,7 +8,7 @@
 
 # Set this to the root of your project when deployed:
 http_path = "/"
-css_dir = "css"
+css_dir = ARGV[3]
 sass_dir = "sass"
 images_dir = "images"
 javascripts_dir = "js"

diff --git a/src/grids/build.xml b/src/grids/build.xml
@@ -5,7 +5,7 @@
 	<property file="build.properties"/>
 	<import file="${build.dir}/../build-tasks.xml"/>
 
-	<target name="default" depends="clean,build,clean-css" 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>
 
 	<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
@@ -5,7 +5,7 @@
 	<property file="build.properties"/>
 	<import file="${build.dir}/../build-tasks.xml"/>
 
-	<target name="default" depends="clean,build,clean-css" 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>
 
 	<target name="copy-all" extensionOf="prepare-files" depends="-copy-css,-copy-images,-copy-js"/>
 

diff --git a/src/theme-clf2-nsi2/build.xml b/src/theme-clf2-nsi2/build.xml
@@ -5,7 +5,7 @@
 	<property file="build.properties"/>
 	<import file="${build.dir}/../build-tasks.xml"/>
 
-	<target name="default" depends="clean,build,clean-css" 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>
 
 	<target name="copy-all" extensionOf="prepare-files" depends="-copy-css,-copy-images,-copy-js"/>
 </project>
diff --git a/src/theme-gcwu-fegc/build.xml b/src/theme-gcwu-fegc/build.xml
@@ -5,7 +5,7 @@
 	<property file="build.properties"/>
 	<import file="${build.dir}/../build-tasks.xml"/>
 
-	<target name="default" depends="clean,build,clean-css" 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>
 
 	<target name="encode-jquery" extensionOf="encode-images" depends="-base64-encode-jquery"/>
 

diff --git a/src/theme-gcwu-intranet/build.xml b/src/theme-gcwu-intranet/build.xml
@@ -5,7 +5,7 @@
 	<property file="build.properties"/>
 	<import file="${build.dir}/../build-tasks.xml"/>
 
-	<target name="default" depends="clean,build,clean-css" 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>
 
 	<target name="encode-jquery" extensionOf="encode-images" depends="-base64-encode-jquery"/>