Merge remote-tracking branch 'origin/master'

matomo-org · May 14, 2014 · 214f556 · 214f556
2 parents 616689f + 9c71faa
commit 214f556
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/tests/angularjs/Gruntfile.js b/tests/angularjs/Gruntfile.js
@@ -11,6 +11,23 @@ module.exports = function(grunt) {
                     spawn: false,
                 },
             },
+            piwikjs: {
+                files: ['js/piwik.js'],
+                tasks: ["shell:compilePiwikJs"],
+                options: {
+                    spawn: false,
+                },
+            }
+        },
+        "shell": {
+            compilePiwikJs: {
+                command: "sed '/<DEBUG>/,/<\\/DEBUG>/d' < piwik.js | sed 's/eval/replacedEvilString/' | java -jar yuicompressor-2.4.2/build/yuicompressor-2.4.2.jar --type js --line-break 1000 | sed 's/replacedEvilString/eval/' | sed 's/^[/][*]/\\/*!/' > piwik-min.js && cp piwik-min.js ../piwik.js",
+                options: {
+                    execOptions: {
+                        cwd: 'js'
+                    }
+                }
+            }
         },
         "clean-pattern": {
             files: {path: "tmp/assets", pattern: /(.*).css/}
@@ -19,6 +36,7 @@ module.exports = function(grunt) {
 
     grunt.loadNpmTasks('clean-pattern');
     grunt.loadNpmTasks('grunt-contrib-watch');
+    grunt.loadNpmTasks('grunt-shell');
 
     grunt.file.setBase('../../')
 

diff --git a/tests/angularjs/package.json b/tests/angularjs/package.json
@@ -9,6 +9,7 @@
     "clean-pattern": "^0.1.2",
     "grunt": ">= 0.4.2",
     "grunt-contrib-watch": "^0.6.1",
+    "grunt-shell": "^0.7.0",
     "karma": ">= 0.12.1",
     "karma-chrome-launcher": ">= 0.1.2",
     "karma-firefox-launcher": ">= 0.1.3",