# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
#
+use strict;
+
# Make rules files
my %makerules =
(
"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",
);
(
"msiexec" => 1,
"notepad" => 1,
- "progman" => 1,
"regedit" => 1,
"regsvr32" => 1,
- "uninstaller" => 1,
"wineboot" => 1,
- "winebrowser" => 1,
"winecfg" => 1,
"wineconsole" => 1,
"winedbg" => 1,
"winefile" => 1,
"winemine" => 1,
"winepath" => 1,
- "winhelp" => 1,
);
# Programs that we don't want to install at all
my %dont_install =
(
- "cmdlgtst" => 1,
- "view" => 1,
"winetest" => 1,
);
-# Special dlls that can be switched on or off by configure
-my %special_dlls =
+# Dlls and programs that are 16-bit specific
+my %modules16 =
(
- "glu32" => "GLU32FILES",
- "opengl32" => "OPENGLFILES",
- "winex11.drv" => "XFILES",
- "winequartz.drv" => "QUARTZFILES"
+ "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",
"/autom4te.cache",
"/config.cache",
"/config.log",
"/config.status",
+ "/configure.lineno",
"/TAGS",
"/tags",
+ "/wine",
+ "/wine64",
"Makefile",
+ "dlldata.c",
+ "dlls/*/*.def",
+ "dlls/shell32/AUTHORS",
+ "*/*/tests/testlist.c",
"include/config.h",
- "include/stamp-h"
+ "include/stamp-h",
+ "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' ],
- [ 'RC_SRCS', '\.rc', '.res' ],
- [ 'RC_SRCS16', '\.rc', '.res' ],
[ '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 %private_headers = (
- "thread.h" => 1,
- "win.h" => 1,
- "wine/list.h" => 1,
- "wine/mmsystem16.h" => 1,
- "wine/mscvpdb.h" => 1,
- "wine/port.h" => 1,
- "wine/pthread.h" => 1,
- "wine/rpcfc.h" => 1,
- "wine/rpcss_shared.h" => 1,
- "wine/server.h" => 1,
- "wine/server_protocol.h" => 1,
- "wine/test.h" => 1,
- "wine/wgl.h" => 1,
- "wine/winaspi.h" => 1,
- "wine/winbase16.h" => 1,
- "wine/windef16.h" => 1,
- "wine/wined3d_caps.h" => 1,
- "wine/wined3d_gl.h" => 1,
- "wine/wined3d_interface.h" => 1,
- "wine/wined3d_types.h" => 1,
- "wine/wingdi16.h" => 1,
- "wine/winnet16.h" => 1,
- "wine/winsock16.h" => 1,
- "wine/winuser16.h" => 1,
- "wine/wpp.h" => 1
+my %exported_wine_headers = (
+ "wine/debug.h" => 1,
+ "wine/exception.h" => 1,
+ "wine/library.h" => 1,
+ "wine/unicode.h" => 1,
+ "wine/itss.idl" => 1,
+ "wine/svcctl.idl" => 1,
);
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,
"dbinit.idl" => 1,
"dbprop.idl" => 1,
"dbs.idl" => 1,
"devenum.idl" => 1,
- "dyngraph.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,
+ "xmldom.idl" => 1,
+ "xmldso.idl" => 1,
+ "wine/winedxgi.idl" => 1,
+);
+
+my %ignored_source_files = (
+ "dlls/wineps.drv/afm2c.c" => 1,
+ "dlls/wineps.drv/mkagl.c" => 1,
+ "programs/winetest/dist.rc" => 1,
);
-my (@makefiles, %makefiles);
+my (@linguas, @makefiles, %makefiles);
+
+sub dirname($)
+{
+ my $ret = shift;
+ return "" unless $ret =~ /\//;
+ $ret =~ s!/[^/]*$!!;
+ return $ret;
+}
# update a file if changed
sub update_file($)
return update_file($file);
}
-# parse the specified makefile to identify the rules file
+# replace a variable in a makefile
+sub replace_makefile_variable($$)
+{
+ my ($file, $var) = @_;
+ my $make = $makefiles{$file};
+ my $replaced = 0;
+
+ return unless defined ${$make}{"=$var"};
+
+ my @values = @{${$make}{"=$var"}};
+ ${$make}{$var} = \@values;
+
+ open NEW_FILE, ">$file.in.new" or die "cannot create $file.in.new";
+
+ open OLD_FILE, "$file.in" or die "cannot open $file.in";
+ while (<OLD_FILE>)
+ {
+ if (/^\s*($var\s*)=/)
+ {
+ # try to preserve formatting
+ my $prefix = $1;
+ my $multiline = /\\$/ || (@values > 1);
+ while (/\\$/)
+ {
+ $_ = <OLD_FILE>;
+ last unless $_;
+ }
+ if ($multiline)
+ {
+ print NEW_FILE "$var = \\\n\t" . join(" \\\n\t", sort @values) . "\n";
+ }
+ else
+ {
+ 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;
+ close NEW_FILE;
+ return update_file("$file.in");
+}
+
+# parse the specified makefile and load the variables
sub parse_makefile($)
{
my $file = shift;
while (<MAKE>)
{
chomp;
+ next if (/^\s*#/);
while (/\\$/) { chop; $_ .= <MAKE>; chomp; } # merge continued lines
+ next if (/^\s*$/);
if (/^\@(MAKE.*RULES)\@/)
{
$make{"=rules"} = $makerules{$var};
next;
}
- if (/^(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 (/^(BISON_SRCS|LEX_SRCS|IDL_[CHIPS]_SRCS|IDL_TLB_SRCS|IMPLIB_SRCS|MC_SRCS|RC_SRCS|RC_SRCS16|RC_BINARIES|SPEC_SRCS16|MANPAGES|PROGRAMS)\s*=\s*(.*)/)
+ if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_[CHIPRS]_SRCS|IDL_TLB_SRCS|IMPLIB_SRCS|C_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 (/^\#\s*MKDLL_SKIP/ || /^\#\s*MKPROG_SKIP/)
+ if (/(install-lib|install-dev)\s*:/)
{
- $make{"=skip"} = 1;
+ push @{$make{"=flags"}}, $1;
next;
}
+ if (/^\s*(TOPSRCDIR|TOPOBJDIR|SRCDIR|VPATH)\s*=\s*(.*)/)
+ {
+ die "Variable $1 in $file.in is obsolete";
+ }
}
- return %make;
-}
-
-################################################################
-# update the makefile list in configure.ac
+ if ($file =~ /^programs\/([^\/]+)\/Makefile/)
+ {
+ push @{$make{"=flags"}}, "install" unless $dont_install{$1};
+ push @{$make{"=flags"}}, "installbin" if $bin_install{$1};
+ }
-sub update_makerules(@)
-{
+ return %make;
}
-
-################################################################
-# update the tests list in programs/winetest/Makefile.in and programs/winetest/winetest.rc
-
-sub update_winetest(@)
+# assign source files to their respective makefile
+sub assign_sources_to_makefiles(@)
{
- my (@tests, @lines);
+ my %subdirs;
foreach my $file (@_)
{
- if ($file =~ /^dlls\/(.*)\/tests\/Makefile/) { push @tests, $1; }
- }
- push @lines, "TESTBINS =";
- push @lines, map { " \\\n\t" . $_ . "_test.exe"; } sort @tests;
- push @lines, "\n\n";
+ next if defined $ignored_source_files{$file};
+ my $dir = dirname( $file );
+ my $subdir = $dir;
- foreach my $test (sort @tests)
- {
- push @lines, "${test}_test.exe: \$(DLLDIR)/$test/tests/${test}_test.exe\$(DLLEXT)\n";
- push @lines, "\tcp \$(DLLDIR)/$test/tests/${test}_test.exe\$(DLLEXT) \$\@ && \$(STRIP) \$\@\n";
- }
- push @lines, "\n# Special rules\n";
+ while ($dir && !defined $makefiles{"$dir/Makefile"}) { $dir = dirname( $dir ); }
+ $subdir =~ s/^$dir\/?//;
+ $subdirs{"$dir/ $subdir"} = 1 if $subdir;
+ next unless $dir;
- replace_in_file( "programs/winetest/Makefile.in", '^TESTBINS\s*=', '^# Special rules', @lines );
+ die "no makefile found for $file\n" unless defined $makefiles{"$dir/Makefile"};
- replace_in_file( "programs/winetest/winetest.rc", ' TESTRES ', undef,
- map { $_ . "_test.exe TESTRES \"" . $_ . "_test.exe\"\n"; } sort @tests );
+ my $make = $makefiles{"$dir/Makefile"};
+ my $name = substr( $file, length($dir) + 1 );
- # return a list of test exe files for .gitignore
- return map { "programs/winetest/" . $_ . "_test.exe"; } sort @tests;
-}
+ 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 =~ /\.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)";
+}
################################################################
-# update the makefile list in configure.ac and Makefile.in
+# update the makefile list in configure.ac
sub update_makefiles(@)
{
- my (@targets, @depends, @lines);
+ my (@lines);
foreach my $var (sort { $makerules{$a} cmp $makerules{$b}; } keys %makerules)
{
- push @lines, "$var=$makerules{$var}\n";
- push @lines, "AC_SUBST_FILE($var)\n\n";
+ my $file = $makerules{$var};
+ my %make = %{$makefiles{$file}};
+ my $rules = $make{"=rules"} ? ",[$make{\"=rules\"}]" : "";
+ push @lines, "WINE_CONFIG_MAKERULES([$file],[$var]$rules)\n";
}
+ push @lines, "\n";
- foreach my $var ((sort values %makerules), (sort @_))
+ foreach my $file (sort @_)
{
- push @lines, "AC_CONFIG_FILES([$var])\n";
+ 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"})
+ {
+ (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_PROG_RULES"})
+ {
+ (my $name = $file) =~ s/^programs\/(.*)\/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.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";
+ }
}
- push @lines, "\nAC_OUTPUT\n";
- replace_in_file( "configure.ac", '^MAKE_RULES', '^AC_OUTPUT$', @lines);
+ push @lines, "\nAC_SUBST([LINGUAS],[\"\\\n", join( " \\\n", sort @linguas ), "\"])\n\n";
- foreach my $file (sort values %makerules)
- {
- push @targets, $file;
- my %make = %{$makefiles{$file}};
- if (!defined($make{"=rules"})) { push @depends, "$file: $file.in"; }
- else { push @depends, "$file: $file.in Make.rules"; }
- }
+ # update the source variables in all the makefiles
foreach my $file (sort @_)
{
- push @targets, $file unless $file eq "Makefile";
- my %makefile = %{$makefiles{$file}};
- my $dep = $makefile{"=rules"};
- push @depends, "$file: $file.in $dep";
+ 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" );
+ 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" );
}
-
- @lines = ();
- push @lines, "ALL_MAKEFILES = \\\n\t";
- push @lines, join (" \\\n\t", @targets ), "\n\n";
- push @lines, "Makefile \$(ALL_MAKEFILES): config.status\n";
- push @lines, "\t\@./config.status \$\@\n";
- push @lines, ".INIT: Makefile\n";
- push @lines, ".BEGIN: Makefile\n\n";
- push @lines, "\$(RECURSE_TARGETS) \$(MAKEDEP): \$(ALL_MAKEFILES)\n\n";
- push @lines, "distclean::\n";
- push @lines, "\t\$(RM) Makefile \$(ALL_MAKEFILES)\n\n";
- push @lines, join ("\n", @depends ), "\n";
-
- replace_in_file( "Makefile.in", '^ALL_MAKEFILES\s*=', undef, @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]}};
}
- push @list, @{$makefile{"RC_BINARIES"}} if defined $makefile{"RC_BINARIES"};
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, %testdirs, %importlibs, %static_implibs, %staticlib_dirs, %altnames);
- my $text = "";
- my @ignores = ();
-
- foreach my $make (@_)
- {
- my %makefile = %{$makefiles{$make}};
- next if defined $makefile{"=skip"};
-
- if ($make =~ /dlls\/(.*)\/tests\/Makefile/)
- {
- $testdirs{$1} = "$1/tests";
- (my $crosstest = $makefile{"TESTDLL"}) =~ s/\.dll$//;
- push @ignores, $makefile{"=dir"} . $crosstest . "_crosstest.exe";
- push @ignores, $makefile{"=dir"} . "testlist.c";
- push @ignores, $makefile{"=dir"} . "*.ok";
- next;
- }
-
- next unless defined $makefile{"MODULE"};
- my $module = $makefile{"MODULE"};
- (my $dir = $makefile{"=dir"}) =~ s/^dlls\/(.*)\//$1/;
-
- if ($module =~ /^lib.*\.a$/)
- {
- $staticlib_dirs{$module} = $dir;
- die "invalid module $module in dir $staticlib_dirs{$module}\n" if "lib$staticlib_dirs{$module}.a" 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_.]+)\.\$\(IMPLIBEXT\)/)
+ 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;
- }
- }
-
- # output special dlls configure definitions
-
- $text .= "# special configure-dependent targets\n\n";
- my %specials = ();
- foreach my $mod (sort keys %special_dlls)
- {
- $specials{$special_dlls{$mod}} .= " " . $mod;
- }
- foreach my $i (sort keys %specials)
- {
- $text .= $i . " =" . $specials{$i} . "\n";
- }
- $text .= "EXTRADIRS =";
- foreach my $i (sort keys %specials) { $text .= sprintf " \@%s\@", $i; }
- $text .= "\n\n";
-
- # output the subdirs list
-
- $text .= "# Subdir list\n\n";
- $text .= "BASEDIRS =";
- foreach my $dir (sort values %directories)
- {
- next if defined($special_dlls{$dir}); # skip special dlls
- $text .= " \\\n\t" . $dir;
- }
-
- $text .= "\n\nIMPLIBSUBDIRS = \\\n\t";
- $text .= join " \\\n\t", sort values %staticlib_dirs;
-
- $text .= "\n\nTESTSUBDIRS = \\\n\t";
- $text .= join " \\\n\t", sort values %testdirs;
-
- $text .= "\n\nSUBDIRS = \\\n\t";
- $text .= join " \\\n\t", "\$(BASEDIRS)", "\$(IMPLIBSUBDIRS)", "\$(TESTSUBDIRS)", sort keys %special_dlls;
-
- $text .= "\n\nBUILDSUBDIRS = \$(BASEDIRS) \$(EXTRADIRS) \$(TESTSUBDIRS)\n";
- $text .= "INSTALLSUBDIRS = \$(BASEDIRS) \$(EXTRADIRS) \$(IMPLIBSUBDIRS)\n";
- $text .= "DOCSUBDIRS = \$(BASEDIRS) \$(EXTRADIRS)\n";
-
- # 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 .= "\n# 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 "lib" . $dir) { push @lib_symlinks, $mod; }
- }
- $text .= "IMPORT_SYMLINKS =";
- foreach my $mod (sort @lib_symlinks)
- {
- $text .= sprintf " \\\n\t%s.\$(IMPLIBEXT)", $importlibs{$mod};
- }
-
- $text .= "\n\nIMPORT_LIBS = \\\n\t\$(IMPORT_SYMLINKS)";
- foreach my $mod (sort keys %staticlib_dirs)
- {
- $text .= sprintf " \\\n\t%s/%s", $staticlib_dirs{$mod}, $mod;
- }
- foreach my $mod (sort keys %importlibs)
- {
- my $dir = $directories{$mod};
- my $def = $mod;
- $def =~ s/\.(dll|drv)$//;
- $text .= sprintf " \\\n\t%s/lib%s.\$(IMPLIBEXT)", $dir, $def;
- next unless defined $static_implibs{$mod};
- $text .= sprintf " \\\n\t%s/lib%s.\$(STATIC_IMPLIBEXT)", $dir, $def
}
- $text .= "\n\n";
- $text .= "implib: \$(IMPORT_LIBS)\n\n";
- $text .= ".PHONY: implib\n\n";
-
- foreach my $mod (sort keys %importlibs)
- {
- my $dir = $directories{$mod};
- my $lib = $importlibs{$mod};
- my $spec = $mod;
- $spec =~ s/\.dll$//;
- $text .= sprintf "%s/%s.\$(IMPLIBEXT): %s/%s.spec \$(WINEBUILD)\n", $dir, $lib, $dir, $spec;
- $text .= sprintf "\t\@cd %s && \$(MAKE) %s.\$(IMPLIBEXT)\n\n", $dir, $lib;
- next unless $static_implibs{$mod};
- $text .= sprintf "%s/%s.\$(STATIC_IMPLIBEXT): dummy\n", $dir, $lib, $dir, $spec;
- $text .= sprintf "\t\@cd %s && \$(MAKE) %s.\$(STATIC_IMPLIBEXT)\n\n", $dir, $lib;
- }
- foreach my $mod (sort @lib_symlinks)
- {
- my $dir = $directories{$mod};
- my $lib = $importlibs{$mod} . ".\$(IMPLIBEXT)";
- $text .= sprintf "%s: %s/%s\n", $lib, $dir, $lib;
- $text .= sprintf "\t\$(RM) \$@ && \$(LN_S) %s/%s \$@\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/%s: %s\n", $staticlib_dirs{$mod}, $mod, $staticlib_dirs{$mod};
- }
- $text .= "\n# Misc rules\n";
-
- replace_in_file( "dlls/Makefile.in",
- '^# special configure-dependent targets',
- '^# Misc rules',
- $text );
-
- # .gitignore file
-
- foreach my $mod (sort @lib_symlinks)
- {
- push @ignores, "dlls/$importlibs{$mod}.def";
- }
- foreach my $mod (sort keys %directories)
- {
- next unless defined $altnames{$mod};
- push @ignores, map { "dlls/" . $_ . "16"; } @{$altnames{$mod}};
- }
- foreach my $mod (sort keys %importlibs)
- {
- my $dir = $directories{$mod};
- my $def = $mod;
- $def =~ s/\.(dll|drv)$//;
- push @ignores, "dlls/$dir/lib$def.def";
- }
-
return @ignores;
}
-################################################################
-# update programs/Makefile.in
-
-sub update_progs(@)
-{
- my (@subdirs, @install_subdirs, @install_progs);
-
- my @ignores = ();
-
- foreach my $make (@_)
- {
- my %makefile = %{$makefiles{$make}};
- my $module = $makefile{"MODULE"};
- (my $dir = $make) =~ s/^programs\/(.*)\/Makefile$/$1/;
- die "Invalid module $module in $make" unless "$dir.exe" eq $module;
- next if defined $makefile{"=skip"};
- push @subdirs, $dir;
- push @ignores, "programs/$dir/$dir";
- push @install_subdirs, $dir unless $dont_install{$dir};
- push @install_progs, $dir if $bin_install{$dir};
- }
-
- replace_in_file( "programs/Makefile.in", '^SUBDIRS\s*=', '^INSTALLDIRS',
- "SUBDIRS = \\\n\t",
- join( " \\\n\t", @subdirs ),
- "\n\n# Sub-directories to run make install into\nINSTALLSUBDIRS = \\\n\t",
- join( " \\\n\t", @install_subdirs ),
- "\n\n# Programs to install in bin directory\nINSTALLPROGS = \\\n\t",
- join( " \\\n\t", @install_progs ),
- "\n\nINSTALLDIRS = \$(DESTDIR)\$(bindir)\n" );
-
- return @ignores;
-}
-
-
-################################################################
-# update include/Makefile.in
-
-sub update_includes()
-{
- return unless -d ".git";
- my (@h_srcs, @idl_srcs, @tlb_srcs, %subdirs);
- my @includes = map { s/^include\///; $_; } split /\0/, `git ls-files -c -z include`;
- foreach my $incl (@includes)
- {
- if ($incl =~ /(.*)\//) { $subdirs{$1} = 1; }
- next if ($private_headers{$incl});
- 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 =~ /\.inl$/) { push @h_srcs, $incl; }
- elsif ($incl =~ /\.idl$/) { push @idl_srcs, $incl; }
- }
- replace_in_file( "include/Makefile.in", '^IDL_H_SRCS\s*=', '^INSTALLDIRS',
- "IDL_H_SRCS = \\\n\t",
- join( " \\\n\t", sort @idl_srcs ),
- "\n\nIDL_TLB_SRCS = \\\n\t",
- join( " \\\n\t", sort @tlb_srcs ),
- "\n\nSRCDIR_INCLUDES = \\\n\t\$(IDL_TLB_SRCS) \\\n\t\$(IDL_H_SRCS) \\\n\t",
- join( " \\\n\t", sort @h_srcs ),
- "\n\nEXTRASUBDIRS = ",
- join( " ", sort keys %subdirs ),
- "\n\nINSTALLDIRS = \\\n" );
-}
-
-
################################################################
# 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"}};
}
-if (-d ".git")
-{
- @makefiles = map { s/\.in$//; $_; } split /\0/, `git ls-files -c -z Makefile.in \\*/Makefile.in`;
-}
-else
+################################################################
+# update the LINGUAS file
+
+sub update_linguas(@)
{
- @makefiles = map { s/^\.\/(.*)\.in/$1/; $_; } split(/\s/,`find . -name Makefile.in -print`);
+ replace_in_file( "po/LINGUAS", undef, undef, join("\n", sort @_), "\n" );
}
-update_includes();
+
+die "needs to be run from a git checkout" unless -d ".git";
+
+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( @all_files );
+update_linguas( @linguas );
update_makefiles( @makefiles );
push @ignores, update_ignores( @makefiles );
-push @ignores, update_winetest( @makefiles );
-push @ignores, update_dlls( sort grep /^dlls\//, @makefiles );
-push @ignores, update_progs( sort grep /^programs\/.*\/Makefile$/, @makefiles );
update_gitignore( @ignores );
projects / wine / blobdiff