Merge pull request h5bp#685 from drublic/master

Prefixing CSS/JS resources automatically, idea from @drublic, technique from @darktable
agos · Aug 15, 2011 · bf52178 · bf52178
2 parents 2fb6ac3 + e1702af
commit bf52178
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/build/build.xml b/build/build.xml
@@ -517,9 +517,9 @@
 
         <checksum file="${dir.intermediate}/${dir.js}/scripts-concat.min.js" algorithm="sha" property="scripts.sha" />
         <if>
-            <isset property="gae.js_dir" />
+            <isset property="js.prefix" />
             <then>
-                <property name="scripts.js" value="${gae.js_dir}/${scripts.sha}.js" />
+                <property name="scripts.js" value="${js.prefix}/${scripts.sha}.js" />
             </then>
             <else>
                 <property name="scripts.js" value="${dir.js}/${scripts.sha}.js" />
@@ -901,9 +901,9 @@
 
         <checksum file="${dir.intermediate}/${dir.css}/style-concat.min.css" algorithm="sha" property="css.sha" />
         <if>
-            <isset property="gae.css_dir" />
+            <isset property="css.prefix" />
             <then>
-                <property name="style.css" value="${gae.css_dir}/${css.sha}.css" />
+                <property name="style.css" value="${css.prefix}/${css.sha}.css" />
             </then>
             <else>
                 <property name="style.css" value="${dir.css}/${css.sha}.css" />

diff --git a/build/config/project.properties b/build/config/project.properties
@@ -74,12 +74,15 @@ env               =
 # dir.css
 # dir.images
 
-# Google App Engine Directory Structure
+# Optional: Maintain custom prefix on concatenated files.
 #
-# Prevent "static/" being included in concated file paths.
+# PHP:
+# css.prefix = <?php echo base_url(); ?>css
+# js.prefix = <?php echo base_url(); ?>js
 #
-# gae.css_dir = /css
-# gae.js_dir = /js
+# App Engine:
+# css.prefix = /css
+# js.prefix = /js
 
 # Override default JSHint Options (see http://jshint.com/ for description of options)
 #tool.jshint.opts =

diff --git a/index.html b/index.html
@@ -22,9 +22,9 @@
   <!-- Place favicon.ico and apple-touch-icon.png in the root directory: mathiasbynens.be/notes/touch-icons -->
 
   <!-- CSS: implied media=all -->
-  <!-- CSS concatenated and minified via ant build script-->
+  <!-- CSS concatenated and minified via ant build script -->
   <link rel="stylesheet" href="css/style.css">
-  <!-- end CSS-->
+  <!-- end CSS -->
 
   <!-- More ideas for your <head> here: h5bp.com/d/head-Tips -->
 
@@ -56,10 +56,10 @@
   <script>window.jQuery || document.write('<script src="js/libs/jquery-1.6.2.min.js"><\/script>')</script>
 
 
-  <!-- scripts concatenated and minified via ant build script-->
+  <!-- scripts concatenated and minified via ant build script -->
   <script defer src="js/plugins.js"></script>
   <script defer src="js/script.js"></script>
-  <!-- end scripts-->
+  <!-- end scripts -->
 
 
   <!-- Change UA-XXXXX-X to be your site's ID -->