removed css prefixers, doing this with regex now. Updated regex to no…

…t add another /css/
deminew · Aug 16, 2011 · 9fe23b3 · 9fe23b3
1 parent c4ef2f3
commit 9fe23b3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 29 deletions.
diff --git a/build/build.xml b/build/build.xml
@@ -516,15 +516,8 @@
         </concat>
 
         <checksum file="${dir.intermediate}/${dir.js}/scripts-concat.min.js" algorithm="sha" property="scripts.sha" />
-        <if>
-            <isset property="js.prefix" />
-            <then>
-                <property name="scripts.js" value="${js.prefix}/${scripts.sha}.js" />
-            </then>
-            <else>
-                <property name="scripts.js" value="${dir.js}/${scripts.sha}.js" />
-            </else>
-        </if>
+
+        <property name="scripts.js" value="${dir.js}/${scripts.sha}.js" />
         <copy file="${dir.intermediate}/${dir.js}/scripts-concat.min.js" tofile="${dir.publish}/${dir.js}/${scripts.sha}.js" />
     </target>
 
@@ -623,7 +616,7 @@
 
         <echo message="Updating the HTML with the new css filename: ${style.css}"/>
 
-        <replaceregexp match="&lt;link rel=['&quot;]?stylesheet['&quot;]?\s+href=['&quot;]?(.*)/style.css(?:\?.*)?['&quot;]?\s*&gt;" 
+        <replaceregexp match="&lt;link rel=['&quot;]?stylesheet['&quot;]?\s+href=['&quot;]?(.*)/?css/style.css(?:\?.*)?['&quot;]?\s*&gt;" 
         	replace="&lt;link rel='stylesheet' href='\1/${style.css}'&gt;" flags="m">
             <fileset dir="${dir.intermediate}" includes="${page-files}"/>
         </replaceregexp>
@@ -901,15 +894,7 @@
         </apply>
 
         <checksum file="${dir.intermediate}/${dir.css}/style-concat.min.css" algorithm="sha" property="css.sha" />
-        <if>
-            <isset property="css.prefix" />
-            <then>
-                <property name="style.css" value="${css.prefix}/${css.sha}.css" />
-            </then>
-            <else>
-                <property name="style.css" value="${css.sha}.css" />
-            </else>
-        </if>
+        <property name="style.css" value="${dir.css}/${css.sha}.css" />
         <copy file="${dir.intermediate}/${dir.css}/style-concat.min.css" tofile="${dir.publish}/${dir.css}/${css.sha}.css" />
 
         <echo message="Minifying any unconcatenated css files..."/>

diff --git a/build/config/project.properties b/build/config/project.properties
@@ -74,16 +74,6 @@ env               =
 # dir.css
 # dir.images
 
-# Optional: Maintain custom prefix on concatenated files.
-#
-# PHP:
-# css.prefix = <?php echo base_url(); ?>css
-# js.prefix = <?php echo base_url(); ?>js
-#
-# App Engine:
-# css.prefix = /css
-# js.prefix = /js
-
 # Override default JSHint Options (see http://jshint.com/ for description of options)
 #tool.jshint.opts =