From 5a3d3f5098c3dfe42d4fbe63f3c43d0d1a154d8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Sun, 4 Jan 2015 17:51:48 +0100
Subject: [PATCH] updated build and release tasks

---
 Gruntfile.js              | 3 +++
 package.json              | 4 ++--
 tasks/build_task.js       | 3 +++
 tasks/options/compress.js | 4 ++--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 6b2554f876571..3caf8cdd21a4a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -13,6 +13,7 @@ module.exports = function (grunt) {
 
   config.mode = grunt.option('mode') || 'standalone';
   config.modeOptions = {
+    zipSuffix: '',
     requirejs: {
       paths: { config: '../config.sample' },
       excludeConfig: true,
@@ -20,6 +21,8 @@ module.exports = function (grunt) {
   };
 
   if (config.mode === 'backend') {
+    grunt.log.writeln('Setting backend build mode');
+    config.modeOptions.zipSuffix = '-backend';
     config.modeOptions.requirejs.path = { config: 'components/config' };
     config.modeOptions.requirejs.excludeConfig = true;
   }
diff --git a/package.json b/package.json
index 284e8fc30b625..55e66649be788 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
     "company": "Coding Instinct AB"
   },
   "name": "grafana",
-  "version": "1.9.1",
+  "version": "2.0.0-alpha",
   "repository": {
     "type": "git",
     "url": "http://github.com/torkelo/grafana.git"
@@ -16,7 +16,7 @@
     "grunt-angular-templates": "^0.5.5",
     "grunt-cli": "~0.1.13",
     "grunt-contrib-clean": "~0.5.0",
-    "grunt-contrib-compress": "~0.5.2",
+    "grunt-contrib-compress": "~0.13.0",
     "grunt-contrib-concat": "^0.4.0",
     "grunt-contrib-connect": "~0.5.0",
     "grunt-contrib-copy": "~0.5.0",
diff --git a/tasks/build_task.js b/tasks/build_task.js
index e605a54a8a367..6d176cc603f97 100644
--- a/tasks/build_task.js
+++ b/tasks/build_task.js
@@ -1,4 +1,5 @@
 module.exports = function(grunt) {
+  "use strict";
 
   // Concat and Minify the src directory into dist
   grunt.registerTask('build', [
@@ -32,6 +33,7 @@ module.exports = function(grunt) {
         src: '**/*',
         dest: '<%= tempDir %>/public/',
       });
+      grunt.config('clean.dest_dir', ['<%= destDir %>']);
       grunt.config('copy.backend_bin', {
         cwd: '../bin',
         expand: true,
@@ -46,6 +48,7 @@ module.exports = function(grunt) {
         dest: '<%= tempDir %>'
       });
       grunt.task.run('copy:dist_to_tmp');
+      grunt.task.run('clean:dest_dir');
       grunt.task.run('copy:backend_bin');
       grunt.task.run('copy:backend_conf');
     }
diff --git a/tasks/options/compress.js b/tasks/options/compress.js
index 66038af6a4f27..4ad42ef41b8e2 100644
--- a/tasks/options/compress.js
+++ b/tasks/options/compress.js
@@ -38,7 +38,7 @@ module.exports = function(config) {
     },
     zip_release: {
       options: {
-        archive: '<%= destDir %>/<%= pkg.name %>-<%= pkg.version %>.zip'
+        archive: '<%= destDir %>/<%= pkg.name %><%= modeOptions.zipSuffix %>-<%= pkg.version %>.zip'
       },
       files : [
         {
@@ -56,7 +56,7 @@ module.exports = function(config) {
     },
     tgz_release: {
       options: {
-        archive: '<%= destDir %>/<%= pkg.name %>-<%= pkg.version %>.tar.gz'
+        archive: '<%= destDir %>/<%= pkg.name %><%= modeOptions.zipSuffix %>-<%= pkg.version %>.tar.gz'
       },
       files : [
         {