[PATCH 0/1] MR2266: makedep: Support resource files for embedded TESTDLL.
Split from https://gitlab.winehq.org/wine/wine/-/merge_requests/2221, this would let us customize testdll version info. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2266
From: Rémi Bernon <rbernon(a)codeweavers.com> --- tools/makedep.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index b94a221854d..f9a4db25323 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -97,9 +97,10 @@ struct incl_file #define FLAG_IDL_HEADER 0x008000 /* generates a header (.h) file */ #define FLAG_RC_PO 0x010000 /* rc file contains translations */ #define FLAG_RC_HEADER 0x020000 /* rc file is a header */ -#define FLAG_C_IMPLIB 0x040000 /* file is part of an import library */ -#define FLAG_C_UNIX 0x080000 /* file is part of a Unix library */ -#define FLAG_SFD_FONTS 0x100000 /* sfd file generated bitmap fonts */ +#define FLAG_RC_TESTDLL 0x040000 /* rc file is for a test dll */ +#define FLAG_C_IMPLIB 0x080000 /* file is part of an import library */ +#define FLAG_C_UNIX 0x100000 /* file is part of a Unix library */ +#define FLAG_SFD_FONTS 0x200000 /* sfd file generated bitmap fonts */ static const struct { @@ -939,6 +940,7 @@ static void parse_pragma_directive( struct file *source, char *str ) { if (!strcmp( flag, "header" )) source->flags |= FLAG_RC_HEADER; else if (!strcmp( flag, "po" )) source->flags |= FLAG_RC_PO; + else if (!strcmp( flag, "testdll" )) source->flags |= FLAG_RC_TESTDLL; } else if (strendswith( source->name, ".sfd" )) { @@ -2744,8 +2746,14 @@ static void output_source_rc( struct makefile *make, struct incl_file *source, c if (source->file->flags & FLAG_RC_HEADER) return; if (source->file->flags & FLAG_GENERATED) strarray_add( &make->clean_files, source->name ); if (linguas.count && (source->file->flags & FLAG_RC_PO)) po_dir = "po"; - for (arch = 0; arch < archs.count; arch++) - if (!make->disabled[arch]) strarray_add( &make->res_files[arch], res_file ); + if (!(source->file->flags & FLAG_RC_TESTDLL)) + { + for (arch = 0; arch < archs.count; arch++) + { + if (make->disabled[arch]) continue; + strarray_add( &make->res_files[arch], res_file ); + } + } if (source->file->flags & FLAG_RC_PO) { strarray_add( &make->pot_files, strmake( "%s.pot", obj )); @@ -3071,10 +3079,10 @@ static void output_source_in( struct makefile *make, struct incl_file *source, c static void output_source_spec( struct makefile *make, struct incl_file *source, const char *obj ) { struct strarray imports = get_expanded_file_local_var( make, obj, "IMPORTS" ); + const char *dll_name, *obj_name, *res_name, *output_file, *debug_file, *output_rsrc; struct strarray dll_flags = empty_strarray; struct strarray default_imports = empty_strarray; struct strarray all_libs, dep_libs; - const char *dll_name, *obj_name, *res_name, *output_file, *debug_file; unsigned int arch; if (!imports.count) imports = make->imports; @@ -3091,12 +3099,15 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, if (!arch) strarray_addall( &all_libs, libs ); dll_name = arch_module_name( strmake( "%s.dll", obj ), arch ); obj_name = obj_dir_path( make, strmake( "%s%s.o", arch_dirs[arch], obj )); - res_name = strmake( "%s%s.res", arch_dirs[arch], obj ); output_file = obj_dir_path( make, dll_name ); + output_rsrc = strmake( "%s.res", dll_name ); + + if (!find_src_file( make, strmake( "%s.rc", obj ))) res_name = NULL; + else res_name = obj_dir_path( make, strmake( "%s.res", obj )); strarray_add( &make->clean_files, dll_name ); - strarray_add( &make->res_files[arch], res_name ); - output( "%s:", obj_dir_path( make, res_name )); + strarray_add( &make->res_files[arch], output_rsrc ); + output( "%s:", obj_dir_path( make, output_rsrc )); output_filename( output_file ); output_filename( tools_path( make, "wrc" )); output( "\n" ); @@ -3106,6 +3117,7 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, output( "%s:", output_file ); output_filename( source->filename ); output_filename( obj_name ); + if (res_name) output_filename( res_name ); output_filenames( dep_libs ); output_filename( tools_path( make, "winebuild" )); output_filename( tools_path( make, "winegcc" )); @@ -3117,6 +3129,7 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, output_filename( "-shared" ); output_filename( source->filename ); output_filename( obj_name ); + if (res_name) output_filename( res_name ); if ((debug_file = get_debug_file( make, dll_name, arch ))) output_filename( strmake( "-Wl,--debug-file,%s", obj_dir_path( make, debug_file ))); output_filenames( all_libs ); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2266
You have to assume that the file name is the same as the .spec, so there's no need for a new makedep flag. Also you'll need to rename the .res for the whole dll to avoid a conflict. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2266#note_26377
On Wed Mar 8 08:52:46 2023 +0000, Alexandre Julliard wrote:
You have to assume that the file name is the same as the .spec, so there's no need for a new makedep flag. Also you'll need to rename the .res for the whole dll to avoid a conflict. The rename is already there I believe (I can probably do it in a separate commit to make that more clear), through the `output_rsrc = strmake( "%s.res", dll_name );` change.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/2266#note_26380
On Wed Mar 8 08:52:46 2023 +0000, Rémi Bernon wrote:
The rename is already there I believe (I can probably do it in a separate commit to make that more clear), through the `output_rsrc = strmake( "%s.res", dll_name );` change. I've made the changes in https://gitlab.winehq.org/wine/wine/-/merge_requests/2221.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/2266#note_26384
This merge request was closed by Rémi Bernon. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2266
participants (2)
-
Alexandre Julliard (＠julliard) -
Rémi Bernon