Minify CSS; copy Touch Charts into resources without minification

01f89706 · Christoph Thelen · 5f8a2fa6 · 01f89706 · 01f89706 · 01f89706
Commit 01f89706 authored Jun 18, 2013 by Christoph Thelen
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 6 deletions

build.xml build.xml +13 -3

pom.xml pom.xml +1 -2

src/main/webapp/st2-index.html src/main/webapp/st2-index.html +1 -1

No files found.
--- a/build.xml
+++ b/build.xml
@@ -25,6 +25,12 @@
 			</fileset>
 			<mapper type="glob" from="*.js" to="*.js.min"/>
 		</apply>
+		<!-- copy Touch Charts manually -->
+		<copy todir="${build.dir}/lib/touch-charts-2.0">
+			<fileset dir="${main.dir}/lib/touch-charts-2.0">
+				<include name="touch-charts.js"/>
+			</fileset>
+		</copy>
 	</target>
 	
 	<target name="-min:js:move" depends="-min:js:minify">
@@ -52,9 +58,13 @@
 	
 	<target name="min:js" depends="-build:init,-assets:copy,-min:js:move" />
 	
-	<target name="min:css">
-		<java jar="${sencha.dir}/jsbuilder/ycompressor/ycompressor.jar" fork="true" failonerror="true" output="${main.dir}/resources/css/arsnova_min.css">
-			<arg value="${main.dir}/resources/css/arsnova_new.css" />
+	<target name="min:css" depends="-build:init,-assets:copy">
+		<java jar="${lib.dir}/stylesheets.jar" fork="true" failonerror="true">
+			<arg line="--allowed-non-standard-function color-stop" />
+			<arg line="--allowed-non-standard-function progid:DXImageTransform.Microsoft.gradient" />
+			<arg value="--output-file" />
+			<arg value="${build.dir}/resources/css/st2-arsnova_min.css" />
+			<arg value="${main.dir}/resources/css/st2-arsnova_new.css" />
 		</java> 
 	</target>
 	

--- a/pom.xml
+++ b/pom.xml
@@ -63,8 +63,7 @@
 						<phase>compile</phase>
 						<configuration>
 							<target>
-								<!-- ant target="min:css" /-->
-								<ant target="min:js" />
+								<ant target="run" />
 							</target>
 						</configuration>
 						<goals>

--- a/src/main/webapp/st2-index.html
+++ b/src/main/webapp/st2-index.html
@@ -14,7 +14,7 @@
 		 <link rel="stylesheet" href="lib/touch-2.2.1/resources/css/sencha-touch.css" type="text/css">
 		 
 		 <!--  will be created by jenkins-->
-		 <link rel="stylesheet" href="resources/css/st2-arsnova_new.css" type="text/css">
+		 <link rel="stylesheet" href="resources/css/st2-arsnova_min.css" type="text/css">
 	 </head>
 	 <body class="x-fullscreen">		
 		<script type="text/javascript" src="lib/touch-2.2.1/sencha-touch-all-compat.js"></script>