Fix gulp build

Author: lazarv

.gitignore

@@ -7,7 +7,6 @@ CommandLine.dll
 JayData_readme.txt
 JaySvcUtil.exe
 Scripts/jaydata*
-build
 /obj/*
 /3rdparty/*
 /bin/*

src/CREDITS.txt renamed to build/CREDITS.txt

@@ -11,8 +11,8 @@
             "require": ["./src/index.js", { "expose": "jaydata/core" }],
             "destFile": "jaydata.js",
             "destFolder": "./dist/public",
-            "header": "./src/jaydata-header.js",
-            "footer": "./src/jaydata-footer.js"
+            "header": "./build/jaydata-header.js",
+            "footer": "./build/jaydata-footer.js"
         },
         {
             "taskName": "odataprovider",
@@ -22,8 +22,8 @@
             "ignore": ["odatajs"],
             "destFile": "oDataProvider.js",
             "destFolder": "./dist/public/jaydataproviders",
-            "header": "./src/jaydata-dep-header.js",
-            "footer": "./src/jaydata-dep-footer.js"
+            "header": "./build/jaydata-dep-header.js",
+            "footer": "./build/jaydata-dep-footer.js"
         },
         {
             "taskName": "sqliteprovider",
@@ -32,8 +32,8 @@
             "external": ["jaydata/core"],
             "destFile": "SqLiteProvider.js",
             "destFolder": "./dist/public/jaydataproviders",
-            "header": "./src/jaydata-dep-header.js",
-            "footer": "./src/jaydata-dep-footer.js"
+            "header": "./build/jaydata-dep-header.js",
+            "footer": "./build/jaydata-dep-footer.js"
         },
         {
             "taskName": "inmemoryprovider",
@@ -42,8 +42,8 @@
             "external": ["jaydata/core"],
             "destFile": "InMemoryProvider.js",
             "destFolder": "./dist/public/jaydataproviders",
-            "header": "./src/jaydata-dep-header.js",
-            "footer": "./src/jaydata-dep-footer.js"
+            "header": "./build/jaydata-dep-header.js",
+            "footer": "./build/jaydata-dep-footer.js"
         },
         {
             "taskName": "yqlprovider",
@@ -52,8 +52,8 @@
             "external": ["jaydata/core"],
             "destFile": "YQLProvider.js",
             "destFolder": "./dist/public/jaydataproviders",
-            "header": "./src/jaydata-dep-header.js",
-            "footer": "./src/jaydata-dep-footer.js"
+            "header": "./build/jaydata-dep-header.js",
+            "footer": "./build/jaydata-dep-footer.js"
         },
         {
             "taskName": "indexeddbprovider",
@@ -62,8 +62,8 @@
             "external": ["jaydata/core"],
             "destFile": "IndexedDbProvider.js",
             "destFolder": "./dist/public/jaydataproviders",
-            "header": "./src/jaydata-dep-header.js",
-            "footer": "./src/jaydata-dep-footer.js"
+            "header": "./build/jaydata-dep-header.js",
+            "footer": "./build/jaydata-dep-footer.js"
         },
         {
             "taskName": "webapiprovider",
@@ -72,8 +72,8 @@
             "external": ["jaydata/core"],
             "destFile": "WebApiProvider.js",
             "destFolder": "./dist/public/jaydataproviders",
-            "header": "./src/jaydata-dep-header.js",
-            "footer": "./src/jaydata-dep-footer.js"
+            "header": "./build/jaydata-dep-header.js",
+            "footer": "./build/jaydata-dep-footer.js"
         },
         {
             "taskName": "facebookprovider",
@@ -82,16 +82,16 @@
             "external": ["jaydata/core"],
             "destFile": "FacebookProvider.js",
             "destFolder": "./dist/public/jaydataproviders",
-            "header": "./src/jaydata-dep-header.js",
-            "footer": "./src/jaydata-dep-footer.js"
+            "header": "./build/jaydata-dep-header.js",
+            "footer": "./build/jaydata-dep-footer.js"
         },
         {
             "taskName": "jaydataproviders",
             "dependencies": ["odataprovider", "sqliteprovider", "inmemoryprovider", "yqlprovider", "indexeddbprovider", "webapiprovider", "facebookprovider"]
         },
         {
             "taskName": "bundle",
-            "dependencies": ["jaydata","jaydataproviders"]
+            "dependencies": ["jaydata", "jaydataproviders"]
         },
         {
             "taskName": "all",

src/buildConfig.json renamed to build/config.json

@@ -1,6 +1,6 @@
-	var $data = require('jaydata/core');
+	/*var $data = require('jaydata/core');
 	$data.version = 'JayData <%=pkg.version %>';
-	$data.versionNumber = '<%=pkg.version %>';
+	$data.versionNumber = '<%=pkg.version %>';*/
 
 	if (typeof window !== "undefined"){
 		window.require = require;

src/jaydata-dep-footer.js renamed to build/jaydata-dep-footer.js

@@ -1,6 +1,6 @@
 require('babel/register');
 var browserify = require('browserify');
-var config = require('./src/buildConfig.json');
+var config = require('./build/config.json');
 var pkg = require('./package.json');
 var gulp = require('gulp');
 var concat = require('gulp-concat');
@@ -23,44 +23,14 @@ var exec = require('child_process').exec;
 var eslint = require('gulp-eslint');
 var header = require('gulp-header');
 var footer = require('gulp-footer');
-var pkg = require('./package.json');
 
 config.options = minimist(process.argv.slice(2), config.buildDefaultOptions);
 var paths = {
   js: ['src/**/*.js'],
   test: ['test/**/*.js']
 }
 
-gulp.task('default', ['babel:compile'], function() {});
-
-/*gulp.task('jaydata_tmp', function() {
-    return browserify()
-    .transform(babelify)
-    .require('./src/index.js', { expose: 'jaydata/core' })
-    .bundle()
-    .on("error", function (err) { console.log("Error: " + err.message) })
-    .pipe(source('jaydata.js'))
-    .pipe(buffer())
-    //.pipe(uglify())
-    .pipe(gulp.dest('./dist/public'));
-});
-
-gulp.task('odataprovider_tmp', function() {
-    if (!fs.existsSync('dist')) fs.mkdirSync('dist');
-    return browserify({
-        standalone: '$data'
-    })
-    .transform(babelify)
-    .require('./src/Types/StorageProviders/oData/index.js', { entry: true })
-    .external('jaydata/core')
-    .ignore('odatajs')
-    .bundle()
-    .on("error", function (err) { console.log("Error: " + err.message) })
-    .pipe(source('oDataProvider.js'))
-    .pipe(buffer())
-    //.pipe(uglify())
-    .pipe(gulp.dest('./dist/public/jaydataproviders'));
-});*/
+gulp.task('default', ['all']);
 
 gulp.task('lint', function(){
     return gulp.src(['src/**/*.js'])
@@ -80,30 +50,30 @@ gulp.task('lint', function(){
             'no-use-before-define': 1
         }
     }))
-    .pipe(eslint.format())
-    .pipe(eslint.failAfterError());
+    .pipe(eslint.format('compact', fs.createWriteStream('./dist/.eslint')))
+    .pipe(eslint.failAfterError())
 });
 
