mirror of
https://github.com/php/php-src.git
synced 2024-09-22 02:17:32 +00:00
fix file lists with subdirs passed to EXTENSION()
The underlying place responsible is the ADD_SOURCES() function. With
this, the calls like
EXTENSION("hello", "sub0/file0.c sub1/file1.c", ...)
are working correctly. Same for
ADD_SOURCES("some/dir", "sub0/file0.c sub1/file1.c", ...)
This commit is contained in:
Anatol Belski
parent
c9357f82d3
commit
8289f11390
@ -1445,83 +1445,118 @@ function ADD_SOURCES(dir, file_list, target, obj_dir)
|
||||
|
||||
dir = dir.replace(new RegExp("/", "g"), "\\");
|
||||
var objs_line = "";
|
||||
var srcs_line = "";
|
||||
|
||||
var sub_build = "$(BUILD_DIR)\\";
|
||||
|
||||
/* if module dir is not a child of the main source dir,
|
||||
* we need to tweak it; we should have detected such a
|
||||
* case in condense_path and rewritten the path to
|
||||
* be relative.
|
||||
* This probably breaks for non-sibling dirs, but that
|
||||
* is not a problem as buildconf only checks for pecl
|
||||
* as either a child or a sibling */
|
||||
if (obj_dir == null) {
|
||||
var build_dir = dir.replace(new RegExp("^..\\\\"), "");
|
||||
var mangle_dir = build_dir.replace(new RegExp("[\\\\/.-]", "g"), "_");
|
||||
var bd_flags_name = "CFLAGS_BD_" + mangle_dir.toUpperCase();
|
||||
}
|
||||
else {
|
||||
var build_dir = obj_dir.replace(new RegExp("^..\\\\"), "");
|
||||
var mangle_dir = build_dir.replace(new RegExp("[\\\\/.-]", "g"), "_");
|
||||
var bd_flags_name = "CFLAGS_BD_" + mangle_dir.toUpperCase();
|
||||
}
|
||||
var srcs_line = "";
|
||||
var objs_line = "";
|
||||
|
||||
|
||||
var dirs = build_dir.split("\\");
|
||||
var i, d = "";
|
||||
for (i = 0; i < dirs.length; i++) {
|
||||
d += dirs[i];
|
||||
build_dirs[build_dirs.length] = d;
|
||||
d += "\\";
|
||||
}
|
||||
sub_build += d;
|
||||
|
||||
|
||||
DEFINE(bd_flags_name, "/Fp" + sub_build + " /FR" + sub_build + " ");
|
||||
if (VS_TOOLSET) {
|
||||
ADD_FLAG(bd_flags_name, "/Fd" + sub_build);
|
||||
}
|
||||
var srcs_by_dir = {};
|
||||
|
||||
/* Parse the file list to create an aggregated structure based on the subdirs passed. */
|
||||
for (i in file_list) {
|
||||
src = file_list[i];
|
||||
obj = src.replace(re, ".obj");
|
||||
tv += " " + sub_build + obj;
|
||||
resp += " " + sub_build.replace('$(BUILD_DIR)', bd) + obj;
|
||||
|
||||
if (!PHP_MP_DISABLED) {
|
||||
if (i > 0) {
|
||||
objs_line += " " + sub_build + obj;
|
||||
srcs_line += " " + dir + "\\" + src;
|
||||
} else {
|
||||
objs_line = sub_build + obj;
|
||||
srcs_line = dir + "\\" + src;
|
||||
}
|
||||
} else {
|
||||
MFO.WriteLine(sub_build + obj + ": " + dir + "\\" + src);
|
||||
var _tmp = src.split("\\");
|
||||
|
||||
if (PHP_ANALYZER == "pvs") {
|
||||
MFO.WriteLine("\t@\"$(PVS_STUDIO)\" --cl-params $(" + flags + ") $(CFLAGS) $(" + bd_flags_name + ") /c " + dir + "\\" + src + " --source-file " + dir + "\\" + src
|
||||
+ " --cfg PVS-Studio.conf --errors-off \"V122 V117 V111\" ");
|
||||
}
|
||||
MFO.WriteLine("\t@$(CC) $(" + flags + ") $(CFLAGS) $(" + bd_flags_name + ") /c " + dir + "\\" + src + " /Fo" + sub_build + obj);
|
||||
var filename = _tmp.pop();
|
||||
|
||||
// build the obj out dir and use it as a key
|
||||
var dirname = _tmp.join("\\");
|
||||
|
||||
//WARNING("dir: " + dir + " dirname: " + dirname + " filename: " + filename);
|
||||
|
||||
/* if module dir is not a child of the main source dir,
|
||||
* we need to tweak it; we should have detected such a
|
||||
* case in condense_path and rewritten the path to
|
||||
* be relative.
|
||||
* This probably breaks for non-sibling dirs, but that
|
||||
* is not a problem as buildconf only checks for pecl
|
||||
* as either a child or a sibling */
|
||||
if (obj_dir == null) {
|
||||
var build_dir = (dirname ? (dir + "\\" + dirname) : dir).replace(new RegExp("^..\\\\"), "");
|
||||
}
|
||||
else {
|
||||
var build_dir = obj_dir.replace(new RegExp("^..\\\\"), "");
|
||||
}
|
||||
|
||||
obj = sub_build + build_dir + "\\" + filename.replace(re, ".obj");
|
||||
|
||||
if (i > 0) {
|
||||
srcs_line += " " + dir + "\\" + src;
|
||||
objs_line += " " + obj
|
||||
} else {
|
||||
srcs_line = dir + "\\" + src;
|
||||
objs_line = obj;
|
||||
}
|
||||
|
||||
resp += " " + obj.replace('$(BUILD_DIR)', bd);
|
||||
tv += " " + obj;
|
||||
|
||||
if (!srcs_by_dir.hasOwnProperty(build_dir)) {
|
||||
srcs_by_dir[build_dir] = [];
|
||||
}
|
||||
|
||||
/* storing the index from the file_list */
|
||||
srcs_by_dir[build_dir].push(i);
|
||||
}
|
||||
|
||||
if (!PHP_MP_DISABLED) {
|
||||
MFO.WriteLine(objs_line + ": " + srcs_line);
|
||||
MFO.WriteLine("\t$(CC) $(" + flags + ") $(CFLAGS) /Fo" + sub_build + " $(" + bd_flags_name + ") /c " + srcs_line);
|
||||
/* Create makefile build targets and dependencies. */
|
||||
MFO.WriteLine(objs_line + ": " + srcs_line);
|
||||
|
||||
/* Create target subdirs if any and produce the compiler calls, /mp is respected if enabled. */
|
||||
for (var k in srcs_by_dir) {
|
||||
var dirs = k.split("\\");
|
||||
var i, d = "";
|
||||
for (i = 0; i < dirs.length; i++) {
|
||||
d += dirs[i];
|
||||
build_dirs[build_dirs.length] = d;
|
||||
d += "\\";
|
||||
}
|
||||
|
||||
var mangle_dir = k.replace(new RegExp("[\\\\/.-]", "g"), "_");
|
||||
var bd_flags_name = "CFLAGS_BD_" + mangle_dir.toUpperCase();
|
||||
|
||||
DEFINE(bd_flags_name, "/Fp" + sub_build + d + " /FR" + sub_build + d + " ");
|
||||
if (VS_TOOLSET) {
|
||||
ADD_FLAG(bd_flags_name, "/Fd" + sub_build + d);
|
||||
}
|
||||
|
||||
if (PHP_MP_DISABLED) {
|
||||
for (var j in srcs_by_dir[k]) {
|
||||
src = file_list[srcs_by_dir[k][j]];
|
||||
if (PHP_ANALYZER == "pvs") {
|
||||
MFO.WriteLine("\t@\"$(PVS_STUDIO)\" --cl-params $(" + flags + ") $(CFLAGS) $(" + bd_flags_name + ") /c " + dir + "\\" + src + " --source-file " + dir + "\\" + src
|
||||
+ " --cfg PVS-Studio.conf --errors-off \"V122 V117 V111\" ");
|
||||
}
|
||||
|
||||
var _tmp = src.split("\\");
|
||||
var filename = _tmp.pop();
|
||||
obj = filename.replace(re, ".obj");
|
||||
|
||||
MFO.WriteLine("\t@$(CC) $(" + flags + ") $(CFLAGS) $(" + bd_flags_name + ") /c " + dir + "\\" + src + " /Fo" + sub_build + d + obj);
|
||||
}
|
||||
} else {
|
||||
/* TODO create a response file at least for the source files to work around the cmd line length limit. */
|
||||
var src_line = "";
|
||||
for (var j in srcs_by_dir[k]) {
|
||||
src_line += dir + "\\" + file_list[srcs_by_dir[k][j]] + " ";
|
||||
}
|
||||
|
||||
MFO.WriteLine("\t$(CC) $(" + flags + ") $(CFLAGS) /Fo" + sub_build + d + " $(" + bd_flags_name + ") /c " + src_line);
|
||||
}
|
||||
}
|
||||
|
||||
DEFINE(sym, tv);
|
||||
|
||||
/* Generate the response file and define it to the Makefile. This can be
|
||||
useful when getting the "command line too long" linker errors. */
|
||||
/* Generate the object response file and define it to the Makefile. This can be
|
||||
useful when getting the "command line too long" linker errors.
|
||||
TODO pack this into a function when response files are used for other kinds of info. */
|
||||
var obj_lst_fh = null;
|
||||
if (!FSO.FileExists(obj_lst_fn)) {
|
||||
obj_lst_fh = FSO.CreateTextFile(obj_lst_fn);
|
||||
//STDOUT.WriteLine("Creating " + obj_lst_fn);
|
||||
} else {
|
||||
//STDOUT.WriteLine("Appending to " + obj_lst_fn);
|
||||
obj_lst_fh = FSO.OpenTextFile(obj_lst_fn, 8);
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user