remove <wineconf> from sample config

Tony Lambregts tony_lambregts at telusplanet.net
Sat Feb 1 20:15:16 CST 2003


Ove Kaaven wrote:

 >
 > On Fri, 31 Jan 2003, Tony Lambregts wrote:
 >
 >> In order to be able to simply include the sample config file in the
 >> documnetation something has to be done about the lines #  <wineconf>
 >> and # </wineconf>. These are just comments and IFAICT can be safely
 >> removed.
 >
 >
 > Not exactly, they're markers used by tools/wineconf to mark the parts
 > that
 > should be copied into the generated config file, in addition to the
 > autogenerated drive config.
 >
 >
 >
OK. But as place holders they can be anything so how about this.

Change Log: Modify the wineconf tags so that the sample config can be 
included in the documentation.

Files Changed: documentation/config
                tools/wineconf

-- 

Tony Lambregts



-------------- next part --------------
Index: documentation/samples/config
===================================================================
RCS file: /home/wine/wine/documentation/samples/config,v
retrieving revision 1.38
diff -u -u -r1.38 config
--- documentation/samples/config	21 Jan 2003 00:28:48 -0000	1.38
+++ documentation/samples/config	1 Feb 2003 05:11:45 -0000
@@ -67,7 +67,7 @@
 ;"ShowDotFiles" = "1"
 "ShellLinker" = "wineshelllink"
 
-# <wineconf>
+# [wineconf]
 
 [Version]
 ; Windows version to imitate (win95,win98,winme,nt351,nt40,win2k,winxp,win20,win30,win31)
@@ -313,4 +313,5 @@
 ;[AppDefaults\\pickygame.exe\\dsound]
 ;"EmulDriver" = "N"
 
-# </wineconf>
+# [/wineconf]
+

-------------- next part --------------
Index: tools/wineconf
===================================================================
RCS file: /home/wine/wine/tools/wineconf,v
retrieving revision 1.14
diff -u -r1.14 wineconf
--- tools/wineconf	1 Jun 2002 02:55:52 -0000	1.14
+++ tools/wineconf	1 Feb 2003 17:42:21 -0000
@@ -437,9 +437,9 @@
 
     if (open(DEFFILE, "$fileName")) {
        while (<DEFFILE>) {
-	  $state = 0 if ($state == 1 && $_ =~ /^[ \t]*\#/o && index($_, "</$tag>") >= 0);
+	  $state = 0 if ($state == 1 && $_ =~ /^[ \t]*\#/o && index($_, "[/$tag]") >= 0);
 	  print $_ if ($state == 1);
-	  $state = 1 if ($state == 0 && $_ =~ /^[ \t]*\#/o && index($_, "<$tag>" ) >= 0);
+	  $state = 1 if ($state == 0 && $_ =~ /^[ \t]*\#/o && index($_, "[$tag]" ) >= 0);
        }
        close(DEFFILE);
     } else {



More information about the wine-patches mailing list