mirror of
https://github.com/NativeScript/NativeScript.git
synced 2025-08-15 11:01:21 +08:00
Move expect.exp for travis
This commit is contained in:
@ -58,7 +58,7 @@ module.exports = {
|
|||||||
pathToApp: "./platforms/ios/build/emulator/TestsApp.app",
|
pathToApp: "./platforms/ios/build/emulator/TestsApp.app",
|
||||||
deployedAppName:"org.nativescript.TestsApp",
|
deployedAppName:"org.nativescript.TestsApp",
|
||||||
mainActivityName:"com.tns.NativeScriptActivity",
|
mainActivityName:"com.tns.NativeScriptActivity",
|
||||||
pathToCompiledTests: "bin/dist/apps/tests",
|
pathToCompiledTests: "bin/dist/tests/app",
|
||||||
simulatorSysLog: pathModule.join(process.env.HOME, "Library/Logs/CoreSimulator", args.emuAvdName, "/system.log"),
|
simulatorSysLog: pathModule.join(process.env.HOME, "Library/Logs/CoreSimulator", args.emuAvdName, "/system.log"),
|
||||||
platform: args.platform
|
platform: args.platform
|
||||||
}
|
}
|
||||||
@ -199,12 +199,10 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
startiOSApp: {
|
startiOSApp: {
|
||||||
cmd: "xcrun simctl launch " + localCfg.emuAvdName + " org.nativescript." + localCfg.testsAppName
|
cmd: "xcrun simctl launch " + localCfg.emuAvdName + " org.nativescript." + localCfg.testsAppName
|
||||||
}
|
},
|
||||||
},
|
"npm-i-modules": {
|
||||||
untar: {
|
cmd: "npm i " + pathModule.relative(localCfg.applicationDir, localCfg.modulesPath),
|
||||||
modules: {
|
cwd: localCfg.applicationDir
|
||||||
src: localCfg.modulesPath,
|
|
||||||
dest: pathModule.join(localCfg.applicationDir, "node_modules")
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
shell: {
|
shell: {
|
||||||
@ -297,7 +295,7 @@ module.exports = {
|
|||||||
"clean:originalAppDir",
|
"clean:originalAppDir",
|
||||||
"copy:testsAppToRunDir",
|
"copy:testsAppToRunDir",
|
||||||
"clean:modules",
|
"clean:modules",
|
||||||
"untar:modules",
|
"exec:npm-i-modules",
|
||||||
"copy:modulesToDir",
|
"copy:modulesToDir",
|
||||||
"clean:tempExtractedModules",
|
"clean:tempExtractedModules",
|
||||||
|
|
||||||
|
@ -1,13 +1,43 @@
|
|||||||
"use strict";
|
"use strict";
|
||||||
var ts = require("typescript");
|
var ts = require("typescript");
|
||||||
var fs = require("fs");
|
var fs = require("fs");
|
||||||
|
var path = require("path");
|
||||||
|
var arg1 = process.argv.length > 2 ? process.argv[2] : "";
|
||||||
|
var isIncremental = arg1.indexOf("i") >= 0;
|
||||||
|
if (isIncremental) {
|
||||||
|
console.log("incremental");
|
||||||
|
}
|
||||||
function compile(fileNames, options) {
|
function compile(fileNames, options) {
|
||||||
|
console.time("program");
|
||||||
var program = ts.createProgram(fileNames, options);
|
var program = ts.createProgram(fileNames, options);
|
||||||
|
console.timeEnd("program");
|
||||||
var sourceFiles = program.getSourceFiles().filter(function (f) { return f.fileName.lastIndexOf(".d.ts") !== f.fileName.length - 5; });
|
var sourceFiles = program.getSourceFiles().filter(function (f) { return f.fileName.lastIndexOf(".d.ts") !== f.fileName.length - 5; });
|
||||||
// sourceFiles.forEach(sf => console.log(" - " + sf.fileName));
|
|
||||||
var emitResults = [];
|
var emitResults = [];
|
||||||
var allDiagnostics = [];
|
var allDiagnostics = [];
|
||||||
sourceFiles.forEach(function (srcFile) { return emitResults.push(program.emit(srcFile)); });
|
console.time("transpile");
|
||||||
|
if (isIncremental) {
|
||||||
|
sourceFiles = sourceFiles.filter(function (srcFile) {
|
||||||
|
try {
|
||||||
|
var tsName = srcFile.fileName;
|
||||||
|
var jsName = path.join(path.dirname(tsName), path.basename(tsName, ".ts")) + ".js";
|
||||||
|
var tsTime = fs.statSync(tsName).mtime.getTime();
|
||||||
|
var jsTime = fs.statSync(jsName).mtime.getTime();
|
||||||
|
return jsTime < tsTime;
|
||||||
|
}
|
||||||
|
catch (e) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
sourceFiles.forEach(function (srcFile) {
|
||||||
|
console.log(" - " + srcFile.fileName);
|
||||||
|
emitResults.push(program.emit(srcFile));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
sourceFiles.forEach(function (srcFile) { return emitResults.push(program.emit(srcFile)); });
|
||||||
|
}
|
||||||
|
console.timeEnd("transpile");
|
||||||
|
console.time("diagnostics");
|
||||||
sourceFiles.forEach(function (srcFile) { return allDiagnostics = allDiagnostics.concat(ts.getPreEmitDiagnostics(program, srcFile)); });
|
sourceFiles.forEach(function (srcFile) { return allDiagnostics = allDiagnostics.concat(ts.getPreEmitDiagnostics(program, srcFile)); });
|
||||||
emitResults.forEach(function (er) { return allDiagnostics = allDiagnostics.concat(er.diagnostics); });
|
emitResults.forEach(function (er) { return allDiagnostics = allDiagnostics.concat(er.diagnostics); });
|
||||||
allDiagnostics.forEach(function (diagnostic) {
|
allDiagnostics.forEach(function (diagnostic) {
|
||||||
@ -18,6 +48,7 @@ function compile(fileNames, options) {
|
|||||||
var code = diagnostic.code;
|
var code = diagnostic.code;
|
||||||
console.log(diagnostic.file.fileName + "(" + (line + 1) + "," + (character + 1) + "): TS" + code + ": " + message);
|
console.log(diagnostic.file.fileName + "(" + (line + 1) + "," + (character + 1) + "): TS" + code + ": " + message);
|
||||||
});
|
});
|
||||||
|
console.timeEnd("diagnostics");
|
||||||
var exitCode = emitResults.some(function (er) { return er.emitSkipped; }) ? 1 : 0;
|
var exitCode = emitResults.some(function (er) { return er.emitSkipped; }) ? 1 : 0;
|
||||||
console.log("Process exiting with code " + exitCode + ".");
|
console.log("Process exiting with code " + exitCode + ".");
|
||||||
process.exit(exitCode);
|
process.exit(exitCode);
|
||||||
|
@ -1,17 +1,51 @@
|
|||||||
import * as ts from "typescript";
|
import * as ts from "typescript";
|
||||||
declare var process, require;
|
declare var process, require;
|
||||||
var fs = require("fs");
|
var fs = require("fs");
|
||||||
|
var path = require("path");
|
||||||
|
|
||||||
|
var arg1 = process.argv.length > 2 ? process.argv[2] : "";
|
||||||
|
|
||||||
|
var isIncremental = arg1.indexOf("i") >= 0;
|
||||||
|
if (isIncremental) {
|
||||||
|
console.log("incremental");
|
||||||
|
}
|
||||||
|
|
||||||
function compile(fileNames: string[], options: ts.CompilerOptions) {
|
function compile(fileNames: string[], options: ts.CompilerOptions) {
|
||||||
|
console.time("program");
|
||||||
var program = ts.createProgram(fileNames, options);
|
var program = ts.createProgram(fileNames, options);
|
||||||
|
|
||||||
|
console.timeEnd("program");
|
||||||
var sourceFiles = program.getSourceFiles().filter(f => f.fileName.lastIndexOf(".d.ts") !== f.fileName.length - 5);
|
var sourceFiles = program.getSourceFiles().filter(f => f.fileName.lastIndexOf(".d.ts") !== f.fileName.length - 5);
|
||||||
// sourceFiles.forEach(sf => console.log(" - " + sf.fileName));
|
|
||||||
|
|
||||||
var emitResults = [];
|
var emitResults = [];
|
||||||
var allDiagnostics = [];
|
var allDiagnostics = [];
|
||||||
|
|
||||||
sourceFiles.forEach(srcFile => emitResults.push(program.emit(srcFile)));
|
console.time("transpile");
|
||||||
|
if (isIncremental) {
|
||||||
|
sourceFiles = sourceFiles.filter(srcFile => {
|
||||||
|
try {
|
||||||
|
var tsName = srcFile.fileName;
|
||||||
|
var jsName = path.join(path.dirname(tsName), path.basename(tsName, ".ts")) + ".js";
|
||||||
|
|
||||||
|
var tsTime = fs.statSync(tsName).mtime.getTime();
|
||||||
|
var jsTime = fs.statSync(jsName).mtime.getTime();
|
||||||
|
|
||||||
|
return jsTime < tsTime;
|
||||||
|
} catch(e) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
sourceFiles.forEach(srcFile => {
|
||||||
|
console.log(" - " + srcFile.fileName);
|
||||||
|
emitResults.push(program.emit(srcFile));
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
sourceFiles.forEach(srcFile => emitResults.push(program.emit(srcFile)));
|
||||||
|
}
|
||||||
|
console.timeEnd("transpile");
|
||||||
|
|
||||||
|
console.time("diagnostics");
|
||||||
sourceFiles.forEach(srcFile => allDiagnostics = allDiagnostics.concat(ts.getPreEmitDiagnostics(program, srcFile)));
|
sourceFiles.forEach(srcFile => allDiagnostics = allDiagnostics.concat(ts.getPreEmitDiagnostics(program, srcFile)));
|
||||||
emitResults.forEach(er => allDiagnostics = allDiagnostics.concat(er.diagnostics));
|
emitResults.forEach(er => allDiagnostics = allDiagnostics.concat(er.diagnostics));
|
||||||
|
|
||||||
@ -23,6 +57,7 @@ function compile(fileNames: string[], options: ts.CompilerOptions) {
|
|||||||
var code = diagnostic.code;
|
var code = diagnostic.code;
|
||||||
console.log(diagnostic.file.fileName + "(" + (line + 1) + "," + (character + 1) + "): TS" + code + ": " + message);
|
console.log(diagnostic.file.fileName + "(" + (line + 1) + "," + (character + 1) + "): TS" + code + ": " + message);
|
||||||
});
|
});
|
||||||
|
console.timeEnd("diagnostics");
|
||||||
|
|
||||||
var exitCode = emitResults.some(er => er.emitSkipped) ? 1 : 0;
|
var exitCode = emitResults.some(er => er.emitSkipped) ? 1 : 0;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user