kiss-lang/kiss
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases Wiki Activity

CompilerTools js failure clear .haxelib from dts2hx

Browse Source
This commit is contained in:
Nat Quayle Nelson
2022-06-19 17:50:25 +00:00
parent 50c0afbd4f
commit d5068511cd
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/kiss/CompilerTools.hx
View File

@@ -170,12 +170,31 @@ class CompilerTools {
FileSystem.rename(file, newName); FileSystem.rename(file, newName);
} }
} }
// Special handling for dts2hx bindings after a finished or failed npm build:
function clearDotHaxelib() {
if (FileSystem.exists(".haxelib")) {
for (externLib in FileSystem.readDirectory(".haxelib")) {
if (FileSystem.exists(Prelude.joinPath(haxelibRepositoryPath, externLib))) {
Prelude.purgeDirectory(Prelude.joinPath(haxelibRepositoryPath, externLib));
}
move(Prelude.joinPath(".haxelib", externLib), Prelude.joinPath(haxelibRepositoryPath, externLib));
}
Prelude.purgeDirectory(".haxelib");
}
}
move("package.json", "package.json.temp"); move("package.json", "package.json.temp");
move("package-lock.json", "package-lock.json.temp"); move("package-lock.json", "package-lock.json.temp");
move("node_modules", "node_modules.temp"); move("node_modules", "node_modules.temp");
File.copy(Path.join([haxelibPath, args.langProjectFile]), "package.json"); File.copy(Path.join([haxelibPath, args.langProjectFile]), "package.json");
var oldHandleError = handleError;
handleError = (error) -> {
clearDotHaxelib();
oldHandleError(error);
}
if (Sys.systemName() == "Windows") { if (Sys.systemName() == "Windows") {
Prelude.tryProcess("cmd.exe", ["/c", 'npm', 'install'], handleError); Prelude.tryProcess("cmd.exe", ["/c", 'npm', 'install'], handleError);
} else { } else {
@@ -185,16 +204,8 @@ class CompilerTools {
FileSystem.deleteFile("package.json"); FileSystem.deleteFile("package.json");
move("node_modules", Prelude.joinPath(args.outputFolder, "node_modules")); move("node_modules", Prelude.joinPath(args.outputFolder, "node_modules"));
move("package-lock.json", Prelude.joinPath(args.outputFolder, "package-lock.json")); move("package-lock.json", Prelude.joinPath(args.outputFolder, "package-lock.json"));
// Special handling for dts2hx bindings:
if (FileSystem.exists(".haxelib")) { clearDotHaxelib();
for (externLib in FileSystem.readDirectory(".haxelib")) {
if (FileSystem.exists(Prelude.joinPath(haxelibRepositoryPath, externLib))) {
Prelude.purgeDirectory(Prelude.joinPath(haxelibRepositoryPath, externLib));
}
move(Prelude.joinPath(".haxelib", externLib), Prelude.joinPath(haxelibRepositoryPath, externLib));
}
Prelude.purgeDirectory(".haxelib");
}
move("package.json.temp", "package.json"); move("package.json.temp", "package.json");
move("package-lock.json.temp", "package-lock.json"); move("package-lock.json.temp", "package-lock.json");