Merge branch 'peers-master'

peers · Sep 28, 2014 · f6230cb · f6230cb
2 parents 7307baa + 78e5ab2
commit f6230cb
Show file tree

Hide file tree

Showing 11 changed files with 81 additions and 820 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+dist/
+node_modules/
diff --git a/.npmignore b/.npmignore
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -0,0 +1,51 @@
+module.exports = function(grunt) {
+  grunt.initConfig({
+    pkg: grunt.file.readJSON('package.json'),
+
+    browserify: {
+      dev: {
+        options: {
+          prepend: ['/*! binarypack.js build:<%= pkg.version %>, development. '+
+                    'Copyright(c) 2012 Eric Zhang <eric@ericzhang.com> MIT Licensed */']
+        },
+        src: ['lib/exports.js'],
+        dest: 'dist/binarypack.js'
+      }
+    },
+
+    uglify: {
+      prod: {
+        options: {
+          mangle: true, compress: true,
+                  },
+        src: 'dist/binarypack.js',
+        dest: 'dist/binarypack.min.js'
+      }
+    },
+
+    concat: {
+      dev: {
+        options: {
+          banner: '/*! binarypack.js build:<%= pkg.version %>, production. '+
+            'Copyright(c) 2012 Eric Zhang <eric@ericzhang.com> MIT Licensed */'
+        },
+        src: 'dist/binarypack.js',
+        dest: 'dist/binarypack.js',
+      },
+      prod: {
+        options: {
+          banner: '/*! binarypack.js build:<%= pkg.version %>, production. '+
+            'Copyright(c) 2012 Eric Zhang <eric@ericzhang.com> MIT Licensed */'
+        },
+        src: 'dist/binarypack.min.js',
+        dest: 'dist/binarypack.min.js',
+      }
+    }
+  });
+
+  grunt.loadNpmTasks('grunt-browserify');
+  grunt.loadNpmTasks('grunt-contrib-uglify');
+  grunt.loadNpmTasks('grunt-contrib-concat');
+
+  grunt.registerTask('default', ['browserify', 'uglify', 'concat']);
+}
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
 default: compress
 
 compress:
-	@node bin/build.js;
+	@./node_modules/.bin/grunt
diff --git a/bin/build.js b/bin/build.js