Home Explore Help
Register Sign In
oscarleiva
/
energylink
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

more work on build process

Torkel Ödegaard 11 years ago
parent
33e3fc70b2
commit
7c72705bc5
3 changed files with 33 additions and 25 deletions
Split View Show Diff Stats
  1. 3 3
      src/views/index.html
  2. 28 0
      tasks/build_task.js
  3. 2 22
      tasks/distribute_task.js

+ 3 - 3
src/views/index.html
View File 

@@ -16,8 +16,8 @@
 
 		</script>
 
 
 		<!-- build:js app/app.js -->
 
-    <script src="public/vendor/require/require.js"></script>
 
-    <script src="public/app/components/require.backend.js"></script>
 
+    <script src="/public/vendor/require/require.js"></script>
 
+    <script src="/public/app/components/require.backend.js"></script>
 
     <!-- endbuild -->
 
 
     <script>require(['app'], function (app) { app.boot(); })</script>
 
@@ -25,7 +25,7 @@
 
   </head>
 
 
   <body ng-cloak ng-controller="GrafanaCtrl">
 
-    <link rel="stylesheet" href="/public/css/grafana.light.min.css" ng-if="grafana.style === 'light'">
 
+    <link rel="stylesheet" href="/css/grafana.light.min.css" ng-if="grafana.style === 'light'">
 
 
 		<div class="pro-container" ng-class="{'pro-sidemenu-open': grafana.sidemenu}">

+ 28 - 0
tasks/build_task.js
View File 

@@ -23,6 +23,34 @@ module.exports = function(grunt) {
 
     //'uglify:dest'
 
   ]);
 
 
+  grunt.registerTask('build-post-process', function() {
 
+    var mode = grunt.config.get('mode');
 
+    if (mode === 'backend') {
 
+      grunt.config('copy.dist_to_tmp', {
 
+        expand: true,
 
+        cwd: '<%= destDir %>',
 
+        src: '**/*',
 
+        dest: '<%= tempDir %>/public/',
 
+      });
 
+      grunt.config('copy.backend_bin', {
 
+        cwd: '../bin',
 
+        expand: true,
 
+        src: ['grafana'],
 
+        options: { mode: true},
 
+        dest: '<%= tempDir %>'
 
+      });
 
+      grunt.config('copy.backend_conf', {
 
+        cwd: '../',
 
+        expand: true,
 
+        src: ['conf/*', '!conf/grafana.dev.ini'],
 
+        dest: '<%= tempDir %>'
 
+      });
 
+      grunt.task.run('copy:dist_to_tmp');
 
+      grunt.task.run('copy:backend_bin');
 
+      grunt.task.run('copy:backend_conf');
 
+    }
 
+  });
 
+
 
   grunt.registerTask('build:grafanaVersion', function() {
 
     grunt.config('string-replace.config', {
 
       files: {

+ 2 - 22
tasks/distribute_task.js
View File 

@@ -1,31 +1,11 @@
 
 module.exports = function(grunt) {
 
-
 
-  // build, then zip and upload to s3
 
-  grunt.registerTask('distribute', [
 
-    'distribute:load_s3_config',
 
-    'build',
 
-    'compress:zip',
 
-    'compress:tgz',
 
-    's3:dist',
 
-    'clean:temp'
 
-  ]);
 
+  "use strict";
 
 
   // build, then zip and upload to s3
 
   grunt.registerTask('release', [
 
-  //  'distribute:load_s3_config',
 
     'build',
 
     'compress:zip_release',
 
     'compress:tgz_release',
 
-    //'s3:release',
 
-    //'clean:temp'
 
   ]);
 
 
-  // collect the key and secret from the .aws-config.json file, finish configuring the s3 task
 
-  grunt.registerTask('distribute:load_s3_config', function () {
 
-    var config = grunt.file.readJSON('.aws-config.json');
 
-    grunt.config('s3.options', {
 
-      key: config.key,
 
-      secret: config.secret
 
-    });
 
-  });
 
-}
 
+};