Skip to content

Fix GH-16843: Windows phpize builds ignore source subfolders #17016

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix GH-16843: Windows phpize builds ignore source subfolders #17016

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions win32/build/confutils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1614,8 +1614,15 @@ function ADD_SOURCES(dir, file_list, target, obj_dir)
if (obj_dir == null) {
if (MODE_PHPIZE) {
/* In the phpize mode, the subdirs are always relative to BUID_DIR.
No need to differentiate by extension, only one gets built. */
var build_dir = (dirname ? dirname : "").replace(new RegExp("^..\\\\"), "");
No need to differentiate by extension, only one gets built.
We still need to cater to subfolders, though. */
if (dir.charAt(configure_module_dirname.length) === "\\" &&
dir.substr(0, configure_module_dirname.length) === configure_module_dirname) {
var reldir = dir.substr(configure_module_dirname.length + 1);
var build_dir = (dirname ? (reldir + "\\" + dirname) : reldir).replace(new RegExp("^..\\\\"), "");
} else {
var build_dir = (dirname ? dirname : "").replace(new RegExp("^..\\\\"), "");
}
} else {
var build_dir = (dirname ? (dir + "\\" + dirname) : dir).replace(new RegExp("^..\\\\"), "");
}
Expand Down