parent
2a74a92682
commit
e22834e316
|
@ -2,6 +2,7 @@
|
|||
npm-debug.log
|
||||
Thumbs.db
|
||||
node_modules/
|
||||
.build/
|
||||
out/
|
||||
out-build/
|
||||
out-editor/
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
"search.exclude": {
|
||||
"**/node_modules/**": true,
|
||||
"**/bower_components": true,
|
||||
".build/**": true,
|
||||
"out*/**": true,
|
||||
"extensions/**/out/**": true
|
||||
}
|
||||
|
|
|
@ -25,6 +25,7 @@ var util = require('./lib/util');
|
|||
var buildfile = require('../src/buildfile');
|
||||
var common = require('./gulpfile.common');
|
||||
var root = path.dirname(__dirname);
|
||||
var build = path.join(root, '.build');
|
||||
var commit = util.getVersion(root);
|
||||
|
||||
var baseModules = [
|
||||
|
@ -112,7 +113,7 @@ var config = {
|
|||
gulp.task('electron', function () {
|
||||
// Force windows to use ia32
|
||||
var arch = (process.platform === 'win32' ? 'ia32' : process.arch);
|
||||
return electron.dest(path.join(path.dirname(root), 'Electron-Build'), _.extend({}, config, { arch: arch }));
|
||||
return electron.dest(path.join(build, 'electron'), _.extend({}, config, { arch: arch }));
|
||||
});
|
||||
|
||||
function mixinProduct() {
|
||||
|
|
|
@ -8,5 +8,5 @@ set ELECTRON_ENABLE_STACK_DUMPING=1
|
|||
|
||||
pushd %~dp0\..
|
||||
node .\node_modules\gulp\bin\gulp.js electron
|
||||
..\Electron-Build\CodeOSS.exe . %*
|
||||
.\.build\electron\CodeOSS.exe . %*
|
||||
popd
|
||||
|
|
|
@ -17,7 +17,7 @@ export ELECTRON_ENABLE_STACK_DUMPING=1
|
|||
cd $ROOT ; node node_modules/gulp/bin/gulp.js electron
|
||||
|
||||
if [[ "$OSTYPE" == "darwin"* ]]; then
|
||||
cd $ROOT; ../Electron-Build/Electron.app/Contents/MacOS/Electron . $*
|
||||
cd $ROOT; ./.build/electron/Electron.app/Contents/MacOS/Electron . $*
|
||||
else
|
||||
cd $ROOT; ../Electron-Build/electron . $*
|
||||
cd $ROOT; ./.build/electron/electron . $*
|
||||
fi
|
||||
|
|
|
@ -3,5 +3,5 @@
|
|||
set ATOM_SHELL_INTERNAL_RUN_AS_NODE=1
|
||||
|
||||
pushd %~dp0\..
|
||||
..\Electron-Build\Code.exe .\node_modules\mocha\bin\_mocha %*
|
||||
.\.build\electron\Code.exe .\node_modules\mocha\bin\_mocha %*
|
||||
popd
|
||||
|
|
|
@ -10,11 +10,11 @@ fi
|
|||
# Unit Tests
|
||||
if [[ "$OSTYPE" == "darwin"* ]]; then
|
||||
cd $ROOT ; ulimit -n 4096 ; ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 \
|
||||
../Electron-Build/Electron.app/Contents/MacOS/Electron \
|
||||
./.build/electron/Electron.app/Contents/MacOS/Electron \
|
||||
node_modules/mocha/bin/_mocha $*
|
||||
else
|
||||
cd $ROOT ; ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 \
|
||||
../Electron-Build/electron \
|
||||
./.build/electron/electron \
|
||||
node_modules/mocha/bin/_mocha $*
|
||||
fi
|
||||
|
||||
|
|
Loading…
Reference in New Issue