From e42924a9788677a349e2002bf14365aa8c59dc0c Mon Sep 17 00:00:00 2001 From: Nan Wang Date: Thu, 23 Jun 2016 18:29:15 +0800 Subject: [PATCH 1/2] use fs-extra.copy to copy script and config.json file for simulator --- native/gulpfile.js | 35 +++++++++++++++++++++-------------- native/package.json | 1 + 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/native/gulpfile.js b/native/gulpfile.js index 7d51a88e98..401eba0543 100644 --- a/native/gulpfile.js +++ b/native/gulpfile.js @@ -7,7 +7,7 @@ var Ftp = require('ftp'); var ExecSync = require('child_process').execSync; var spawn = require('child_process').spawn; var Path = require('path'); -var fs = require('fs'); +var fs = require('fs-extra'); gulp.task('make-cocos2d-x', gulpSequence('gen-cocos2d-x', 'upload-cocos2d-x')); gulp.task('make-prebuilt', gulpSequence('gen-libs', 'collect-prebuilt-mk', 'archive-prebuilt-mk', 'archive-prebuilt', 'upload-prebuilt', 'upload-prebuilt-mk')); @@ -156,28 +156,35 @@ gulp.task('collect-prebuilt-mk', function () { }).pipe(gulp.dest('prebuilt_mk')); }); -gulp.task('update-simulator-config', ['update-simulator-script'], function () { - var destPath = process.platform === 'win32' ? './simulator/win32' : './simulator/mac/Simulator.app/Contents/Resources'; - return gulp.src('./tools/simulator/config.json') - .pipe(gulp.dest(destPath)); +gulp.task('update-simulator-config', ['update-simulator-script'], function (cb) { + var destPath = process.platform === 'win32' ? './simulator/win32/config.json' : './simulator/mac/Simulator.app/Contents/Resources/config.json'; + fs.copy('./tools/simulator/config.json', destPath, cb); }); -gulp.task('update-simulator-script', function () { - var destPath = process.platform === 'win32' ? './simulator/win32' : './simulator/mac/Simulator.app/Contents/Resources'; - var updateScript = function () { - // scripts - return gulp.src(['./cocos/scripting/js-bindings/script/**/*', '!**/.DS_Store'], { - base: './cocos/scripting/js-bindings' - }).pipe(gulp.dest(destPath)); +gulp.task('update-simulator-script', function (cb) { + var destPath = process.platform === 'win32' ? './simulator/win32/script' : './simulator/mac/Simulator.app/Contents/Resources/script'; + var updateScript = function (callback) { + fs.copy('./cocos/scripting/js-bindings/script', destPath, { + clobber: true, + filter: function(name) { + if (name.startsWith('.DS_Store')) { + return false; + } else { + return true; + } + } + }, callback); }; if (!fs.existsSync(destPath)) { console.error(`Cant\'t find simulator dir [${destPath}]`); } else { if (process.platform === 'win32') { - downloadSimulatorDLL(updateScript); + downloadSimulatorDLL(function () { + updateScript(cb); + }); } else { - updateScript(); + updateScript(cb); } } }); diff --git a/native/package.json b/native/package.json index 06c9a5f3ef..1cf6375aee 100644 --- a/native/package.json +++ b/native/package.json @@ -8,6 +8,7 @@ }, "devDependencies": { "download": "4.4.3", + "fs-extra": "0.30.0", "ftp": "0.3.10", "gulp": "3.9.1", "gulp-sequence": "0.4.5", From bc7c27dcc6a2c03022865aa24d9b2516dbd569b1 Mon Sep 17 00:00:00 2001 From: Nan Wang Date: Thu, 23 Jun 2016 18:35:59 +0800 Subject: [PATCH 2/2] fix simulator path check --- native/gulpfile.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/native/gulpfile.js b/native/gulpfile.js index 401eba0543..a947383a78 100644 --- a/native/gulpfile.js +++ b/native/gulpfile.js @@ -162,7 +162,8 @@ gulp.task('update-simulator-config', ['update-simulator-script'], function (cb) }); gulp.task('update-simulator-script', function (cb) { - var destPath = process.platform === 'win32' ? './simulator/win32/script' : './simulator/mac/Simulator.app/Contents/Resources/script'; + var simulatorPath = process.platform === 'win32' ? './simulator/win32' : './simulator/mac/Simulator.app/Contents/Resources'; + var destPath = simulatorPath + '/script'; var updateScript = function (callback) { fs.copy('./cocos/scripting/js-bindings/script', destPath, { clobber: true, @@ -176,8 +177,8 @@ gulp.task('update-simulator-script', function (cb) { }, callback); }; - if (!fs.existsSync(destPath)) { - console.error(`Cant\'t find simulator dir [${destPath}]`); + if (!fs.existsSync(simulatorPath)) { + console.error(`Cant\'t find simulator dir [${simulatorPath}]`); } else { if (process.platform === 'win32') { downloadSimulatorDLL(function () {