-//gulp.task('bundle', ['lint', 'jaydata', 'odataprovider', 'sqliteprovider'])
-
 gulp.task('nodejs', function() {
     return gulp.src(['src/**/*.js'])
-    .pipe(babel())
+    .pipe(babel({
+        compact: false
+    }))
     .pipe(gulp.dest('./dist/lib'))
     .on('error', function(err){
 		console.log('>>> ERROR', err);
 		this.emit('end');
 	});
 });
 
-/*gulp.task('jaydata.min', function(){
-    return gulp.src('./dist/jaydata.js')
+gulp.task('jaydata.min', function(){
+    return gulp.src('./dist/public/jaydata.js')
     .pipe(closureCompiler({
         compilerPath: './node_modules/google-closure-compiler/compiler.jar',
-        fileName: 'dist/jaydata.min.js'
+        fileName: 'dist/public/jaydata.min.js'
     }))
-    .pipe(gulp.dest('./dist'));
-});*/
+    .pipe(gulp.dest('./dist/public'));
+});
 
 gulp.task('test', ['bundle'], function(done){
     karma.start({
@@ -114,24 +84,6 @@ gulp.task('test', ['bundle'], function(done){
     });
 });
 
-gulp.task('babel:compile', function() {
-  return gulp.src(paths.js)
-    .pipe(sourcemaps.init())
-    .pipe(gulp_babel({
-      modules: 'umd',
-      comments: false
-    }))
-    .pipe(sourcemaps.write())
-    .pipe(gulp.dest('build'));
-});
-
-gulp.task('release', ['JayData', 'providers', 'modules'], function() {
-  return gulp.src("build/**/*.js")
-    .pipe(header(fs.readFileSync('src/CREDITS.txt'), pkg))
-    .pipe(gulp.dest("build"));
-});
-
-
 gulp.task('apidocs', ['jaydata'], function (cb) {
     exec('node_modules\\.bin\\jsdoc dist\\public\\jaydata.js -t node_modules\\jaguarjs-jsdoc -d apidocs', function (err, stdout, stderr) {
         console.log(stdout);
@@ -184,6 +136,7 @@ function gulpTask(td, config){
     if (td.header){
         task = task.pipe(header(fs.readFileSync(td.header, 'utf8'), { pkg: pkg }));
     }
+    task = task.pipe(header(fs.readFileSync('./build/CREDITS.txt'), pkg));
 
     if (td.footer){
         task = task.pipe(footer(fs.readFileSync(td.footer, 'utf8'), { pkg: pkg }));

src/jaydata-dep-header.js renamed to build/jaydata-dep-header.js

@@ -1,5 +1,6 @@
 import $data from './initializeJayDataClient.js';
 import * as acorn from 'acorn';
+import * as pkg from '../../package.json';
 
 if (typeof console === 'undefined') {
   console = {
@@ -20,8 +21,8 @@ if (!console.error) console.error = function() {};
   /// Collection of JayData services
   ///</summary>
   $data.__namespace = true;
-  // $data.version = "JayData 1.2.0";
-  // $data.versionNumber = "1.2.0";
+  $data.version = "JayData " + pkg.version;
+  $data.versionNumber = pkg.version;
   $data.root = {};
   $data.Acorn = acorn;
   //$data.Acorn = $data.Acorn || (typeof acorn == 'object' ? acorn : undefined);