# 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",
);
"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]",
+ "*.fake",
"*.ok",
"*.res",
"*.so",
"/config.cache",
"/config.log",
"/config.status",
+ "/configure.lineno",
"/TAGS",
"/tags",
+ "/wine",
"Makefile",
"dlldata.c",
"dlls/*/*.def",
- "dlls/*/tests/*crosstest.exe",
- "dlls/*/tests/testlist.c",
+ "*/*/tests/*crosstest.exe",
+ "*/*/tests/testlist.c",
"include/config.h",
"include/stamp-h",
- "programs/winetest/tests.rc",
"programs/winetest/*_test.exe",
+ "programs/winetest/*_test.rc",
+ "programs/winetest/build.nfo",
+ "programs/winetest/build.rc",
+ "tools/makedep",
);
# Source files and their resulting target to ignore
);
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,
+ "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,
"wine/winedxgi.idl" => 1,
);
-my (@makefiles, %makefiles);
+my %ignored_source_files = (
+ "dlls/wineps.drv/afm2c.c" => 1,
+ "dlls/wineps.drv/mkagl.c" => 1,
+ "programs/winetest/dist.rc" => 1,
+);
+
+my (@all_files, @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);
}
+# replace a variable in a makefile
+sub replace_makefile_variable($$)
+{
+ my ($file, $var) = @_;
+ my $make = $makefiles{$file};
+
+ 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";
+ }
+ next;
+ }
+ print NEW_FILE $_;
+ }
+ close OLD_FILE;
+ close NEW_FILE;
+ return update_file("$file.in");
+}
+
# parse the specified makefile to identify the rules file
sub parse_makefile($)
{
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)\s*=\s*(.*)/)
{
$make{$1} = $2;
next;
}
- if (/^(BISON_SRCS|LEX_SRCS|IDL_[CHIPS]_SRCS|IDL_TLB_SRCS|IMPLIB_SRCS|MC_SRCS|RC_SRCS|RC_SRCS16|RC_BINARIES|SPEC_SRCS16|EXTRA_OBJS16|MANPAGES|PROGRAMS)\s*=\s*(.*)/)
+ if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_[CHIPS]_SRCS|IDL_TLB_SRCS|IMPLIB_SRCS|C_SRCS|MC_SRCS|RC_SRCS|SVG_SRCS|MANPAGES|PROGRAMS)\s*=\s*(.*)/)
{
my @list = split(/\s+/, $2);
$make{$1} = \@list;
next;
}
+ if (/^\s*(TOPSRCDIR|TOPOBJDIR|SRCDIR|VPATH)\s*=\s*(.*)/)
+ {
+ die "Variable $1 in $file.in is obsolete";
+ }
}
return %make;
}
+# assign source files to their respective makefile
+sub assign_sources_to_makefiles()
+{
+ foreach my $file (@all_files)
+ {
+ next if defined $ignored_source_files{$file};
+ my $dir = dirname( $file );
+
+ while ($dir && !defined $makefiles{"$dir/Makefile"}) { $dir = dirname( $dir ); }
+ 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 =~ /\.mc$/) { push @{${$make}{"=MC_SRCS"}}, $basename; }
+ elsif ($basename =~ /\.svg$/) { push @{${$make}{"=SVG_SRCS"}}, $basename; }
+ }
+}
################################################################
# update the makefile list in configure.ac
my %make = %{$makefiles{$file}};
my $rules = $make{"=rules"};
my $args = "";
- if ($rules eq $makerules{"MAKE_DLL_RULES"}) { $args = ",[dlls],[ALL_DLL_DIRS]"; }
- 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]"; }
+ my $is_win16 = $make{"MODULE"} && ($make{"MODULE"} =~ /16$/ || $modules16{$make{"MODULE"}});
+ 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"} || "";
+ my $implib_srcs = defined($make{"IMPLIB_SRCS"}) && join( " ", @{$make{"IMPLIB_SRCS"}} );
+ $args .= "," if $implib || $is_win16;
+ $args .= "enable_win16" if $is_win16;
+ $args .= ",[$implib]" if $implib;
+ $args .= ",[$implib_srcs]" if $implib_srcs;
+ push @lines, "WINE_CONFIG_DLL($name$args)\n";
+ }
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 .= "]";
+ if ($name =~ /\./)
+ {
+ die "Invalid MODULE in $file" unless $make{"MODULE"} eq $name;
+ }
+ else
+ {
+ die "Invalid MODULE in $file" unless $make{"MODULE"} eq "$name.exe";
+ }
+ my $install = $dont_install{$name} ? "" : "install";
+ $install .= "bin" if $bin_install{$name};
+ $args .= "," if $is_win16 || $install;
+ $args .= "$install" if $install;
+ $args .= ",enable_win16" if $is_win16;
+ push @lines, "WINE_CONFIG_PROGRAM($name$args)\n";
}
- elsif ($file =~ /^[^\/]*\/Makefile$/) { $args = ",[],[ALL_TOP_DIRS]"; }
- push @lines, "WINE_CONFIG_MAKEFILE([$file],[$rules]$args)\n";
+ elsif ($rules eq $makerules{"MAKE_TEST_RULES"})
+ {
+ (my $dir = $file) =~ s/^(.*)\/Makefile/$1/;
+ push @lines, "WINE_CONFIG_TEST($dir)\n";
+ }
+ elsif ($rules eq $makerules{"MAKE_IMPLIB_RULES"})
+ {
+ (my $name = $file) =~ s/^dlls\/(.*)\/Makefile/$1/;
+ push @lines, "WINE_CONFIG_LIB($name)\n";
+ }
+ elsif ($file =~ /^tools.*\/Makefile$/)
+ {
+ (my $name = $file) =~ s/^(.*)\/Makefile/$1/;
+ push @lines, "WINE_CONFIG_TOOL($name)\n";
+ }
+ elsif ($file =~ /\/Makefile$/)
+ {
+ (my $name = $file) =~ s/^(.*)\/Makefile/$1/;
+ push @lines, "WINE_CONFIG_MAKEFILE([$name])\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" );
+ replace_makefile_variable( $file, "RC_SRCS" );
}
- 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);
}
{
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;
}
sub update_includes()
{
- return unless -d ".git";
my (@h_srcs, @private_idl_srcs, @public_idl_srcs, @tlb_srcs, %subdirs);
- my @includes = map { s/^include\///; $_; } split /\0/, `git ls-files -c -z include`;
+ my @includes = map { (my $ret = $_) =~ s/^include\///; $ret; } grep /^include\//, @all_files;
foreach my $incl (@includes)
{
if ($incl =~ /(.*)\//) { $subdirs{$1} = 1; }
{
push @ignores, map { s/\$\(EXEEXT\)//; $dir . $_; } @{$makefile{"PROGRAMS"}};
}
- if ($dir =~ /^programs\/(.*)\/$/)
- {
- push @ignores, "$dir$1";
- }
}
# prepend a slash to paths that don't have one
}
-if (-d ".git")
-{
- @makefiles = map { s/\.in$//; $_; } split /\0/, `git ls-files -c -z Makefile.in \\*/Makefile.in`;
-}
-else
-{
- @makefiles = map { s/^\.\/(.*)\.in/$1/; $_; } split(/\s/,`find . -name Makefile.in -print`);
-}
+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;
foreach my $file (sort values %makerules, @makefiles)
{
$makefiles{$file} = \%make;
}
+assign_sources_to_makefiles();
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