"MAKE_RULES" => "Make.rules",
"MAKE_DLL_RULES" => "dlls/Makedll.rules",
"MAKE_IMPLIB_RULES" => "dlls/Makeimplib.rules",
- "MAKE_TEST_RULES" => "dlls/Maketest.rules",
+ "MAKE_TEST_RULES" => "Maketest.rules",
"MAKE_PROG_RULES" => "programs/Makeprog.rules",
);
# Programs that we don't want to install at all
my %dont_install =
(
- "cmdlgtst" => 1,
- "view" => 1,
"winetest" => 1,
);
+# Dlls and programs that are 16-bit specific
+my %modules16 =
+(
+ "ifsmgr.vxd" => 1,
+ "mmdevldr.vxd" => 1,
+ "monodebg.vxd" => 1,
+ "vdhcp.vxd" => 1,
+ "vmm.vxd" => 1,
+ "vnbt.vxd" => 1,
+ "vnetbios.vxd" => 1,
+ "vtdapi.vxd" => 1,
+ "vwin32.vxd" => 1,
+ "w32skrnl.dll" => 1,
+ "winevdm.exe" => 1,
+ "wow32.dll" => 1,
+);
+
# Default patterns for top-level .gitignore
my @ignores = (
"*.[oa]",
+ "*.exe",
+ "*.fake",
+ "*.man",
"*.ok",
"*.res",
"*.so",
"/config.cache",
"/config.log",
"/config.status",
+ "/configure.lineno",
"/TAGS",
"/tags",
+ "/wine",
+ "/wine64",
"Makefile",
"dlldata.c",
"dlls/*/*.def",
- "dlls/*/tests/*crosstest.exe",
- "dlls/*/tests/testlist.c",
+ "dlls/shell32/AUTHORS",
+ "*/*/tests/testlist.c",
"include/config.h",
"include/stamp-h",
- "programs/winetest/*_test.exe",
- "programs/winetest/*_test.rc",
+ "loader/wine_info.plist",
+ "msg.pot",
+ "po/*.mo",
+ "programs/winetest/build.nfo",
"programs/winetest/build.rc",
+ "rsrc.pot",
+ "tools/makedep",
);
# Source files and their resulting target to ignore
[ 'BISON_SRCS', '\.y', '.tab.c' ],
[ 'BISON_SRCS', '\.y', '.tab.h' ],
[ 'LEX_SRCS', '\.l', '.yy.c' ],
- [ 'MC_SRCS', '\.mc', '.mc.rc' ],
[ 'IDL_TLB_SRCS', '\.idl', '.tlb' ],
[ 'IDL_H_SRCS', '\.idl', '.h' ],
[ 'IDL_C_SRCS', '\.idl', '.h' ],
[ 'IDL_I_SRCS', '\.idl', '_i.c' ],
[ 'IDL_P_SRCS', '\.idl', '_p.c' ],
[ 'IDL_S_SRCS', '\.idl', '_s.c' ],
+ [ 'PUBLIC_IDL_H_SRCS', '\.idl', '.h' ],
+ [ 'PRIVATE_IDL_H_SRCS', '\.idl', '.h' ],
+ [ 'XTEMPLATE_SRCS', '\.x', '.h' ],
);
my %exported_wine_headers = (
);
my %private_idl_headers = (
+ "access.idl" => 1,
+ "asynot.idl" => 1,
+ "asysta.idl" => 1,
"axcore.idl" => 1,
"axextend.idl" => 1,
"binres.idl" => 1,
+ "cmdbas.idl" => 1,
+ "cmdtxt.idl" => 1,
+ "crtrow.idl" => 1,
"dbccmd.idl" => 1,
"dbcses.idl" => 1,
"dbdsad.idl" => 1,
"devenum.idl" => 1,
"dyngraph.idl" => 1,
"opnrst.idl" => 1,
+ "row.idl" => 1,
+ "rowchg.idl" => 1,
+ "rstbas.idl" => 1,
+ "rstinf.idl" => 1,
+ "rstloc.idl" => 1,
"sesprp.idl" => 1,
"vmrender.idl" => 1,
- "wine/wined3d.idl" => 1,
+ "xmldom.idl" => 1,
+ "xmldso.idl" => 1,
"wine/winedxgi.idl" => 1,
);
"programs/winetest/dist.rc" => 1,
);
-my (@all_files, @makefiles, %makefiles);
+my (@linguas, @makefiles, %makefiles);
sub dirname($)
{
{
my ($file, $var) = @_;
my $make = $makefiles{$file};
+ my $replaced = 0;
return unless defined ${$make}{"=$var"};
open OLD_FILE, "$file.in" or die "cannot open $file.in";
while (<OLD_FILE>)
{
- if (/^\s*($var\s+)=/)
+ if (/^\s*($var\s*)=/)
{
# try to preserve formatting
my $prefix = $1;
{
print NEW_FILE "$prefix= @values\n";
}
+ $replaced = 1;
next;
}
+ if (/^\@MAKE/ && !$replaced)
+ {
+ print NEW_FILE "$var = \\\n\t" . join(" \\\n\t", sort @values) . "\n";
+ }
print NEW_FILE $_;
}
close OLD_FILE;
return update_file("$file.in");
}
-# parse the specified makefile to identify the rules file
+# parse the specified makefile and load the variables
sub parse_makefile($)
{
my $file = shift;
$make{"=rules"} = $makerules{$var};
next;
}
- if (/^\s*(MODULE|IMPORTLIB|TESTDLL)\s*=\s*(.*)/)
+ if (/^\s*(MODULE|IMPORTLIB|TESTDLL|MANPAGE)\s*=\s*(.*)/)
{
- $make{$1} = $2;
+ my $var = $1;
+ $make{$var} = $2;
+ push @{$make{"=flags"}}, "implib" if $var eq "IMPORTLIB";
+ push @{$make{"=flags"}}, "manpage" if $var eq "MANPAGE";
next;
}
- if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_[CHIPS]_SRCS|IDL_TLB_SRCS|IMPLIB_SRCS|C_SRCS|MC_SRCS|RC_SRCS|SVG_SRCS|C_SRCS16|RC_SRCS16|SPEC_SRCS16|EXTRA_OBJS16|MANPAGES|PROGRAMS)\s*=\s*(.*)/)
+ if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_[CHIPRS]_SRCS|IDL_TLB_SRCS|IMPLIB_SRCS|C_SRCS|OBJC_SRCS|MC_SRCS|RC_SRCS|PO_SRCS|SVG_SRCS|PROGRAMS)\s*=\s*(.*)/)
{
+ my $var = $1;
my @list = split(/\s+/, $2);
- $make{$1} = \@list;
+ $make{$var} = \@list;
+ push @{$make{"=flags"}}, "mc" if $var eq "MC_SRCS";
+ push @{$make{"=flags"}}, "po" if $var eq "PO_SRCS";
+ push @{$make{"=flags"}}, "staticimplib" if $var eq "IMPLIB_SRCS";
+ next;
+ }
+ if (/(install-lib|install-dev)\s*:/)
+ {
+ push @{$make{"=flags"}}, $1;
next;
}
+ if (/^\s*(TOPSRCDIR|TOPOBJDIR|SRCDIR|VPATH)\s*=\s*(.*)/)
+ {
+ die "Variable $1 in $file.in is obsolete";
+ }
+ }
+
+ if ($file =~ /^programs\/([^\/]+)\/Makefile/)
+ {
+ push @{$make{"=flags"}}, "install" unless $dont_install{$1};
+ push @{$make{"=flags"}}, "installbin" if $bin_install{$1};
}
+
return %make;
}
# assign source files to their respective makefile
-sub assign_sources_to_makefiles()
+sub assign_sources_to_makefiles(@)
{
- foreach my $file (@all_files)
+ my %subdirs;
+
+ foreach my $file (@_)
{
next if defined $ignored_source_files{$file};
my $dir = dirname( $file );
+ my $subdir = $dir;
while ($dir && !defined $makefiles{"$dir/Makefile"}) { $dir = dirname( $dir ); }
+ $subdir =~ s/^$dir\/?//;
+ $subdirs{"$dir/ $subdir"} = 1 if $subdir;
next unless $dir;
die "no makefile found for $file\n" unless defined $makefiles{"$dir/Makefile"};
my $make = $makefiles{"$dir/Makefile"};
- my $basename = substr( $file, length($dir) + 1 );
-
- if ($basename =~ /\.c$/) { push @{${$make}{"=C_SRCS"}}, $basename; }
- elsif ($basename =~ /\.l$/) { push @{${$make}{"=LEX_SRCS"}}, $basename; }
- elsif ($basename =~ /\.y$/) { push @{${$make}{"=BISON_SRCS"}}, $basename; }
- elsif ($basename =~ /\.rc$/) { push @{${$make}{"=RC_SRCS"}}, $basename; }
- elsif ($basename =~ /\.rc$/) { push @{${$make}{"=RC_SRCS"}}, $basename; }
- elsif ($basename =~ /\.svg$/) { push @{${$make}{"=SVG_SRCS"}}, $basename; }
+ my $name = substr( $file, length($dir) + 1 );
+
+ if ($dir eq "include")
+ {
+ next if ($name =~ /\.in$/);
+ if ($name =~ /^wine\// && !$exported_wine_headers{$name})
+ {
+ if ($private_idl_headers{$name}) { push @{${$make}{"=PRIVATE_IDL_H_SRCS"}}, $name; }
+ next;
+ }
+ if ($name =~ /stdole2\.idl$/) { push @{${$make}{"=IDL_TLB_SRCS"}}, $name; }
+ elsif ($private_idl_headers{$name}) { push @{${$make}{"=SRCDIR_INCLUDES"}}, $name; }
+ elsif ($name =~ /\.h$/) { push @{${$make}{"=SRCDIR_INCLUDES"}}, $name; }
+ elsif ($name =~ /\.x$/) { push @{${$make}{"=XTEMPLATE_SRCS"}}, $name; }
+ elsif ($name =~ /\.rh$/) { push @{${$make}{"=SRCDIR_INCLUDES"}}, $name; }
+ elsif ($name =~ /\.inl$/) { push @{${$make}{"=SRCDIR_INCLUDES"}}, $name; }
+ elsif ($name =~ /\.idl$/) { push @{${$make}{"=PUBLIC_IDL_H_SRCS"}}, $name; }
+ else { die "unknown file $name in include dir"; }
+ }
+ else
+ {
+ if ($name =~ /\.c$/) { push @{${$make}{"=C_SRCS"}}, $name; }
+ elsif ($name =~ /\.m$/) { push @{${$make}{"=OBJC_SRCS"}}, $name; }
+ elsif ($name =~ /\.l$/) { push @{${$make}{"=LEX_SRCS"}}, $name; }
+ elsif ($name =~ /\.y$/) { push @{${$make}{"=BISON_SRCS"}}, $name; }
+ elsif ($name =~ /\.rc$/) { push @{${$make}{"=RC_SRCS"}}, $name; }
+ elsif ($name =~ /\.mc$/) { push @{${$make}{"=MC_SRCS"}}, $name; }
+ elsif ($name =~ /\.svg$/) { push @{${$make}{"=SVG_SRCS"}}, $name; }
+ }
+ }
+ foreach my $key (keys %subdirs)
+ {
+ my ($dir, $subdir) = split " ", $key;
+ if ($dir eq "/") { $dir = ""; }
+ push @{${$makefiles{"${dir}Makefile"}}{"=EXTRASUBDIRS"}}, $subdir;
}
+
+ # add extra variables to include source list
+ my $make = $makefiles{"include/Makefile"};
+ unshift @{${$make}{"=SRCDIR_INCLUDES"}}, "\$(XTEMPLATE_SRCS)";
+ unshift @{${$make}{"=SRCDIR_INCLUDES"}}, "\$(PUBLIC_IDL_H_SRCS)";
+ unshift @{${$make}{"=SRCDIR_INCLUDES"}}, "\$(IDL_TLB_SRCS)";
}
################################################################
my %make = %{$makefiles{$file}};
my $rules = $make{"=rules"};
my $args = "";
+ my $is_win16 = $make{"MODULE"} && ($make{"MODULE"} =~ /16$/ || $modules16{$make{"MODULE"}});
+ my $flag_args = defined $make{"=flags"} ? ",[" . join(",",sort @{$make{"=flags"}}) ."]" : "";
if ($rules eq $makerules{"MAKE_DLL_RULES"})
{
- $args = ",[dlls],[ALL_DLL_DIRS]";
- $args .= ",[enable_win16]" if $make{"MODULE"} =~ /(16|\.vxd)$/;
+ (my $name = $file) =~ s/^dlls\/(.*)\/Makefile/$1/;
+ if ($name =~ /\./)
+ {
+ die "Invalid MODULE in $file" unless $make{"MODULE"} eq $name;
+ }
+ else
+ {
+ die "Invalid MODULE in $file" unless $make{"MODULE"} eq "$name.dll";
+ }
+ my $implib = $make{"IMPORTLIB"} || "";
+ $args .= "," if $is_win16 || defined $make{"=flags"};
+ $args .= "enable_win16" if $is_win16;
+ $args .= $flag_args;
+ $args .= ",[$implib]" if $implib && $implib ne $name;
+ push @lines, "WINE_CONFIG_DLL($name$args)\n";
}
- elsif ($rules eq $makerules{"MAKE_IMPLIB_RULES"}) { $args = ",[dlls],[ALL_IMPLIB_DIRS]"; }
- elsif ($rules eq $makerules{"MAKE_TEST_RULES"}) { $args = ",[dlls],[ALL_TEST_DIRS],[enable_tests]"; }
elsif ($rules eq $makerules{"MAKE_PROG_RULES"})
{
(my $name = $file) =~ s/^programs\/(.*)\/Makefile/$1/;
- $args = ",[programs],[ALL_PROGRAM_DIRS";
- $args .= ",ALL_PROGRAM_INSTALL_DIRS" unless $dont_install{$name};
- $args .= ",ALL_PROGRAM_BIN_INSTALL_DIRS" if $bin_install{$name};
- $args .= "]";
- $args .= ",[enable_win16]" if $make{"MODULE"} =~ /16$/;
+ if ($name =~ /\./)
+ {
+ die "Invalid MODULE in $file" unless $make{"MODULE"} eq $name;
+ }
+ else
+ {
+ die "Invalid MODULE in $file" unless $make{"MODULE"} eq "$name.exe";
+ }
+ $args .= "," if $is_win16 || defined $make{"=flags"};
+ $args .= "enable_win16" if $is_win16;
+ push @lines, "WINE_CONFIG_PROGRAM($name$args$flag_args)\n";
+ }
+ elsif ($rules eq $makerules{"MAKE_TEST_RULES"})
+ {
+ (my $dir = $file) =~ s/^(.*)\/Makefile/$1/;
+ push @lines, "WINE_CONFIG_TEST($dir$flag_args)\n";
+ }
+ elsif ($rules eq $makerules{"MAKE_IMPLIB_RULES"})
+ {
+ (my $name = $file) =~ s/^dlls\/(.*)\/Makefile/$1/;
+ push @lines, "WINE_CONFIG_LIB($name$flag_args)\n";
+ }
+ elsif ($file =~ /^tools.*\/Makefile$/)
+ {
+ (my $name = $file) =~ s/^(.*)\/Makefile/$1/;
+ push @lines, "WINE_CONFIG_TOOL($name$flag_args)\n";
+ }
+ elsif ($file =~ /\/Makefile$/)
+ {
+ (my $name = $file) =~ s/^(.*)\/Makefile/$1/;
+ $args = "[$name]";
+ $args .= "," if defined $make{"=flags"};
+ push @lines, "WINE_CONFIG_MAKEFILE($args$flag_args)\n";
}
- elsif ($file =~ /^[^\/]*\/Makefile$/) { $args = ",[],[ALL_TOP_DIRS]"; }
- push @lines, "WINE_CONFIG_MAKEFILE([$file],[$rules]$args)\n";
}
+ push @lines, "\nAC_SUBST([LINGUAS],[\"\\\n", join( " \\\n", sort @linguas ), "\"])\n\n";
+
# update the source variables in all the makefiles
foreach my $file (sort @_)
{
- my %make = %{$makefiles{$file}};
-
replace_makefile_variable( $file, "LEX_SRCS" );
replace_makefile_variable( $file, "BISON_SRCS" );
replace_makefile_variable( $file, "MC_SRCS" );
replace_makefile_variable( $file, "SVG_SRCS" );
- replace_makefile_variable( $file, "C_SRCS" ) unless defined $make{"C_SRCS16"};
- replace_makefile_variable( $file, "RC_SRCS" ) unless defined $make{"RC_SRCS16"};
+ replace_makefile_variable( $file, "C_SRCS" );
+ replace_makefile_variable( $file, "OBJC_SRCS" );
+ replace_makefile_variable( $file, "RC_SRCS" );
+ replace_makefile_variable( $file, "PRIVATE_IDL_H_SRCS" );
+ replace_makefile_variable( $file, "PUBLIC_IDL_H_SRCS" );
+ replace_makefile_variable( $file, "IDL_TLB_SRCS" );
+ replace_makefile_variable( $file, "XTEMPLATE_SRCS" );
+ replace_makefile_variable( $file, "SRCDIR_INCLUDES" );
+ replace_makefile_variable( $file, "EXTRASUBDIRS" );
}
- push @lines, "\ndnl Build dependencies for test files compiled into winetest\n";
- replace_in_file( "configure.ac", '^WINE_CONFIG_MAKERULES', '^dnl Build dependencies for test files compiled into winetest$', @lines);
+ push @lines, "dnl End of auto-generated output commands\n";
+ replace_in_file( "configure.ac", '^WINE_CONFIG_MAKERULES', '^dnl End of auto-generated output commands\n$', @lines);
}
{
my @pattern = @{$src};
next unless defined $makefile{$pattern[0]};
+ next if $pattern[0] eq "IDL_TLB_SRCS" && $makefile{"=rules"} eq "dlls/Makedll.rules";
push @list, map { (my $ret = $_) =~ s/$pattern[1]$/$pattern[2]/; $ret; } @{$makefile{$pattern[0]}};
}
foreach my $f (@list)
{
push @ignores, $makefile{"=dir"} . $f unless $f =~ /\$\(.*\)/; # skip make variables
}
- }
- return @ignores;
-}
-
-################################################################
-# update dlls/Makefile.in
-
-sub update_dlls(@)
-{
- my (%directories, %importlibs, %static_implibs, %staticlib_dirs, %altnames);
- my $text = "";
- my @ignores = ();
-
- foreach my $make (@_)
- {
- my %makefile = %{$makefiles{$make}};
- next if ($makefile{"=rules"} eq $makerules{"MAKE_TEST_RULES"});
-
- next unless defined $makefile{"MODULE"};
- my $module = $makefile{"MODULE"};
- (my $dir = $makefile{"=dir"}) =~ s/^dlls\/(.*)\//$1/;
-
- if ($makefile{"=rules"} eq $makerules{"MAKE_IMPLIB_RULES"})
- {
- $staticlib_dirs{$module} = $dir;
- die "invalid module $module in dir $staticlib_dirs{$module}\n" if "$staticlib_dirs{$module}" ne $module;
- }
- else
- {
- die "invalid module $module" unless $module =~ /\./;
- (my $mod = $module) =~ s/\.dll$//;
- die "invalid directory $dir for module $module\n" unless $mod eq $dir;
- $directories{$module} = $dir;
- }
if (defined $makefile{"IMPORTLIB"})
{
if ($makefile{"IMPORTLIB"} =~ /^([a-zA-Z0-9_.]+)/)
{
- $importlibs{$module} = $1;
+ if ("dlls/$1/" ne $makefile{"=dir"}) { push @ignores, "dlls/lib$1.def"; }
}
else
{
- die "invalid importlib name $makefile{IMPORTLIB} in $make";
+ die "invalid importlib name $makefile{IMPORTLIB} in $file";
}
}
-
- $static_implibs{$module} = 1 if defined $makefile{"IMPLIB_SRCS"};
-
- if (defined $makefile{"SPEC_SRCS16"})
- {
- my @list = map { $_ =~ s/\.spec$//; $_ .= ".dll" unless $_ =~ /\./; $_; } @{$makefile{"SPEC_SRCS16"}};
- $altnames{$module} = \@list;
- }
- if (defined $makefile{"EXTRA_OBJS16"})
- {
- foreach my $obj (@{$makefile{"EXTRA_OBJS16"}})
- {
- if ($obj =~ /^(.*\.(exe|mod))\.o/) { push @{$altnames{$module}}, $1; }
- }
- }
- }
-
- # output the list of 16-bit files
-
- my @targets16 = ();
- foreach my $mod (sort keys %directories)
- {
- next unless defined $altnames{$mod};
- foreach my $i (sort @{$altnames{$mod}})
- {
- push @targets16, $i . "16";
- }
- }
- $text .= "# 16-bit dlls\n\n";
- $text .= "WIN16_FILES = \\\n";
- $text .= "\t" . join( " \\\n\t", sort @targets16 ) . "\n\n";
- $text .= "\@MAKE_RULES\@\n\n";
-
- # output the all: target
-
- $text .= "# Main target\n\n";
- $text .= "all: \$(BUILDSUBDIRS) \@WIN16_FILES\@\n\n";
-
- # output the lib name -> directory rules
-
- $text .= "# Placeholders for 16-bit libraries\n\n";
- foreach my $mod (sort keys %directories)
- {
- next unless defined $altnames{$mod};
- $text .= sprintf "%s:\n", join(" ", map { $_ . "16"; } sort @{$altnames{$mod}});
- $text .= sprintf "\techo \"%s\" >\$\@\n\n", $mod;
- }
-
- # output the import libraries rules
-
- $text .= "# Import libraries\n\n";
- $text .= "STATIC_IMPLIBEXT = \$(IMPLIBEXT:def=def.a)\n\n";
-
- my @lib_symlinks = ();
- foreach my $mod (sort keys %importlibs)
- {
- my $dir = $directories{$mod};
- my $lib = $importlibs{$mod};
- if ($lib ne $dir) { push @lib_symlinks, $mod; }
- }
- $text .= "IMPORT_SYMLINKS =";
- foreach my $mod (sort @lib_symlinks)
- {
- $text .= sprintf " \\\n\tlib%s.\$(IMPLIBEXT)", $importlibs{$mod};
- }
-
- $text .= "\n\nIMPORT_LIBS = \\\n\t\$(IMPORT_SYMLINKS)";
- foreach my $mod (sort keys %staticlib_dirs)
- {
- $text .= sprintf " \\\n\t%s/lib%s.a", $staticlib_dirs{$mod}, $mod;
- }
- foreach my $mod (sort keys %importlibs)
- {
- $text .= " \\\n\t$directories{$mod}/lib$importlibs{$mod}.\$(IMPLIBEXT)";
- next unless defined $static_implibs{$mod};
- $text .= " \\\n\t$directories{$mod}/lib$importlibs{$mod}.\$(STATIC_IMPLIBEXT)";
- }
- $text .= "\n\nCROSS_IMPLIBS =";
- foreach my $mod (sort @lib_symlinks)
- {
- $text .= sprintf " \\\n\tlib%s.a", $importlibs{$mod};
- }
- foreach my $mod (sort keys %importlibs)
- {
- next if defined $static_implibs{$mod};
- $text .= " \\\n\t$directories{$mod}/lib$importlibs{$mod}.a";
- }
- $text .= "\n\n";
- $text .= "\$(TESTSUBDIRS:%=%/__crosstest__): \$(CROSS_IMPLIBS)\n\n";
- $text .= "implib: \$(IMPORT_LIBS)\n\n";
- $text .= "testsubdirs: \$(TESTSUBDIRS)\n\n";
- $text .= ".PHONY: implib testsubdirs\n\n";
-
- foreach my $mod (sort keys %importlibs)
- {
- my $dir = $directories{$mod};
- my $lib = $importlibs{$mod};
- my $spec = $mod;
- $spec =~ s/\.dll$//;
- if (defined($static_implibs{$mod}))
- {
- $text .= sprintf "%s/lib%s.def: %s/%s.spec \$(WINEBUILD)\n", $dir, $lib, $dir, $spec;
- $text .= sprintf "\t\@cd %s && \$(MAKE) lib%s.def\n\n", $dir, $lib;
- $text .= sprintf "%s/lib%s.\$(STATIC_IMPLIBEXT): dummy\n", $dir, $lib, $dir, $spec;
- $text .= sprintf "\t\@cd %s && \$(MAKE) lib%s.\$(STATIC_IMPLIBEXT)\n\n", $dir, $lib;
- }
- else
- {
- $text .= sprintf "%s/lib%s.def %s/lib%s.a: %s/%s.spec \$(WINEBUILD)\n",
- $dir, $lib, $dir, $lib, $dir, $spec;
- $text .= sprintf "\t\@cd %s && \$(MAKE) `basename \$\@`\n\n", $dir;
- }
- }
- foreach my $mod (sort @lib_symlinks)
- {
- my $dir = $directories{$mod};
- my $lib = "lib" . $importlibs{$mod};
- $text .= sprintf "%s.a: %s/%s.a\n", $lib, $dir, $lib;
- $text .= sprintf "\t\$(RM) \$@ && \$(LN_S) %s/%s.a \$@\n\n", $dir, $lib;
- $text .= sprintf "%s.def: %s/%s.def\n", $lib, $dir, $lib;
- $text .= sprintf "\t\$(RM) \$@ && \$(LN_S) %s/%s.def \$@\n\n", $dir, $lib;
- }
-
- $text .= "\$(BUILDSUBDIRS): \$(IMPORT_LIBS)\n";
- $text .= "\$(INSTALLSUBDIRS:%=%/__install__) \$(INSTALLSUBDIRS:%=%/__install-lib__): \$(IMPORT_LIBS)\n\n";
-
- # output the inter-dll dependencies and rules
-
- $text .= "# Map library name to the corresponding directory\n\n";
-
- foreach my $mod (sort keys %staticlib_dirs)
- {
- $text .= sprintf "%s/lib%s.a: %s\n", $staticlib_dirs{$mod}, $mod, $staticlib_dirs{$mod};
}
- $text .= "\n# Misc rules\n";
-
- replace_in_file( "dlls/Makefile.in",
- '^# 16-bit dlls',
- '^# Misc rules',
- $text );
-
- # .gitignore file
-
- foreach my $mod (sort @lib_symlinks)
- {
- push @ignores, "dlls/lib$importlibs{$mod}.def";
- }
- foreach my $mod (sort keys %directories)
- {
- next unless defined $altnames{$mod};
- push @ignores, map { "dlls/" . $_ . "16"; } @{$altnames{$mod}};
- }
-
return @ignores;
}
-################################################################
-# update include/Makefile.in
-
-sub update_includes()
-{
- my (@h_srcs, @private_idl_srcs, @public_idl_srcs, @tlb_srcs, %subdirs);
- my @includes = map { (my $ret = $_) =~ s/^include\///; $ret; } grep /^include\//, @all_files;
- foreach my $incl (@includes)
- {
- if ($incl =~ /(.*)\//) { $subdirs{$1} = 1; }
- next if ($incl =~ /\.in$/);
- if ($incl =~ /^wine\// && !$exported_wine_headers{$incl})
- {
- if ($private_idl_headers{$incl}) { push @private_idl_srcs, $incl; }
- next;
- }
- if ($incl =~ /stdole2\.idl$/) { push @tlb_srcs, $incl; }
- elsif ($private_idl_headers{$incl}) { push @h_srcs, $incl; }
- elsif ($incl =~ /\.h$/) { push @h_srcs, $incl; }
- elsif ($incl =~ /\.rh$/) { push @h_srcs, $incl; }
- elsif ($incl =~ /\.inl$/) { push @h_srcs, $incl; }
- elsif ($incl =~ /\.idl$/) { push @public_idl_srcs, $incl; }
- else { die "unknown file $incl in include dir"; }
- }
- replace_in_file( "include/Makefile.in", '^PRIVATE_IDL_H_SRCS\s*=', '^INSTALLDIRS',
- "PRIVATE_IDL_H_SRCS = \\\n\t",
- join( " \\\n\t", sort @private_idl_srcs ),
- "\n\nPUBLIC_IDL_H_SRCS = \\\n\t",
- join( " \\\n\t", sort @public_idl_srcs ),
- "\n\nIDL_TLB_SRCS = \\\n\t",
- join( " \\\n\t", sort @tlb_srcs ),
- "\n\nSRCDIR_INCLUDES = \\\n\t\$(IDL_TLB_SRCS) \\\n\t\$(PUBLIC_IDL_H_SRCS) \\\n\t",
- join( " \\\n\t", sort @h_srcs ),
- "\n\nEXTRASUBDIRS = ",
- join( " ", sort keys %subdirs ),
- "\n\nINSTALLDIRS = \\\n" );
- return map { s/(.*)\.idl$/include\/$1.h/; $_; } @public_idl_srcs, @private_idl_srcs;
-}
-
-
################################################################
# update the main .gitignore
{
my %makefile = %{$makefiles{$make}};
my $dir = $makefile{"=dir"};
- if (defined $makefile{"MANPAGES"})
- {
- push @ignores, map { $dir . $_; } @{$makefile{"MANPAGES"}};
- }
if (defined $makefile{"PROGRAMS"})
{
push @ignores, map { s/\$\(EXEEXT\)//; $dir . $_; } @{$makefile{"PROGRAMS"}};
}
+################################################################
+# update the LINGUAS file
+
+sub update_linguas(@)
+{
+ replace_in_file( "po/LINGUAS", undef, undef, join("\n", sort @_), "\n" );
+}
+
+
die "needs to be run from a git checkout" unless -d ".git";
-@all_files = split /\0/, `git ls-files -c -z`;
-@makefiles = map { my $ret = $_; $ret =~ s/\.in$//; $ret; } grep /Makefile.in$/, @all_files;
+my @all_files = split /\0/, `git ls-files -c -z`;
+@linguas = map { (my $ret = $_) =~ s/^po\/(.*)\.po/$1/; $ret; } grep /^po\/.*\.po$/, @all_files;
+@makefiles = map { (my $ret = $_) =~ s/\.in$//; $ret; } grep /Makefile.in$/, @all_files;
foreach my $file (sort values %makerules, @makefiles)
{
$makefiles{$file} = \%make;
}
-assign_sources_to_makefiles();
+assign_sources_to_makefiles( @all_files );
+update_linguas( @linguas );
update_makefiles( @makefiles );
-push @ignores, update_includes();
push @ignores, update_ignores( @makefiles );
-push @ignores, update_dlls( sort grep /^dlls\//, @makefiles );
update_gitignore( @ignores );
projects / wine / blobdiff