Updated build compatibility and .gitignore.

yanneves · Feb 20, 2012 · 9e54836 · 9e54836
1 parent 0815ef5
commit 9e54836
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,13 +34,13 @@ dwsync.xml
 .hg
 .svn
 .CVS
-intermediate
-publish
+working
+http
 .idea
 
 # build script local files
-# build/buildinfo.properties
-# build/config/buildinfo.properties
+build/buildinfo.properties
+build/config/buildinfo.properties
 
 # backbone-boilerplate ignores
 dist/

diff --git a/build/config/default.properties b/build/config/default.properties
@@ -8,7 +8,7 @@
 #
 # Directory Paths
 #
-dir.source          = ./http
+dir.source          = ./http_dev
 dir.intermediate    = working/intermediate
 dir.publish         = http
 dir.build           = build
@@ -53,7 +53,7 @@ file.default.exclude        = .gitignore, .project, .settings, README.markdown,
 #
 # Bypass Optimization for these files
 #
-# file.default.js.bypass
+file.default.js.bypass		= head.js
 # If set, these files will not be optimized (minifications, concatinations, image optimizations will not be applied)
 # Note: you cannot declare an empty file.default.bypass property
 
@@ -78,10 +78,10 @@ file.default.stylesheets    =
 # Script Optimisation
 #
 # If set, concat libraries with main scripts file, producing single script file
-build.concat.scripts        = true
+build.concat.scripts        = false
 
 # default options for closure compiler.
-scripts.compilation.level =SIMPLE_OPTIMIZATIONS
+scripts.compilation.level = SIMPLE_OPTIMIZATIONS
 scripts.compilation.warninglevel = QUIET
 
 #

diff --git a/http/.gitignore b/http/.gitignore
diff --git a/http_dev/index.html b/http_dev/index.html
@@ -27,7 +27,7 @@
   <!-- All JavaScript at the bottom, except this Modernizr build.
        Modernizr enables HTML5 elements & feature detects for optimal performance.
        Create your own custom Modernizr build: www.modernizr.com/download/ -->
-  <script src="js/libs/modernizr-2.5.2.min.js"></script>
+  <script src="js/modules/head.js"></script>
 </head>
 <body>
   <!-- Prompt IE 6 users to install Chrome Frame. Remove this if you support IE 6.
@@ -48,12 +48,7 @@
 
   <!-- JavaScript at the bottom for fast page loading -->
 
-  <!-- Grab Google CDN's jQuery, with a protocol relative URL; fall back to local if offline -->
-  <script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
-  <script>window.jQuery || document.write('<script src="js/libs/jquery-1.7.1.min.js"><\/script>')</script>
-
   <!-- scripts concatenated and minified via build script -->
-  <script src="js/plugins.js"></script>
   <script src="js/core.js"></script>
   <!-- end scripts -->
 

diff --git a/http_dev/js/head.js → http_dev/js/modules/head.js b/http_dev/js/head.js → http_dev/js/modules/head.js