Merge pull request #298 from humphd/t791

Add build step for stamping Butter with git commit sha version info.
mozilla · May 25, 2012 · 7d0e566 · 7d0e566
2 parents b0570be + c26facb
commit 7d0e566
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/make.js b/make.js
@@ -75,6 +75,12 @@ target.build = function() {
   exec(RJS + ' -o tools/build.js');
   exec(RJS + ' -o tools/build.optimized.js');
 
+  // Stamp Butter.version with the git commit sha we are using
+  var version = exec('git describe',
+                     {silent:true}).output.replace(/\r?\n/m, "");
+  sed('-i', '@VERSION@', version, 'dist/butter.js');
+  sed('-i', '@VERSION@', version, 'dist/butter.min.js');
+
   exec(STYLUS + ' css');
   cp('css/*.css', DIST_DIR);
 };

diff --git a/src/main.js b/src/main.js
@@ -737,6 +737,10 @@
 
     Butter.instances = __instances;
 
+    // Butter will report a version, which is the git commit sha
+    // of the version we ship.  This happens in make.js's build target.
+    Butter.version = "@VERSION@";
+
     if ( window.Butter.__waiting ) {
       for ( var i=0, l=window.Butter.__waiting.length; i<l; ++i ) {
         Butter.apply( {}, window.Butter.__waiting[ i ] );