Winemaker patch

[François Gouget]

Changelog:

   François Gouget <fgouget at codeweavers.com>

 * tools/winemaker

   Make sure all files are terminated with a '\n'
   Remove obsolete comment about 'afxres.h' coming back after editing in
VC
   Added support for the RTF qualifier in RC files


   Note that making sure all headers contain a trailing '\n' is
important. First if it's not the case gcc 2.97 will generate an annoying
warning. But even more important, if compiled with Sun's C compiler,
this could cause errors as in this example:

Let's assume foo.h's last line is '#endif' without a '\n'. Then:

#include "foo.h"
#include "bar.h"

will become:

#endif #include "bar.h"

Of course, 'bar.h' is not included after that!


-- 
François Gouget
fgouget at codeweavers.com
-------------- next part --------------
Index: tools/winemaker
===================================================================
RCS file: /home/cvs/wine/wine/tools/winemaker,v
retrieving revision 1.15
diff -u -r1.15 winemaker
--- tools/winemaker	2001/01/11 20:17:42	1.15
+++ tools/winemaker	2001/02/06 03:58:59
@@ -3,7 +3,7 @@
 # Copyright 2000 Francois Gouget for CodeWeavers
 # fgouget at codeweavers.com
 #
-my $version="0.5.5";
+my $version="0.5.6";
 
 use Cwd;
 use File::Basename;
@@ -1268,14 +1268,16 @@
   my $rc_textinclude_state=0;
   while (<FILEI>) {
     $line++;
-    $_ =~ s/\r\n$/\n/;
+    s/\r\n$/\n/;
+    if (!/\n$/) {
+      # Make sure all files are '\n' terminated
+      $_ .= "\n";
+    }
     if ($is_rc and !$is_mfc and /^(\s*\#\s*include\s*)\"afxres\.h\"/) {
       # VC6 automatically includes 'afxres.h', an MFC specific header, in 
       # the RC files it generates (even in non-MFC projects). So we replace 
       # it with 'winres.h' its very close standard cousin so that non MFC 
-      # projects can compile in Wine without the MFC sources. This does not 
-      # harm VC but it will put 'afxres.h' back the next time the file is 
-      # edited.
+      # projects can compile in Wine without the MFC sources.
       my $warning="mfc:afxres.h";
       if (!defined $warnings{$warning}) {
 	$warnings{$warning}="1";
@@ -1320,7 +1322,7 @@
 	$modified=1;
       }
     } elsif ($is_rc) {
-      if ($rc_block_depth == 0 and /^(\w+\s+(BITMAP|CURSOR|FONT|FONTDIR|ICON|MESSAGETABLE|TEXT)\s+((DISCARDABLE|FIXED|IMPURE|LOADONCALL|MOVEABLE|PRELOAD|PURE)\s+)*)([\"<]?)([^\">\r\n]+)([\">]?)/) {
+      if ($rc_block_depth == 0 and /^(\w+\s+(BITMAP|CURSOR|FONT|FONTDIR|ICON|MESSAGETABLE|TEXT)\s+((DISCARDABLE|FIXED|IMPURE|LOADONCALL|MOVEABLE|PRELOAD|PURE|RTF)\s+)*)([\"<]?)([^\">\r\n]+)([\">]?)/) {
 	my $from_file=($5 eq "<"?"":$dirname);
 	my $real_include_name=get_real_include_name($line,$6,$from_file,$project,$target);
 	print FILEO "$1$5$real_include_name$7$'";