pyrite-dev/pmake
12
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix path stuff

Browse source
This commit is contained in:
Nishi 2026-05-10 01:10:59 +09:00
commit 5962ba05ec
Signed by: nishi
GPG key ID: 27EF69B208EB9343
3 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/js/cmdline.js
View file

@ -105,13 +105,13 @@ function make(output) {
for(var i = 0; i < targets.length; i++) { for(var i = 0; i < targets.length; i++) {
mk.write(targets[i].target + ": " + pmake.resolveProjects(targets[i].libraries).map(target_map).join(" ") + "\n"); mk.write(targets[i].target + ": " + pmake.resolveProjects(targets[i].libraries).map(target_map).join(" ") + "\n");
mk.write(" @cd " + targets[i].base + " ; $(MAKE) $(MAKEARGS) -f " + makefile(targets[i]) + "\n"); mk.write(" @cd " + targets[i].base + " ; $(MAKE) $(MAKEARGS) -f " + targets[i].target + ".make\n");
mk.write("\n"); mk.write("\n");
} }
mk.write("clean:\n"); mk.write("clean:\n");
for(var i = 0; i < targets.length; i++) { for(var i = 0; i < targets.length; i++) {
mk.write(" @cd " + targets[i].base + " ; $(MAKE) $(MAKEARGS) -f " + makefile(targets[i]) + " clean\n"); mk.write(" @cd " + targets[i].base + " ; $(MAKE) $(MAKEARGS) -f " + targets[i].target + ".make clean\n");
} }
mk.write("\n"); mk.write("\n");

6
src/js/core.js
View file

@ -251,6 +251,12 @@ const Project = function(target) {
this.libraries = []; this.libraries = [];
this.output = target; this.output = target;
this.base = fs.cwd(); this.base = fs.cwd();
if(this.base == fs.startedCwd) {
this.base = ".";
} else {
this.base = this.base.substr(fs.startedCwd.length + 1);
}
}; };
Project.prototype.generate = function() { Project.prototype.generate = function() {

8
src/js_fs.c
View file

@ -105,7 +105,10 @@ static duk_ret_t js_fs_cwd(duk_context* self) {
} }
void js_fs_init(void) { void js_fs_init(void) {
int obj; int obj;
char started_cwd[1024];
getcwd(started_cwd, 1024);
obj = duk_push_object(js_ctx); obj = duk_push_object(js_ctx);
@ -124,5 +127,8 @@ void js_fs_init(void) {
duk_push_c_function(js_ctx, js_fs_cwd, 0); duk_push_c_function(js_ctx, js_fs_cwd, 0);
duk_put_prop_string(js_ctx, obj, "cwd"); duk_put_prop_string(js_ctx, obj, "cwd");
duk_push_string(js_ctx, started_cwd);
duk_put_prop_string(js_ctx, obj, "startedCwd");
duk_put_prop_string(js_ctx, 0, "fs"); duk_put_prop_string(js_ctx, 0, "fs");
} }