svn commit: r1189173 - /incubator/wookie/trunk/widgets/templates/build.xml

[rg...@apache.org]

Author: rgardler
Date: Wed Oct 26 12:38:54 2011
New Revision: 1189173

URL: http://svn.apache.org/viewvc?rev=1189173&view=rev
Log:
Ensure CSS has a line break at the end of the all.css file.

Make sub-template or widget defined CSS more come last to ensure thy override any earlier definitions (thanks to Steve Lee)

Modified:
    incubator/wookie/trunk/widgets/templates/build.xml

Modified: incubator/wookie/trunk/widgets/templates/build.xml
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/build.xml?rev=1189173&r1=1189172&r2=1189173&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/build.xml (original)
+++ incubator/wookie/trunk/widgets/templates/build.xml Wed Oct 26 12:38:54 2011
@@ -1,4 +1,3 @@
-<?xml version="1.0"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -19,7 +18,6 @@
 
     <property name="wookie.root.dir" location="../../"/>
     <property name="project.build.dir" location="${wookie.root.dir}/build"/>
-    <property name="widget.template.dir" value="${wookie.root.dir}/widgets/widget-template"/>
     <property name="template.dir" location="."/>
     <property name="widget.build.dir" location="./build"/>
   
@@ -37,6 +35,7 @@
       <echo message="+------------------------------------------+"/>
       <echo message="|                                          |"/>
       <echo message="|  Generating widgets                      |"/>
+      <echo message="|  in: ${basedir}                          |"/>
       <echo message="|                                          |"/>
       <echo message="+------------------------------------------+"/>
 
@@ -76,9 +75,9 @@
       <echo message="|  Widget: ${widget.name}"/>
       <echo message="|  Template: ${template.name}"/>
       <echo message="+------------------------------------------"/>
-
+    	
       <ant antfile="${template.dir}/${template.name}/template_build.xml" 
-           target="_init_template"/>
+      	target="_init_template"/>
 
       <ant antfile="${template.dir}/${template.name}/template_build.xml" 
            target="_generate_from_parent_templates"/>
@@ -159,15 +158,16 @@
           <include name="**/*.css"/>
         </fileset>     
       </copy>
-      <concat destfile="${widget.build.dir}/${widget.shortname}/style/all.css.new">
-        <fileset dir="./style"
-                 erroronmissingdir="false">
-          <include name="*.css.add"/>
-        </fileset>
+      <concat destfile="${widget.build.dir}/${widget.shortname}/style/all.css.new"
+      		  fixlastline="true">
         <fileset dir="${widget.build.dir}/${widget.shortname}/style"
                  erroronmissingdir="false">
           <include name="all.css"/>
         </fileset>
+        <fileset dir="./style"
+                 erroronmissingdir="false">
+          <include name="*.css.add"/>
+        </fileset>
       </concat>
       <move tofile="${widget.build.dir}/${widget.shortname}/style/all.css" 
             file="${widget.build.dir}/${widget.shortname}/style/all.css.new"