Changed structure of building folders

lindell · May 18, 2016 · 853191e · 853191e
1 parent 18870fd
commit 853191e
Show file tree

Hide file tree

Showing 65 changed files with 58 additions and 36 deletions.
diff --git a/bin/node/JsBarcode.js → bin/JsBarcode.js b/bin/node/JsBarcode.js → bin/JsBarcode.js
diff --git a/bin/node/barcodes/CODE128/CODE128.js → bin/barcodes/CODE128/CODE128.js b/bin/node/barcodes/CODE128/CODE128.js → bin/barcodes/CODE128/CODE128.js
diff --git a/bin/node/barcodes/CODE128/CODE128A.js → bin/barcodes/CODE128/CODE128A.js b/bin/node/barcodes/CODE128/CODE128A.js → bin/barcodes/CODE128/CODE128A.js
diff --git a/bin/node/barcodes/CODE128/CODE128B.js → bin/barcodes/CODE128/CODE128B.js b/bin/node/barcodes/CODE128/CODE128B.js → bin/barcodes/CODE128/CODE128B.js
diff --git a/bin/node/barcodes/CODE128/CODE128C.js → bin/barcodes/CODE128/CODE128C.js b/bin/node/barcodes/CODE128/CODE128C.js → bin/barcodes/CODE128/CODE128C.js
diff --git a/bin/node/barcodes/CODE128/CODE128_AUTO.js → bin/barcodes/CODE128/CODE128_AUTO.js b/bin/node/barcodes/CODE128/CODE128_AUTO.js → bin/barcodes/CODE128/CODE128_AUTO.js
diff --git a/bin/node/barcodes/CODE128/index.js → bin/barcodes/CODE128/index.js b/bin/node/barcodes/CODE128/index.js → bin/barcodes/CODE128/index.js
diff --git a/bin/node/barcodes/CODE39/index.js → bin/barcodes/CODE39/index.js b/bin/node/barcodes/CODE39/index.js → bin/barcodes/CODE39/index.js
diff --git a/bin/node/barcodes/EAN_UPC/EAN13.js → bin/barcodes/EAN_UPC/EAN13.js b/bin/node/barcodes/EAN_UPC/EAN13.js → bin/barcodes/EAN_UPC/EAN13.js
diff --git a/bin/node/barcodes/EAN_UPC/EAN2.js → bin/barcodes/EAN_UPC/EAN2.js b/bin/node/barcodes/EAN_UPC/EAN2.js → bin/barcodes/EAN_UPC/EAN2.js
diff --git a/bin/node/barcodes/EAN_UPC/EAN5.js → bin/barcodes/EAN_UPC/EAN5.js b/bin/node/barcodes/EAN_UPC/EAN5.js → bin/barcodes/EAN_UPC/EAN5.js
diff --git a/bin/node/barcodes/EAN_UPC/EAN8.js → bin/barcodes/EAN_UPC/EAN8.js b/bin/node/barcodes/EAN_UPC/EAN8.js → bin/barcodes/EAN_UPC/EAN8.js
diff --git a/bin/node/barcodes/EAN_UPC/UPC.js → bin/barcodes/EAN_UPC/UPC.js b/bin/node/barcodes/EAN_UPC/UPC.js → bin/barcodes/EAN_UPC/UPC.js
diff --git a/bin/node/barcodes/EAN_UPC/UPCE.js → bin/barcodes/EAN_UPC/UPCE.js b/bin/node/barcodes/EAN_UPC/UPCE.js → bin/barcodes/EAN_UPC/UPCE.js
diff --git a/bin/node/barcodes/EAN_UPC/ean_encoder.js → bin/barcodes/EAN_UPC/ean_encoder.js b/bin/node/barcodes/EAN_UPC/ean_encoder.js → bin/barcodes/EAN_UPC/ean_encoder.js
diff --git a/bin/node/barcodes/EAN_UPC/index.js → bin/barcodes/EAN_UPC/index.js b/bin/node/barcodes/EAN_UPC/index.js → bin/barcodes/EAN_UPC/index.js
diff --git a/bin/node/barcodes/GenericBarcode/index.js → bin/barcodes/GenericBarcode/index.js b/bin/node/barcodes/GenericBarcode/index.js → bin/barcodes/GenericBarcode/index.js
diff --git a/bin/node/barcodes/ITF/index.js → bin/barcodes/ITF/index.js b/bin/node/barcodes/ITF/index.js → bin/barcodes/ITF/index.js
diff --git a/bin/node/barcodes/ITF14/index.js → bin/barcodes/ITF14/index.js b/bin/node/barcodes/ITF14/index.js → bin/barcodes/ITF14/index.js
diff --git a/bin/node/barcodes/MSI/MSI.js → bin/barcodes/MSI/MSI.js b/bin/node/barcodes/MSI/MSI.js → bin/barcodes/MSI/MSI.js
diff --git a/bin/node/barcodes/MSI/MSI10.js → bin/barcodes/MSI/MSI10.js b/bin/node/barcodes/MSI/MSI10.js → bin/barcodes/MSI/MSI10.js
diff --git a/bin/node/barcodes/MSI/MSI1010.js → bin/barcodes/MSI/MSI1010.js b/bin/node/barcodes/MSI/MSI1010.js → bin/barcodes/MSI/MSI1010.js
diff --git a/bin/node/barcodes/MSI/MSI11.js → bin/barcodes/MSI/MSI11.js b/bin/node/barcodes/MSI/MSI11.js → bin/barcodes/MSI/MSI11.js
diff --git a/bin/node/barcodes/MSI/MSI1110.js → bin/barcodes/MSI/MSI1110.js b/bin/node/barcodes/MSI/MSI1110.js → bin/barcodes/MSI/MSI1110.js
diff --git a/bin/node/barcodes/MSI/checksums.js → bin/barcodes/MSI/checksums.js b/bin/node/barcodes/MSI/checksums.js → bin/barcodes/MSI/checksums.js
diff --git a/bin/node/barcodes/MSI/index.js → bin/barcodes/MSI/index.js b/bin/node/barcodes/MSI/index.js → bin/barcodes/MSI/index.js
diff --git a/bin/node/barcodes/index.js → bin/barcodes/index.js b/bin/node/barcodes/index.js → bin/barcodes/index.js
diff --git a/bin/node/barcodes/index.tmp.js → bin/barcodes/index.tmp.js b/bin/node/barcodes/index.tmp.js → bin/barcodes/index.tmp.js
diff --git a/bin/node/barcodes/pharmacode/index.js → bin/barcodes/pharmacode/index.js b/bin/node/barcodes/pharmacode/index.js → bin/barcodes/pharmacode/index.js
diff --git a/bin/node/cli.js → bin/cli.js b/bin/node/cli.js → bin/cli.js
diff --git a/bin/node/help/fixOptions.js → bin/help/fixOptions.js b/bin/node/help/fixOptions.js → bin/help/fixOptions.js
diff --git a/bin/node/help/getOptionsFromElement.js → bin/help/getOptionsFromElement.js b/bin/node/help/getOptionsFromElement.js → bin/help/getOptionsFromElement.js
diff --git a/bin/node/help/linearizeEncodings.js → bin/help/linearizeEncodings.js b/bin/node/help/linearizeEncodings.js → bin/help/linearizeEncodings.js
diff --git a/bin/node/help/merge.js → bin/help/merge.js b/bin/node/help/merge.js → bin/help/merge.js
diff --git a/bin/node/help/optionsFromStrings.js → bin/help/optionsFromStrings.js b/bin/node/help/optionsFromStrings.js → bin/help/optionsFromStrings.js
diff --git a/bin/node/renderers/canvas.js → bin/renderers/canvas.js b/bin/node/renderers/canvas.js → bin/renderers/canvas.js
diff --git a/bin/node/renderers/index.js → bin/renderers/index.js b/bin/node/renderers/index.js → bin/renderers/index.js
diff --git a/bin/node/renderers/svg.js → bin/renderers/svg.js b/bin/node/renderers/svg.js → bin/renderers/svg.js
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "JsBarcode",
-  "main": "bin/browser/JsBarcode.all.js",
+  "main": "dist/JsBarcode.all.min.js",
   "version": "3.3.5",
   "homepage": "https://github.com/lindell/JsBarcode",
   "authors": [

diff --git a/bin/browser/JsBarcode.all.js → dist/JsBarcode.all.js b/bin/browser/JsBarcode.all.js → dist/JsBarcode.all.js
diff --git a/bin/browser/JsBarcode.all.min.js → dist/JsBarcode.all.min.js b/bin/browser/JsBarcode.all.min.js → dist/JsBarcode.all.min.js
diff --git a/...browser/barcodes/JsBarcode.code128.min.js → dist/barcodes/JsBarcode.code128.min.js b/...browser/barcodes/JsBarcode.code128.min.js → dist/barcodes/JsBarcode.code128.min.js
diff --git a/bin/browser/barcodes/JsBarcode.code39.min.js → dist/barcodes/JsBarcode.code39.min.js b/bin/browser/barcodes/JsBarcode.code39.min.js → dist/barcodes/JsBarcode.code39.min.js
diff --git a/...browser/barcodes/JsBarcode.ean-upc.min.js → dist/barcodes/JsBarcode.ean-upc.min.js b/...browser/barcodes/JsBarcode.ean-upc.min.js → dist/barcodes/JsBarcode.ean-upc.min.js
diff --git a/bin/browser/barcodes/JsBarcode.itf-14.min.js → dist/barcodes/JsBarcode.itf-14.min.js b/bin/browser/barcodes/JsBarcode.itf-14.min.js → dist/barcodes/JsBarcode.itf-14.min.js
diff --git a/bin/browser/barcodes/JsBarcode.itf.min.js → dist/barcodes/JsBarcode.itf.min.js b/bin/browser/barcodes/JsBarcode.itf.min.js → dist/barcodes/JsBarcode.itf.min.js
diff --git a/bin/browser/barcodes/JsBarcode.msi.min.js → dist/barcodes/JsBarcode.msi.min.js b/bin/browser/barcodes/JsBarcode.msi.min.js → dist/barcodes/JsBarcode.msi.min.js
diff --git a/...wser/barcodes/JsBarcode.pharmacode.min.js → dist/barcodes/JsBarcode.pharmacode.min.js b/...wser/barcodes/JsBarcode.pharmacode.min.js → dist/barcodes/JsBarcode.pharmacode.min.js
diff --git a/example/index.html b/example/index.html
@@ -3,7 +3,7 @@
 <head>
 	<meta charset="UTF-8">
 	<title></title>
-	<script src="../bin/browser/JsBarcode.all.js"></script>
+	<script src="../dist/JsBarcode.all.js"></script>
 	<script>
 		Number.prototype.zeroPadding = function(){
 			var ret = "" + this.valueOf();

diff --git a/example/toBase64.html b/example/toBase64.html
@@ -3,8 +3,7 @@
 <head>
 	<meta charset="UTF-8">
 	<title></title>
-	<script src="../JsBarcode.js"></script>
-	<script src="../barcodes/CODE39.js"></script>
+	<script src="../dist/JsBarcode.all.js"></script>
   <script>
     function textToBase64Barcode(text){
       var canvas = document.createElement("canvas");

diff --git a/gulpfile.js b/gulpfile.js
@@ -12,11 +12,12 @@ var clean = require('gulp-clean');
 var gulpWebpack = require('webpack-stream');
 var webpack = require('webpack');
 var gzipSize = require('gzip-size');
+var request = require('request');
 
 var fs = require('fs');
 
 gulp.task("clean", function(){
-  return gulp.src("bin/", {read: false})
+  return gulp.src(["bin/", "dist/"], {read: false})
     .pipe(clean());
 });
 
@@ -30,31 +31,31 @@ function babelFunc(){
       presets: ['es2015'],
       plugins: [["transform-es2015-classes", {loose: true}]]
     }))
-    .pipe(gulp.dest("bin/node/"));
+    .pipe(gulp.dest("bin/"));
 }
 
 gulp.task("webpack", ["babel"], function () {
   return webpackFunc();
 });
 
 function webpackFunc(){
-  return gulp.src('bin/node/JsBarcode.js')
+  return gulp.src('bin/JsBarcode.js')
     .pipe(gulpWebpack(
       {
         output: {
           filename: 'JsBarcode.all.js',
         }
       }
     , webpack))
-    .pipe(gulp.dest("bin/browser/"));
+    .pipe(gulp.dest("dist/"));
 }
 
 gulp.task("webpack-min", ["babel"], function () {
   return webpackMin('JsBarcode.all.min.js');
 });
 
 function webpackMin(filename){
-  return gulp.src('bin/node/JsBarcode.js')
+  return gulp.src('bin/JsBarcode.js')
     .pipe(gulpWebpack(
       {
         output: {
@@ -63,7 +64,7 @@ function webpackMin(filename){
         plugins: [new webpack.optimize.UglifyJsPlugin()],
       }
     , webpack))
-    .pipe(gulp.dest("bin/browser/"));
+    .pipe(gulp.dest("dist/"));
 }
 
 gulp.task("webpack-all", function (cb) {
@@ -78,8 +79,8 @@ gulp.task("webpack-all", function (cb) {
     toFile += "export default {" + barcode.names + "}";
 
     fs.writeFile("src/barcodes/index.js", toFile, function(){
-      if(fs.existsSync("bin/node/barcodes/index.js")){
-        fs.unlinkSync("bin/node/barcodes/index.js");
+      if(fs.existsSync("bin/barcodes/index.js")){
+        fs.unlinkSync("bin/barcodes/index.js");
       }
       babelFunc().on('end', function(){
         webpackMin("barcodes/" + barcode.filename).on('end', callback);
@@ -126,7 +127,9 @@ gulp.task('git-release', ['compress'], function(cb){
   var v = 'v' + pkg.version;
   var message = 'Release ' + v;
 
-  gulp.src(['./package.json', './bower.json', './bin/'])
+  updateReadmeFileSizes();
+
+  gulp.src(['./package.json', './bower.json', './README.md', './bin/', './dist'])
     .pipe(git.add({args: '--all'}))
     .pipe(git.commit(message));
 
@@ -172,16 +175,37 @@ gulp.task('github-release', function(done) {
     repo: "JsBarcode",
     tag: v,
     name: name,
-    assets: [__dirname + "/bin/browser/JsBarcode.all.min.js", __dirname + "/bin/browser/JsBarcode.all.js"]
+    assets: [__dirname + "/dist/JsBarcode.all.min.js", __dirname + "/dist/JsBarcode.all.js"]
   }, done);
 });
 
-gulp.task('update-readme-sizes', function(){
+gulp.task('jsdelivr', function(){
+  request({
+    url: "https://api.jsdelivr.com/v1/jsdelivr/libraries?name=jsbarcode",
+    json: true
+  }, function (error, response, body) {
+    if (!error && response.statusCode === 200) {
+      var readme = fs.readFileSync('README.md', "utf-8");
+      var version = body[0].lastversion;
+
+      readme = readme.replace(/https:\/\/cdn\.jsdelivr\.net\/jsbarcode\/[0-9]+\.[0-9]+\.[0-9]+\//g,
+        "https://cdn.jsdelivr.net/jsbarcode/" + version + "/");
+
+      fs.writeFileSync('README.md', readme, 'utf8');
+
+      console.log("New version: " + version);
+    }
+  })
+});
+
+gulp.task("update-readme-sizes", updateReadmeFileSizes);
+
+function updateReadmeFileSizes(){
   var files = require('./barcode-building.json');
   var readme = fs.readFileSync('README.md', "utf-8");
 
   // Update .all files
-  var data = fs.readFileSync('bin/browser/JsBarcode.all.min.js');
+  var data = fs.readFileSync('dist/JsBarcode.all.min.js');
   var filesize = gzipSize.sync(data);
 
   var regexp = new RegExp('\\|[^\\|]*\\|([ \\t\\*]*\\[JsBarcode\\.all\\.min\\.js\\])');
@@ -191,7 +215,7 @@ gulp.task('update-readme-sizes', function(){
   for(var i in files){
     var filename = files[i].filename;
 
-    var data = fs.readFileSync('bin/browser/barcodes/' + filename);
+    var data = fs.readFileSync('dist/barcodes/' + filename);
     var filesize = gzipSize.sync(data);
 
     var regexp = new RegExp('\\|[^\\|]*\\|([ \\t]*\\[' + RegExp.escape(filename) + '\\])');
@@ -200,7 +224,7 @@ gulp.task('update-readme-sizes', function(){
   }
 
   fs.writeFileSync('README.md', readme, 'utf8');
-});
+}
 
 function formatSize(bytes){
   var kilobytes = Math.round(bytes/1024*10)/10;
@@ -233,7 +257,6 @@ gulp.task('compile-web', ['webpack'], function(done){
 
 gulp.task('release', function(callback){
   runSequence(
-    'update-readme-sizes',
     'git-release',
     'wait',
     'github-release',

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "jsbarcode",
   "version": "3.3.5",
   "description": "JsBarcode is a simple and powerfull way to create different types of 1d barcodes.",
-  "main": "./bin/node/JsBarcode.js",
+  "main": "./bin/JsBarcode.js",
   "directories": {
     "example": "example",
     "test": "test",
@@ -35,8 +35,8 @@
     "url": "https://github.com/lindell/JsBarcode/issues"
   },
   "bin": {
-    "JsBarcode": "./bin/node/cli.js",
-    "jsbarcode": "./bin/node/cli.js"
+    "JsBarcode": "./bin/cli.js",
+    "jsbarcode": "./bin/cli.js"
   },
   "homepage": "https://github.com/lindell/JsBarcode#readme",
   "devDependencies": {

diff --git a/test/browser/canvasTest.html b/test/browser/canvasTest.html
@@ -3,7 +3,7 @@
 <head>
 	<meta charset="UTF-8">
 	<title>Test minified version</title>
-	<script src="../../bin/browser/JsBarcode.all.js"></script>
+	<script src="../../dist/JsBarcode.all.js"></script>
 
 	<script src="tests.js"></script>
 	<script src="canvasTest.js"></script>

diff --git a/test/browser/initTest.html b/test/browser/initTest.html
@@ -4,7 +4,7 @@
 	<meta charset="UTF-8">
 	<title>Test minified version</title>
 	<script src="help/jquery-2.2.3.js"></script>
-	<script src="../../bin/browser/JsBarcode.all.js"></script>
+	<script src="../../dist/JsBarcode.all.js"></script>
 	<style>
 		@font-face {
 			font-family: "OCRB";

diff --git a/test/browser/jQueryTest.html b/test/browser/jQueryTest.html
@@ -5,7 +5,7 @@
 	<title>Test minified version</title>
 	<script src="help/jquery-2.2.3.js"></script>
 
-	<script src="../../bin/browser/JsBarcode.all.js"></script>
+	<script src="../../dist/JsBarcode.all.js"></script>
 
 	<script src="tests.js"></script>
 	<script src="jQueryTest.js"></script>

diff --git a/test/browser/svgTest.html b/test/browser/svgTest.html
@@ -3,7 +3,7 @@
 <head>
 	<meta charset="UTF-8">
 	<title>Test minified version</title>
-	<script src="../../bin/browser/JsBarcode.all.js"></script>
+	<script src="../../dist/JsBarcode.all.js"></script>
 
 	<script src="tests.js"></script>
 	<script src="svgTest.js"></script>

diff --git a/test/browser/tests.js b/test/browser/tests.js
@@ -2,12 +2,12 @@ function createTests(newTest){
   newTest("This has a \nnewline", {width: 1});
   newTest("\tHi\nHI", {width: 1});
   newTest("A little test!", {format: "CODE128", width: 1});
-  newTest("A LITTLE TEST", {format: "CODE39", width: 1});
+  newTest("ABCDEFG", {format: "CODE39", width: 1, mod43: true});
   newTest("A little test", {format: "CODE39", width: 1});
   newTest("12345", {format: "EAN5", width: 1});
   newTest("52", {format: "EAN2", width: 1});
   newTest("423514346455", {format: "UPC", width: 2, textMargin: 0});
-  newTest("5901234123457", {format: "EAN13", fontSize: 20, textMargin: 0});
+  newTest("5901234123457", {format: "EAN13", fontSize: 20, textMargin: 0, lastChar: ">"});
   newTest("590123412345", {format: "EAN13", width: 2, fontSize: 16});
   newTest("590123412345", {format: "EAN13", width: 3});
   newTest("96385074", {format: "EAN8", width: 1});

diff --git a/test/node/CODE128.test.js b/test/node/CODE128.test.js
@@ -1,5 +1,5 @@
 var assert = require('assert');
-var JsBarcode = require('../../bin/node/JsBarcode.js');
+var JsBarcode = require('../../bin/JsBarcode.js');
 var Canvas = require("canvas");
 
 

diff --git a/test/node/CODE39.test.js b/test/node/CODE39.test.js
@@ -1,5 +1,5 @@
 var assert = require('assert');
-var JsBarcode = require('../../bin/node/JsBarcode.js');
+var JsBarcode = require('../../bin/JsBarcode.js');
 var Canvas = require("canvas");
 
 

diff --git a/test/node/EAN-UPC.test.js b/test/node/EAN-UPC.test.js
@@ -1,5 +1,5 @@
 var assert = require('assert');
-var JsBarcode = require('../../bin/node/JsBarcode.js');
+var JsBarcode = require('../../bin/JsBarcode.js');
 var Canvas = require("canvas");
 var help = require("./help/help");
 

diff --git a/test/node/ITF-14.test.js b/test/node/ITF-14.test.js
@@ -1,5 +1,5 @@
 var assert = require('assert');
-var JsBarcode = require('../../bin/node/JsBarcode.js');
+var JsBarcode = require('../../bin/JsBarcode.js');
 var Canvas = require("canvas");
 
 

diff --git a/test/node/ITF.test.js b/test/node/ITF.test.js
@@ -1,5 +1,5 @@
 var assert = require('assert');
-var JsBarcode = require('../../bin/node/JsBarcode.js');
+var JsBarcode = require('../../bin/JsBarcode.js');
 var Canvas = require("canvas");
 
 

diff --git a/test/node/JsBarcode.test.js b/test/node/JsBarcode.test.js
@@ -1,5 +1,5 @@
 var assert = require('assert');
-var JsBarcode = require('../../bin/node/JsBarcode.js');
+var JsBarcode = require('../../bin/JsBarcode.js');
 var Canvas = require("canvas");
 
 describe('Encoders', function() {

diff --git a/test/node/MSI.test.js b/test/node/MSI.test.js
@@ -1,5 +1,5 @@
 var assert = require('assert');
-var JsBarcode = require('../../bin/node/JsBarcode.js');
+var JsBarcode = require('../../bin/JsBarcode.js');
 var Canvas = require("canvas");
 
 

diff --git a/test/node/pharmacode.test.js b/test/node/pharmacode.test.js
@@ -1,5 +1,5 @@
 var assert = require('assert');
-var JsBarcode = require('../../bin/node/JsBarcode.js');
+var JsBarcode = require('../../bin/JsBarcode.js');
 var Canvas = require("canvas");
 
 describe('Pharmacode', function() {