Skip to content

Commit 212e537

Browse files
PanayotCankovPanayotCankov
committed
Move expect.exp for travis
1 parent 7118e11 commit 212e537

File tree

4 files changed

+76
-12
lines changed

4 files changed

+76
-12
lines changed

‎build/run-testsapp.grunt.js‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ module.exports = {
5858
pathToApp: "./platforms/ios/build/emulator/TestsApp.app",
5959
deployedAppName:"org.nativescript.TestsApp",
6060
mainActivityName:"com.tns.NativeScriptActivity",
61-
pathToCompiledTests: "bin/dist/apps/tests",
61+
pathToCompiledTests: "bin/dist/tests/app",
6262
simulatorSysLog: pathModule.join(process.env.HOME, "Library/Logs/CoreSimulator", args.emuAvdName, "/system.log"),
6363
platform: args.platform
6464
}
@@ -199,12 +199,10 @@ module.exports = {
199199
},
200200
startiOSApp: {
201201
cmd: "xcrun simctl launch " + localCfg.emuAvdName + " org.nativescript." + localCfg.testsAppName
202-
}
203-
},
204-
untar: {
205-
modules: {
206-
src: localCfg.modulesPath,
207-
dest: pathModule.join(localCfg.applicationDir, "node_modules")
202+
},
203+
"npm-i-modules": {
204+
cmd: "npm i " + pathModule.relative(localCfg.applicationDir, localCfg.modulesPath),
205+
cwd: localCfg.applicationDir
208206
}
209207
},
210208
shell: {
@@ -297,7 +295,7 @@ module.exports = {
297295
"clean:originalAppDir",
298296
"copy:testsAppToRunDir",
299297
"clean:modules",
300-
"untar:modules",
298+
"exec:npm-i-modules",
301299
"copy:modulesToDir",
302300
"clean:tempExtractedModules",
303301

‎build/tsc-dev.js‎

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,43 @@
11
"use strict";
22
var ts = require("typescript");
33
var fs = require("fs");
4+
var path = require("path");
5+
var arg1 = process.argv.length > 2 ? process.argv[2] : "";
6+
var isIncremental = arg1.indexOf("i") >= 0;
7+
if (isIncremental) {
8+
console.log("incremental");
9+
}
410
function compile(fileNames, options) {
11+
console.time("program");
512
var program = ts.createProgram(fileNames, options);
13+
console.timeEnd("program");
614
var sourceFiles = program.getSourceFiles().filter(function (f) { return f.fileName.lastIndexOf(".d.ts") !== f.fileName.length - 5; });
7-
// sourceFiles.forEach(sf => console.log(" - " + sf.fileName));
815
var emitResults = [];
916
var allDiagnostics = [];
10-
sourceFiles.forEach(function (srcFile) { return emitResults.push(program.emit(srcFile)); });
17+
console.time("transpile");
18+
if (isIncremental) {
19+
sourceFiles = sourceFiles.filter(function (srcFile) {
20+
try {
21+
var tsName = srcFile.fileName;
22+
var jsName = path.join(path.dirname(tsName), path.basename(tsName, ".ts")) + ".js";
23+
var tsTime = fs.statSync(tsName).mtime.getTime();
24+
var jsTime = fs.statSync(jsName).mtime.getTime();
25+
return jsTime < tsTime;
26+
}
27+
catch (e) {
28+
return true;
29+
}
30+
});
31+
sourceFiles.forEach(function (srcFile) {
32+
console.log(" - " + srcFile.fileName);
33+
emitResults.push(program.emit(srcFile));
34+
});
35+
}
36+
else {
37+
sourceFiles.forEach(function (srcFile) { return emitResults.push(program.emit(srcFile)); });
38+
}
39+
console.timeEnd("transpile");
40+
console.time("diagnostics");
1141
sourceFiles.forEach(function (srcFile) { return allDiagnostics = allDiagnostics.concat(ts.getPreEmitDiagnostics(program, srcFile)); });
1242
emitResults.forEach(function (er) { return allDiagnostics = allDiagnostics.concat(er.diagnostics); });
1343
allDiagnostics.forEach(function (diagnostic) {
@@ -18,6 +48,7 @@ function compile(fileNames, options) {
1848
var code = diagnostic.code;
1949
console.log(diagnostic.file.fileName + "(" + (line + 1) + "," + (character + 1) + "): TS" + code + ": " + message);
2050
});
51+
console.timeEnd("diagnostics");
2152
var exitCode = emitResults.some(function (er) { return er.emitSkipped; }) ? 1 : 0;
2253
console.log("Process exiting with code " + exitCode + ".");
2354
process.exit(exitCode);

‎build/tsc-dev.ts‎

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,51 @@
11
import * as ts from "typescript";
22
declare var process, require;
33
var fs = require("fs");
4+
var path = require("path");
5+
6+
var arg1 = process.argv.length > 2 ? process.argv[2] : "";
7+
8+
var isIncremental = arg1.indexOf("i") >= 0;
9+
if (isIncremental) {
10+
console.log("incremental");
11+
}
412

513
function compile(fileNames: string[], options: ts.CompilerOptions) {
14+
console.time("program");
615
var program = ts.createProgram(fileNames, options);
716

17+
console.timeEnd("program");
818
var sourceFiles = program.getSourceFiles().filter(f => f.fileName.lastIndexOf(".d.ts") !== f.fileName.length - 5);
9-
// sourceFiles.forEach(sf => console.log(" - " + sf.fileName));
1019

1120
var emitResults = [];
1221
var allDiagnostics = [];
1322

14-
sourceFiles.forEach(srcFile => emitResults.push(program.emit(srcFile)));
23+
console.time("transpile");
24+
if (isIncremental) {
25+
sourceFiles = sourceFiles.filter(srcFile => {
26+
try {
27+
var tsName = srcFile.fileName;
28+
var jsName = path.join(path.dirname(tsName), path.basename(tsName, ".ts")) + ".js";
29+
30+
var tsTime = fs.statSync(tsName).mtime.getTime();
31+
var jsTime = fs.statSync(jsName).mtime.getTime();
32+
33+
return jsTime < tsTime;
34+
} catch(e) {
35+
return true;
36+
}
37+
});
38+
39+
sourceFiles.forEach(srcFile => {
40+
console.log(" - " + srcFile.fileName);
41+
emitResults.push(program.emit(srcFile));
42+
});
43+
} else {
44+
sourceFiles.forEach(srcFile => emitResults.push(program.emit(srcFile)));
45+
}
46+
console.timeEnd("transpile");
47+
48+
console.time("diagnostics");
1549
sourceFiles.forEach(srcFile => allDiagnostics = allDiagnostics.concat(ts.getPreEmitDiagnostics(program, srcFile)));
1650
emitResults.forEach(er => allDiagnostics = allDiagnostics.concat(er.diagnostics));
1751

@@ -23,6 +57,7 @@ function compile(fileNames: string[], options: ts.CompilerOptions) {
2357
var code = diagnostic.code;
2458
console.log(diagnostic.file.fileName + "(" + (line + 1) + "," + (character + 1) + "): TS" + code + ": " + message);
2559
});
60+
console.timeEnd("diagnostics");
2661

2762
var exitCode = emitResults.some(er => er.emitSkipped) ? 1 : 0;
2863

tns-core-modules/expect.exp renamed to expect.exp

File renamed without changes.

0 commit comments

Comments
 (0)