winmerge-svn — Subscribe to this list if you wish to receive notifications from Subversion

[Winmerge-svn] SF.net SVN: winmerge: [3773] trunk/Src

[<ki...@us...>]

Revision: 3773
          http://svn.sourceforge.net/winmerge/?rev=3773&view=rev
Author:   kimmov
Date:     2006-11-06 09:07:27 -0800 (Mon, 06 Nov 2006)

Log Message:
-----------
PATCH: [ 1590892 ] Handle unicode paths for project files

Modified Paths:
--------------
    trunk/Src/Changes.txt
    trunk/Src/ProjectFile.cpp

Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt	2006-11-04 23:59:31 UTC (rev 3772)
+++ trunk/Src/Changes.txt	2006-11-06 17:07:27 UTC (rev 3773)
@@ -2,6 +2,10 @@
 Add new items to top.
 (This summarizes all changes to all files under Src, including Src\Languages.)
 
+2006-11-06 Kimmo
+ PATCH: [ 1590892 ] Handle unicode paths for project files
+  Src: ProjectFile.cpp
+
 2006-11-03 Kimmo
  PATCH: [ 1589427 ] Add back read-only handling for project files
   Src: ProjectFile.cpp

Modified: trunk/Src/ProjectFile.cpp
===================================================================
--- trunk/Src/ProjectFile.cpp	2006-11-04 23:59:31 UTC (rev 3772)
+++ trunk/Src/ProjectFile.cpp	2006-11-06 17:07:27 UTC (rev 3773)
@@ -52,42 +52,36 @@
  * @param [in] path Path to project file.
  * @param [out] sError Error string if error happened.
  * @return TRUE if reading succeeded, FALSE if error happened.
- * @bug This doesn't handle unicode paths!
  */
 BOOL ProjectFile::Read(LPCTSTR path, CString *sError)
 {
 	BOOL loaded = FALSE;
-	LPCSTR pathAnsi;
-
-#ifdef UNICODE
-	USES_CONVERSION;
-	pathAnsi = T2A(path);
-#else
-	pathAnsi = path;
-#endif
-
     scew_tree* tree = NULL;
     scew_parser* parser = NULL;
 
     parser = scew_parser_create();
     scew_parser_ignore_whitespaces(parser, 1);
 
-	if (scew_parser_load_file(parser, pathAnsi))
+	FILE * fp = _tfopen(path, _T("r"));
+	if (fp)
 	{
-		tree = scew_parser_tree(parser);
-
-		scew_element * root = GetRootElement(tree);
-		if (root)
+		if (scew_parser_load_file_fp(parser, fp))
 		{
-			loaded = TRUE;
-			GetPathsData(root);
-		};
-	}
-    scew_tree_free(tree);
+			tree = scew_parser_tree(parser);
 
-    /* Frees the SCEW parser */
-    scew_parser_free(parser);
+			scew_element * root = GetRootElement(tree);
+			if (root)
+			{
+				loaded = TRUE;
+				GetPathsData(root);
+			};
+		}
+		scew_tree_free(tree);
 
+		/* Frees the SCEW parser */
+		scew_parser_free(parser);
+		fclose(fp);
+	}
 	return loaded;
 }
 
@@ -194,15 +188,6 @@
 BOOL ProjectFile::Save(LPCTSTR path, CString *sError)
 {
 	BOOL success = TRUE;
-	LPCSTR pathAnsi;
-
-#ifdef UNICODE
-	USES_CONVERSION;
-	pathAnsi = T2A(path);
-#else
-	pathAnsi = path;
-#endif
-	
 	scew_tree* tree = NULL;
 	scew_element* root = NULL;
 	scew_element* paths = NULL;
@@ -228,14 +213,29 @@
 	// Set the XML file standalone
 	scew_tree_set_xml_standalone(tree, 1);
 
-	if (!scew_writer_tree_file(tree, pathAnsi))
+	FILE * fp = _tfopen(path, _T("w"));
+	if (fp)
+	{
+		if (!scew_writer_tree_fp(tree, fp))
+		{
+			success = FALSE;
+			*sError = LoadResString(IDS_FILEWRITE_ERROR);
+		}
+		fclose(fp);
+	}
+	else
+	{
 		success = FALSE;
+	}
 	
 	/* Frees the SCEW tree */
 	scew_tree_free(tree);
 
+	if (success == FALSE)
+	{
+		*sError = LoadResString(IDS_FILEWRITE_ERROR);
+	}
 	return success;
-	//	return Serialize(true, path, sError);
 }
 
 /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [3772] trunk/Docs/Developers

[<ki...@us...>]

Revision: 3772
          http://svn.sourceforge.net/winmerge/?rev=3772&view=rev
Author:   kimmov
Date:     2006-11-04 15:59:31 -0800 (Sat, 04 Nov 2006)

Log Message:
-----------
Update building instructions for expat and scew (a lot simpler now)

Modified Paths:
--------------
    trunk/Docs/Developers/Changes.txt
    trunk/Docs/Developers/readme-developers.html

Modified: trunk/Docs/Developers/Changes.txt
===================================================================
--- trunk/Docs/Developers/Changes.txt	2006-11-04 23:51:15 UTC (rev 3771)
+++ trunk/Docs/Developers/Changes.txt	2006-11-04 23:59:31 UTC (rev 3772)
@@ -1,3 +1,7 @@
+2006-11-05 Kimmo
+ Update building instructions for expat and scew (a lot simpler now)
+  Developers: readme-developers.html
+
 2006-11-03 Tim
  PATCH: [ 1589578 ] Add <h4> style to readme-developers.html
   Developers: readme-developers.html

Modified: trunk/Docs/Developers/readme-developers.html
===================================================================
--- trunk/Docs/Developers/readme-developers.html	2006-11-04 23:51:15 UTC (rev 3771)
+++ trunk/Docs/Developers/readme-developers.html	2006-11-04 23:59:31 UTC (rev 3772)
@@ -131,26 +131,12 @@
     using Visual Studio 2003.Net or later you need to convert the file to new format when
     Visual Studio opens the file.</li>
   <li>Select from Visual Studio menu Build / Batch Build</li>
-  <li>Make sure all targets are selected</li>
+  <li>Select either debug or release targets.</li>
   <li>Select Rebuild All</li>
-  <li><i>Wait until build finishes...</i></li>
-  <li>Build files are in folder <code>Externals/expat/lib</code> subfolders.</li>
-  <li>Create folder <code>/Build/expat</code>
-  <li>Select the target to use - we want to use dll version (no _static in folder name):
-    <ul>
-      <li><code>Debug</code> - debug ansi</li>
-      <li><code>Debug-w</code> - debug unicode</li>
-      <li><code>Release</code> - release ansi</li>
-      <li><code>Release-w</code> - release unicode</li>
-    </ul>
-    I'd choose release version, as we aren't interested in debugging expat itself.
-  </li>
-  <li>Copy expat import library (<code>.lib</code>) and <code>dll</code> file to
-    <code>/Build/expat</code> from selected expat build folder (e.g. Release-w)</li>
  </ul></p>
 
-<p class="note">I (kimmov) know this is not very convenient as when switching WinMerge target
-you have to copy the correct files to /Build/expat. I figure out better solution for this.</p>
+<p>After build finishes, selected (debug or release) lib and dll files are in
+<code>/Build/expat</code>. WinMerge executable's project file picks them from there.</p>
 
 <h4>Compiling scew</h4>
 <p>scew is in <code>/Externals/scew</code> folder in source tree. To compile scew:<br>
@@ -161,13 +147,12 @@
   <li>Select from Visual Studio menu Build / Batch Build</li>
   <li>Make sure all targets are selected</li>
   <li>Select Rebuild All</li>
-  <li><i>Wait until build finishes...</i></li>
-  <li>Copy all <code>.lib</code> files from folder <code>/Externals/scew/win32/lib</code> to
-    <code>/Build/expat</code></li>
 </ul></p>
 
-<p>scew is a static library and it automatically selects the correct .lib file to use.
-See <code>/Externals/scew/scew/scew.h</code> about more info how it is done.</p>
+<p>After build finishes, lib and dll files are in <code>/Build/expat</code>. WinMerge
+executable's project file picks them from there. scew is a static library and it
+automatically selects the correct .lib file to use. See <code>/Externals/scew/scew/scew.h</code>
+for more info how it is done.</p>
 
 <h4>Compiling WinMerge executable targets</h4>
 <p>There are several targets available for compiling different projects. Targets used


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [3771] trunk/Externals/scew

[<ki...@us...>]

Revision: 3771
          http://svn.sourceforge.net/winmerge/?rev=3771&view=rev
Author:   kimmov
Date:     2006-11-04 15:51:15 -0800 (Sat, 04 Nov 2006)

Log Message:
-----------
* scew/win32/scew.dsp: Added post-build commands to copy lib files to /Build/expat
* scew/win32/scew.dsp: Added include path to expat for one target (missed in previous commit)

Modified Paths:
--------------
    trunk/Externals/scew/ChangeLog
    trunk/Externals/scew/win32/scew.dsp

Modified: trunk/Externals/scew/ChangeLog
===================================================================
--- trunk/Externals/scew/ChangeLog	2006-11-04 23:47:40 UTC (rev 3770)
+++ trunk/Externals/scew/ChangeLog	2006-11-04 23:51:15 UTC (rev 3771)
@@ -1,4 +1,11 @@
 Changes for WinMerge compile:
+
+2006-11-05 Kimmo Varis <ki...@wi...>
+	* scew/win32/scew.dsp: Added post-build commands to copy
+	lib files to /Build/expat
+	* scew/win32/scew.dsp: Added include path to expat for one
+	target (missed in previous commit)
+
 2006-11-01 Kimmo Varis <ki...@wi...>
 
 	* scew/win32/scew.dsp: added library paths to WinMerge /Build/expat

Modified: trunk/Externals/scew/win32/scew.dsp
===================================================================
--- trunk/Externals/scew/win32/scew.dsp	2006-11-04 23:47:40 UTC (rev 3770)
+++ trunk/Externals/scew/win32/scew.dsp	2006-11-04 23:51:15 UTC (rev 3771)
@@ -57,6 +57,10 @@
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"lib\scew.lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy  lib\scew.lib  ..\..\..\Build\expat\ 
+# End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "scew - Win32 Debug"
 
@@ -81,6 +85,10 @@
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"lib\scew_d.lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy  lib\scew_d.lib  ..\..\..\Build\expat\ 
+# End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "scew - Win32 Debug Unicode"
 
@@ -106,6 +114,10 @@
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"lib\scew_ud.lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy  lib\scew_ud.lib  ..\..\..\Build\expat\ 
+# End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "scew - Win32 Release Unicode"
 
@@ -121,7 +133,7 @@
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
 # SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /W4 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_LIB" /D "_UNICODE" /D "XML_UNICODE_WCHAR_T" /FD /c
+# ADD CPP /nologo /MD /W4 /GX /O2 /I "../../expat/lib" /I "../../expat/xmlwf" /D "NDEBUG" /D "WIN32" /D "_LIB" /D "_UNICODE" /D "XML_UNICODE_WCHAR_T" /FD /c
 # SUBTRACT CPP /WX /YX
 # ADD BASE RSC /l 0x411 /d "NDEBUG"
 # ADD RSC /l 0x411 /d "NDEBUG"
@@ -131,6 +143,10 @@
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"lib\scew_u.lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy  lib\scew_u.lib  ..\..\..\Build\expat\ 
+# End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "scew - Win32 XMLStatic Debug"
 
@@ -156,6 +172,10 @@
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"lib\scew_d.lib"
 # ADD LIB32 /nologo /out:"lib\scew_sd.lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy  lib\scew_sd.lib  ..\..\..\Build\expat\ 
+# End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "scew - Win32 XMLStatic Release"
 
@@ -181,6 +201,10 @@
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"lib\scew.lib"
 # ADD LIB32 /nologo /out:"lib\scew_s.lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy  lib\scew_s.lib  ..\..\..\Build\expat\ 
+# End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "scew - Win32 XMLStatic Debug Unicode"
 
@@ -206,6 +230,10 @@
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"lib\scew_ud.lib"
 # ADD LIB32 /nologo /out:"lib\scew_usd.lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy  lib\scew_usd.lib  ..\..\..\Build\expat\ 
+# End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "scew - Win32 XMLStatic Release Unicode"
 
@@ -231,6 +259,10 @@
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"lib\scew_u.lib"
 # ADD LIB32 /nologo /out:"lib\scew_us.lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy  lib\scew_us.lib  ..\..\..\Build\expat\ 
+# End Special Build Tool
 
 !ENDIF 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [3770] trunk/Externals/expat

[<ki...@us...>]

Revision: 3770
          http://svn.sourceforge.net/winmerge/?rev=3770&view=rev
Author:   kimmov
Date:     2006-11-04 15:47:40 -0800 (Sat, 04 Nov 2006)

Log Message:
-----------
- Add post-build steps to VC6 project files to copy .lib and .dll files to /Build/expat

Modified Paths:
--------------
    trunk/Externals/expat/Changes
    trunk/Externals/expat/lib/expat.dsp
    trunk/Externals/expat/lib/expat_static.dsp
    trunk/Externals/expat/lib/expatw.dsp
    trunk/Externals/expat/lib/expatw_static.dsp

Modified: trunk/Externals/expat/Changes
===================================================================
--- trunk/Externals/expat/Changes	2006-11-03 19:54:11 UTC (rev 3769)
+++ trunk/Externals/expat/Changes	2006-11-04 23:47:40 UTC (rev 3770)
@@ -1,3 +1,7 @@
+For WinMerge (kimmov): Nov 5 2006
+        - Add post-build steps to VC6 project files to copy .lib and .dll
+          files to /Build/expat
+
 Release 2.0.0 Wed Jan 11 2006
         - We no longer use the "check" library for C unit testing; we
           always use the (partial) internal implementation of the API.

Modified: trunk/Externals/expat/lib/expat.dsp
===================================================================
--- trunk/Externals/expat/lib/expat.dsp	2006-11-03 19:54:11 UTC (rev 3769)
+++ trunk/Externals/expat/lib/expat.dsp	2006-11-04 23:47:40 UTC (rev 3770)
@@ -55,6 +55,10 @@
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"Release\libexpat.dll"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=mkdir ..\..\..\Build\expat	copy Release\libexpat.dll ..\..\..\Build\expat	copy Release\libexpat.lib ..\..\..\Build\expat
+# End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "expat - Win32 Debug"
 
@@ -80,6 +84,10 @@
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /debug /machine:I386 /out:"Debug\libexpat.dll"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=mkdir ..\..\..\Build\expat	copy Debug\libexpat.dll ..\..\..\Build\expat	copy Debug\libexpat.lib ..\..\..\Build\expat
+# End Special Build Tool
 
 !ENDIF 
 

Modified: trunk/Externals/expat/lib/expat_static.dsp
===================================================================
--- trunk/Externals/expat/lib/expat_static.dsp	2006-11-03 19:54:11 UTC (rev 3769)
+++ trunk/Externals/expat/lib/expat_static.dsp	2006-11-04 23:47:40 UTC (rev 3770)
@@ -51,6 +51,10 @@
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"Release_static\libexpatMT.lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=mkdir ..\..\..\Build\expat	copy Release_static\libexpatMT.lib ..\..\..\Build\expat
+# End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "expat_static - Win32 Debug"
 
@@ -75,6 +79,10 @@
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"Debug_static\libexpatMT.lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=mkdir ..\..\..\Build\expat	copy Debug_static\libexpatMT.lib ..\..\..\Build\expat
+# End Special Build Tool
 
 !ENDIF 
 

Modified: trunk/Externals/expat/lib/expatw.dsp
===================================================================
--- trunk/Externals/expat/lib/expatw.dsp	2006-11-03 19:54:11 UTC (rev 3769)
+++ trunk/Externals/expat/lib/expatw.dsp	2006-11-04 23:47:40 UTC (rev 3770)
@@ -55,6 +55,10 @@
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"Release-w\libexpatw.dll"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=mkdir ..\..\..\Build\expat	copy Release-w\libexpatw.dll ..\..\..\Build\expat	copy Release-w\libexpatw.lib ..\..\..\Build\expat
+# End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "expatw - Win32 Debug"
 
@@ -81,6 +85,10 @@
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /debug /machine:I386 /out:"Debug-w\libexpatw.dll"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=mkdir ..\..\..\Build\expat	copy Debug-w\libexpatw.dll ..\..\..\Build\expat	copy Debug-w\libexpatw.lib ..\..\..\Build\expat
+# End Special Build Tool
 
 !ENDIF 
 

Modified: trunk/Externals/expat/lib/expatw_static.dsp
===================================================================
--- trunk/Externals/expat/lib/expatw_static.dsp	2006-11-03 19:54:11 UTC (rev 3769)
+++ trunk/Externals/expat/lib/expatw_static.dsp	2006-11-04 23:47:40 UTC (rev 3770)
@@ -51,6 +51,10 @@
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"Release-w_static\libexpatwMT.lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=mkdir ..\..\..\Build\expat	copy Release-w_static\libexpatwMT.lib ..\..\..\Build\expat
+# End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "expatw_static - Win32 Debug"
 
@@ -75,6 +79,10 @@
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"Debug-w_static\libexpatwMT.lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=mkdir ..\..\..\Build\expat	copy Debug-w_static\libexpatwMT.lib ..\..\..\Build\expat
+# End Special Build Tool
 
 !ENDIF 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [3769] trunk/Installer/InnoSetup

[<ki...@us...>]

Revision: 3769
          http://svn.sourceforge.net/winmerge/?rev=3769&view=rev
Author:   kimmov
Date:     2006-11-03 11:54:11 -0800 (Fri, 03 Nov 2006)

Log Message:
-----------
PATCH: [ 1589585 ] Install expat dlls

Modified Paths:
--------------
    trunk/Installer/InnoSetup/Changes.txt
    trunk/Installer/InnoSetup/WinMerge.iss

Modified: trunk/Installer/InnoSetup/Changes.txt
===================================================================
--- trunk/Installer/InnoSetup/Changes.txt	2006-11-03 19:52:27 UTC (rev 3768)
+++ trunk/Installer/InnoSetup/Changes.txt	2006-11-03 19:54:11 UTC (rev 3769)
@@ -1,3 +1,7 @@
+2006-11-03 Kimmo
+ PATCH: [ 1589585 ] Install expat dlls
+  InnoSetup: WinMerge.iss
+
 2006-11-01 Kimmo
  PATCH: [ 1588234 ] Remove manifest files from the installer
   InnoSetup: WinMerge.iss

Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss	2006-11-03 19:52:27 UTC (rev 3768)
+++ trunk/Installer/InnoSetup/WinMerge.iss	2006-11-03 19:54:11 UTC (rev 3769)
@@ -335,6 +335,10 @@
 ; 64-bit version of ShellExtension
 Source: ..\..\Build\ShellExtensionX64\ShellExtensionX64.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder 64bit; MinVersion: 0,5.01.2600; Check: IsWin64
 
+; Expat dlls
+Source: ..\..\Build\expat\libexpat.dll; DestDir: {app}; Flags: promptifolder; Components: Core; Check: not IsWin64
+Source: ..\..\Build\expat\libexpatw.dll; DestDir: {app}; Flags: promptifolder; Components: Core; MinVersion: 0, 4
+
 Source: ..\..\Build\Languages\MergeBulgarian.lang; DestDir: {app}\Languages; Components: Languages\Bulgarian; Flags: ignoreversion comparetimestamp
 Source: ..\..\Docs\Users\Languages\ReadMe-Bulgarian.txt; DestDir: {app}\Docs; Components: Languages\Bulgarian
 Source: ..\..\Build\Languages\MergeCatalan.lang; DestDir: {app}\Languages; Components: Languages\Catalan; Flags: ignoreversion comparetimestamp
@@ -982,7 +986,6 @@
         if IsTaskSelected('ClearCase') then
         begin
             IntegrateClearCase();
-        end;        
+        end;
     end;
 End;
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [3768] trunk/Src

[<ki...@us...>]

Revision: 3768
          http://svn.sourceforge.net/winmerge/?rev=3768&view=rev
Author:   kimmov
Date:     2006-11-03 11:52:27 -0800 (Fri, 03 Nov 2006)

Log Message:
-----------
PATCH: [ 1589563 ] Fix crash with weird filetimes (and cleanup the code)

Modified Paths:
--------------
    trunk/Src/Changes.txt
    trunk/Src/DiffFileInfo.cpp
    trunk/Src/DiffFileInfo.h
    trunk/Src/DirScan.cpp
    trunk/Src/DirViewColHandler.cpp
    trunk/Src/DirViewColItems.cpp
    trunk/Src/FileInfo.cpp
    trunk/Src/FileInfo.h

Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt	2006-11-03 19:39:24 UTC (rev 3767)
+++ trunk/Src/Changes.txt	2006-11-03 19:52:27 UTC (rev 3768)
@@ -7,6 +7,9 @@
   Src: ProjectFile.cpp
  PATCH: [ 1589438 ] Add read-only info to ProjectFile dialog
   Src: MainFrm.cpp
+ PATCH: [ 1589563 ] Fix crash with weird filetimes (and cleanup the code)
+  Src: DiffFileInfo.cpp DiffFileInfo.h DirScan.cpp DirViewColHandler.cpp
+   DirViewColItems.cpp FileInfo.cpp FileInfo.h
 
 2006-11-03 Tim
  PATCH: [ 1589601 ] Add "ReDim" keyword to Visual Basic highlighter

Modified: trunk/Src/DiffFileInfo.cpp
===================================================================
--- trunk/Src/DiffFileInfo.cpp	2006-11-03 19:39:24 UTC (rev 3767)
+++ trunk/Src/DiffFileInfo.cpp	2006-11-03 19:52:27 UTC (rev 3768)
@@ -28,45 +28,6 @@
 #include "unicoder.h"
 
 /**
- * @brief Convert a FILETIME to a long (standard time)
- */
-static __int64 FileTimeToInt64(FILETIME & ft)
-{
-	return CTime(ft).GetTime();
-}
-
-/**
- * @brief Update fileinfo from given file
- * @param [in] sFilePath Full path to file/directory to update
- * @return TRUE if file exists
- */
-BOOL DiffFileInfo::Update(LPCTSTR sFilePath)
-{
-	// CFileFind doesn't expose the attributes
-	// CFileStatus doesn't expose 64 bit size
-	BOOL Update = FALSE;
-	WIN32_FIND_DATA wfd;
-	HANDLE h = FindFirstFile(sFilePath, &wfd);
-	__int64 mtime64 = 0;
-	size = -1;
-	flags.reset();
-	mtime = 0;
-	if (h != INVALID_HANDLE_VALUE)
-	{
-		mtime64 = FileTimeToInt64(wfd.ftLastWriteTime);
-		flags.attributes = wfd.dwFileAttributes;
-
-		// Folders don't have a size (size remains as -1)
-		if ((flags.attributes & FILE_ATTRIBUTE_DIRECTORY) == 0)
-			size = FileInfo::GetSizeFromFindData(wfd);
-		FindClose(h);
-		Update = TRUE;
-	}
-	mtime = mtime64;
-	return Update;
-}
-
-/**
  * @brief Clears FileInfo data.
  */
 void DiffFileInfo::Clear()
@@ -77,7 +38,6 @@
 	m_textStats.clear();
 }
 
-
 /**
  * @brief Return true if file is in any Unicode encoding
  */

Modified: trunk/Src/DiffFileInfo.h
===================================================================
--- trunk/Src/DiffFileInfo.h	2006-11-03 19:39:24 UTC (rev 3767)
+++ trunk/Src/DiffFileInfo.h	2006-11-03 19:52:27 UTC (rev 3768)
@@ -84,7 +84,9 @@
 
 
 /**
- * @brief Information for file
+ * @brief Information for file.
+ * This class expands FileInfo class with encoding information and
+ * text stats information.
  */
 struct DiffFileInfo : public FileInfo
 {
@@ -100,7 +102,6 @@
 // methods
 
 	DiffFileInfo() { Clear(); }
-	BOOL Update(LPCTSTR sFilePath);
 	void Clear();
 	bool IsEditableEncoding() const;
 };

Modified: trunk/Src/DirScan.cpp
===================================================================
--- trunk/Src/DirScan.cpp	2006-11-03 19:39:24 UTC (rev 3767)
+++ trunk/Src/DirScan.cpp	2006-11-03 19:52:27 UTC (rev 3768)
@@ -8,6 +8,8 @@
 
 #include "stdafx.h"
 #include <shlwapi.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #include "DirScan.h"
 #include "CompareStats.h"
 #include "common/unicoder.h"
@@ -36,13 +38,11 @@
  */
 struct fentry
 {
-	CString name;
-	// storing __time_t if MSVC6 (__MSC_VER<1300)
-	// storing __time64_t if MSVC7 (VC.NET)
+	CString name; /**< Item name */
 	__int64 mtime; /**< Last modify time */
 	__int64 ctime; /**< Creation modify time */
-	__int64 size;
-	int attrs;
+	__int64 size; /**< File size */
+	int attrs; /**< Item attributes */
 };
 typedef CArray<fentry, fentry&> fentryArray;
 
@@ -356,6 +356,8 @@
  *
  * @param [in] di DiffItem to compare
  * @param [in,out] pCtxt Compare context: contains difflist, encoding info etc.
+ * @todo For date compare, maybe we should use creation date if modification
+ * date is missing?
  */
 void CompareDiffItem(DIFFITEM di, CDiffContext * pCtxt)
 {
@@ -405,19 +407,33 @@
 				pCtxt->m_nCompMethod == CMP_DATE_SIZE)
 			{
 				// Compare by modified date
-				__int64 nTimeDiff = di.left.mtime - di.right.mtime;
-				// Remove sign
-				nTimeDiff = (nTimeDiff > 0 ? nTimeDiff : -nTimeDiff);
-				if (pCtxt->m_bIgnoreSmallTimeDiff)
+				// Check that we have both filetimes
+				if (di.left.mtime != 0 && di.right.mtime != 0)
 				{
-					// If option to ignore small timediffs (couple of seconds)
-					// is set, decrease absolute difference by allowed diff
-					nTimeDiff -= SmallTimeDiff;
+					__int64 nTimeDiff = di.left.mtime - di.right.mtime;
+					// Remove sign
+					nTimeDiff = (nTimeDiff > 0 ? nTimeDiff : -nTimeDiff);
+					if (pCtxt->m_bIgnoreSmallTimeDiff)
+					{
+						// If option to ignore small timediffs (couple of seconds)
+						// is set, decrease absolute difference by allowed diff
+						nTimeDiff -= SmallTimeDiff;
+					}
+					if (nTimeDiff <= 0)
+						di.diffcode |= DIFFCODE::TEXT | DIFFCODE::SAME;
+					else
+						di.diffcode |= DIFFCODE::TEXT | DIFFCODE::DIFF;
 				}
-				if (nTimeDiff <= 0)
-					di.diffcode |= DIFFCODE::TEXT | DIFFCODE::SAME;
 				else
-					di.diffcode |= DIFFCODE::TEXT | DIFFCODE::DIFF;
+				{
+					// Filetimes for item(s) could not be read. So we have to
+					// set error status, unless we have DATE_SIZE -compare
+					// when we have still hope for size compare..
+					if (pCtxt->m_nCompMethod == CMP_DATE_SIZE)
+						di.diffcode |= DIFFCODE::TEXT | DIFFCODE::SAME;
+					else
+						di.diffcode |= DIFFCODE::TEXT | DIFFCODE::CMPERR;
+				}
 				
 				// This is actual CMP_DATE_SIZE method..
 				// If file sizes differ mark them different
@@ -472,7 +488,16 @@
 }
 
 /**
- * @brief Load arrays with all directories & files in specified dir
+ * @brief Find files and subfolders from given folder.
+ * This function saves all files and subfolders in given folder to arrays.
+ * We use 64-bit version of stat() to get times since find doesn't return
+ * valid times for very old files (around year 1970). Even stat() seems to
+ * give negative time values but we can live with that. Those around 1970
+ * times can happen when file is created so that it  doesn't get valid
+ * creation or modificatio dates.
+ * @param [in] sDir Base folder for files and subfolders.
+ * @param [in, out] dirs Array where subfolders are stored.
+ * @param [in, out] files Array where files are stored.
  */
 void LoadFiles(const CString & sDir, fentryArray * dirs, fentryArray * files)
 {
@@ -489,14 +514,28 @@
 			DWORD dwIsDirectory = ff.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY;
 			if (dwIsDirectory && StrStr(_T(".."), ff.cFileName))
 				continue;
+
 			fentry ent;
-			// Save filetimes as seconds since January 1, 1970
-			ent.ctime = CTime(ff.ftCreationTime).GetTime();
-			ent.mtime = CTime(ff.ftLastWriteTime).GetTime();
-			if (!dwIsDirectory)
-				ent.size = FileInfo::GetSizeFromFindData(ff);
-			else
-				ent.size = -1;  // No size for directories
+			CString fullpath = paths_ConcatPath(sDir, ff.cFileName);
+			struct _stati64 fstats;
+			if (_tstati64(fullpath, &fstats) == 0)
+			{
+				// Save filetimes as seconds since January 1, 1970
+				// Note that times can be < 0 if they are around that 1970..
+				// Anyway that is not sensible case for normal files so we can
+				// just use zero for their time.
+				ent.ctime = fstats.st_ctime;
+				if (ent.ctime < 0)
+					ent.ctime = 0;
+				ent.mtime = fstats.st_mtime;
+				if (ent.mtime < 0)
+					ent.mtime = 0;
+
+				if (ff.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+					ent.size = -1;  // No size for directories
+				else
+					ent.size = fstats.st_size;
+			}
 			ent.name = ff.cFileName;
 			ent.attrs = ff.dwFileAttributes;
 			(dwIsDirectory ? dirs : files) -> Add(ent);

Modified: trunk/Src/DirViewColHandler.cpp
===================================================================
--- trunk/Src/DirViewColHandler.cpp	2006-11-03 19:39:24 UTC (rev 3767)
+++ trunk/Src/DirViewColHandler.cpp	2006-11-03 19:52:27 UTC (rev 3768)
@@ -199,7 +199,7 @@
 	int nIdx = pParam->item.iItem;
 	int i = ColPhysToLog(pParam->item.iSubItem);
 	POSITION key = GetItemKey(nIdx);
-	if (key == (POSITION) SPECIAL_ITEM_POS)
+	if (key == SPECIAL_ITEM_POS)
 	{
 		if (IsColName(i))
 		{
@@ -215,13 +215,13 @@
 	{
 		CString s = ColGetTextToDisplay(&ctxt, i, di);
 		// Add '*' to newer time field
-		if
-		(
-			(IsColLmTime(i) && di.left.mtime > di.right.mtime) // Left modification time
-		||	(IsColRmTime(i) && di.left.mtime < di.right.mtime) // Right modification time
-		)
+		if (di.left.mtime != 0 || di.right.mtime != 0)
 		{
-			s.Insert(0, _T("* "));
+			if ((IsColLmTime(i) && di.left.mtime > di.right.mtime) ||
+				(IsColRmTime(i) && di.left.mtime < di.right.mtime))
+			{
+				s.Insert(0, _T("* "));
+			}
 		}
 		// Don't show result for folderitems appearing both sides
 		if ((IsColStatus(i) || IsColStatusAbbr(i)) &&

Modified: trunk/Src/DirViewColItems.cpp
===================================================================
--- trunk/Src/DirViewColItems.cpp	2006-11-03 19:39:24 UTC (rev 3767)
+++ trunk/Src/DirViewColItems.cpp	2006-11-03 19:52:27 UTC (rev 3768)
@@ -66,10 +66,10 @@
 }
 /**
  * @brief Function to compare two diffcodes for a sort
+ * @todo How shall we order diff statuses?
  */
 static int cmpdiffcode(int diffcode1, int diffcode2)
 {
-	// TODO: How shall we order these ?
 	return diffcode1-diffcode2;	
 }
 /**

Modified: trunk/Src/FileInfo.cpp
===================================================================
--- trunk/Src/FileInfo.cpp	2006-11-03 19:39:24 UTC (rev 3767)
+++ trunk/Src/FileInfo.cpp	2006-11-03 19:52:27 UTC (rev 3768)
@@ -23,42 +23,45 @@
 // $Id$
 
 #include "stdafx.h"
+#include <sys/types.h>
+#include <sys/stat.h>
 #include "FileInfo.h"
 
 /**
- * @brief Convert a FILETIME to a long (standard time)
- */
-static __int64 FileTimeToInt64(FILETIME & ft)
-{
-	return CTime(ft).GetTime();
-}
-
-/**
  * @brief Update fileinfo from given file
  * @param [in] sFilePath Full path to file/directory to update
+ * @return TRUE if information was updated (item was found).
  */
-void FileInfo::Update(CString sFilePath)
+BOOL FileInfo::Update(CString sFilePath)
 {
-	// CFileFind doesn't expose the attributes
-	// CFileStatus doesn't expose 64 bit size
-
-	WIN32_FIND_DATA wfd;
-	HANDLE h = FindFirstFile(sFilePath, &wfd);
+	struct _stati64 fstats;
 	__int64 mtime64 = 0;
+	BOOL retVal = FALSE;
+
 	size = -1;
 	flags.reset();
 	mtime = 0;
-	if (h != INVALID_HANDLE_VALUE)
+
+	if (_tstati64(sFilePath, &fstats) == 0)
 	{
-		mtime64 = FileTimeToInt64(wfd.ftLastWriteTime);
-		flags.attributes = wfd.dwFileAttributes;
+		// There can be files without modification date.
+		// Then we must use creation date. Of course we assume
+		// creation date then exists...
+		if (fstats.st_mtime == 0)
+			mtime64 = fstats.st_ctime;
+		else
+			mtime64 = fstats.st_mtime;
 
-		// No size for directory ( size remains as -1)$
+		flags.attributes = GetFileAttributes(sFilePath);
+
+		// No size for directory ( size remains as -1)
 		if ((flags.attributes & FILE_ATTRIBUTE_DIRECTORY) == 0)
-			size = FileInfo::GetSizeFromFindData(wfd);
-		FindClose(h);
+			size = fstats.st_size;
+
+		retVal = TRUE;
 	}
 	mtime = mtime64;
+	return retVal;
 }
 
 /**
@@ -72,28 +75,3 @@
 	version.Empty();
 	flags.reset();
 }
-
-/**
- * @brief Returns 64-bit filesize from Windows Find Data.
- * This function calculates 64-bit filesize from given find-data where
- * filesize is in two variables.
- * @param [in] findData Find-data to get filesize.
- * @return 64-bit filesize.
- */
-__int64 FileInfo::GetSizeFromFindData(const WIN32_FIND_DATA & findData)
-{
-	__int64 tmpSize = 0;
-	// Get file's size. If more than 31 bits is needed then we need to
-	// calculate full 64 bits. Since size is signed variable.
-	if (findData.nFileSizeHigh > 0 || findData.nFileSizeLow > INT_MAX)
-	{
-		tmpSize = findData.nFileSizeHigh;
-		tmpSize = tmpSize << 32;
-		tmpSize += findData.nFileSizeLow;
-	}
-	else
-	{
-		tmpSize = findData.nFileSizeLow;
-	}
-	return tmpSize;
-}

Modified: trunk/Src/FileInfo.h
===================================================================
--- trunk/Src/FileInfo.h	2006-11-03 19:39:24 UTC (rev 3767)
+++ trunk/Src/FileInfo.h	2006-11-03 19:52:27 UTC (rev 3768)
@@ -36,12 +36,13 @@
 };
 
 /**
- * @brief Information for file
+ * @brief Information for file.
+ * This class stores basic information from a file or folder.
+ * Information consists of file times, size and attributes.
+ * Also version info can be get for files supporting it.
  */
 struct FileInfo
 {
-	// storing __time_t if MSVC6 (__MSC_VER<1300)
-	// storing __time64_t if MSVC7 (VC.NET)
 	__int64 ctime; /**< time of creation */
 	__int64 mtime; /**< time of last modify */
 	__int64 size; /**< file size in bytes, -1 means file does not exist*/
@@ -49,10 +50,8 @@
 	FileFlags flags; /**< file attributes */
 	FileInfo() { Clear(); }
 
-	void Update(CString sFilePath);
+	BOOL Update(CString sFilePath);
 	void Clear();
-
-	static __int64 GetSizeFromFindData(const WIN32_FIND_DATA & findData);
 };
 
 #endif // _FILE_INFO_H_INCLUDED


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [3767] branches/R2_6/Src

[<ki...@us...>]

Revision: 3767
          http://svn.sourceforge.net/winmerge/?rev=3767&view=rev
Author:   kimmov
Date:     2006-11-03 11:39:24 -0800 (Fri, 03 Nov 2006)

Log Message:
-----------
PATCH: [ 1589438 ] Add read-only info to ProjectFile dialog

Modified Paths:
--------------
    branches/R2_6/Src/Changes.txt
    branches/R2_6/Src/MainFrm.cpp

Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt	2006-11-03 19:35:34 UTC (rev 3766)
+++ branches/R2_6/Src/Changes.txt	2006-11-03 19:39:24 UTC (rev 3767)
@@ -2,6 +2,9 @@
 Add new items to top.
 (This summarizes all changes to all files under Src, including Src\Languages.)
 
+2006-11-03 Kimmo
+ PATCH: [ 1589438 ] Add read-only info to ProjectFile dialog
+  Src: MainFrm.cpp
 2006-11-03 Tim
  PATCH: [ 1589601 ] Add "ReDim" keyword to Visual Basic highlighter
   Src\editlib: basic.cpp

Modified: branches/R2_6/Src/MainFrm.cpp
===================================================================
--- branches/R2_6/Src/MainFrm.cpp	2006-11-03 19:35:34 UTC (rev 3766)
+++ branches/R2_6/Src/MainFrm.cpp	2006-11-03 19:39:24 UTC (rev 3767)
@@ -3072,6 +3072,8 @@
 		left = pMergeDoc->m_filePaths.GetLeft();
 		right = pMergeDoc->m_filePaths.GetRight();
 		pathsDlg.SetPaths(left, right);
+		pathsDlg.m_bLeftPathReadOnly = pMergeDoc->m_ptBuf[0]->GetReadOnly();
+		pathsDlg.m_bRightPathReadOnly = pMergeDoc->m_ptBuf[1]->GetReadOnly();
 	}
 	else if (bDirFrame)
 	{
@@ -3085,6 +3087,9 @@
 		right = item.getRightFilepath(pDoc->GetRightBasePath());
 		right += "\\";
 		pathsDlg.SetPaths(left, right);
+		pathsDlg.m_bIncludeSubfolders = pDoc->GetRecursive();
+		pathsDlg.m_bLeftPathReadOnly = pDoc->GetReadOnly(TRUE);
+		pathsDlg.m_bRightPathReadOnly = pDoc->GetReadOnly(FALSE);
 	}
 
 	CString filterNameOrMask = theApp.m_globalFileFilter.GetFilterNameOrMask();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [3766] trunk/Src

[<ki...@us...>]

Revision: 3766
          http://svn.sourceforge.net/winmerge/?rev=3766&view=rev
Author:   kimmov
Date:     2006-11-03 11:35:34 -0800 (Fri, 03 Nov 2006)

Log Message:
-----------
PATCH: [ 1589438 ] Add read-only info to ProjectFile dialog

Modified Paths:
--------------
    trunk/Src/Changes.txt
    trunk/Src/MainFrm.cpp

Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt	2006-11-03 19:30:14 UTC (rev 3765)
+++ trunk/Src/Changes.txt	2006-11-03 19:35:34 UTC (rev 3766)
@@ -5,6 +5,8 @@
 2006-11-03 Kimmo
  PATCH: [ 1589427 ] Add back read-only handling for project files
   Src: ProjectFile.cpp
+ PATCH: [ 1589438 ] Add read-only info to ProjectFile dialog
+  Src: MainFrm.cpp
 
 2006-11-03 Tim
  PATCH: [ 1589601 ] Add "ReDim" keyword to Visual Basic highlighter

Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp	2006-11-03 19:30:14 UTC (rev 3765)
+++ trunk/Src/MainFrm.cpp	2006-11-03 19:35:34 UTC (rev 3766)
@@ -3059,6 +3059,8 @@
 		left = pMergeDoc->m_filePaths.GetLeft();
 		right = pMergeDoc->m_filePaths.GetRight();
 		pathsDlg.SetPaths(left, right);
+		pathsDlg.m_bLeftPathReadOnly = pMergeDoc->m_ptBuf[0]->GetReadOnly();
+		pathsDlg.m_bRightPathReadOnly = pMergeDoc->m_ptBuf[1]->GetReadOnly();
 	}
 	else if (bDirFrame)
 	{
@@ -3072,6 +3074,9 @@
 		right = item.getRightFilepath(pDoc->GetRightBasePath());
 		right += "\\";
 		pathsDlg.SetPaths(left, right);
+		pathsDlg.m_bIncludeSubfolders = pDoc->GetRecursive();
+		pathsDlg.m_bLeftPathReadOnly = pDoc->GetReadOnly(TRUE);
+		pathsDlg.m_bRightPathReadOnly = pDoc->GetReadOnly(FALSE);
 	}
 
 	CString filterNameOrMask = theApp.m_globalFileFilter.GetFilterNameOrMask();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [3765] trunk/Src

[<ki...@us...>]

Revision: 3765
          http://svn.sourceforge.net/winmerge/?rev=3765&view=rev
Author:   kimmov
Date:     2006-11-03 11:30:14 -0800 (Fri, 03 Nov 2006)

Log Message:
-----------
PATCH: [ 1589427 ] Add back read-only handling for project files

Modified Paths:
--------------
    trunk/Src/Changes.txt
    trunk/Src/ProjectFile.cpp

Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt	2006-11-03 16:33:28 UTC (rev 3764)
+++ trunk/Src/Changes.txt	2006-11-03 19:30:14 UTC (rev 3765)
@@ -2,6 +2,10 @@
 Add new items to top.
 (This summarizes all changes to all files under Src, including Src\Languages.)
 
+2006-11-03 Kimmo
+ PATCH: [ 1589427 ] Add back read-only handling for project files
+  Src: ProjectFile.cpp
+
 2006-11-03 Tim
  PATCH: [ 1589601 ] Add "ReDim" keyword to Visual Basic highlighter
   Src\editlib: basic.cpp

Modified: trunk/Src/ProjectFile.cpp
===================================================================
--- trunk/Src/ProjectFile.cpp	2006-11-03 16:33:28 UTC (rev 3764)
+++ trunk/Src/ProjectFile.cpp	2006-11-03 19:30:14 UTC (rev 3765)
@@ -34,6 +34,8 @@
 const TCHAR Right_element_name[] = _T("right");
 const TCHAR Filter_element_name[] = _T("filter");
 const TCHAR Subfolders_element_name[] = _T("subfolders");
+const TCHAR Left_ro_element_name[] = _T("left-readonly");
+const TCHAR Right_ro_element_name[] = _T("right-readonly");
 
 /** 
  * @brief Standard constructor.
@@ -134,11 +136,15 @@
 		scew_element *right = NULL;
 		scew_element *filter = NULL;
 		scew_element *subfolders = NULL;
+		scew_element *left_ro = NULL;
+		scew_element *right_ro = NULL;
 
 		left = scew_element_by_name(paths, Left_element_name);
 		right = scew_element_by_name(paths, Right_element_name);
 		filter = scew_element_by_name(paths, Filter_element_name);
 		subfolders = scew_element_by_name(paths, Subfolders_element_name);
+		left_ro = scew_element_by_name(paths, Left_ro_element_name);
+		right_ro = scew_element_by_name(paths, Right_ro_element_name);
 
 		if (left)
 		{
@@ -164,6 +170,18 @@
 			folders = scew_element_contents(subfolders);
 			m_subfolders = _ttoi(folders);
 		}
+		if (left_ro)
+		{
+			LPCTSTR readonly = NULL;
+			readonly = scew_element_contents(left_ro);
+			m_bLeftReadOnly = (_ttoi(readonly) != 0);
+		}
+		if (right_ro)
+		{
+			LPCTSTR readonly = NULL;
+			readonly = scew_element_contents(right_ro);
+			m_bRightReadOnly = (_ttoi(readonly) != 0);
+		}
 	}
 }
 
@@ -269,16 +287,24 @@
 		m_filter.ReleaseBuffer();
 	}
 
-	LPCTSTR path;
 	element = scew_element_add(parent, Subfolders_element_name);
 	if (m_subfolders != 0)
-	{
 		scew_element_set_contents(element, _T("1"));
-	}
 	else
-	{
 		scew_element_set_contents(element, _T("0"));
-	}
+
+	element = scew_element_add(parent, Left_ro_element_name);
+	if (m_bLeftReadOnly)
+		scew_element_set_contents(element, _T("1"));
+	else
+		scew_element_set_contents(element, _T("0"));
+
+	element = scew_element_add(parent, Right_ro_element_name);
+	if (m_bRightReadOnly)
+		scew_element_set_contents(element, _T("1"));
+	else
+		scew_element_set_contents(element, _T("0"));
+
 	return TRUE;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [3764] branches/R2_6/Src

[<ge...@us...>]

Revision: 3764
          http://svn.sourceforge.net/winmerge/?rev=3764&view=rev
Author:   gerundt
Date:     2006-11-03 08:33:28 -0800 (Fri, 03 Nov 2006)

Log Message:
-----------
PATCH: [ 1589601 ] Add "ReDim" keyword to Visual Basic highlighter

Modified Paths:
--------------
    branches/R2_6/Src/Changes.txt
    branches/R2_6/Src/editlib/basic.cpp

Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt	2006-11-03 16:30:52 UTC (rev 3763)
+++ branches/R2_6/Src/Changes.txt	2006-11-03 16:33:28 UTC (rev 3764)
@@ -2,6 +2,10 @@
 Add new items to top.
 (This summarizes all changes to all files under Src, including Src\Languages.)
 
+2006-11-03 Tim
+ PATCH: [ 1589601 ] Add "ReDim" keyword to Visual Basic highlighter
+  Src\editlib: basic.cpp
+
 2006-11-02 Kimmo
  PATCH: [ 1588212 ] Add manifest file to resource file
   Src: Merge.rc

Modified: branches/R2_6/Src/editlib/basic.cpp
===================================================================
--- branches/R2_6/Src/editlib/basic.cpp	2006-11-03 16:30:52 UTC (rev 3763)
+++ branches/R2_6/Src/editlib/basic.cpp	2006-11-03 16:33:28 UTC (rev 3764)
@@ -173,6 +173,7 @@
     _T ("Public"),
     _T ("Private"),
     _T ("Property"),
+    _T ("ReDim"),
     _T ("Rem"),
     _T ("Resume"),
     _T ("Right"),


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [3763] trunk/Src

[<ge...@us...>]

Revision: 3763
          http://svn.sourceforge.net/winmerge/?rev=3763&view=rev
Author:   gerundt
Date:     2006-11-03 08:30:52 -0800 (Fri, 03 Nov 2006)

Log Message:
-----------
PATCH: [ 1589601 ] Add "ReDim" keyword to Visual Basic highlighter

Modified Paths:
--------------
    trunk/Src/Changes.txt
    trunk/Src/editlib/basic.cpp

Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt	2006-11-03 16:25:32 UTC (rev 3762)
+++ trunk/Src/Changes.txt	2006-11-03 16:30:52 UTC (rev 3763)
@@ -2,6 +2,10 @@
 Add new items to top.
 (This summarizes all changes to all files under Src, including Src\Languages.)
 
+2006-11-03 Tim
+ PATCH: [ 1589601 ] Add "ReDim" keyword to Visual Basic highlighter
+  Src\editlib: basic.cpp
+
 2006-11-01 Kimmo
  Add Expat version 2.0.0 to /Externals/expat (revision: 3749)
   New folder: /Externals/Expat

Modified: trunk/Src/editlib/basic.cpp
===================================================================
--- trunk/Src/editlib/basic.cpp	2006-11-03 16:25:32 UTC (rev 3762)
+++ trunk/Src/editlib/basic.cpp	2006-11-03 16:30:52 UTC (rev 3763)
@@ -173,6 +173,7 @@
     _T ("Public"),
     _T ("Private"),
     _T ("Property"),
+    _T ("ReDim"),
     _T ("Rem"),
     _T ("Resume"),
     _T ("Right"),


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [3762] branches/R2_6/Docs/Developers

[<ge...@us...>]

Revision: 3762
          http://svn.sourceforge.net/winmerge/?rev=3762&view=rev
Author:   gerundt
Date:     2006-11-03 08:25:32 -0800 (Fri, 03 Nov 2006)

Log Message:
-----------
PATCH: [ 1589578 ] Add <h4> style to readme-developers.html

Modified Paths:
--------------
    branches/R2_6/Docs/Developers/Changes.txt
    branches/R2_6/Docs/Developers/readme-developers.html

Modified: branches/R2_6/Docs/Developers/Changes.txt
===================================================================
--- branches/R2_6/Docs/Developers/Changes.txt	2006-11-03 16:22:10 UTC (rev 3761)
+++ branches/R2_6/Docs/Developers/Changes.txt	2006-11-03 16:25:32 UTC (rev 3762)
@@ -1,3 +1,7 @@
+2006-11-03 Tim
+ PATCH: [ 1589578 ] Add <h4> style to readme-developers.html
+  Developers: readme-developers.html
+
 2006-09-25 Kimmo
  Add info about different PSDK versions and components needed
   Developers: readme-developers.html

Modified: branches/R2_6/Docs/Developers/readme-developers.html
===================================================================
--- branches/R2_6/Docs/Developers/readme-developers.html	2006-11-03 16:22:10 UTC (rev 3761)
+++ branches/R2_6/Docs/Developers/readme-developers.html	2006-11-03 16:25:32 UTC (rev 3762)
@@ -11,6 +11,11 @@
       border-left: 4px solid #FFCC00;
       border-bottom: 1px solid #FFCC00;
     }
+    h4 {
+      padding: 2px;
+      border-left: 8px solid #FF9933;
+      border-bottom: 1px solid #FF9933;
+    }
     pre {
       margin-left: 25px;
       margin-right: 25px;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [3761] trunk/Docs/Developers

[<ge...@us...>]

Revision: 3761
          http://svn.sourceforge.net/winmerge/?rev=3761&view=rev
Author:   gerundt
Date:     2006-11-03 08:22:10 -0800 (Fri, 03 Nov 2006)

Log Message:
-----------
PATCH: [ 1589578 ] Add <h4> style to readme-developers.html

Modified Paths:
--------------
    trunk/Docs/Developers/Changes.txt
    trunk/Docs/Developers/readme-developers.html

Modified: trunk/Docs/Developers/Changes.txt
===================================================================
--- trunk/Docs/Developers/Changes.txt	2006-11-02 23:13:55 UTC (rev 3760)
+++ trunk/Docs/Developers/Changes.txt	2006-11-03 16:22:10 UTC (rev 3761)
@@ -1,3 +1,7 @@
+2006-11-03 Tim
+ PATCH: [ 1589578 ] Add <h4> style to readme-developers.html
+  Developers: readme-developers.html
+
 2006-11-02 Kimmo
  Update installer doc for expat dlls
   Developers: readme-InnoSetup.html

Modified: trunk/Docs/Developers/readme-developers.html
===================================================================
--- trunk/Docs/Developers/readme-developers.html	2006-11-02 23:13:55 UTC (rev 3760)
+++ trunk/Docs/Developers/readme-developers.html	2006-11-03 16:22:10 UTC (rev 3761)
@@ -11,6 +11,11 @@
       border-left: 4px solid #FFCC00;
       border-bottom: 1px solid #FFCC00;
     }
+    h4 {
+      padding: 2px;
+      border-left: 8px solid #FF9933;
+      border-bottom: 1px solid #FF9933;
+    }
     pre {
       margin-left: 25px;
       margin-right: 25px;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [3760] trunk/Docs/Developers

[<ki...@us...>]

Revision: 3760
          http://svn.sourceforge.net/winmerge/?rev=3760&view=rev
Author:   kimmov
Date:     2006-11-02 15:13:55 -0800 (Thu, 02 Nov 2006)

Log Message:
-----------
Update installer doc for expat dlls

Modified Paths:
--------------
    trunk/Docs/Developers/Changes.txt
    trunk/Docs/Developers/readme-InnoSetup.html

Modified: trunk/Docs/Developers/Changes.txt
===================================================================
--- trunk/Docs/Developers/Changes.txt	2006-11-02 17:51:37 UTC (rev 3759)
+++ trunk/Docs/Developers/Changes.txt	2006-11-02 23:13:55 UTC (rev 3760)
@@ -1,3 +1,7 @@
+2006-11-02 Kimmo
+ Update installer doc for expat dlls
+  Developers: readme-InnoSetup.html
+
 2006-11-01 Kimmo
  Update building instructions after expat and scew addition
   Developers: readme-developers.html

Modified: trunk/Docs/Developers/readme-InnoSetup.html
===================================================================
--- trunk/Docs/Developers/readme-InnoSetup.html	2006-11-02 17:51:37 UTC (rev 3759)
+++ trunk/Docs/Developers/readme-InnoSetup.html	2006-11-02 23:13:55 UTC (rev 3760)
@@ -65,6 +65,13 @@
   <code>Build/</code>
   <ul>
     <li>
+     <code>expat</code>
+     <ul>
+      <li><code>libexpat.dll</code></li>
+      <li><code>libexpatw.dll</code></li>
+     </ul>
+    </li>
+    <li>
      <code>Languages</code>
      <ul>
       <li><code>*.lang</code></li>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [3759] branches/R2_6/Installer/InnoSetup

[<ki...@us...>]

Revision: 3759
          http://svn.sourceforge.net/winmerge/?rev=3759&view=rev
Author:   kimmov
Date:     2006-11-02 09:51:37 -0800 (Thu, 02 Nov 2006)

Log Message:
-----------
PATCH: [ 1588234 ] Remove manifest files from the installer

Modified Paths:
--------------
    branches/R2_6/Installer/InnoSetup/Changes.txt
    branches/R2_6/Installer/InnoSetup/WinMerge.iss

Modified: branches/R2_6/Installer/InnoSetup/Changes.txt
===================================================================
--- branches/R2_6/Installer/InnoSetup/Changes.txt	2006-11-02 17:48:14 UTC (rev 3758)
+++ branches/R2_6/Installer/InnoSetup/Changes.txt	2006-11-02 17:51:37 UTC (rev 3759)
@@ -1,3 +1,7 @@
+2006-11-02 Kimmo
+ PATCH: [ 1588234 ] Remove manifest files from the installer
+  InnoSetup: WinMerge.iss
+
 2006-09-26 Kimmo
  PATCH: [ 1563171 ] Catalan translation update
   Submitted by Jordi Vilar

Modified: branches/R2_6/Installer/InnoSetup/WinMerge.iss
===================================================================
--- branches/R2_6/Installer/InnoSetup/WinMerge.iss	2006-11-02 17:48:14 UTC (rev 3758)
+++ branches/R2_6/Installer/InnoSetup/WinMerge.iss	2006-11-02 17:51:37 UTC (rev 3759)
@@ -248,9 +248,9 @@
 Name: {app}\WinMerge.exe; Type: files; MinVersion: 4, 0
 Name: {app}\WinMergeU.exe; Type: files; MinVersion: 0, 4
 
-;The other manifest file is legitimate, but is only valid on windows XP or higher, so if the operating system isn't at least windows XP the
-;Manifest file is indeed removed.
-Name: {app}\WinMergeU.exe.manifest; Type: files; OnlyBelowVersion: 0, 5.01
+;Remove manifest files as we don't need them in 2.6.2 / 2.7.1.1 or later
+Name: {app}\WinMerge.exe.manifest; Type: files
+Name: {app}\WinMergeU.exe.manifest; Type: files
 
 ;This won't work, because the file has to be unregistered, and explorer closed, first.
 ;Name: {app}\ShellExtension.dll; Type: files; Check: TaskDisabled('ShellExtension')
@@ -315,10 +315,6 @@
 Source: ..\..\Build\MergeUnicodeRelease\WinMergeU.exe; DestDir: {app}; Flags: promptifolder; MinVersion: 0, 4; Components: Core
 Source: ..\..\Build\MergeRelease\WinMerge.exe; DestDir: {app}; Flags: promptifolder; Components: Core; Check: not IsWin64
 
-;The MinVersion forces Inno Setup to only copy the following file if the user is running a WinNT platform system
-Source: WinMergeU.exe.manifest; DestDir: {app}; Flags: promptifolder; MinVersion: 0, 5.01; Components: Core
-Source: WinMerge.exe.manifest; DestDir: {app}; Flags: promptifolder; Components: Core; MinVersion: 0,5.01; Check: not IsWin64
-
 ; Icon for projectfiles
 Source: MergeProject.ico; DestDir: {app}; Flags: promptifolder; Components: Core
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [3758] branches/R2_6

[<ki...@us...>]

Revision: 3758
          http://svn.sourceforge.net/winmerge/?rev=3758&view=rev
Author:   kimmov
Date:     2006-11-02 09:48:14 -0800 (Thu, 02 Nov 2006)

Log Message:
-----------
PATCH: [ 1588212 ] Add manifest file to resource file

Modified Paths:
--------------
    branches/R2_6/Src/Changes.txt
    branches/R2_6/Src/Languages/Brazilian/MergeBrazilian.rc
    branches/R2_6/Src/Languages/Bulgarian/MergeBulgarian.rc
    branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc
    branches/R2_6/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
    branches/R2_6/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
    branches/R2_6/Src/Languages/Czech/MergeCzech.rc
    branches/R2_6/Src/Languages/Danish/MergeDanish.rc
    branches/R2_6/Src/Languages/Dutch/MergeDutch.rc
    branches/R2_6/Src/Languages/French/MergeFrench.rc
    branches/R2_6/Src/Languages/German/MergeGerman.rc
    branches/R2_6/Src/Languages/Hungarian/MergeHungarian.rc
    branches/R2_6/Src/Languages/Italian/MergeItalian.rc
    branches/R2_6/Src/Languages/Japanese/MergeJapanese.rc
    branches/R2_6/Src/Languages/Korean/MergeKorean.rc
    branches/R2_6/Src/Languages/Norwegian/MergeNorwegian.rc
    branches/R2_6/Src/Languages/Polish/MergePolish.rc
    branches/R2_6/Src/Languages/Russian/MergeRussian.rc
    branches/R2_6/Src/Languages/Slovak/MergeSlovak.rc
    branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc
    branches/R2_6/Src/Languages/Swedish/MergeSwedish.rc
    branches/R2_6/Src/Languages/Turkish/MergeTurkish.rc
    branches/R2_6/Src/Merge.rc

Added Paths:
-----------
    branches/R2_6/Src/res/WinMerge.exe.manifest
    branches/R2_6/Src/res/WinMergeU.exe.manifest

Removed Paths:
-------------
    branches/R2_6/Installer/InnoSetup/WinMerge.exe.manifest
    branches/R2_6/Installer/InnoSetup/WinMergeU.exe.manifest

Deleted: branches/R2_6/Installer/InnoSetup/WinMerge.exe.manifest
===================================================================
--- branches/R2_6/Installer/InnoSetup/WinMerge.exe.manifest	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Installer/InnoSetup/WinMerge.exe.manifest	2006-11-02 17:48:14 UTC (rev 3758)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-	<assemblyIdentity
-	   version="1.0.0.0"
-	   processorArchitecture="X86"
-	   name="Microsoft.Winweb.WinMerge"
-	   type="win32"
-	/>
-	<description>WinMerge Application</description>
-	<dependency>
-	   <dependentAssembly>
-	     <assemblyIdentity
-	       type="win32"
-	       name="Microsoft.Windows.Common-Controls"
-	       version="6.0.0.0"
-	       processorArchitecture="X86"
-	       publicKeyToken="6595b64144ccf1df"
-	       language="*"
-	     />
-	   </dependentAssembly>
-	</dependency>
-</assembly>
\ No newline at end of file

Deleted: branches/R2_6/Installer/InnoSetup/WinMergeU.exe.manifest
===================================================================
--- branches/R2_6/Installer/InnoSetup/WinMergeU.exe.manifest	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Installer/InnoSetup/WinMergeU.exe.manifest	2006-11-02 17:48:14 UTC (rev 3758)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-	<assemblyIdentity
-	   version="1.0.0.0"
-	   processorArchitecture="X86"
-	   name="Microsoft.Winweb.WinMerge"
-	   type="win32"
-	/>
-	<description>WinMerge Application</description>
-	<dependency>
-	   <dependentAssembly>
-	     <assemblyIdentity
-	       type="win32"
-	       name="Microsoft.Windows.Common-Controls"
-	       version="6.0.0.0"
-	       processorArchitecture="X86"
-	       publicKeyToken="6595b64144ccf1df"
-	       language="*"
-	     />
-	   </dependentAssembly>
-	</dependency>
-</assembly>
\ No newline at end of file

Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Changes.txt	2006-11-02 17:48:14 UTC (rev 3758)
@@ -2,6 +2,13 @@
 Add new items to top.
 (This summarizes all changes to all files under Src, including Src\Languages.)
 
+2006-11-02 Kimmo
+ PATCH: [ 1588212 ] Add manifest file to resource file
+  Src: Merge.rc
+  Src/Languages/*: Merge*.rc
+  Move files from Installer/InnoSetup: WinMerge.exe.manifest WinMergeU.exe.manifest
+   to Src/res
+
 2006-10-31 Kimmo
  PATCH: [ 1586869 ] Fix File Select -dialog modality
   Src: DirCmpReportDlg.cpp FileFiltersDlg.cpp MainFrm.cpp Merge.cpp Merge.h

Modified: branches/R2_6/Src/Languages/Brazilian/MergeBrazilian.rc
===================================================================
--- branches/R2_6/Src/Languages/Brazilian/MergeBrazilian.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Brazilian/MergeBrazilian.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/Bulgarian/MergeBulgarian.rc
===================================================================
--- branches/R2_6/Src/Languages/Bulgarian/MergeBulgarian.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Bulgarian/MergeBulgarian.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc
===================================================================
--- branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
===================================================================
--- branches/R2_6/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -62,6 +62,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
===================================================================
--- branches/R2_6/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/Czech/MergeCzech.rc
===================================================================
--- branches/R2_6/Src/Languages/Czech/MergeCzech.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Czech/MergeCzech.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/Danish/MergeDanish.rc
===================================================================
--- branches/R2_6/Src/Languages/Danish/MergeDanish.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Danish/MergeDanish.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/Dutch/MergeDutch.rc
===================================================================
--- branches/R2_6/Src/Languages/Dutch/MergeDutch.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Dutch/MergeDutch.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/French/MergeFrench.rc
===================================================================
--- branches/R2_6/Src/Languages/French/MergeFrench.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/French/MergeFrench.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/German/MergeGerman.rc
===================================================================
--- branches/R2_6/Src/Languages/German/MergeGerman.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/German/MergeGerman.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/Hungarian/MergeHungarian.rc
===================================================================
--- branches/R2_6/Src/Languages/Hungarian/MergeHungarian.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Hungarian/MergeHungarian.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/Italian/MergeItalian.rc
===================================================================
--- branches/R2_6/Src/Languages/Italian/MergeItalian.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Italian/MergeItalian.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/Japanese/MergeJapanese.rc
===================================================================
--- branches/R2_6/Src/Languages/Japanese/MergeJapanese.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Japanese/MergeJapanese.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/Korean/MergeKorean.rc
===================================================================
--- branches/R2_6/Src/Languages/Korean/MergeKorean.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Korean/MergeKorean.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/Norwegian/MergeNorwegian.rc
===================================================================
--- branches/R2_6/Src/Languages/Norwegian/MergeNorwegian.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Norwegian/MergeNorwegian.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/Polish/MergePolish.rc
===================================================================
--- branches/R2_6/Src/Languages/Polish/MergePolish.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Polish/MergePolish.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/Russian/MergeRussian.rc
===================================================================
--- branches/R2_6/Src/Languages/Russian/MergeRussian.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Russian/MergeRussian.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/Slovak/MergeSlovak.rc
===================================================================
--- branches/R2_6/Src/Languages/Slovak/MergeSlovak.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Slovak/MergeSlovak.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc
===================================================================
--- branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/Swedish/MergeSwedish.rc
===================================================================
--- branches/R2_6/Src/Languages/Swedish/MergeSwedish.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Swedish/MergeSwedish.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/Turkish/MergeTurkish.rc
===================================================================
--- branches/R2_6/Src/Languages/Turkish/MergeTurkish.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Turkish/MergeTurkish.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Merge.rc
===================================================================
--- branches/R2_6/Src/Merge.rc	2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Merge.rc	2006-11-02 17:48:14 UTC (rev 3758)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Copied: branches/R2_6/Src/res/WinMerge.exe.manifest (from rev 3757, branches/R2_6/Installer/InnoSetup/WinMerge.exe.manifest)
===================================================================
--- branches/R2_6/Src/res/WinMerge.exe.manifest	                        (rev 0)
+++ branches/R2_6/Src/res/WinMerge.exe.manifest	2006-11-02 17:48:14 UTC (rev 3758)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+	<assemblyIdentity
+	   version="1.0.0.0"
+	   processorArchitecture="X86"
+	   name="Microsoft.Winweb.WinMerge"
+	   type="win32"
+	/>
+	<description>WinMerge Application</description>
+	<dependency>
+	   <dependentAssembly>
+	     <assemblyIdentity
+	       type="win32"
+	       name="Microsoft.Windows.Common-Controls"
+	       version="6.0.0.0"
+	       processorArchitecture="X86"
+	       publicKeyToken="6595b64144ccf1df"
+	       language="*"
+	     />
+	   </dependentAssembly>
+	</dependency>
+</assembly>
\ No newline at end of file

Copied: branches/R2_6/Src/res/WinMergeU.exe.manifest (from rev 3757, branches/R2_6/Installer/InnoSetup/WinMergeU.exe.manifest)
===================================================================
--- branches/R2_6/Src/res/WinMergeU.exe.manifest	                        (rev 0)
+++ branches/R2_6/Src/res/WinMergeU.exe.manifest	2006-11-02 17:48:14 UTC (rev 3758)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+	<assemblyIdentity
+	   version="1.0.0.0"
+	   processorArchitecture="X86"
+	   name="Microsoft.Winweb.WinMerge"
+	   type="win32"
+	/>
+	<description>WinMerge Application</description>
+	<dependency>
+	   <dependentAssembly>
+	     <assemblyIdentity
+	       type="win32"
+	       name="Microsoft.Windows.Common-Controls"
+	       version="6.0.0.0"
+	       processorArchitecture="X86"
+	       publicKeyToken="6595b64144ccf1df"
+	       language="*"
+	     />
+	   </dependentAssembly>
+	</dependency>
+</assembly>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [3757] trunk/Web

[<ge...@us...>]

Revision: 3757
          http://svn.sourceforge.net/winmerge/?rev=3757&view=rev
Author:   gerundt
Date:     2006-11-01 13:28:14 -0800 (Wed, 01 Nov 2006)

Log Message:
-----------
PATCH: [ 1586854 ] Web: Change font to Verdana

Modified Paths:
--------------
    trunk/Web/Changes.txt
    trunk/Web/css/all.css
    trunk/Web/css/print.css

Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt	2006-11-01 18:42:51 UTC (rev 3756)
+++ trunk/Web/Changes.txt	2006-11-01 21:28:14 UTC (rev 3757)
@@ -1,3 +1,7 @@
+2006-11-01 Tim
+ PATCH: [ 1586854 ] Web: Change font to Verdana
+  Web\css: all.css print.css
+
 2006-10-30 Tim
  BUG: [ 1586836 ] Web: Translation status say 2.4 is still "latest stable"
   Web\developer\l10n: status.php

Modified: trunk/Web/css/all.css
===================================================================
--- trunk/Web/css/all.css	2006-11-01 18:42:51 UTC (rev 3756)
+++ trunk/Web/css/all.css	2006-11-01 21:28:14 UTC (rev 3757)
@@ -3,9 +3,15 @@
 	padding: 0;
 	color: black;
 	background: white;
-	font-family: sans-serif;
+	font-family: Verdana,Helvetica,Arial,sans-serif;
+	font-size: small;
 }
 
+code,pre {
+	font-family: "Courier New",Courier,monospace;
+	font-size: 1em;
+}
+
 #head {
 	margin: 0;
 	padding: 5px 5px 0 15px;
@@ -82,7 +88,7 @@
 	margin: 5px;
 	margin-top: 10px;
 	padding: 5px;
-	width: 11.2em;
+	width: 12em;
 	background: #C0C0C0;
 	border: 1px solid #808080;
 }
@@ -90,7 +96,6 @@
 #nav h2 {
 	margin: 0;
 	padding: 0 0 5px 0;
-	font-family: sans-serif;
 	font-size: medium;
 }
 
@@ -102,12 +107,12 @@
 }
 
 #ads {
-	margin: 5px;
+	margin: 5px 0 0 14em;
 	padding: 5px;
 }
 
 #content {
-	margin: 5px 0 0 12.5em;
+	margin: 5px 0 0 14em;
 	padding: 5px;
 }
 
@@ -115,11 +120,6 @@
 	margin-top: 0;
 }
 
-h1, h2, h3, h4 {
-	font-family: serif;
-	font-weight: bold;
-}
-
 p.important {
 	padding: 5px;
 	background-color: #FFDDDD;

Modified: trunk/Web/css/print.css
===================================================================
--- trunk/Web/css/print.css	2006-11-01 18:42:51 UTC (rev 3756)
+++ trunk/Web/css/print.css	2006-11-01 21:28:14 UTC (rev 3757)
@@ -3,9 +3,15 @@
 	padding: 0;
 	color: black;
 	background: white;
-	font-family: sans-serif;
+	font-family: Verdana,Helvetica,Arial,sans-serif;
+	font-size: small;
 }
 
+code,pre {
+	font-family: "Courier New",Courier,monospace;
+	font-size: 1em;
+}
+
 #head {
 	margin: 0;
 	padding: 5px;
@@ -38,11 +44,6 @@
 	margin-top: 0;
 }
 
-h1, h2, h3, h4 {
-	font-family: serif;
-	font-weight: bold;
-}
-
 p.important {
 	padding: 5px;
 	background-color: #FFFFFF;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [3756] trunk/Installer/InnoSetup

[<ki...@us...>]

Revision: 3756
          http://svn.sourceforge.net/winmerge/?rev=3756&view=rev
Author:   kimmov
Date:     2006-11-01 10:42:51 -0800 (Wed, 01 Nov 2006)

Log Message:
-----------
PATCH: [ 1588234 ] Remove manifest files from the installer

Modified Paths:
--------------
    trunk/Installer/InnoSetup/Changes.txt
    trunk/Installer/InnoSetup/WinMerge.iss

Modified: trunk/Installer/InnoSetup/Changes.txt
===================================================================
--- trunk/Installer/InnoSetup/Changes.txt	2006-11-01 18:32:37 UTC (rev 3755)
+++ trunk/Installer/InnoSetup/Changes.txt	2006-11-01 18:42:51 UTC (rev 3756)
@@ -1,3 +1,7 @@
+2006-11-01 Kimmo
+ PATCH: [ 1588234 ] Remove manifest files from the installer
+  InnoSetup: WinMerge.iss
+
 2006-09-26 Kimmo
  PATCH: [ 1563171 ] Catalan translation update
   Submitted by Jordi Vilar

Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss	2006-11-01 18:32:37 UTC (rev 3755)
+++ trunk/Installer/InnoSetup/WinMerge.iss	2006-11-01 18:42:51 UTC (rev 3756)
@@ -248,9 +248,9 @@
 Name: {app}\WinMerge.exe; Type: files; MinVersion: 4, 0
 Name: {app}\WinMergeU.exe; Type: files; MinVersion: 0, 4
 
-;The other manifest file is legitimate, but is only valid on windows XP or higher, so if the operating system isn't at least windows XP the
-;Manifest file is indeed removed.
-Name: {app}\WinMergeU.exe.manifest; Type: files; OnlyBelowVersion: 0, 5.01
+;Remove manifest files as we don't need them in 2.6.2 / 2.7.1.1 or later
+Name: {app}\WinMerge.exe.manifest; Type: files
+Name: {app}\WinMergeU.exe.manifest; Type: files
 
 ;This won't work, because the file has to be unregistered, and explorer closed, first.
 ;Name: {app}\ShellExtension.dll; Type: files; Check: TaskDisabled('ShellExtension')
@@ -315,10 +315,6 @@
 Source: ..\..\Build\MergeUnicodeRelease\WinMergeU.exe; DestDir: {app}; Flags: promptifolder; MinVersion: 0, 4; Components: Core
 Source: ..\..\Build\MergeRelease\WinMerge.exe; DestDir: {app}; Flags: promptifolder; Components: Core; Check: not IsWin64
 
-;The MinVersion forces Inno Setup to only copy the following file if the user is running a WinNT platform system
-Source: WinMergeU.exe.manifest; DestDir: {app}; Flags: promptifolder; MinVersion: 0, 5.01; Components: Core
-Source: WinMerge.exe.manifest; DestDir: {app}; Flags: promptifolder; Components: Core; MinVersion: 0,5.01; Check: not IsWin64
-
 ; Icon for projectfiles
 Source: MergeProject.ico; DestDir: {app}; Flags: promptifolder; Components: Core
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [3755] trunk

[<ki...@us...>]

Revision: 3755
          http://svn.sourceforge.net/winmerge/?rev=3755&view=rev
Author:   kimmov
Date:     2006-11-01 10:32:37 -0800 (Wed, 01 Nov 2006)

Log Message:
-----------
PATCH: [ 1588212 ] Add manifest file to resource file

Modified Paths:
--------------
    trunk/Src/Changes.txt
    trunk/Src/Languages/Brazilian/MergeBrazilian.rc
    trunk/Src/Languages/Bulgarian/MergeBulgarian.rc
    trunk/Src/Languages/Catalan/MergeCatalan.rc
    trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
    trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
    trunk/Src/Languages/Czech/MergeCzech.rc
    trunk/Src/Languages/Danish/MergeDanish.rc
    trunk/Src/Languages/Dutch/MergeDutch.rc
    trunk/Src/Languages/French/MergeFrench.rc
    trunk/Src/Languages/German/MergeGerman.rc
    trunk/Src/Languages/Hungarian/MergeHungarian.rc
    trunk/Src/Languages/Italian/MergeItalian.rc
    trunk/Src/Languages/Japanese/MergeJapanese.rc
    trunk/Src/Languages/Korean/MergeKorean.rc
    trunk/Src/Languages/Norwegian/MergeNorwegian.rc
    trunk/Src/Languages/Polish/MergePolish.rc
    trunk/Src/Languages/Russian/MergeRussian.rc
    trunk/Src/Languages/Slovak/MergeSlovak.rc
    trunk/Src/Languages/Spanish/MergeSpanish.rc
    trunk/Src/Languages/Swedish/MergeSwedish.rc
    trunk/Src/Languages/Turkish/MergeTurkish.rc
    trunk/Src/Merge.rc

Added Paths:
-----------
    trunk/Src/res/WinMerge.exe.manifest
    trunk/Src/res/WinMergeU.exe.manifest

Removed Paths:
-------------
    trunk/Installer/InnoSetup/WinMerge.exe.manifest
    trunk/Installer/InnoSetup/WinMergeU.exe.manifest

Deleted: trunk/Installer/InnoSetup/WinMerge.exe.manifest
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.exe.manifest	2006-11-01 16:35:58 UTC (rev 3754)
+++ trunk/Installer/InnoSetup/WinMerge.exe.manifest	2006-11-01 18:32:37 UTC (rev 3755)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-	<assemblyIdentity
-	   version="1.0.0.0"
-	   processorArchitecture="X86"
-	   name="Microsoft.Winweb.WinMerge"
-	   type="win32"
-	/>
-	<description>WinMerge Application</description>
-	<dependency>
-	   <dependentAssembly>
-	     <assemblyIdentity
-	       type="win32"
-	       name="Microsoft.Windows.Common-Controls"
-	       version="6.0.0.0"
-	       processorArchitecture="X86"
-	       publicKeyToken="6595b64144ccf1df"
-	       language="*"
-	     />
-	   </dependentAssembly>
-	</dependency>
-</assembly>
\ No newline at end of file

Deleted: trunk/Installer/InnoSetup/WinMergeU.exe.manifest
===================================================================
--- trunk/Installer/InnoSetup/WinMergeU.exe.manifest	2006-11-01 16:35:58 UTC (rev 3754)
+++ trunk/Installer/InnoSetup/WinMergeU.exe.manifest	2006-11-01 18:32:37 UTC (rev 3755)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-	<assemblyIdentity
-	   version="1.0.0.0"
-	   processorArchitecture="X86"
-	   name="Microsoft.Winweb.WinMerge"
-	   type="win32"
-	/>
-	<description>WinMerge Application</description>
-	<dependency>
-	   <dependentAssembly>
-	     <assemblyIdentity
-	       type="win32"
-	       name="Microsoft.Windows.Common-Controls"
-	       version="6.0.0.0"
-	       processorArchitecture="X86"
-	       publicKeyToken="6595b64144ccf1df"
-	       language="*"
-	     />
-	   </dependentAssembly>
-	</dependency>
-</assembly>
\ No newline at end of file

Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt	2006-11-01 16:35:58 UTC (rev 3754)
+++ trunk/Src/Changes.txt	2006-11-01 18:32:37 UTC (rev 3755)
@@ -10,6 +10,11 @@
  PATCH: [ 1587574 ] Convert project files code to use expat+SCEW
   Src: Merge.dsp ProjectFile.cpp ProjectFile.h
   Remove folder: Src/ExpatLib/*
+ PATCH: [ 1588212 ] Add manifest file to resource file
+  Src: Merge.rc
+  Src/Languages/*: Merge*.rc
+  Move files from Installer/InnoSetup: WinMerge.exe.manifest WinMergeU.exe.manifest
+   to Src/res
 
 2006-10-31 Kimmo
  PATCH: [ 1586869 ] Fix File Select -dialog modality (commit the file I missed in previous commit)

Modified: trunk/Src/Languages/Brazilian/MergeBrazilian.rc
===================================================================
--- trunk/Src/Languages/Brazilian/MergeBrazilian.rc	2006-11-01 16:35:58 UTC (rev 3754)
+++ trunk/Src/Languages/Brazilian/MergeBrazilian.rc	2006-11-01 18:32:37 UTC (rev 3755)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: trunk/Src/Languages/Bulgarian/MergeBulgarian.rc
===================================================================
--- trunk/Src/Languages/Bulgarian/MergeBulgarian.rc	2006-11-01 16:35:58 UTC (rev 3754)
+++ trunk/Src/Languages/Bulgarian/MergeBulgarian.rc	2006-11-01 18:32:37 UTC (rev 3755)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: trunk/Src/Languages/Catalan/MergeCatalan.rc
===================================================================
--- trunk/Src/Languages/Catalan/MergeCatalan.rc	2006-11-01 16:35:58 UTC (rev 3754)
+++ trunk/Src/Languages/Catalan/MergeCatalan.rc	2006-11-01 18:32:37 UTC (rev 3755)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
===================================================================
--- trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc	2006-11-01 16:35:58 UTC (rev 3754)
+++ trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc	2006-11-01 18:32:37 UTC (rev 3755)
@@ -62,6 +62,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
===================================================================
--- trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc	2006-11-01 16:35:58 UTC (rev 3754)
+++ trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc	2006-11-01 18:32:37 UTC (rev 3755)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: trunk/Src/Languages/Czech/MergeCzech.rc
===================================================================
--- trunk/Src/Languages/Czech/MergeCzech.rc	2006-11-01 16:35:58 UTC (rev 3754)
+++ trunk/Src/Languages/Czech/MergeCzech.rc	2006-11-01 18:32:37 UTC (rev 3755)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: trunk/Src/Languages/Danish/MergeDanish.rc
===================================================================
--- trunk/Src/Languages/Danish/MergeDanish.rc	2006-11-01 16:35:58 UTC (rev 3754)
+++ trunk/Src/Languages/Danish/MergeDanish.rc	2006-11-01 18:32:37 UTC (rev 3755)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: trunk/Src/Languages/Dutch/MergeDutch.rc
===================================================================
--- trunk/Src/Languages/Dutch/MergeDutch.rc	2006-11-01 16:35:58 UTC (rev 3754)
+++ trunk/Src/Languages/Dutch/MergeDutch.rc	2006-11-01 18:32:37 UTC (rev 3755)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: trunk/Src/Languages/French/MergeFrench.rc
===================================================================
--- trunk/Src/Languages/French/MergeFrench.rc	2006-11-01 16:35:58 UTC (rev 3754)
+++ trunk/Src/Languages/French/MergeFrench.rc	2006-11-01 18:32:37 UTC (rev 3755)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: trunk/Src/Languages/German/MergeGerman.rc
===================================================================
--- trunk/Src/Languages/German/MergeGerman.rc	2006-11-01 16:35:58 UTC (rev 3754)
+++ trunk/Src/Languages/German/MergeGerman.rc	2006-11-01 18:32:37 UTC (rev 3755)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: trunk/Src/Languages/Hungarian/MergeHungarian.rc
===================================================================
--- trunk/Src/Languages/Hungarian/MergeHungarian.rc	2006-11-01 16:35:58 UTC (rev 3754)
+++ trunk/Src/Languages/Hungarian/MergeHungarian.rc	2006-11-01 18:32:37 UTC (rev 3755)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: trunk/Src/Languages/Italian/MergeItalian.rc
===================================================================
--- trunk/Src/Languages/Italian/MergeItalian.rc	2006-11-01 16:35:58 UTC (rev 3754)
+++ trunk/Src/Languages/Italian/MergeItalian.rc	2006-11-01 18:32:37 UTC (rev 3755)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: trunk/Src/Languages/Japanese/MergeJapanese.rc
===================================================================
--- trunk/Src/Languages/Japanese/MergeJapanese.rc	2006-11-01 16:35:58 UTC (rev 3754)
+++ trunk/Src/Languages/Japanese/MergeJapanese.rc	2006-11-01 18:32:37 UTC (rev 3755)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: trunk/Src/Languages/Korean/MergeKorean.rc
===================================================================
--- trunk/Src/Languages/Korean/MergeKorean.rc	2006-11-01 16:35:58 UTC (rev 3754)
+++ trunk/Src/Languages/Korean/MergeKorean.rc	2006-11-01 18:32:37 UTC (rev 3755)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: trunk/Src/Languages/Norwegian/MergeNorwegian.rc
===================================================================
--- trunk/Src/Languages/Norwegian/MergeNorwegian.rc	2006-11-01 16:35:58 UTC (rev 3754)
+++ trunk/Src/Languages/Norwegian/MergeNorwegian.rc	2006-11-01 18:32:37 UTC (rev 3755)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: trunk/Src/Languages/Polish/MergePolish.rc
===================================================================
--- trunk/Src/Languages/Polish/MergePolish.rc	2006-11-01 16:35:58 UTC (rev 3754)
+++ trunk/Src/Languages/Polish/MergePolish.rc	2006-11-01 18:32:37 UTC (rev 3755)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: trunk/Src/Languages/Russian/MergeRussian.rc
===================================================================
--- trunk/Src/Languages/Russian/MergeRussian.rc	2006-11-01 16:35:58 UTC (rev 3754)
+++ trunk/Src/Languages/Russian/MergeRussian.rc	2006-11-01 18:32:37 UTC (rev 3755)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: trunk/Src/Languages/Slovak/MergeSlovak.rc
===================================================================
--- trunk/Src/Languages/Slovak/MergeSlovak.rc	2006-11-01 16:35:58 UTC (rev 3754)
+++ trunk/Src/Languages/Slovak/MergeSlovak.rc	2006-11-01 18:32:37 UTC (rev 3755)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: trunk/Src/Languages/Spanish/MergeSpanish.rc
===================================================================
--- trunk/Src/Languages/Spanish/MergeSpanish.rc	2006-11-01 16:35:58 UTC (rev 3754)
+++ trunk/Src/Languages/Spanish/MergeSpanish.rc	2006-11-01 18:32:37 UTC (rev 3755)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: trunk/Src/Languages/Swedish/MergeSwedish.rc
===================================================================
--- trunk/Src/Languages/Swedish/MergeSwedish.rc	2006-11-01 16:35:58 UTC (rev 3754)
+++ trunk/Src/Languages/Swedish/MergeSwedish.rc	2006-11-01 18:32:37 UTC (rev 3755)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: trunk/Src/Languages/Turkish/MergeTurkish.rc
===================================================================
--- trunk/Src/Languages/Turkish/MergeTurkish.rc	2006-11-01 16:35:58 UTC (rev 3754)
+++ trunk/Src/Languages/Turkish/MergeTurkish.rc	2006-11-01 18:32:37 UTC (rev 3755)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: trunk/Src/Merge.rc
===================================================================
--- trunk/Src/Merge.rc	2006-11-01 16:35:58 UTC (rev 3754)
+++ trunk/Src/Merge.rc	2006-11-01 18:32:37 UTC (rev 3755)
@@ -60,6 +60,15 @@
 #endif    // APSTUDIO_INVOKED
 
 
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+  #ifdef UNICODE
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "res\\WinMergeU.exe.manifest"
+  #else
+    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "res\\WinMerge.exe.manifest"
+  #endif
+#endif // MSC_VER
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Copied: trunk/Src/res/WinMerge.exe.manifest (from rev 3745, trunk/Installer/InnoSetup/WinMerge.exe.manifest)
===================================================================
--- trunk/Src/res/WinMerge.exe.manifest	                        (rev 0)
+++ trunk/Src/res/WinMerge.exe.manifest	2006-11-01 18:32:37 UTC (rev 3755)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+	<assemblyIdentity
+	   version="1.0.0.0"
+	   processorArchitecture="X86"
+	   name="Microsoft.Winweb.WinMerge"
+	   type="win32"
+	/>
+	<description>WinMerge Application</description>
+	<dependency>
+	   <dependentAssembly>
+	     <assemblyIdentity
+	       type="win32"
+	       name="Microsoft.Windows.Common-Controls"
+	       version="6.0.0.0"
+	       processorArchitecture="X86"
+	       publicKeyToken="6595b64144ccf1df"
+	       language="*"
+	     />
+	   </dependentAssembly>
+	</dependency>
+</assembly>
\ No newline at end of file

Copied: trunk/Src/res/WinMergeU.exe.manifest (from rev 3745, trunk/Installer/InnoSetup/WinMergeU.exe.manifest)
===================================================================
--- trunk/Src/res/WinMergeU.exe.manifest	                        (rev 0)
+++ trunk/Src/res/WinMergeU.exe.manifest	2006-11-01 18:32:37 UTC (rev 3755)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+	<assemblyIdentity
+	   version="1.0.0.0"
+	   processorArchitecture="X86"
+	   name="Microsoft.Winweb.WinMerge"
+	   type="win32"
+	/>
+	<description>WinMerge Application</description>
+	<dependency>
+	   <dependentAssembly>
+	     <assemblyIdentity
+	       type="win32"
+	       name="Microsoft.Windows.Common-Controls"
+	       version="6.0.0.0"
+	       processorArchitecture="X86"
+	       publicKeyToken="6595b64144ccf1df"
+	       language="*"
+	     />
+	   </dependentAssembly>
+	</dependency>
+</assembly>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [3754] trunk/Docs/Developers

[<ki...@us...>]

Revision: 3754
          http://svn.sourceforge.net/winmerge/?rev=3754&view=rev
Author:   kimmov
Date:     2006-11-01 08:35:58 -0800 (Wed, 01 Nov 2006)

Log Message:
-----------
Update building instructions after expat and scew addition

Modified Paths:
--------------
    trunk/Docs/Developers/Changes.txt
    trunk/Docs/Developers/readme-developers.html

Modified: trunk/Docs/Developers/Changes.txt
===================================================================
--- trunk/Docs/Developers/Changes.txt	2006-11-01 16:28:40 UTC (rev 3753)
+++ trunk/Docs/Developers/Changes.txt	2006-11-01 16:35:58 UTC (rev 3754)
@@ -1,3 +1,7 @@
+2006-11-01 Kimmo
+ Update building instructions after expat and scew addition
+  Developers: readme-developers.html
+
 2006-09-25 Kimmo
  Add info about different PSDK versions and components needed
   Developers: readme-developers.html

Modified: trunk/Docs/Developers/readme-developers.html
===================================================================
--- trunk/Docs/Developers/readme-developers.html	2006-11-01 16:28:40 UTC (rev 3753)
+++ trunk/Docs/Developers/readme-developers.html	2006-11-01 16:35:58 UTC (rev 3754)
@@ -62,7 +62,11 @@
 <p>Note that WinMerge uses MFC heavily. So free editions of Visual Studio cannot
 compile WinMerge, unless you have MFC installed separately.</p>
 
-<h4>Additional requirements</h4>
+<h4>Libraries</h4>
+<p>WinMerge executable depends on Expat XML parser and SCEW wrapper libraries. Both are in
+source tree, but need to be compiled before compiling WinMerge executable.</p>
+
+<h4>Additional requirements (out of source tree)</h4>
 <ul>
   <li>HTML Help Workshop (either stand-alone or from Platform SDK)<br>
     Download it from :<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/htmlhelp/html/hwMicrosoftHTMLHelpDownloads.asp">
@@ -115,8 +119,52 @@
 directory. Propable cause is that including files from Platform SDK directories breaks
 things.</p>
 
+<h4>Compiling expat</h4>
+<p>expat is in <code>/Externals/expat</code> folder in source tree. To compile expat:<br>
+<ul>
+  <li>Open Visual Studio workspace <code>/Externals/expat/expat.dsw</code>. If you are
+    using Visual Studio 2003.Net or later you need to convert the file to new format when
+    Visual Studio opens the file.</li>
+  <li>Select from Visual Studio menu Build / Batch Build</li>
+  <li>Make sure all targets are selected</li>
+  <li>Select Rebuild All</li>
+  <li><i>Wait until build finishes...</i></li>
+  <li>Build files are in folder <code>Externals/expat/lib</code> subfolders.</li>
+  <li>Create folder <code>/Build/expat</code>
+  <li>Select the target to use - we want to use dll version (no _static in folder name):
+    <ul>
+      <li><code>Debug</code> - debug ansi</li>
+      <li><code>Debug-w</code> - debug unicode</li>
+      <li><code>Release</code> - release ansi</li>
+      <li><code>Release-w</code> - release unicode</li>
+    </ul>
+    I'd choose release version, as we aren't interested in debugging expat itself.
+  </li>
+  <li>Copy expat import library (<code>.lib</code>) and <code>dll</code> file to
+    <code>/Build/expat</code> from selected expat build folder (e.g. Release-w)</li>
+ </ul></p>
 
-<h4>Compiling targets</h4>
+<p class="note">I (kimmov) know this is not very convenient as when switching WinMerge target
+you have to copy the correct files to /Build/expat. I figure out better solution for this.</p>
+
+<h4>Compiling scew</h4>
+<p>scew is in <code>/Externals/scew</code> folder in source tree. To compile scew:<br>
+<ul>
+  <li>Open Visual Studio project file <code>/Externals/scew/win32/scew.dsp</code> If you are
+    using Visual Studio 2003.Net or later you need to convert the file to new format when
+    Visual Studio opens the file.</li>
+  <li>Select from Visual Studio menu Build / Batch Build</li>
+  <li>Make sure all targets are selected</li>
+  <li>Select Rebuild All</li>
+  <li><i>Wait until build finishes...</i></li>
+  <li>Copy all <code>.lib</code> files from folder <code>/Externals/scew/win32/lib</code> to
+    <code>/Build/expat</code></li>
+</ul></p>
+
+<p>scew is a static library and it automatically selects the correct .lib file to use.
+See <code>/Externals/scew/scew/scew.h</code> about more info how it is done.</p>
+
+<h4>Compiling WinMerge executable targets</h4>
 <p>There are several targets available for compiling different projects. Targets used
 for compiling releases are:<br>
 <ul>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [3753] trunk/Externals/scew

[<ki...@us...>]

Revision: 3753
          http://svn.sourceforge.net/winmerge/?rev=3753&view=rev
Author:   kimmov
Date:     2006-11-01 08:28:40 -0800 (Wed, 01 Nov 2006)

Log Message:
-----------
Changes for WinMerge compile:
2006-11-01 Kimmo Varis <ki...@wi...>

	* scew/win32/scew.dsp: added library paths to WinMerge /Build/expat

Modified Paths:
--------------
    trunk/Externals/scew/ChangeLog
    trunk/Externals/scew/win32/scew.dsp

Modified: trunk/Externals/scew/ChangeLog
===================================================================
--- trunk/Externals/scew/ChangeLog	2006-11-01 15:48:02 UTC (rev 3752)
+++ trunk/Externals/scew/ChangeLog	2006-11-01 16:28:40 UTC (rev 3753)
@@ -1,3 +1,8 @@
+Changes for WinMerge compile:
+2006-11-01 Kimmo Varis <ki...@wi...>
+
+	* scew/win32/scew.dsp: added library paths to WinMerge /Build/expat
+
 **** Changes in version 0.3.2 ****
 
 2004-05-23  Aleix Conchillo Flaque  <al...@me...>

Modified: trunk/Externals/scew/win32/scew.dsp
===================================================================
--- trunk/Externals/scew/win32/scew.dsp	2006-11-01 15:48:02 UTC (rev 3752)
+++ trunk/Externals/scew/win32/scew.dsp	2006-11-01 16:28:40 UTC (rev 3753)
@@ -1,30 +1,30 @@
 # Microsoft Developer Studio Project File - Name="scew" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** \x95ҏW\x82\xB5\x82Ȃ\xA2\x82ł\xAD\x82\xBE\x82\xB3\x82\xA2 **
+# ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
 CFG=scew - Win32 XMLStatic Debug Unicode
-!MESSAGE \x82\xB1\x82\xEA\x82͗L\x8C\xF8\x82\xC8Ҳ\xB8̧\xB2قł͂\xA0\x82\xE8\x82܂\xB9\x82\xF1\x81B \x82\xB1\x82\xCC\xCC\xDFۼު\xB8Ă\xF0\xCB\xDE\xD9\xC4ނ\xB7\x82邽\x82߂ɂ\xCD NMAKE \x82\xF0\x8Eg\x97p\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
-!MESSAGE [Ҳ\xB8̧\xB2ق̴\xB8\xBD\xCE߰\xC4] \xBA\xCF\xDD\xC4ނ\xF0\x8Eg\x97p\x82\xB5\x82Ď\xC0\x8Ds\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
 !MESSAGE 
 !MESSAGE NMAKE /f "scew.mak".
 !MESSAGE 
-!MESSAGE NMAKE \x82̎\xC0\x8Ds\x8E\x9E\x82ɍ\\x90\xAC\x82\xF0\x8Ew\x92\xE8\x82ł\xAB\x82܂\xB7
-!MESSAGE \xBA\xCF\xDD\xC4\xDE ײݏ\xE3\x82\xC5ϸۂ̐ݒ\xE8\x82\xF0\x92\xE8\x8B`\x82\xB5\x82܂\xB7\x81B\x97\xE1:
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
 !MESSAGE NMAKE /f "scew.mak" CFG="scew - Win32 XMLStatic Debug Unicode"
 !MESSAGE 
-!MESSAGE \x91I\x91\xF0\x89”\\x82\xC8\xCB\xDE\xD9\xC4\xDE Ӱ\xC4\xDE:
+!MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "scew - Win32 Release" ("Win32 (x86) Static Library" \x97p)
-!MESSAGE "scew - Win32 Debug" ("Win32 (x86) Static Library" \x97p)
-!MESSAGE "scew - Win32 Debug Unicode" ("Win32 (x86) Static Library" \x97p)
-!MESSAGE "scew - Win32 Release Unicode" ("Win32 (x86) Static Library" \x97p)
-!MESSAGE "scew - Win32 XMLStatic Debug" ("Win32 (x86) Static Library" \x97p)
-!MESSAGE "scew - Win32 XMLStatic Release" ("Win32 (x86) Static Library" \x97p)
-!MESSAGE "scew - Win32 XMLStatic Debug Unicode" ("Win32 (x86) Static Library" \x97p)
-!MESSAGE "scew - Win32 XMLStatic Release Unicode" ("Win32 (x86) Static Library" \x97p)
+!MESSAGE "scew - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "scew - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "scew - Win32 Debug Unicode" (based on "Win32 (x86) Static Library")
+!MESSAGE "scew - Win32 Release Unicode" (based on "Win32 (x86) Static Library")
+!MESSAGE "scew - Win32 XMLStatic Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "scew - Win32 XMLStatic Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "scew - Win32 XMLStatic Debug Unicode" (based on "Win32 (x86) Static Library")
+!MESSAGE "scew - Win32 XMLStatic Release Unicode" (based on "Win32 (x86) Static Library")
 !MESSAGE 
 
 # Begin Project
@@ -47,7 +47,7 @@
 # PROP Intermediate_Dir "obj\Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
+# ADD CPP /nologo /MD /W4 /GX /O2 /I "../../expat/lib" /I "../../expat/xmlwf" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x411 /d "NDEBUG"
 # ADD RSC /l 0x411 /d "NDEBUG"
@@ -71,7 +71,7 @@
 # PROP Intermediate_Dir "obj\Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /I "../../expat/lib" /I "../../expat/xmlwf" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x411 /d "_DEBUG"
 # ADD RSC /l 0x411 /d "_DEBUG"
@@ -96,7 +96,7 @@
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c
 # SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_LIB" /D "_UNICODE" /D "XML_UNICODE_WCHAR_T" /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /I "../../expat/lib" /I "../../expat/xmlwf" /D "_DEBUG" /D "WIN32" /D "_LIB" /D "_UNICODE" /D "XML_UNICODE_WCHAR_T" /FD /GZ /c
 # SUBTRACT CPP /WX /YX
 # ADD BASE RSC /l 0x411 /d "_DEBUG"
 # ADD RSC /l 0x411 /d "_DEBUG"
@@ -146,7 +146,7 @@
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c
 # SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /D "_DEBUG" /D "_MBCS" /D "WIN32" /D "_LIB" /D "XML_STATIC" /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /I "../../expat/lib" /I "../../expat/xmlwf" /D "_DEBUG" /D "_MBCS" /D "WIN32" /D "_LIB" /D "XML_STATIC" /FD /GZ /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x411 /d "_DEBUG"
 # ADD RSC /l 0x411 /d "_DEBUG"
@@ -171,7 +171,7 @@
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
 # SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /W4 /GX /O2 /D "NDEBUG" /D "_MBCS" /D "WIN32" /D "_LIB" /D "XML_STATIC" /FD /c
+# ADD CPP /nologo /MD /W4 /GX /O2 /I "../../expat/lib" /I "../../expat/xmlwf" /D "NDEBUG" /D "_MBCS" /D "WIN32" /D "_LIB" /D "XML_STATIC" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x411 /d "NDEBUG"
 # ADD RSC /l 0x411 /d "NDEBUG"
@@ -196,7 +196,7 @@
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /D "_DEBUG" /D "_UNICODE" /D "WIN32" /D "_LIB" /FD /GZ /c
 # SUBTRACT BASE CPP /WX /YX
-# ADD CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /D "_DEBUG" /D "XML_STATIC" /D "WIN32" /D "_LIB" /D "_UNICODE" /D "XML_UNICODE_WCHAR_T" /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /I "../../expat/lib" /I "../../expat/xmlwf" /D "_DEBUG" /D "XML_STATIC" /D "WIN32" /D "_LIB" /D "_UNICODE" /D "XML_UNICODE_WCHAR_T" /FD /GZ /c
 # SUBTRACT CPP /WX /YX
 # ADD BASE RSC /l 0x411 /d "_DEBUG"
 # ADD RSC /l 0x411 /d "_DEBUG"
@@ -221,7 +221,7 @@
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "NDEBUG" /D "_UNICODE" /D "WIN32" /D "_LIB" /FD /c
 # SUBTRACT BASE CPP /WX /YX
-# ADD CPP /nologo /MD /W4 /GX /O2 /D "NDEBUG" /D "XML_STATIC" /D "WIN32" /D "_LIB" /D "_UNICODE" /D "XML_UNICODE_WCHAR_T" /FD /c
+# ADD CPP /nologo /MD /W4 /GX /O2 /I "../../expat/lib" /I "../../expat/xmlwf" /D "NDEBUG" /D "XML_STATIC" /D "WIN32" /D "_LIB" /D "_UNICODE" /D "XML_UNICODE_WCHAR_T" /FD /c
 # SUBTRACT CPP /WX /YX
 # ADD BASE RSC /l 0x411 /d "NDEBUG"
 # ADD RSC /l 0x411 /d "NDEBUG"
@@ -366,4 +366,3 @@
 # End Group
 # End Target
 # End Project
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [3752] trunk/Src

[<ki...@us...>]

Revision: 3752
          http://svn.sourceforge.net/winmerge/?rev=3752&view=rev
Author:   kimmov
Date:     2006-11-01 07:48:02 -0800 (Wed, 01 Nov 2006)

Log Message:
-----------
PATCH: [ 1587574 ] Convert project files code to use expat+SCEW

Modified Paths:
--------------
    trunk/Src/Changes.txt
    trunk/Src/Merge.dsp
    trunk/Src/ProjectFile.cpp
    trunk/Src/ProjectFile.h

Removed Paths:
-------------
    trunk/Src/ExpatLib/

Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt	2006-11-01 15:44:01 UTC (rev 3751)
+++ trunk/Src/Changes.txt	2006-11-01 15:48:02 UTC (rev 3752)
@@ -7,6 +7,9 @@
   New folder: /Externals/Expat
  Add SCEW version 0.4.0 to /Externals/scew (revision: 3750)
   New folder: /Externals/scew
+ PATCH: [ 1587574 ] Convert project files code to use expat+SCEW
+  Src: Merge.dsp ProjectFile.cpp ProjectFile.h
+  Remove folder: Src/ExpatLib/*
 
 2006-10-31 Kimmo
  PATCH: [ 1586869 ] Fix File Select -dialog modality (commit the file I missed in previous commit)

Modified: trunk/Src/Merge.dsp
===================================================================
--- trunk/Src/Merge.dsp	2006-11-01 15:44:01 UTC (rev 3751)
+++ trunk/Src/Merge.dsp	2006-11-01 15:48:02 UTC (rev 3752)
@@ -45,7 +45,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /EHa /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /FR /Yu"stdafx.h" /FD /EHa /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /I "..\Externals\expat\lib" /I "..\Externals\expat\xmlwf" /I "..\Externals\scew" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /FR /Yu"stdafx.h" /FD /EHa /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
 # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
@@ -55,7 +55,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 version.lib shlwapi.lib imm32.lib HtmlHelp.lib /nologo /subsystem:windows /debug /machine:I386 /out:"..\Build\MergeDebug/WinMerge.exe" /pdbtype:sept
+# ADD LINK32 version.lib shlwapi.lib imm32.lib HtmlHelp.lib  libexpat.lib /nologo /subsystem:windows /debug /machine:I386 /out:"..\Build\MergeDebug/WinMerge.exe" /pdbtype:sept /libpath:"..\Build\expat"
 
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeDebug"
 
@@ -72,7 +72,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "." /I "..\common" /I ".\editlib" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /FR /Yu"stdafx.h" /FD /EHa /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /D "UNICODE" /D "_UNICODE" /FR /Yu"stdafx.h" /FD /EHa /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /I "..\Externals\expat\lib" /I "..\Externals\expat\xmlwf" /I "..\Externals\scew" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /D "UNICODE" /D "_UNICODE" /D "XML_UNICODE_WCHAR_T" /FR /Yu"stdafx.h" /FD /EHa /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
 # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
@@ -82,7 +82,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 version.lib shlwapi.lib /nologo /subsystem:windows /debug /machine:I386 /out:"..\Build\MergeUnicodeDebug/WinMerge.exe" /pdbtype:sept
-# ADD LINK32 version.lib shlwapi.lib imm32.lib HtmlHelp.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /out:"..\Build\MergeUnicodeDebug/WinMergeU.exe" /pdbtype:sept
+# ADD LINK32 version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpatw.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /out:"..\Build\MergeUnicodeDebug/WinMergeU.exe" /pdbtype:sept /libpath:"..\Build\expat"
 
 !ELSEIF  "$(CFG)" == "Merge - Win32 Release"
 
@@ -99,7 +99,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W4 /GR /GX /Zi /O1 /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /Yu"stdafx.h" /FD /EHa /c
-# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O1 /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /Yu"stdafx.h" /FD /EHa /c
+# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O1 /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /I "..\Externals\expat\lib" /I "..\Externals\expat\xmlwf" /I "..\Externals\scew" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /Yu"stdafx.h" /FD /EHa /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
 # ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
@@ -110,7 +110,7 @@
 LINK32=link.exe
 # ADD BASE LINK32 version.lib shlwapi.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\Build\MergeRelease/WinMerge.exe" /verbose:lib
 # SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 version.lib shlwapi.lib imm32.lib HtmlHelp.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\Build\MergeRelease/WinMerge.exe" /verbose:lib
+# ADD LINK32 version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\Build\MergeRelease/WinMerge.exe" /libpath:"..\Build\expat" /verbose:lib
 # SUBTRACT LINK32 /pdb:none
 
 !ELSEIF  "$(CFG)" == "Merge - Win32 UnicodeRelease"
@@ -128,7 +128,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W4 /GR /GX /Zi /O1 /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /FD /EHa /c
-# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O1 /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /FD /EHa /c
+# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O1 /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /I "..\Externals\expat\lib" /I "..\Externals\expat\xmlwf" /I "..\Externals\scew" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /D "UNICODE" /D "_UNICODE" /D "XML_UNICODE_WCHAR_T" /Yu"stdafx.h" /FD /EHa /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
 # ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
@@ -139,7 +139,7 @@
 LINK32=link.exe
 # ADD BASE LINK32 version.lib shlwapi.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\Build\MergeUnicodeRelease\WinMergeU.exe" /verbose:lib
 # SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 version.lib shlwapi.lib imm32.lib HtmlHelp.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\Build\MergeUnicodeRelease\WinMergeU.exe" /verbose:lib
+# ADD LINK32 version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpatw.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\Build\MergeUnicodeRelease\WinMergeU.exe" /libpath:"..\Build\expat" /verbose:lib
 # SUBTRACT LINK32 /pdb:none
 
 !ENDIF 

Modified: trunk/Src/ProjectFile.cpp
===================================================================
--- trunk/Src/ProjectFile.cpp	2006-11-01 15:44:01 UTC (rev 3751)
+++ trunk/Src/ProjectFile.cpp	2006-11-01 15:48:02 UTC (rev 3752)
@@ -17,15 +17,23 @@
 /** 
  * @file  ProjectFile.cpp
  *
- * @brief Implementation file for ProjectFile class
+ * @brief Implementation file for ProjectFile class.
  */
 // RCS ID line follows -- this is updated by CVS
 // $Id$
 
 #include "stdafx.h"
+#include <scew/scew.h>
+
 #include "ProjectFile.h"
-#include "XmlDoc.h"
 
+// Constants for xml element names
+const TCHAR Root_element_name[] = _T("project");
+const TCHAR Paths_element_name[] = _T("paths");
+const TCHAR Left_element_name[] = _T("left");
+const TCHAR Right_element_name[] = _T("right");
+const TCHAR Filter_element_name[] = _T("filter");
+const TCHAR Subfolders_element_name[] = _T("subfolders");
 
 /** 
  * @brief Standard constructor.
@@ -38,96 +46,239 @@
 }
 
 /** 
- * @brief Get message from exception into sError, or else throw it.
- *
- * If this successfully extracts the error description into the string, it simply returns FALSE
- * If it fails to extract the error description, it rethrows the exception
- */
-static BOOL NTAPI False(CException *e, CString *sError)
-{
-	if (sError == NULL)
-		throw e;
-	TCHAR szError[1024];
-	e->GetErrorMessage(szError, 1024);
-	*sError = szError;
-	e->Delete();
-	return FALSE;
-}
-
-/** 
  * @brief Open given path-file and read data from it to member variables.
  * @param [in] path Path to project file.
  * @param [out] sError Error string if error happened.
  * @return TRUE if reading succeeded, FALSE if error happened.
+ * @bug This doesn't handle unicode paths!
  */
 BOOL ProjectFile::Read(LPCTSTR path, CString *sError)
 {
-	return Serialize(false, path, sError);
+	BOOL loaded = FALSE;
+	LPCSTR pathAnsi;
+
+#ifdef UNICODE
+	USES_CONVERSION;
+	pathAnsi = T2A(path);
+#else
+	pathAnsi = path;
+#endif
+
+    scew_tree* tree = NULL;
+    scew_parser* parser = NULL;
+
+    parser = scew_parser_create();
+    scew_parser_ignore_whitespaces(parser, 1);
+
+	if (scew_parser_load_file(parser, pathAnsi))
+	{
+		tree = scew_parser_tree(parser);
+
+		scew_element * root = GetRootElement(tree);
+		if (root)
+		{
+			loaded = TRUE;
+			GetPathsData(root);
+		};
+	}
+    scew_tree_free(tree);
+
+    /* Frees the SCEW parser */
+    scew_parser_free(parser);
+
+	return loaded;
 }
 
 /** 
+ * @brief Return project file XML's root element.
+ * @param [in] tree XML tree we got from the parser.
+ * @return Root element pointer.
+ */
+scew_element* ProjectFile::GetRootElement(scew_tree * tree)
+{
+	scew_element * root = NULL;
+
+	if (tree != NULL)
+	{
+		root = scew_tree_root(tree);
+	}
+
+	if (root != NULL)
+	{
+		// Make sure we have correct root element
+		if (_tcscmp(Root_element_name, scew_element_name(root)) != 0)
+		{
+			root = NULL;
+		}
+	}
+	return root;
+}
+
+/** 
+ * @brief Reads the paths data from the XML data.
+ * This function reads the paths data inside given element in XML data.
+ * @param [in] parent Parent element for the paths data.
+ */
+void ProjectFile::GetPathsData(scew_element * parent)
+{
+	scew_element *paths = NULL;
+
+	if (parent != NULL)
+	{
+		paths = scew_element_by_name(parent, Paths_element_name);
+	}
+
+	if (paths != NULL)
+	{
+		scew_element *left = NULL;
+		scew_element *right = NULL;
+		scew_element *filter = NULL;
+		scew_element *subfolders = NULL;
+
+		left = scew_element_by_name(paths, Left_element_name);
+		right = scew_element_by_name(paths, Right_element_name);
+		filter = scew_element_by_name(paths, Filter_element_name);
+		subfolders = scew_element_by_name(paths, Subfolders_element_name);
+
+		if (left)
+		{
+			LPCTSTR path = NULL;
+			path = scew_element_contents(right);
+			m_leftFile = path;
+		}
+		if (right)
+		{
+			LPCTSTR path = NULL;
+			path = scew_element_contents(right);
+			m_rightFile = path;
+		}
+		if (filter)
+		{
+			LPCTSTR filtername = NULL;
+			filtername = scew_element_contents(filter);
+			m_filter = filtername;
+		}
+		if (subfolders)
+		{
+			LPCTSTR folders = NULL;
+			folders = scew_element_contents(subfolders);
+			m_subfolders = _ttoi(folders);
+		}
+	}
+}
+
+/** 
  * @brief Save data from member variables to path-file.
  * @param [in] path Path to project file.
  * @param [out] sError Error string if error happened.
  * @return TRUE if saving succeeded, FALSE if error happened.
- * @note paths are converted to UTF-8
  */
 BOOL ProjectFile::Save(LPCTSTR path, CString *sError)
 {
-	return Serialize(true, path, sError);
+	BOOL success = TRUE;
+	LPCSTR pathAnsi;
+
+#ifdef UNICODE
+	USES_CONVERSION;
+	pathAnsi = T2A(path);
+#else
+	pathAnsi = path;
+#endif
+	
+	scew_tree* tree = NULL;
+	scew_element* root = NULL;
+	scew_element* paths = NULL;
+
+	tree = scew_tree_create();
+	root = scew_tree_add_root(tree, Root_element_name);
+	if (root != NULL)
+	{
+		paths = AddPathsElement(root);
+	}
+	else
+		success = FALSE;
+
+	if (paths != NULL)
+	{
+		AddPathsContent(paths);
+	}
+	else
+		success = FALSE;
+	
+	scew_tree_set_xml_encoding(tree, _T("UTF-8"));
+
+	// Set the XML file standalone
+	scew_tree_set_xml_standalone(tree, 1);
+
+	if (!scew_writer_tree_file(tree, pathAnsi))
+		success = FALSE;
+	
+	/* Frees the SCEW tree */
+	scew_tree_free(tree);
+
+	return success;
+	//	return Serialize(true, path, sError);
 }
 
-	
-/** 
- * @brief Read or write project file
- * @param [in] writing TRUE if project file is saved, FALSE if it is loaded.
- * @param [in] path Path to project file.
- * @param [out] sError Error string if error happened.
- * @return TRUE if operation succeeded, FALSE if error happened.
+/**
+ * @brief Add paths element into XML tree.
+ * @param [in] parent Parent element for the paths element.
+ * @return pointer to added paths element.
  */
-BOOL ProjectFile::Serialize(bool writing, LPCTSTR path, CString *sError)
+scew_element* ProjectFile::AddPathsElement(scew_element * parent)
 {
-	int leftReadOnly = m_bLeftReadOnly ? 1 : 0;
-	int rightReadOnly = m_bRightReadOnly ? 1 : 0;
+	scew_element* element = NULL;
+	element = scew_element_add(parent, Paths_element_name);
+	return element;
+}
 
-	try
+/**
+ * @brief Add paths data to the XML tree.
+ * This function adds our paths data to the XML tree.
+ * @param [in] parent Parent element for paths data.
+ * @return TRUE if we succeeded, FALSE otherwise.
+ */
+BOOL ProjectFile::AddPathsContent(scew_element * parent)
+{
+	scew_element* element = NULL;
+
+	if (!m_leftFile.IsEmpty())
 	{
-		XmlDoc::XML_LOADSAVE loadSave = (writing ? XmlDoc::XML_SAVE : XmlDoc::XML_LOAD);
+		LPCTSTR path;
+		element = scew_element_add(parent, Left_element_name);
+		path = m_leftFile.GetBuffer(MAX_PATH);
+		scew_element_set_contents(element, path);
+		m_leftFile.ReleaseBuffer();
+	}
 
-		XmlDoc doc(path, loadSave, _T("UTF-8"));
-		doc.Begin();
-		{
-			XmlElement project(doc, _T("project"));
-			{
-				XmlElement paths(doc, _T("paths"));
-				{
-					XmlElement(doc, _T("left"), m_leftFile);
-				} {
-					XmlElement(doc, _T("left-readonly"), leftReadOnly);
-				} {
-					XmlElement(doc, _T("right"), m_rightFile);
-				} {
-					XmlElement(doc, _T("right-readonly"), rightReadOnly);
-				} {
-					XmlElement(doc, _T("filter"), m_filter);
-				} {
-					XmlElement(doc, _T("subfolders"), m_subfolders);
-				}
-			}
-		}
-		doc.End();
+	if (!m_rightFile.IsEmpty())
+	{
+		LPCTSTR path;
+		element = scew_element_add(parent, Right_element_name);
+		path = m_rightFile.GetBuffer(MAX_PATH);
+		scew_element_set_contents(element, path);
+		m_rightFile.ReleaseBuffer();
+	}
 
-	}
-	catch (CException *e)
+	if (!m_filter.IsEmpty())
 	{
-		return False(e, sError);
+		LPCTSTR filter;
+		element = scew_element_add(parent, Filter_element_name);
+		filter = m_filter.GetBuffer(MAX_PATH);
+		scew_element_set_contents(element, filter);
+		m_filter.ReleaseBuffer();
 	}
 
-	if (!writing)
+	LPCTSTR path;
+	element = scew_element_add(parent, Subfolders_element_name);
+	if (m_subfolders != 0)
 	{
-		m_bLeftReadOnly = (leftReadOnly == 1);
-		m_bRightReadOnly = (rightReadOnly == 1);
+		scew_element_set_contents(element, _T("1"));
 	}
+	else
+	{
+		scew_element_set_contents(element, _T("0"));
+	}
 	return TRUE;
 }
 
@@ -270,27 +421,6 @@
 }
 
 /** 
- * @brief Reads one value from XML data.
- */
-BOOL ProjectFile::GetVal(TCHAR *pPaths, TCHAR *pVal, CString * sval,
-		TCHAR *ptag1, TCHAR *ptag2, TCHAR *pbuf)
-{
-	if (pPaths && pVal && pVal > pPaths)
-	{
-		TCHAR tmpPath[MAX_PATH] = {0};
-		TCHAR *pTagEnd = _tcsstr(pbuf, ptag2);
-		if ((pTagEnd - pVal) < (MAX_PATH * sizeof(TCHAR)))
-		{
-			pVal += _tcslen(ptag1);
-			_tcsncpy(tmpPath, pVal, pTagEnd - pVal);
-			*sval = tmpPath;
-			return TRUE;
-		}
-	}
-	return FALSE;
-}
-
-/** 
  * @brief Returns left and right paths and recursive from project file
  * 
  * @param [out] sLeft Left path

Modified: trunk/Src/ProjectFile.h
===================================================================
--- trunk/Src/ProjectFile.h	2006-11-01 15:44:01 UTC (rev 3751)
+++ trunk/Src/ProjectFile.h	2006-11-01 15:48:02 UTC (rev 3752)
@@ -22,6 +22,8 @@
 // RCS ID line follows -- this is updated by CVS
 // $Id$
 
+#include <scew/scew.h>
+
 /** @brief File extension for path files */
 const TCHAR PROJECTFILE_EXT[] = _T("WinMerge");
 
@@ -59,10 +61,12 @@
 	void GetPaths(CString & sLeft, CString & sRight, BOOL & bSubFolders) const;
 
 protected:
-	BOOL Serialize(bool writing, LPCTSTR path, CString *sError);
-	BOOL GetVal(TCHAR *pPaths, TCHAR *pVal, CString * sval,
-		TCHAR *ptag1, TCHAR *ptag2, TCHAR *pbuf);
+	scew_element* GetRootElement(scew_tree * tree);
+	void GetPathsData(scew_element * parent);
 
+	scew_element* AddPathsElement(scew_element * parent);
+	BOOL AddPathsContent(scew_element * parent);
+
 private:
 	CString m_leftFile; /**< Left path */
 	CString m_rightFile; /**< Right path */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [3751] trunk/Src/Changes.txt

[<ki...@us...>]

Revision: 3751
          http://svn.sourceforge.net/winmerge/?rev=3751&view=rev
Author:   kimmov
Date:     2006-11-01 07:44:01 -0800 (Wed, 01 Nov 2006)

Log Message:
-----------
Add Expat version 2.0.0 to /Externals/expat (revision: 3749)
  New folder: /Externals/Expat
 Add SCEW version 0.4.0 to /Externals/scew (revision: 3750)
  New folder: /Externals/scew

Modified Paths:
--------------
    trunk/Src/Changes.txt

Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt	2006-11-01 15:41:27 UTC (rev 3750)
+++ trunk/Src/Changes.txt	2006-11-01 15:44:01 UTC (rev 3751)
@@ -2,6 +2,12 @@
 Add new items to top.
 (This summarizes all changes to all files under Src, including Src\Languages.)
 
+2006-11-01 Kimmo
+ Add Expat version 2.0.0 to /Externals/expat (revision: 3749)
+  New folder: /Externals/Expat
+ Add SCEW version 0.4.0 to /Externals/scew (revision: 3750)
+  New folder: /Externals/scew
+
 2006-10-31 Kimmo
  PATCH: [ 1586869 ] Fix File Select -dialog modality (commit the file I missed in previous commit)
   Src/Common: PreferencesDlg.cpp


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge: [3750] trunk/Externals

[<ki...@us...>]

Revision: 3750
          http://svn.sourceforge.net/winmerge/?rev=3750&view=rev
Author:   kimmov
Date:     2006-11-01 07:41:27 -0800 (Wed, 01 Nov 2006)

Log Message:
-----------
Add SCEW version 0.4.0 to /Externals/scew

Added Paths:
-----------
    trunk/Externals/scew/
    trunk/Externals/scew/AUTHORS
    trunk/Externals/scew/COPYING
    trunk/Externals/scew/ChangeLog
    trunk/Externals/scew/INSTALL
    trunk/Externals/scew/INSTALL.WIN32
    trunk/Externals/scew/Makefile.am
    trunk/Externals/scew/Makefile.in
    trunk/Externals/scew/NEWS
    trunk/Externals/scew/README
    trunk/Externals/scew/THANKS
    trunk/Externals/scew/aclocal.m4
    trunk/Externals/scew/config.h.in
    trunk/Externals/scew/configure
    trunk/Externals/scew/configure.in
    trunk/Externals/scew/depcomp
    trunk/Externals/scew/doc/
    trunk/Externals/scew/doc/Doxyfile.in
    trunk/Externals/scew/doc/Makefile.am
    trunk/Externals/scew/doc/Makefile.in
    trunk/Externals/scew/etc/
    trunk/Externals/scew/etc/Makefile.am
    trunk/Externals/scew/etc/Makefile.in
    trunk/Externals/scew/etc/autoconf/
    trunk/Externals/scew/etc/autoconf/Makefile.am
    trunk/Externals/scew/etc/autoconf/Makefile.in
    trunk/Externals/scew/etc/autoconf/doxygen.m4
    trunk/Externals/scew/etc/pkg-config/
    trunk/Externals/scew/etc/pkg-config/Makefile.am
    trunk/Externals/scew/etc/pkg-config/Makefile.in
    trunk/Externals/scew/etc/pkg-config/scew.pc.in
    trunk/Externals/scew/examples/
    trunk/Externals/scew/examples/Makefile.am
    trunk/Externals/scew/examples/Makefile.in
    trunk/Externals/scew/examples/README
    trunk/Externals/scew/examples/scew_print/
    trunk/Externals/scew/examples/scew_print/Makefile.am
    trunk/Externals/scew/examples/scew_print/Makefile.in
    trunk/Externals/scew/examples/scew_print/scew_print.c
    trunk/Externals/scew/examples/scew_stream/
    trunk/Externals/scew/examples/scew_stream/Makefile.am
    trunk/Externals/scew/examples/scew_stream/Makefile.in
    trunk/Externals/scew/examples/scew_stream/scew_stream.c
    trunk/Externals/scew/examples/scew_write/
    trunk/Externals/scew/examples/scew_write/Makefile.am
    trunk/Externals/scew/examples/scew_write/Makefile.in
    trunk/Externals/scew/examples/scew_write/scew_write.c
    trunk/Externals/scew/install-sh
    trunk/Externals/scew/missing
    trunk/Externals/scew/mkinstalldirs
    trunk/Externals/scew/scew/
    trunk/Externals/scew/scew/Makefile.am
    trunk/Externals/scew/scew/Makefile.in
    trunk/Externals/scew/scew/attribute.c
    trunk/Externals/scew/scew/attribute.h
    trunk/Externals/scew/scew/element.c
    trunk/Externals/scew/scew/element.h
    trunk/Externals/scew/scew/error.c
    trunk/Externals/scew/scew/error.h
    trunk/Externals/scew/scew/parser.c
    trunk/Externals/scew/scew/parser.h
    trunk/Externals/scew/scew/scew.h
    trunk/Externals/scew/scew/str.c
    trunk/Externals/scew/scew/str.h
    trunk/Externals/scew/scew/tree.c
    trunk/Externals/scew/scew/tree.h
    trunk/Externals/scew/scew/types.h
    trunk/Externals/scew/scew/writer.c
    trunk/Externals/scew/scew/writer.h
    trunk/Externals/scew/scew/xattribute.c
    trunk/Externals/scew/scew/xattribute.h
    trunk/Externals/scew/scew/xelement.h
    trunk/Externals/scew/scew/xerror.c
    trunk/Externals/scew/scew/xerror.h
    trunk/Externals/scew/scew/xhandler.c
    trunk/Externals/scew/scew/xhandler.h
    trunk/Externals/scew/scew/xparser.c
    trunk/Externals/scew/scew/xparser.h
    trunk/Externals/scew/scew/xprint.c
    trunk/Externals/scew/scew/xprint.h
    trunk/Externals/scew/scew/xtree.h
    trunk/Externals/scew/win32/
    trunk/Externals/scew/win32/Makefile.am
    trunk/Externals/scew/win32/Makefile.in
    trunk/Externals/scew/win32/scew.dsp

Added: trunk/Externals/scew/AUTHORS
===================================================================
--- trunk/Externals/scew/AUTHORS	                        (rev 0)
+++ trunk/Externals/scew/AUTHORS	2006-11-01 15:41:27 UTC (rev 3750)
@@ -0,0 +1,7 @@
+Authors of SCEW (Simple C Expat Wrapper)
+See also the files THANKS and ChangeLog.
+
+Aleix Conchillo Flaque designed and implemented SCEW.
+
+---
+$Id: AUTHORS,v 1.1 2002/12/03 23:58:55 aleix Exp $

Added: trunk/Externals/scew/COPYING
===================================================================
--- trunk/Externals/scew/COPYING	                        (rev 0)
+++ trunk/Externals/scew/COPYING	2006-11-01 15:41:27 UTC (rev 3750)
@@ -0,0 +1,504 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+

Added: trunk/Externals/scew/ChangeLog
===================================================================
--- trunk/Externals/scew/ChangeLog	                        (rev 0)
+++ trunk/Externals/scew/ChangeLog	2006-11-01 15:41:27 UTC (rev 3750)
@@ -0,0 +1,102 @@
+**** Changes in version 0.3.2 ****
+
+2004-05-23  Aleix Conchillo Flaque  <al...@me...>
+
+	* src (Module): Added stream functionality.
+
+2004-03-20  Aleix Conchillo Flaque  <al...@me...>
+
+	* by now just some minor fixes.
+
+**** Changes in version 0.3.1 ****
+
+2004-01-26  Aleix Conchillo Flaque  <al...@me...>
+
+	* src/writer.*: write functions moved from tree to new writer
+	files.
+
+2004-01-25  Aleix Conchillo Flaque  <al...@me...>
+
+	* src/xtree.*: added XML preamble support.
+
+2003-12-09  Brodie Thiesfield
+
+        * re-jigged the source tree to make building and installing as a
+        common system library on Windows easier.
+
+        * src directory renamed scew to keep consistency of code on
+        both Unix and Windows platforms. Enables cross platform building
+        of code always using #include <scew/scew.h>
+
+        * added Windows DevStudio 6+ build workspace to easily build
+        all required versions of the library.
+
+        * much of scew/str.* rewritten to use compiler macros instead of
+        separate functions. Means one less level of function calling and
+        supports Unicode building on Windows simply.
+
+        * scew/mem.* removed (functions now available through str.h)
+
+        * added INSTALL.WIN32 file to describe building on Windows
+
+**** Changes in version 0.3.0 ****
+
+2003-07-16  Aleix Conchillo Flaque  <al...@me...>
+
+        * src/element.c, src/xattribute.c: performance improvement by
+	saving last index visited.
+
+	* src (Module): Lots of fixes and improvements by Brodie
+	Thiesfield.
+
+**** Changes in version 0.2.1 ****
+
+2003-07-09  Aleix Conchillo Flaque  <al...@me...>
+
+	* src/str.h (Module): Added isalpha, isalnum, isdigit, isspace,
+	isprint... functions.
+
+	* src/mem.h (Module): Added initial memory functions.
+
+2003-07-08  Aleix Conchillo Flaque  <al...@me...>
+
+	* src (Module):
+	- Added error system
+	- Fixed some minor bugs
+	- Improve white space parse treatment
+	- New string functions
+	- Added support for XML declarations attributes (version,
+       	encoding, standalone)
+
+2003-05-01  Aleix Conchillo Flaque  <al...@me...>
+
+	* src/tree.c (scew_tree_save_file): file closing fixed.
+
+**** Changes in version 0.2.0 ****
+
+2003-04-25  Aleix Conchillo Flaque  <al...@me...>
+
+	* src (Module): Added compatibilized headers with C++ (ifdef
+	__cplusplus).
+
+2003-04-24  Aleix Conchillo Flaque  <al...@me...>
+
+	* src (Module): Compilation warnings fixes.
+
+	* src/xattribute.c(scew_element_del_attr): memory crash fixed.
+
+**** Changes in version 0.1.1 ****
+
+2003-03-30  Aleix Conchillo Flaque  <al...@me...>
+
+	* src (Module): Lot of cleanup and some important changes in
+	internal data structures. Everything is now based in a triply
+	linked tree which is created when reading a file or when creating
+	a new XML tree in memory.
+
+2003-02-21  Aleix Conchillo Flaque  <al...@me...>
+
+	* src (Module): Added new tree structure which is now included in
+	scew_parser and will be used for writing purposes.
+
+	* ChangeLog started

Added: trunk/Externals/scew/INSTALL
===================================================================
--- trunk/Externals/scew/INSTALL	                        (rev 0)
+++ trunk/Externals/scew/INSTALL	2006-11-01 15:41:27 UTC (rev 3750)
@@ -0,0 +1,182 @@
+Basic Installation
+==================
+
+   These are generic installation instructions.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, a file
+`config.cache' that saves the results of its tests to speed up
+reconfiguring, and a file `config.log' containing compiler output
+(useful mainly for debugging `configure').
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If at some point `config.cache'
+contains results you don't want to keep, you may remove or edit it.
+
+   The file `configure.in' is used to create `configure' by a program
+called `autoconf'.  You only need `configure.in' if you want to change
+it or regenerate `configure' using a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.  If you're
+     using `csh' on an old version of System V, you might need to type
+     `sh ./configure' instead to prevent `csh' from trying to execute
+     `configure' itself.
+
+     Running `configure' takes awhile.  While running, it prints some
+     messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.
+
+  5. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+Compilers and Options
+=====================
+
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  You can give `configure'
+initial values for variables by setting them in the environment.  Using
+a Bourne-compatible shell, you can do that on the command line like
+this:
+     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
+
+Or on systems that have the `env' program, you can do it like this:
+     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
+
+Compiling For Multiple Architectures
+====================================
+
+   You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+   If you have to use a `make' that does not supports the `VPATH'
+variable, you have to compile the package for one architecture at a time
+in the source code directory.  After you have installed the package for
+one architecture, use `make distclean' before reconfiguring for another
+architecture.
+
+Installation Names
+==================
+
+   By default, `make install' will install the package's files in
+`/usr/local/bin', `/usr/local/man', etc.  You can specify an
+installation prefix other than `/usr/local' by giving `configure' the
+option `--prefix=PATH'.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+give `configure' the option `--exec-prefix=PATH', the package will use
+PATH as the prefix for installing programs and libraries.
+Documentation and other data files will still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=PATH' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+   Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+   There may be some features `configure' can not figure out
+automatically, but needs to determine by the type of host the package
+will run on.  Usually `configure' can figure that out, but if it prints
+a message saying it can not guess the host type, give it the
+`--host=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name with three fields:
+     CPU-COMPANY-SYSTEM
+
+See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the host type.
+
+   If you are building compiler tools for cross-compiling, you can also
+use the `--target=TYPE' option to select the type of system they will
+produce code for and the `--build=TYPE' option to select the type of
+system on which you are compiling the package.
+
+Sharing Defaults
+================
+
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Operation Controls
+==================
+
+   `configure' recognizes the following options to control how it
+operates.
+
+`--cache-file=FILE'
+     Use and save the results of the tests in FILE instead of
+     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
+     debugging `configure'.
+
+`--help'
+     Print a summary of the options to `configure', and exit.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`--version'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`configure' also accepts some other, not widely useful, options.

Added: trunk/Externals/scew/INSTALL.WIN32
===================================================================
--- trunk/Externals/scew/INSTALL.WIN32	                        (rev 0)
+++ trunk/Externals/scew/INSTALL.WIN32	2006-11-01 15:41:27 UTC (rev 3750)
@@ -0,0 +1,49 @@
+Windows Installation
+====================
+
+Extract the SCEW distribution library to it's installation location. For
+example, the scew-0.3.2 distribution may be extracted to the directory
+
+  c:\lib\scew-0.3.2
+
+Open the scew.dsp file from win32 directory in Visual Studio 6 or Visual
+Studio  .NET  2002/2003.  Go  to  the  'Build'  menu and  select  'Batch
+Build...'.   Select all  of the  configurations  to be  built and  click
+'Rebuild  All'.   This will  build  versions  of  the SCEW  library  for
+Debug/Release, MBCS/Unicode and not/XML_STATIC.
+
+Note that  SCEW is always  linked statically with your  application. The
+XML_STATIC compile option determines whether  libexpat will be used as a
+static linked library or a DLL.
+
+Add the  following directories to  the DevStudio Project paths.  This is
+available via the 'Tools', 'Options' menu. 'Directories' in DevStudio 6,
+'Projects' in DevStudio .NET.
+
+  Include Directories
+    SCEW top level, e.g. "c:\lib\scew-0.3.2"
+
+  Library Directories
+    SCEW win32 lib, e.g. "c:\lib\scew-0.3.2\win32\lib"
+
+You will also  have to include your Expat  library directory to Includes
+and Library:
+
+  Include and Library Directories
+    <expat_install>\source\lib e.g. "c:\lib\expat\source\lib"
+
+To use SCEW in your application, you simply include the SCEW header file
+like:
+
+  #include <scew/scew.h>
+
+Including this header will  automatically cause the correct SCEW library
+to  be  linked  in  with   your  application  for  the  current  compile
+settings.  You  do not  need  to  add the  SCEW  library  to the  linker
+settings.
+
+Note: you  do need to add  the appropriate Expat library  to your linker
+settings.
+
+===
+$Id: INSTALL.WIN32,v 1.5 2004/01/30 12:12:53 aleix Exp $

Added: trunk/Externals/scew/Makefile.am
===================================================================
--- trunk/Externals/scew/Makefile.am	                        (rev 0)
+++ trunk/Externals/scew/Makefile.am	2006-11-01 15:41:27 UTC (rev 3750)
@@ -0,0 +1,26 @@
+#
+# $Id: Makefile.am,v 1.11 2004/01/29 22:42:09 aleix Exp $
+#
+# Author: Aleix Conchillo Flaque <al...@me...>
+# Date:   Mon Nov 04, 2002 20:29
+#
+# Copyright (C) 2002, 2003, 2004 Aleix Conchillo Flaque
+#
+
+SUBDIRS = doc etc win32 scew examples
+
+EXTRA_DIST = INSTALL.WIN32
+
+.PHONY: doc
+
+if DOC
+
+doc:
+	(cd doc && $(MAKE) doc)
+
+else
+
+doc:
+	@echo "Doxygen documentation generation not enabled";
+
+endif

Added: trunk/Externals/scew/Makefile.in
===================================================================
--- trunk/Externals/scew/Makefile.in	                        (rev 0)
+++ trunk/Externals/scew/Makefile.in	2006-11-01 15:41:27 UTC (rev 3750)
@@ -0,0 +1,539 @@
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# @configure_input@
+
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# $Id: Makefile.am,v 1.11 2004/01/29 22:42:09 aleix Exp $
+#
+# Author: Aleix Conchillo Flaque <al...@me...>
+# Date:   Mon Nov 04, 2002 20:29
+#
+# Copyright (C) 2002, 2003, 2004 Aleix Conchillo Flaque
+#
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = .
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DOC_FALSE = @DOC_FALSE@
+DOC_TRUE = @DOC_TRUE@
+DOT = @DOT@
+DOXYGEN = @DOXYGEN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+enable_dot = @enable_dot@
+enable_html_docs = @enable_html_docs@
+enable_latex_docs = @enable_latex_docs@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+
+SUBDIRS = doc etc win32 scew examples
+
+EXTRA_DIST = INSTALL.WIN32
+subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+
+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+	ps-recursive install-info-recursive uninstall-info-recursive \
+	all-recursive install-data-recursive install-exec-recursive \
+	installdirs-recursive install-recursive uninstall-recursive \
+	check-recursive installcheck-recursive
+DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
+	COPYING ChangeLog INSTALL Makefile.am NEWS THANKS aclocal.m4 \
+	config.h.in configure configure.in depcomp install-sh missing \
+	mkinstalldirs
+DIST_SUBDIRS = $(SUBDIRS)
+all: config.h
+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+.SUFFIXES:
+
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
+
+$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	$(SHELL) ./config.status --recheck
+$(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+	cd $(srcdir) && $(AUTOCONF)
+
+$(ACLOCAL_M4):  configure.in 
+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+config.h: stamp-h1
+	@if test ! -f $@; then \
+	  rm -f stamp-h1; \
+	  $(MAKE) stamp-h1; \
+	else :; fi
+
+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+	@rm -f stamp-h1
+	cd $(top_builddir) && $(SHELL) ./config.status config.h
+
+$(srcdir)/config.h.in:  $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOHEADER)
+	touch $(srcdir)/config.h.in
+
+distclean-hdr:
+	-rm -f config.h stamp-h1
+uninstall-info-am:
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@set fnord $$MAKEFLAGS; amf=$$2; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+	@set fnord $$MAKEFLAGS; amf=$$2; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ETAGS = etags
+ETAGSFLAGS =
+
+CTAGS = ctags
+CTAGSFLAGS =
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	else \
+	  include_option=--include; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -f $$subdir/TAGS && \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
+
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = .
+distdir = $(PACKAGE)-$(VERSION)
+
+am__remove_distdir = \
+  { test ! -d $(distdir) \
+    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr $(distdir); }; }
+
+GZIP_ENV = --best
+distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
+
+distdir: $(DISTFILES)
+	$(am__remove_distdir)
+	mkdir $(distdir)
+	$(mkinstalldirs) $(distdir)/doc $(distdir)/etc/pkg-config
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d $(distdir)/$$subdir \
+	    || mkdir $(distdir)/$$subdir \
+	    || exit 1; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$(top_distdir)" \
+	        distdir=../$(distdir)/$$subdir \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+	|| chmod -R a+r $(distdir)
+dist-gzip: distdir
+	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
+
+dist dist-all: distdir
+	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	$(am__remove_distdir)
+	GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
+	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	mkdir $(distdir)/_build
+	mkdir $(distdir)/_inst
+	chmod a-w $(distdir)
+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+	  && cd $(distdir)/_build \
+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+	        distuninstallcheck \
+	  && chmod -R a-w "$$dc_install_base" \
+	  && ({ \
+	       (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
+	  && rm -rf "$$dc_destdir" \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
+	  && rm -f $(distdir).tar.gz \
+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+	$(am__remove_distdir)
+	@echo "$(distdir).tar.gz is ready for distribution" | \
+	  sed 'h;s/./=/g;p;x;p;x'
+distuninstallcheck:
+	@cd $(distuninstallcheck_dir) \
+	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	   || { echo "ERROR: files left after uninstall:" ; \
+	        if test -n "$(DESTDIR)"; then \
+	          echo "  (check DESTDIR support)"; \
+	        fi ; \
+	        $(distuninstallcheck_listfiles) ; \
+	        exit 1; } >&2
+distcleancheck: distclean
+	@if test '$(srcdir)' = . ; then \
+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+	  exit 1 ; \
+	fi
+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+	  || { echo "ERROR: files left in build directory after distclean:" ; \
+	       $(distcleancheck_listfiles) ; \
+	       exit 1; } >&2
+check-am: all-am
+check: check-recursive
+all-am: Makefile config.h
+installdirs: installdirs-recursive
+installdirs-am:
+
+install: in...
 
[truncated message content]

[Winmerge-svn] SF.net SVN: winmerge: [3749] trunk/Externals

[<ki...@us...>]

Revision: 3749
          http://svn.sourceforge.net/winmerge/?rev=3749&view=rev
Author:   kimmov
Date:     2006-11-01 07:36:35 -0800 (Wed, 01 Nov 2006)

Log Message:
-----------
Add Expat version 2.0.0 to /Externals/expat

Added Paths:
-----------
    trunk/Externals/expat/
    trunk/Externals/expat/COPYING
    trunk/Externals/expat/Changes
    trunk/Externals/expat/MANIFEST
    trunk/Externals/expat/Makefile.in
    trunk/Externals/expat/README
    trunk/Externals/expat/amiga/
    trunk/Externals/expat/amiga/Makefile
    trunk/Externals/expat/amiga/README.txt
    trunk/Externals/expat/amiga/expat.xml
    trunk/Externals/expat/amiga/expat_lib.c
    trunk/Externals/expat/amiga/expat_vectors.c
    trunk/Externals/expat/amiga/include/
    trunk/Externals/expat/amiga/include/inline4/
    trunk/Externals/expat/amiga/include/inline4/expat.h
    trunk/Externals/expat/amiga/include/interfaces/
    trunk/Externals/expat/amiga/include/interfaces/expat.h
    trunk/Externals/expat/amiga/include/libraries/
    trunk/Externals/expat/amiga/include/libraries/expat.h
    trunk/Externals/expat/amiga/include/proto/
    trunk/Externals/expat/amiga/include/proto/expat.h
    trunk/Externals/expat/amiga/launch.c
    trunk/Externals/expat/amiga/stdlib.c
    trunk/Externals/expat/bcb5/
    trunk/Externals/expat/bcb5/README.txt
    trunk/Externals/expat/bcb5/all_projects.bpg
    trunk/Externals/expat/bcb5/elements.bpf
    trunk/Externals/expat/bcb5/elements.bpr
    trunk/Externals/expat/bcb5/elements.mak
    trunk/Externals/expat/bcb5/expat.bpf
    trunk/Externals/expat/bcb5/expat.bpr
    trunk/Externals/expat/bcb5/expat.mak
    trunk/Externals/expat/bcb5/expat_static.bpf
    trunk/Externals/expat/bcb5/expat_static.bpr
    trunk/Externals/expat/bcb5/expat_static.mak
    trunk/Externals/expat/bcb5/expatw.bpf
    trunk/Externals/expat/bcb5/expatw.bpr
    trunk/Externals/expat/bcb5/expatw.mak
    trunk/Externals/expat/bcb5/expatw_static.bpf
    trunk/Externals/expat/bcb5/expatw_static.bpr
    trunk/Externals/expat/bcb5/expatw_static.mak
    trunk/Externals/expat/bcb5/libexpat_mtd.def
    trunk/Externals/expat/bcb5/libexpatw_mtd.def
    trunk/Externals/expat/bcb5/makefile.mak
    trunk/Externals/expat/bcb5/outline.bpf
    trunk/Externals/expat/bcb5/outline.bpr
    trunk/Externals/expat/bcb5/outline.mak
    trunk/Externals/expat/bcb5/setup.bat
    trunk/Externals/expat/bcb5/xmlwf.bpf
    trunk/Externals/expat/bcb5/xmlwf.bpr
    trunk/Externals/expat/bcb5/xmlwf.mak
    trunk/Externals/expat/configure
    trunk/Externals/expat/configure.in
    trunk/Externals/expat/conftools/
    trunk/Externals/expat/conftools/PrintPath
    trunk/Externals/expat/conftools/ac_c_bigendian_cross.m4
    trunk/Externals/expat/conftools/config.guess
    trunk/Externals/expat/conftools/config.sub
    trunk/Externals/expat/conftools/expat.m4
    trunk/Externals/expat/conftools/get-version.sh
    trunk/Externals/expat/conftools/install-sh
    trunk/Externals/expat/conftools/libtool.m4
    trunk/Externals/expat/conftools/ltmain.sh
    trunk/Externals/expat/conftools/mkinstalldirs
    trunk/Externals/expat/doc/
    trunk/Externals/expat/doc/expat.png
    trunk/Externals/expat/doc/reference.html
    trunk/Externals/expat/doc/style.css
    trunk/Externals/expat/doc/valid-xhtml10.png
    trunk/Externals/expat/doc/xmlwf.1
    trunk/Externals/expat/doc/xmlwf.sgml
    trunk/Externals/expat/examples/
    trunk/Externals/expat/examples/elements.c
    trunk/Externals/expat/examples/elements.dsp
    trunk/Externals/expat/examples/outline.c
    trunk/Externals/expat/examples/outline.dsp
    trunk/Externals/expat/expat.dsw
    trunk/Externals/expat/expat_config.h.in
    trunk/Externals/expat/lib/
    trunk/Externals/expat/lib/Makefile.MPW
    trunk/Externals/expat/lib/amigaconfig.h
    trunk/Externals/expat/lib/ascii.h
    trunk/Externals/expat/lib/asciitab.h
    trunk/Externals/expat/lib/expat.dsp
    trunk/Externals/expat/lib/expat.h
    trunk/Externals/expat/lib/expat_external.h
    trunk/Externals/expat/lib/expat_static.dsp
    trunk/Externals/expat/lib/expatw.dsp
    trunk/Externals/expat/lib/expatw_static.dsp
    trunk/Externals/expat/lib/iasciitab.h
    trunk/Externals/expat/lib/internal.h
    trunk/Externals/expat/lib/latin1tab.h
    trunk/Externals/expat/lib/libexpat.def
    trunk/Externals/expat/lib/libexpatw.def
    trunk/Externals/expat/lib/macconfig.h
    trunk/Externals/expat/lib/nametab.h
    trunk/Externals/expat/lib/utf8tab.h
    trunk/Externals/expat/lib/winconfig.h
    trunk/Externals/expat/lib/xmlparse.c
    trunk/Externals/expat/lib/xmlrole.c
    trunk/Externals/expat/lib/xmlrole.h
    trunk/Externals/expat/lib/xmltok.c
    trunk/Externals/expat/lib/xmltok.h
    trunk/Externals/expat/lib/xmltok_impl.c
    trunk/Externals/expat/lib/xmltok_impl.h
    trunk/Externals/expat/lib/xmltok_ns.c
    trunk/Externals/expat/tests/
    trunk/Externals/expat/tests/README.txt
    trunk/Externals/expat/tests/benchmark/
    trunk/Externals/expat/tests/benchmark/README.txt
    trunk/Externals/expat/tests/benchmark/benchmark.c
    trunk/Externals/expat/tests/benchmark/benchmark.dsp
    trunk/Externals/expat/tests/benchmark/benchmark.dsw
    trunk/Externals/expat/tests/chardata.c
    trunk/Externals/expat/tests/chardata.h
    trunk/Externals/expat/tests/minicheck.c
    trunk/Externals/expat/tests/minicheck.h
    trunk/Externals/expat/tests/runtests.c
    trunk/Externals/expat/tests/runtestspp.cpp
    trunk/Externals/expat/tests/xmltest.sh
    trunk/Externals/expat/vms/
    trunk/Externals/expat/vms/README.vms
    trunk/Externals/expat/vms/descrip.mms
    trunk/Externals/expat/vms/expat_config.h
    trunk/Externals/expat/win32/
    trunk/Externals/expat/win32/MANIFEST.txt
    trunk/Externals/expat/win32/README.txt
    trunk/Externals/expat/win32/expat.iss
    trunk/Externals/expat/xmlwf/
    trunk/Externals/expat/xmlwf/codepage.c
    trunk/Externals/expat/xmlwf/codepage.h
    trunk/Externals/expat/xmlwf/ct.c
    trunk/Externals/expat/xmlwf/filemap.h
    trunk/Externals/expat/xmlwf/readfilemap.c
    trunk/Externals/expat/xmlwf/unixfilemap.c
    trunk/Externals/expat/xmlwf/win32filemap.c
    trunk/Externals/expat/xmlwf/xmlfile.c
    trunk/Externals/expat/xmlwf/xmlfile.h
    trunk/Externals/expat/xmlwf/xmlmime.c
    trunk/Externals/expat/xmlwf/xmlmime.h
    trunk/Externals/expat/xmlwf/xmltchar.h
    trunk/Externals/expat/xmlwf/xmlurl.h
    trunk/Externals/expat/xmlwf/xmlwf.c
    trunk/Externals/expat/xmlwf/xmlwf.dsp
    trunk/Externals/expat/xmlwf/xmlwin32url.cxx

Added: trunk/Externals/expat/COPYING
===================================================================
--- trunk/Externals/expat/COPYING	                        (rev 0)
+++ trunk/Externals/expat/COPYING	2006-11-01 15:36:35 UTC (rev 3749)
@@ -0,0 +1,22 @@
+Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
+                               and Clark Cooper
+Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Added: trunk/Externals/expat/Changes
===================================================================
--- trunk/Externals/expat/Changes	                        (rev 0)
+++ trunk/Externals/expat/Changes	2006-11-01 15:36:35 UTC (rev 3749)
@@ -0,0 +1,148 @@
+Release 2.0.0 Wed Jan 11 2006
+        - We no longer use the "check" library for C unit testing; we
+          always use the (partial) internal implementation of the API.
+        - Report XML_NS setting via XML_GetFeatureList().
+        - Fixed headers for use from C++.
+        - XML_GetCurrentLineNumber() and  XML_GetCurrentColumnNumber()
+          now return unsigned integers.
+        - Added XML_LARGE_SIZE switch to enable 64-bit integers for
+          byte indexes and line/column numbers.
+        - Updated to use libtool 1.5.22 (the most recent).
+        - Added support for AmigaOS.
+        - Some mostly minor bug fixes. SF issues include: 1006708,
+          1021776, 1023646, 1114960, 1156398, 1221160, 1271642.
+
+Release 1.95.8 Fri Jul 23 2004
+        - Major new feature: suspend/resume.  Handlers can now request
+          that a parse be suspended for later resumption or aborted
+          altogether.  See "Temporarily Stopping Parsing" in the
+          documentation for more details.
+        - Some mostly minor bug fixes, but compilation should no
+          longer generate warnings on most platforms.  SF issues
+          include: 827319, 840173, 846309, 888329, 896188, 923913,
+          928113, 961698, 985192.
+
+Release 1.95.7 Mon Oct 20 2003
+        - Fixed enum XML_Status issue (reported on SourceForge many
+          times), so compilers that are properly picky will be happy.
+        - Introduced an XMLCALL macro to control the calling
+          convention used by the Expat API; this macro should be used
+          to annotate prototypes and definitions of callback
+          implementations in code compiled with a calling convention
+          other than the default convention for the host platform.
+        - Improved ability to build without the configure-generated
+          expat_config.h header.  This is useful for applications
+          which embed Expat rather than linking in the library.
+        - Fixed a variety of bugs: see SF issues 458907, 609603,
+          676844, 679754, 692878, 692964, 695401, 699323, 699487,
+          820946.
+        - Improved hash table lookups.
+        - Added more regression tests and improved documentation.
+
+Release 1.95.6 Tue Jan 28 2003
+        - Added XML_FreeContentModel().
+        - Added XML_MemMalloc(), XML_MemRealloc(), XML_MemFree().
+        - Fixed a variety of bugs: see SF issues 615606, 616863,
+          618199, 653180, 673791.
+        - Enhanced the regression test suite.
+        - Man page improvements: includes SF issue 632146.
+
+Release 1.95.5 Fri Sep 6 2002
+        - Added XML_UseForeignDTD() for improved SAX2 support.
+        - Added XML_GetFeatureList().
+        - Defined XML_Bool type and the values XML_TRUE and XML_FALSE.
+        - Use an incomplete struct instead of a void* for the parser
+          (may not retain).
+        - Fixed UTF-8 decoding bug that caused legal UTF-8 to be rejected.
+        - Finally fixed bug where default handler would report DTD
+          events that were already handled by another handler.
+          Initial patch contributed by Darryl Miles.
+        - Removed unnecessary DllMain() function that caused static
+          linking into a DLL to be difficult.
+        - Added VC++ projects for building static libraries.
+        - Reduced line-length for all source code and headers to be
+          no longer than 80 characters, to help with AS/400 support.
+        - Reduced memory copying during parsing (SF patch #600964).
+        - Fixed a variety of bugs: see SF issues 580793, 434664,
+          483514, 580503, 581069, 584041, 584183, 584832, 585537,
+          596555, 596678, 598352, 598944, 599715, 600479, 600971.
+
+Release 1.95.4 Fri Jul 12 2002
+        - Added support for VMS, contributed by Craig Berry.  See
+          vms/README.vms for more information.
+        - Added Mac OS (classic) support, with a makefile for MPW,
+          contributed by Thomas Wegner and Daryle Walker.
+        - Added Borland C++ Builder 5 / BCC 5.5 support, contributed
+          by Patrick McConnell (SF patch #538032).
+        - Fixed a variety of bugs: see SF issues 441449, 563184,
+          564342, 566334, 566901, 569461, 570263, 575168, 579196.
+        - Made skippedEntityHandler conform to SAX2 (see source comment)
+        - Re-implemented WFC: Entity Declared from XML 1.0 spec and
+          added a new error "entity declared in parameter entity":
+          see SF bug report 569461 and SF patch 578161
+        - Re-implemented section 5.1 from XML 1.0 spec:
+          see SF bug report 570263 and SF patch 578161
+
+Release 1.95.3 Mon Jun 3 2002
+        - Added a project to the MSVC workspace to create a wchar_t
+          version of the library; the DLLs are named libexpatw.dll.
+        - Changed the name of the Windows DLLs from expat.dll to
+          libexpat.dll; this fixes SF bug #432456.
+        - Added the XML_ParserReset() API function.
+        - Fixed XML_SetReturnNSTriplet() to work for element names.
+        - Made the XML_UNICODE builds usable (thanks, Karl!).
+        - Allow xmlwf to read from standard input.
+        - Install a man page for xmlwf on Unix systems.
+        - Fixed many bugs; see SF bug reports 231864, 461380, 464837,
+          466885, 469226, 477667, 484419, 487840, 494749, 496505,
+          547350.  Other bugs which we can't test as easily may also
+          have been fixed, especially in the area of build support.
+
+Release 1.95.2 Fri Jul 27 2001
+        - More changes to make MSVC happy with the build; add a single
+          workspace to support both the library and xmlwf application.
+        - Added a Windows installer for Windows users; includes
+          xmlwf.exe.
+        - Added compile-time constants that can be used to determine the
+          Expat version
+        - Removed a lot of GNU-specific dependencies to aide portability
+          among the various Unix flavors.
+        - Fix the UTF-8 BOM bug.
+        - Cleaned up warning messages for several compilers.
+        - Added the -Wall, -Wstrict-prototypes options for GCC.
+
+Release 1.95.1 Sun Oct 22 15:11:36 EDT 2000
+        - Changes to get expat to build under Microsoft compiler
+        - Removed all aborts and instead return an UNEXPECTED_STATE error.
+        - Fixed a bug where a stray '%' in an entity value would cause an
+          abort.
+        - Defined XML_SetEndNamespaceDeclHandler. Thanks to Darryl Miles for
+          finding this oversight.
+        - Changed default patterns in lib/Makefile.in to fit non-GNU makes
+          Thanks to ro...@un... for reporting and providing an
+          account to test on.
+        - The reference had the wrong label for XML_SetStartNamespaceDecl.
+          Reported by an anonymous user.
+
+Release 1.95.0 Fri Sep 29 2000
+        - XML_ParserCreate_MM
+                Allows you to set a memory management suite to replace the
+                standard malloc,realloc, and free.
+        - XML_SetReturnNSTriplet
+                If you turn this feature on when namespace processing is in
+                effect, then qualified, prefixed element and attribute names
+                are returned as "uri|name|prefix" where '|' is whatever
+                separator character is used in namespace processing.
+        - Merged in features from perl-expat
+                o XML_SetElementDeclHandler
+                o XML_SetAttlistDeclHandler
+                o XML_SetXmlDeclHandler
+                o XML_SetEntityDeclHandler
+                o StartDoctypeDeclHandler takes 3 additional parameters:
+                        sysid, pubid, has_internal_subset
+                o Many paired handler setters (like XML_SetElementHandler)
+                  now have corresponding individual handler setters
+                o XML_GetInputContext for getting the input context of
+                  the current parse position.
+        - Added reference material
+        - Packaged into a distribution that builds a sharable library

Added: trunk/Externals/expat/MANIFEST
===================================================================
--- trunk/Externals/expat/MANIFEST	                        (rev 0)
+++ trunk/Externals/expat/MANIFEST	2006-11-01 15:36:35 UTC (rev 3749)
@@ -0,0 +1,128 @@
+amiga/stdlib.c
+amiga/launch.c
+amiga/expat_vectors.c
+amiga/expat_lib.c
+amiga/expat.xml
+amiga/README.txt
+amiga/Makefile
+amiga/include/proto/expat.h
+amiga/include/libraries/expat.h
+amiga/include/interfaces/expat.h
+amiga/include/inline4/expat.h
+bcb5/README.txt
+bcb5/all_projects.bpg
+bcb5/elements.bpf
+bcb5/elements.bpr
+bcb5/elements.mak
+bcb5/expat.bpf
+bcb5/expat.bpr
+bcb5/expat.mak
+bcb5/expat_static.bpf
+bcb5/expat_static.bpr
+bcb5/expat_static.mak
+bcb5/expatw.bpf
+bcb5/expatw.bpr
+bcb5/expatw.mak
+bcb5/expatw_static.bpf
+bcb5/expatw_static.bpr
+bcb5/expatw_static.mak
+bcb5/libexpat_mtd.def
+bcb5/libexpatw_mtd.def
+bcb5/makefile.mak
+bcb5/outline.bpf
+bcb5/outline.bpr
+bcb5/outline.mak
+bcb5/setup.bat
+bcb5/xmlwf.bpf
+bcb5/xmlwf.bpr
+bcb5/xmlwf.mak
+doc/expat.png
+doc/reference.html
+doc/style.css
+doc/valid-xhtml10.png
+doc/xmlwf.1
+doc/xmlwf.sgml
+COPYING
+Changes
+MANIFEST
+Makefile.in
+README
+configure
+configure.in
+expat_config.h.in
+expat.dsw
+conftools/PrintPath
+conftools/ac_c_bigendian_cross.m4
+conftools/config.guess
+conftools/config.sub
+conftools/expat.m4
+conftools/get-version.sh
+conftools/install-sh
+conftools/libtool.m4
+conftools/ltmain.sh
+conftools/mkinstalldirs
+examples/elements.c
+examples/elements.dsp
+examples/outline.c
+examples/outline.dsp
+lib/Makefile.MPW
+lib/amigaconfig.h
+lib/ascii.h
+lib/asciitab.h
+lib/expat.dsp
+lib/expat.h
+lib/expat_external.h
+lib/expat_static.dsp
+lib/expatw.dsp
+lib/expatw_static.dsp
+lib/iasciitab.h
+lib/internal.h
+lib/latin1tab.h
+lib/libexpat.def
+lib/libexpatw.def
+lib/macconfig.h
+lib/nametab.h
+lib/utf8tab.h
+lib/winconfig.h
+lib/xmlparse.c
+lib/xmlrole.c
+lib/xmlrole.h
+lib/xmltok.c
+lib/xmltok.h
+lib/xmltok_impl.c
+lib/xmltok_impl.h
+lib/xmltok_ns.c
+tests/benchmark/README.txt
+tests/benchmark/benchmark.c
+tests/benchmark/benchmark.dsp
+tests/benchmark/benchmark.dsw
+tests/README.txt
+tests/chardata.c
+tests/chardata.h
+tests/minicheck.c
+tests/minicheck.h
+tests/runtests.c
+tests/runtestspp.cpp
+tests/xmltest.sh
+vms/README.vms
+vms/descrip.mms
+vms/expat_config.h
+win32/MANIFEST.txt
+win32/README.txt
+win32/expat.iss
+xmlwf/codepage.c
+xmlwf/codepage.h
+xmlwf/ct.c
+xmlwf/filemap.h
+xmlwf/readfilemap.c
+xmlwf/unixfilemap.c
+xmlwf/win32filemap.c
+xmlwf/xmlfile.c
+xmlwf/xmlfile.h
+xmlwf/xmlmime.c
+xmlwf/xmlmime.h
+xmlwf/xmltchar.h
+xmlwf/xmlurl.h
+xmlwf/xmlwf.c
+xmlwf/xmlwf.dsp
+xmlwf/xmlwin32url.cxx

Added: trunk/Externals/expat/Makefile.in
===================================================================
--- trunk/Externals/expat/Makefile.in	                        (rev 0)
+++ trunk/Externals/expat/Makefile.in	2006-11-01 15:36:35 UTC (rev 3749)
@@ -0,0 +1,185 @@
+################################################################
+# Process this file with top-level configure script to produce Makefile
+#
+# Copyright 2000 Clark Cooper
+#
+#  This file is part of EXPAT.
+#
+#  EXPAT is free software; you can redistribute it and/or modify it
+#  under the terms of the License (based on the MIT/X license) contained
+#  in the file COPYING that comes with this distribution.
+#
+# EXPAT IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN EXPAT.
+#
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+libdir = @libdir@
+includedir = @includedir@
+man1dir = @mandir@/man1
+
+top_builddir = .
+
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+mkinstalldirs = $(SHELL) $(top_srcdir)/conftools/mkinstalldirs
+
+MANFILE = $(srcdir)/doc/xmlwf.1
+APIHEADER = $(srcdir)/lib/expat.h $(srcdir)/lib/expat_external.h
+LIBRARY = libexpat.la
+
+ifndef INSTALL_ROOT
+INSTALL_ROOT=$(DESTDIR)
+endif
+
+default:  buildlib xmlwf/xmlwf
+
+buildlib: $(LIBRARY)
+
+all: $(LIBRARY) xmlwf/xmlwf examples/elements examples/outline
+
+clean:
+	cd lib && rm -f $(LIBRARY) *.o *.lo && rm -rf .libs _libs
+	cd xmlwf && rm -f xmlwf *.o *.lo && rm -rf .libs _libs
+	cd examples && rm -f elements outline *.o *.lo && rm -rf .libs _libs
+	cd tests && rm -rf .libs runtests runtests.o runtestspp runtestspp.o
+	cd tests && rm -f chardata.o minicheck.o
+	rm -rf .libs libexpat.la
+	rm -f examples/core tests/core xmlwf/core
+
+clobber: clean
+
+distclean: clean
+	rm -f expat_config.h config.status config.log config.cache libtool
+	rm -f Makefile
+
+extraclean: distclean
+	rm -f expat_config.h.in configure
+	rm -f conftools/ltconfig conftools/ltmain.sh conftools/libtool.m4
+
+check: tests/runtests tests/runtestspp
+	tests/runtests
+	tests/runtestspp
+
+install: xmlwf/xmlwf installlib
+	$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) $(INSTALL_ROOT)$(man1dir)
+	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf $(INSTALL_ROOT)$(bindir)/xmlwf
+	$(INSTALL_DATA) $(MANFILE) $(INSTALL_ROOT)$(man1dir)
+
+installlib: $(LIBRARY) $(APIHEADER)
+	$(mkinstalldirs) $(INSTALL_ROOT)$(libdir) $(INSTALL_ROOT)$(includedir)
+	$(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(INSTALL_ROOT)$(libdir)/$(LIBRARY)
+	for FN in $(APIHEADER) ; do $(INSTALL_DATA) $$FN $(INSTALL_ROOT)$(includedir) ; done
+
+uninstall: uninstalllib
+	$(LIBTOOL) --mode=uninstall rm -f $(INSTALL_ROOT)$(bindir)/xmlwf
+	rm -f $(INSTALL_ROOT)$(man1dir)/xmlwf.1
+
+uninstalllib:
+	$(LIBTOOL) --mode=uninstall rm -f $(INSTALL_ROOT)$(libdir)/$(LIBRARY)
+	rm -f $(INSTALL_ROOT)$(includedir)/expat.h
+	rm -f $(INSTALL_ROOT)$(includedir)/expat_external.h
+
+# for VPATH builds (invoked by configure)
+mkdir-init:
+	@for d in lib xmlwf examples tests ; do \
+		(mkdir $$d 2> /dev/null || test 1) ; \
+	done
+
+CC = @CC@
+LIBTOOL = @LIBTOOL@
+
+INCLUDES = -I$(srcdir)/lib -I.
+LDFLAGS = @LDFLAGS@
+CPPFLAGS = @CPPFLAGS@
+CFLAGS = @CFLAGS@ -DHAVE_EXPAT_CONFIG_H
+VSNFLAG = -version-info @LIBCURRENT@:@LIBREVISION@:@LIBAGE@
+
+### autoconf this?
+LTFLAGS = --silent
+
+COMPILE = $(CC) $(INCLUDES) $(CFLAGS) $(DEFS) $(CPPFLAGS)
+CXXCOMPILE = $(CXX) $(INCLUDES) $(CFLAGS) $(DEFS) $(CPPFLAGS)
+LTCOMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE)
+LINK_LIB = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -no-undefined $(VSNFLAG) -rpath $(libdir) $(LDFLAGS) -o $@
+LINK_EXE = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LDFLAGS) -o $@
+LINK_CXX_EXE = $(LIBTOOL) $(LTFLAGS) --mode=link $(CXXCOMPILE) $(LDFLAGS) -o $@
+
+LIB_OBJS = lib/xmlparse.lo lib/xmltok.lo lib/xmlrole.lo
+$(LIBRARY): $(LIB_OBJS)
+	$(LINK_LIB) $(LIB_OBJS)
+
+lib/xmlparse.lo: lib/xmlparse.c lib/expat.h lib/xmlrole.h lib/xmltok.h \
+	$(top_builddir)/expat_config.h lib/expat_external.h lib/internal.h
+
+lib/xmlrole.lo: lib/xmlrole.c lib/ascii.h lib/xmlrole.h \
+	$(top_builddir)/expat_config.h lib/expat_external.h lib/internal.h
+
+lib/xmltok.lo: lib/xmltok.c lib/xmltok_impl.c lib/xmltok_ns.c \
+	lib/ascii.h lib/asciitab.h lib/iasciitab.h lib/latin1tab.h \
+	lib/nametab.h lib/utf8tab.h lib/xmltok.h lib/xmltok_impl.h \
+	$(top_builddir)/expat_config.h lib/expat_external.h lib/internal.h
+
+
+XMLWF_OBJS = xmlwf/xmlwf.o xmlwf/xmlfile.o xmlwf/codepage.o xmlwf/@FILEMAP@.o
+xmlwf/xmlwf.o: xmlwf/xmlwf.c
+xmlwf/xmlfile.o: xmlwf/xmlfile.c
+xmlwf/codepage.o: xmlwf/codepage.c
+xmlwf/@FILEMAP@.o: xmlwf/@FILEMAP@.c
+xmlwf/xmlwf: $(XMLWF_OBJS) $(LIBRARY)
+	$(LINK_EXE) $(XMLWF_OBJS) $(LIBRARY)
+
+examples/elements.o: examples/elements.c
+examples/elements: examples/elements.o $(LIBRARY)
+	$(LINK_EXE) $< $(LIBRARY)
+
+examples/outline.o: examples/outline.c
+examples/outline: examples/outline.o $(LIBRARY)
+	$(LINK_EXE) $< $(LIBRARY)
+
+tests/chardata.o: tests/chardata.c tests/chardata.h
+tests/minicheck.o: tests/minicheck.c tests/minicheck.h
+tests/runtests.o: tests/runtests.c tests/chardata.h
+tests/runtests: tests/runtests.o tests/chardata.o tests/minicheck.o $(LIBRARY)
+	$(LINK_EXE) $^
+tests/runtestspp.o: tests/runtestspp.cpp tests/runtests.c tests/chardata.h
+tests/runtestspp: tests/runtestspp.o tests/chardata.o tests/minicheck.o $(LIBRARY)
+	$(LINK_CXX_EXE) $^
+
+tests/xmlts.zip:
+	wget --output-document=tests/xmlts.zip \
+		http://www.w3.org/XML/Test/xmlts20020606.zip
+
+tests/XML-Test-Suite: tests/xmlts.zip
+	cd tests && unzip -q xmlts.zip
+
+run-xmltest: xmlwf/xmlwf tests/XML-Test-Suite
+	tests/xmltest.sh
+
+.SUFFIXES: .c .lo .o
+
+.c.o:
+	$(COMPILE) -o $@ -c $<
+.c.lo:
+	$(LTCOMPILE) -o $@ -c $<
+
+.PHONY: buildlib all \
+	clean distclean extraclean maintainer-clean \
+	dist distdir \
+	install uninstall

Added: trunk/Externals/expat/README
===================================================================
--- trunk/Externals/expat/README	                        (rev 0)
+++ trunk/Externals/expat/README	2006-11-01 15:36:35 UTC (rev 3749)
@@ -0,0 +1,118 @@
+
+                        Expat, Release 2.0.0
+
+This is Expat, a C library for parsing XML, written by James Clark.
+Expat is a stream-oriented XML parser.  This means that you register
+handlers with the parser before starting the parse.  These handlers
+are called when the parser discovers the associated structures in the
+document being parsed.  A start tag is an example of the kind of
+structures for which you may register handlers.
+
+Windows users should use the expat_win32bin package, which includes
+both precompiled libraries and executables, and source code for
+developers.
+
+Expat is free software.  You may copy, distribute, and modify it under
+the terms of the License contained in the file COPYING distributed
+with this package.  This license is the same as the MIT/X Consortium
+license.
+
+Versions of Expat that have an odd minor version (the middle number in
+the release above), are development releases and should be considered
+as beta software.  Releases with even minor version numbers are
+intended to be production grade software.
+
+If you are building Expat from a check-out from the CVS repository,
+you need to run a script that generates the configure script using the
+GNU autoconf and libtool tools.  To do this, you need to have
+autoconf 2.52 or newer and libtool 1.4 or newer.  Run the script like
+this:
+
+        ./buildconf.sh
+
+Once this has been done, follow the same instructions as for building
+from a source distribution.
+
+To build Expat from a source distribution, you first run the
+configuration shell script in the top level distribution directory:
+
+        ./configure
+
+There are many options which you may provide to configure (which you
+can discover by running configure with the --help option).  But the
+one of most interest is the one that sets the installation directory.
+By default, the configure script will set things up to install
+libexpat into /usr/local/lib, expat.h into /usr/local/include, and
+xmlwf into /usr/local/bin.  If, for example, you'd prefer to install
+into /home/me/mystuff/lib, /home/me/mystuff/include, and
+/home/me/mystuff/bin, you can tell configure about that with:
+
+        ./configure --prefix=/home/me/mystuff
+        
+Another interesting option is to enable 64-bit integer support for
+line and column numbers and the over-all byte index:
+
+        ./configure CPPFLAGS=-DXML_LARGE_SIZE
+
+After running the configure script, the "make" command will build
+things and "make install" will install things into their proper
+location.  Have a look at the "Makefile" to learn about additional
+"make" options.  Note that you need to have write permission into
+the directories into which things will be installed.
+
+If you are interested in building Expat to provide document
+information in UTF-16 rather than the default UTF-8, follow these
+instructions:
+
+        1. For UTF-16 output as unsigned short (and version/error
+           strings as char), run:
+
+               ./configure CPPFLAGS=-DXML_UNICODE
+
+           For UTF-16 output as wchar_t (incl. version/error strings),
+           run:
+
+               ./configure CFLAGS="-g -O2 -fshort-wchar" \
+                           CPPFLAGS=-DXML_UNICODE_WCHAR_T
+
+        2. Edit the MakeFile, changing:
+
+               LIBRARY = libexpat.la
+
+           to:
+
+               LIBRARY = libexpatw.la
+
+           (Note the additional "w" in the library name.)
+
+        3. Run "make buildlib" (which builds the library only).
+
+        4. Run "make installlib" (which installs the library only).
+
+Note for Solaris users:  The "ar" command is usually located in
+"/usr/ccs/bin", which is not in the default PATH.  You will need to
+add this to your path for the "make" command, and probably also switch
+to GNU make (the "make" found in /usr/ccs/bin does not seem to work
+properly -- appearantly it does not understand .PHONY directives).  If
+you're using ksh or bash, use this command to build:
+
+        PATH=/usr/ccs/bin:$PATH make
+
+When using Expat with a project using autoconf for configuration, you
+can use the probing macro in conftools/expat.m4 to determine how to
+include Expat.  See the comments at the top of that file for more
+information.
+
+A reference manual is available in the file doc/reference.html in this
+distribution.
+
+The homepage for this project is http://www.libexpat.org/.  There
+are links there to connect you to the bug reports page.  If you need
+to report a bug when you don't have access to a browser, you may also
+send a bug report by email to exp...@ma....
+
+Discussion related to the direction of future expat development takes
+place on exp...@ma....  Archives of this list and
+other Expat-related lists may be found at:
+
+        http://mail.libexpat.org/mailman/listinfo/

Added: trunk/Externals/expat/amiga/Makefile
===================================================================
--- trunk/Externals/expat/amiga/Makefile	                        (rev 0)
+++ trunk/Externals/expat/amiga/Makefile	2006-11-01 15:36:35 UTC (rev 3749)
@@ -0,0 +1,184 @@
+#
+# Makefile for AmigaOS
+#
+
+.PHONY: help all staticlib sharedlib check clean install
+
+vpath %.c ../lib ../examples ../xmlwf ../tests
+vpath %.h ../lib ../tests
+
+
+#
+# Set these for SDK installation.
+#
+tooldir = SDK:Local/C
+staticlibdir = SDK:Local/clib2/lib
+staticincludedir = SDK:Local/clib2/include
+sharedlibdir = LIBS:
+sharedincludedir = SDK:Local/common/include
+
+
+ifeq ($(MAKECMDGOALS), staticlib)
+ DESTDIR = lib
+else
+ DESTDIR = libs
+endif
+
+STATICLIB = $(DESTDIR)/libexpat.a
+SHAREDLIB = $(DESTDIR)/expat.library
+
+XMLWF = $(DESTDIR)/xmlwf
+ELEMENTS = $(DESTDIR)/elements
+OUTLINE = $(DESTDIR)/outline
+RUNTESTS = $(DESTDIR)/runtests
+BENCHMARK = $(DESTDIR)/benchmark
+
+
+help:
+	@echo "Requires:"
+	@echo " AmigaOS 4.0"
+	@echo " SDK 51.15"
+	@echo " clib2 1.198"
+	@echo ""
+	@echo "Targets:"
+	@echo " all - make expat libraries, xmlwf, examples and run test suite"
+	@echo " install - install expat libraries and tools into SDK"
+
+all:
+	-makedir lib libs
+	$(MAKE) staticlib
+	$(MAKE) sharedlib
+
+staticlib: $(STATICLIB) $(XMLWF) $(ELEMENTS) $(OUTLINE) $(RUNTESTS) $(BENCHMARK) check
+	@echo done
+
+sharedlib: $(SHAREDLIB) $(XMLWF) $(ELEMENTS) $(OUTLINE) $(RUNTESTS) $(BENCHMARK) check
+	@echo done
+
+check:
+	$(RUNTESTS)
+
+clean:
+	-delete lib/#?.o quiet
+	-delete libs/#?.o quiet
+
+install:
+	copy lib/xmlwf $(tooldir) quiet
+	copy /lib/expat.h /lib/expat_external.h $(staticincludedir) quiet
+	copy lib/libexpat.a $(staticlibdir) quiet
+	copy libs/expat.library $(sharedlibdir) quiet
+	copy include $(sharedincludedir) quiet all
+
+
+CC = gcc
+LIBTOOL = ar
+STRIP = strip
+
+LDFLAGS =
+LIBS =
+CFLAGS = -DNDEBUG -O2
+LTFLAGS = -crs
+STRIPFLAGS = -R.comment
+LAUNCH =
+
+ifeq ($(MAKECMDGOALS), staticlib)
+ LIBS += $(STATICLIB)
+ INCLUDES = -I../lib
+endif
+
+ifeq ($(MAKECMDGOALS), sharedlib)
+ CFLAGS += -DAMIGA_SHARED_LIB -D__USE_INLINE__
+ INCLUDES = -I. -Iinclude -Iinclude/libraries -I../lib
+ LAUNCH = $(DESTDIR)/launch.o
+endif
+
+
+COMPILE = $(CC) $(CFLAGS) $(INCLUDES) -c
+
+LINK = $(CC) $(LDFLAGS) -o $@
+
+
+$(STATICLIB): $(DESTDIR)/xmlparse.o $(DESTDIR)/xmltok.o $(DESTDIR)/xmlrole.o
+	$(LIBTOOL) $(LTFLAGS) $@ $^
+
+$(DESTDIR)/xmlparse.o: xmlparse.c expat.h xmlrole.h xmltok.h \
+	expat_external.h internal.h amigaconfig.h
+	$(COMPILE) $< -o $@
+
+$(DESTDIR)/xmlrole.o: xmlrole.c ascii.h xmlrole.h expat_external.h \
+	internal.h amigaconfig.h
+	$(COMPILE) $< -o $@
+
+$(DESTDIR)/xmltok.o: xmltok.c xmltok_impl.c xmltok_ns.c ascii.h asciitab.h \
+	iasciitab.h latin1tab.h nametab.h utf8tab.h xmltok.h xmltok_impl.h \
+	expat_external.h internal.h amigaconfig.h
+	$(COMPILE) $< -o $@
+
+
+$(SHAREDLIB): $(DESTDIR)/expat_lib.o $(DESTDIR)/expat_vectors.o $(DESTDIR)/stdlib.o lib/libexpat.a
+	$(LINK) -nostartfiles -nostdlib -o $@ $^
+
+$(DESTDIR)/expat_lib.o: expat_lib.c
+	$(COMPILE) $< -o $@
+
+$(DESTDIR)/expat_vectors.o: expat_vectors.c
+	$(COMPILE) $< -o $@
+
+$(DESTDIR)/stdlib.o: stdlib.c
+	$(COMPILE) $< -o $@
+
+$(LAUNCH): launch.c
+	$(COMPILE) $< -o $@
+
+
+$(XMLWF): $(DESTDIR)/xmlwf.o $(DESTDIR)/xmlfile.o $(DESTDIR)/codepage.o $(DESTDIR)/readfilemap.o $(LAUNCH)
+	$(LINK) $^ $(LIBS)
+	$(STRIP) $(STRIPFLAGS) $@
+
+$(DESTDIR)/xmlwf.o: xmlwf.c
+	$(COMPILE) $< -o $@
+
+$(DESTDIR)/xmlfile.o: xmlfile.c
+	$(COMPILE) $< -o $@
+
+$(DESTDIR)/codepage.o: codepage.c
+	$(COMPILE) $< -o $@
+
+$(DESTDIR)/readfilemap.o: readfilemap.c
+	$(COMPILE) $< -o $@
+
+
+$(ELEMENTS): $(DESTDIR)/elements.o $(LAUNCH)
+	$(LINK) $^ $(LIBS)
+	$(STRIP) $(STRIPFLAGS) $@
+
+$(DESTDIR)/elements.o: elements.c
+	$(COMPILE) $< -o $@
+
+
+$(OUTLINE): $(DESTDIR)/outline.o $(LAUNCH)
+	$(LINK) $^ $(LIBS)
+	$(STRIP) $(STRIPFLAGS) $@
+
+$(DESTDIR)/outline.o: outline.c
+	$(COMPILE) $< -o $@
+
+
+$(RUNTESTS): $(DESTDIR)/runtests.o $(DESTDIR)/chardata.o $(DESTDIR)/minicheck.o $(LAUNCH)
+	$(LINK) $^ $(LIBS)
+
+$(DESTDIR)/chardata.o: chardata.c chardata.h
+	$(COMPILE) $< -o $@
+
+$(DESTDIR)/minicheck.o: minicheck.c minicheck.h
+	$(COMPILE) $< -o $@
+
+$(DESTDIR)/runtests.o: runtests.c chardata.h
+	$(COMPILE) $< -o $@
+
+
+$(BENCHMARK): $(DESTDIR)/benchmark.o $(LAUNCH)
+	$(LINK) $^ $(LIBS) -lm
+
+$(DESTDIR)/benchmark.o: benchmark/benchmark.c
+	$(COMPILE) $< -o $@

Added: trunk/Externals/expat/amiga/README.txt
===================================================================
--- trunk/Externals/expat/amiga/README.txt	                        (rev 0)
+++ trunk/Externals/expat/amiga/README.txt	2006-11-01 15:36:35 UTC (rev 3749)
@@ -0,0 +1,56 @@
+SUMMARY
+=======
+This is a port of expat for AmigaOS 4.0 which includes the
+SDK, some XML tools and the libraries.
+
+Both static and shared library versions are supported.
+
+The static library version is limited to clib2 although it should
+be possible to use newlib with the appopriate compile options.
+
+The shared library version is based on the work of Fredrik Wikstrom
+and is currently limited to PPC only.
+
+
+HISTORY
+=======
+4.0  - updated for corresponding Expat 2.0 release
+     - some minor CVS related changes
+
+3.1  - removed obsolete sfd file
+     - added library description xml file
+     - refactored Makefile
+     - removed extraneous VARARGS68K keywords
+     - reworked default memory handling functions in shared lib
+     - updated amigaconfig.h
+
+3.0  - initial release
+     - based on expat 1.95.8
+
+
+BUILDING
+========
+To build expat.library, xmlwf tool, examples and run the test suite,
+simply type 'make all' in the amiga subdirectory.
+
+The test suite will compile and run for both the static and shared
+library versions.
+
+
+INSTALLATION
+============
+To install both static and shared versions of expat into the
+AmigaOS SDK type 'make install' in the amiga subdirectory.
+
+
+CONFIGURATION
+=============
+You may want to edit the lib/amigaconfig.h file to remove
+DTD and/or XML namespace support if they are not required by your
+specific application for a smaller and faster implementation.
+
+
+TO DO
+=====
+- wide character support (UTF-16)
+- provide 68k backwards compatibility

Added: trunk/Externals/expat/amiga/expat.xml
===================================================================
--- trunk/Externals/expat/amiga/expat.xml	                        (rev 0)
+++ trunk/Externals/expat/amiga/expat.xml	2006-11-01 15:36:35 UTC (rev 3749)
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE library SYSTEM "library.dtd">
+<!-- autogenerated by fdtrans v51.16 -->
+<library name="expat" basename="ExpatBase" basetype="Library" openname="expat.library">
+	<include>libraries/expat.h</include>
+	<interface name="main" version="1.0" struct="ExpatIFace" prefix="_Expat_" asmprefix="IExpat" global="IExpat">
+		<method name="Obtain" result="uint32"/>
+		<method name="Release" result="uint32"/>
+		<method name="Expunge" result="void" status="unimplemented"/>
+		<method name="Clone" result="struct Interface *" status="unimplemented"/>
+		<method name="XML_ParserCreate" result="XML_Parser">
+			<arg name="encodingName" type="const XML_Char *"/>
+		</method>
+		<method name="XML_ParserCreateNS" result="XML_Parser">
+			<arg name="encodingName" type="const XML_Char *"/>
+			<arg name="nsSep" type="XML_Char"/>
+		</method>
+		<method name="XML_ParserCreate_MM" result="XML_Parser">
+			<arg name="encoding" type="const XML_Char *"/>
+			<arg name="memsuite" type="const XML_Memory_Handling_Suite *"/>
+			<arg name="namespaceSeparator" type="const XML_Char *"/>
+		</method>
+		<method name="XML_ExternalEntityParserCreate" result="XML_Parser">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="context" type="const XML_Char *"/>
+			<arg name="encoding" type="const XML_Char *"/>
+		</method>
+		<method name="XML_ParserFree" result="void">
+			<arg name="parser" type="XML_Parser"/>
+		</method>
+		<method name="XML_Parse" result="enum XML_Status">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="s" type="const char *"/>
+			<arg name="len" type="int"/>
+			<arg name="isFinal" type="int"/>
+		</method>
+		<method name="XML_ParseBuffer" result="enum XML_Status">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="len" type="int"/>
+			<arg name="isFinal" type="int"/>
+		</method>
+		<method name="XML_GetBuffer" result="void *">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="len" type="int"/>
+		</method>
+		<method name="XML_SetStartElementHandler" result="void">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="start" type="XML_StartElementHandler"/>
+		</method>
+		<method name="XML_SetEndElementHandler" result="void">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="end" type="XML_EndElementHandler"/>
+		</method>
+		<method name="XML_SetElementHandler" result="void">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="start" type="XML_StartElementHandler"/>
+			<arg name="end" type="XML_EndElementHandler"/>
+		</method>
+		<method name="XML_SetCharacterDataHandler" result="void">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="handler" type="XML_CharacterDataHandler"/>
+		</method>
+		<method name="XML_SetProcessingInstructionHandler" result="void">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="handler" type="XML_ProcessingInstructionHandler"/>
+		</method>
+		<method name="XML_SetCommentHandler" result="void">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="handler" type="XML_CommentHandler"/>
+		</method>
+		<method name="XML_SetStartCdataSectionHandler" result="void">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="start" type="XML_StartCdataSectionHandler"/>
+		</method>
+		<method name="XML_SetEndCdataSectionHandler" result="void">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="end" type="XML_EndCdataSectionHandler"/>
+		</method>
+		<method name="XML_SetCdataSectionHandler" result="void">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="start" type="XML_StartCdataSectionHandler"/>
+			<arg name="end" type="XML_EndCdataSectionHandler"/>
+		</method>
+		<method name="XML_SetDefaultHandler" result="void">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="handler" type="XML_DefaultHandler"/>
+		</method>
+		<method name="XML_SetDefaultHandlerExpand" result="void">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="handler" type="XML_DefaultHandler"/>
+		</method>
+		<method name="XML_SetExternalEntityRefHandler" result="void">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="handler" type="XML_ExternalEntityRefHandler"/>
+		</method>
+		<method name="XML_SetExternalEntityRefHandlerArg" result="void">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="arg" type="void *"/>
+		</method>
+		<method name="XML_SetUnknownEncodingHandler" result="void">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="handler" type="XML_UnknownEncodingHandler"/>
+			<arg name="data" type="void *"/>
+		</method>
+		<method name="XML_SetStartNamespaceDeclHandler" result="void">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="start" type="XML_StartNamespaceDeclHandler"/>
+		</method>
+		<method name="XML_SetEndNamespaceDeclHandler" result="void">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="end" type="XML_EndNamespaceDeclHandler"/>
+		</method>
+		<method name="XML_SetNamespaceDeclHandler" result="void">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="start" type="XML_StartNamespaceDeclHandler"/>
+			<arg name="end" type="XML_EndNamespaceDeclHandler"/>
+		</method>
+		<method name="XML_SetXmlDeclHandler" result="void">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="handler" type="XML_XmlDeclHandler"/>
+		</method>
+		<method name="XML_SetStartDoctypeDeclHandler" result="void">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="start" type="XML_StartDoctypeDeclHandler"/>
+		</method>
+		<method name="XML_SetEndDoctypeDeclHandler" result="void">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="end" type="XML_EndDoctypeDeclHandler"/>
+		</method>
+		<method name="XML_SetDoctypeDeclHandler" result="void">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="start" type="XML_StartDoctypeDeclHandler"/>
+			<arg name="end" type="XML_EndDoctypeDeclHandler"/>
+		</method>
+		<method name="XML_SetElementDeclHandler" result="void">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="eldecl" type="XML_ElementDeclHandler"/>
+		</method>
+		<method name="XML_SetAttlistDeclHandler" result="void">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="attdecl" type="XML_AttlistDeclHandler"/>
+		</method>
+		<method name="XML_SetEntityDeclHandler" result="void">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="handler" type="XML_EntityDeclHandler"/>
+		</method>
+		<method name="XML_SetUnparsedEntityDeclHandler" result="void">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="handler" type="XML_UnparsedEntityDeclHandler"/>
+		</method>
+		<method name="XML_SetNotationDeclHandler" result="void">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="handler" type="XML_NotationDeclHandler"/>
+		</method>
+		<method name="XML_SetNotStandaloneHandler" result="void">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="handler" type="XML_NotStandaloneHandler"/>
+		</method>
+		<method name="XML_GetErrorCode" result="enum XML_Error">
+			<arg name="parser" type="XML_Parser"/>
+		</method>
+		<method name="XML_ErrorString" result="const XML_LChar *">
+			<arg name="code" type="enum XML_Error"/>
+		</method>
+		<method name="XML_GetCurrentByteIndex" result="long">
+			<arg name="parser" type="XML_Parser"/>
+		</method>
+		<method name="XML_GetCurrentLineNumber" result="int">
+			<arg name="parser" type="XML_Parser"/>
+		</method>
+		<method name="XML_GetCurrentColumnNumber" result="int">
+			<arg name="parser" type="XML_Parser"/>
+		</method>
+		<method name="XML_GetCurrentByteCount" result="int">
+			<arg name="parser" type="XML_Parser"/>
+		</method>
+		<method name="XML_GetInputContext" result="const char *">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="offset" type="int *"/>
+			<arg name="size" type="int *"/>
+		</method>
+		<method name="XML_SetUserData" result="void">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="userData" type="void *"/>
+		</method>
+		<method name="XML_DefaultCurrent" result="void">
+			<arg name="parser" type="XML_Parser"/>
+		</method>
+		<method name="XML_UseParserAsHandlerArg" result="void">
+			<arg name="parser" type="XML_Parser"/>
+		</method>
+		<method name="XML_SetBase" result="enum XML_Status">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="base" type="const XML_Char *"/>
+		</method>
+		<method name="XML_GetBase" result="const XML_Char *">
+			<arg name="parser" type="XML_Parser"/>
+		</method>
+		<method name="XML_GetSpecifiedAttributeCount" result="int">
+			<arg name="parser" type="XML_Parser"/>
+		</method>
+		<method name="XML_GetIdAttributeIndex" result="int">
+			<arg name="parser" type="XML_Parser"/>
+		</method>
+		<method name="XML_SetEncoding" result="enum XML_Status">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="encoding" type="const XML_Char *"/>
+		</method>
+		<method name="XML_SetParamEntityParsing" result="int">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="parsing" type="enum XML_ParamEntityParsing"/>
+		</method>
+		<method name="XML_SetReturnNSTriplet" result="void">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="do_nst" type="int"/>
+		</method>
+		<method name="XML_ExpatVersion" result="const XML_LChar *">
+		</method>
+		<method name="XML_ExpatVersionInfo" result="XML_Expat_Version">
+		</method>
+		<method name="XML_ParserReset" result="XML_Bool">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="encoding" type="const XML_Char *"/>
+		</method>
+		<method name="XML_SetSkippedEntityHandler" result="void">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="handler" type="XML_SkippedEntityHandler"/>
+		</method>
+		<method name="XML_UseForeignDTD" result="enum XML_Error">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="useDTD" type="XML_Bool"/>
+		</method>
+		<method name="XML_GetFeatureList" result="const XML_Feature *">
+		</method>
+		<method name="XML_StopParser" result="enum XML_Status">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="resumable" type="XML_Bool"/>
+		</method>
+		<method name="XML_ResumeParser" result="enum XML_Status">
+			<arg name="parser" type="XML_Parser"/>
+		</method>
+		<method name="XML_GetParsingStatus" result="void">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="status" type="XML_ParsingStatus *"/>
+		</method>
+		<method name="XML_FreeContentModel" result="void">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="model" type="XML_Content *"/>
+		</method>
+		<method name="XML_MemMalloc" result="void *">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="size" type="size_t"/>
+		</method>
+		<method name="XML_MemRealloc" result="void *">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="ptr" type="void *"/>
+			<arg name="size" type="size_t"/>
+		</method>
+		<method name="XML_MemFree" result="void">
+			<arg name="parser" type="XML_Parser"/>
+			<arg name="ptr" type="void *"/>
+		</method>
+	</interface>
+</library>

Added: trunk/Externals/expat/amiga/expat_lib.c
===================================================================
--- trunk/Externals/expat/amiga/expat_lib.c	                        (rev 0)
+++ trunk/Externals/expat/amiga/expat_lib.c	2006-11-01 15:36:35 UTC (rev 3749)
@@ -0,0 +1,233 @@
+/*
+** Copyright (c) 2001-2005 Expat maintainers.
+**
+** Permission is hereby granted, free of charge, to any person obtaining
+** a copy of this software and associated documentation files (the
+** "Software"), to deal in the Software without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Software, and to
+** permit persons to whom the Software is furnished to do so, subject to
+** the following conditions:
+** 
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Software.
+** 
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <dos/dos.h>
+#include <proto/exec.h>
+
+#define LIBNAME		"expat.library"
+#define LIBPRI		0
+#define VERSION		4
+#define REVISION	0
+#define VSTRING		"expat.library 4.0 (27.12.2005)"  /* dd.mm.yyyy */
+
+
+static const char* __attribute__((used)) verstag = "\0$VER: " VSTRING;
+
+
+struct ExpatBase {
+	struct Library libNode;
+	uint16 pad;
+	BPTR SegList;
+};
+
+
+struct ExpatBase * libInit(struct ExpatBase *libBase, BPTR seglist, struct ExecIFace *ISys);
+uint32 libObtain (struct LibraryManagerInterface *Self);
+uint32 libRelease (struct LibraryManagerInterface *Self);
+struct ExpatBase *libOpen (struct LibraryManagerInterface *Self, uint32 version);
+BPTR libClose (struct LibraryManagerInterface *Self);
+BPTR libExpunge (struct LibraryManagerInterface *Self);
+
+
+static APTR lib_manager_vectors[] = {
+	libObtain,
+	libRelease,
+	NULL,
+	NULL,
+	libOpen,
+	libClose,
+	libExpunge,
+	NULL,
+	(APTR)-1,
+};
+
+
+static struct TagItem lib_managerTags[] = {
+	{ MIT_Name, (uint32)"__library" },
+	{ MIT_VectorTable, (uint32)lib_manager_vectors },
+	{ MIT_Version, 1 },
+	{ TAG_END, 0 }
+};
+
+
+extern void *main_vectors[];
+
+static struct TagItem lib_mainTags[] = {
+	{ MIT_Name, (uint32)"main" },
+	{ MIT_VectorTable, (uint32)main_vectors },
+	{ MIT_Version, 1 },
+	{ TAG_END, 0 }
+};
+
+
+static APTR libInterfaces[] = {
+	lib_managerTags,
+	lib_mainTags,
+	NULL
+};
+
+
+static struct TagItem libCreateTags[] = {
+	{ CLT_DataSize, sizeof(struct ExpatBase) },
+	{ CLT_InitFunc, (uint32)libInit },
+	{ CLT_Interfaces, (uint32)libInterfaces },
+	{ TAG_END, 0 }
+};
+
+
+static struct Resident __attribute__((used)) lib_res = {
+	RTC_MATCHWORD,	// rt_MatchWord
+	&lib_res,		// rt_MatchTag
+	&lib_res+1,		// rt_EndSkip
+	RTF_NATIVE | RTF_AUTOINIT,	// rt_Flags
+	VERSION,		// rt_Version
+	NT_LIBRARY,		// rt_Type
+	LIBPRI,			// rt_Pri
+	LIBNAME,		// rt_Name
+	VSTRING,		// rt_IdString
+	libCreateTags	// rt_Init
+};
+
+
+struct Library *DOSLib = 0;
+struct Library *UtilityBase = 0;
+
+struct ExecIFace *IExec = 0;
+struct DOSIFace *IDOS = 0;
+struct UtilityIFace *IUtility = 0;
+
+
+void _start()
+{
+}
+
+
+struct ExpatBase *libInit(struct ExpatBase *libBase, BPTR seglist, struct ExecIFace *ISys)
+{
+	libBase->libNode.lib_Node.ln_Type = NT_LIBRARY;
+	libBase->libNode.lib_Node.ln_Pri = LIBPRI;
+	libBase->libNode.lib_Node.ln_Name = LIBNAME;
+	libBase->libNode.lib_Flags = LIBF_SUMUSED|LIBF_CHANGED;
+	libBase->libNode.lib_Version = VERSION;
+	libBase->libNode.lib_Revision = REVISION;
+	libBase->libNode.lib_IdString = VSTRING;
+	libBase->SegList = seglist;
+
+	IExec = ISys;
+
+	DOSLib = OpenLibrary("dos.library", 51);
+	if ( DOSLib != 0 )  {
+		IDOS = (struct DOSIFace *)GetInterface(DOSLib, "main", 1, NULL);
+		if ( IDOS != 0 )  {
+			UtilityBase = OpenLibrary("utility.library", 51);
+			if ( UtilityBase != 0 )  {
+				IUtility = (struct UtilityIFace*)GetInterface(UtilityBase, "main", 1, NULL);
+				if ( IUtility != 0 )  {
+					return libBase;
+				}
+
+				CloseLibrary(UtilityBase);
+			}
+
+			DropInterface((struct Interface *)IDOS);
+		}
+
+		CloseLibrary(DOSLib);
+	}
+
+	return NULL;
+}
+
+
+uint32 libObtain( struct LibraryManagerInterface *Self )
+{
+	++Self->Data.RefCount;
+	return Self->Data.RefCount;
+}
+
+
+uint32 libRelease( struct LibraryManagerInterface *Self )
+{
+	--Self->Data.RefCount;
+	return Self->Data.RefCount;
+}
+
+
+struct ExpatBase *libOpen( struct LibraryManagerInterface *Self, uint32 version )
+{
+	struct ExpatBase *libBase;
+
+	libBase = (struct ExpatBase *)Self->Data.LibBase;
+
+	++libBase->libNode.lib_OpenCnt;
+	libBase->libNode.lib_Flags &= ~LIBF_DELEXP;
+
+	return libBase;
+}
+
+
+BPTR libClose( struct LibraryManagerInterface *Self )
+{
+	struct ExpatBase *libBase;
+
+	libBase = (struct ExpatBase *)Self->Data.LibBase;
+
+	--libBase->libNode.lib_OpenCnt;
+	if ( libBase->libNode.lib_OpenCnt ) {
+		return 0;
+	}
+
+	if ( libBase->libNode.lib_Flags & LIBF_DELEXP ) {
+		return (BPTR)Self->LibExpunge();
+	}
+	else {
+		return 0;
+	}
+}
+
+
+BPTR libExpunge( struct LibraryManagerInterface *Self )
+{
+	struct ExpatBase *libBase;
+	BPTR result = 0;
+
+	libBase = (struct ExpatBase *)Self->Data.LibBase;
+
+	if (libBase->libNode.lib_OpenCnt == 0) {
+		Remove(&libBase->libNode.lib_Node);
+
+		result = libBase->SegList;
+
+		DropInterface((struct Interface *)IUtility);
+		CloseLibrary(UtilityBase);
+		DropInterface((struct Interface *)IDOS);
+		CloseLibrary(DOSLib);
+
+		DeleteLibrary(&libBase->libNode);
+	}
+	else {
+		libBase->libNode.lib_Flags |= LIBF_DELEXP;
+	}
+
+	return result;
+}

Added: trunk/Externals/expat/amiga/expat_vectors.c
===================================================================
--- trunk/Externals/expat/amiga/expat_vectors.c	                        (rev 0)
+++ trunk/Externals/expat/amiga/expat_vectors.c	2006-11-01 15:36:35 UTC (rev 3749)
@@ -0,0 +1,505 @@
+/*
+** Copyright (c) 2001-2005 Expat maintainers.
+**
+** Permission is hereby granted, free of charge, to any person obtaining
+** a copy of this software and associated documentation files (the
+** "Software"), to deal in the Software without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Software, and to
+** permit persons to whom the Software is furnished to do so, subject to
+** the following conditions:
+** 
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Software.
+** 
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <exec/types.h>
+#include <exec/exec.h>
+#include <exec/interfaces.h>
+#include <interfaces/expat.h>
+
+extern uint32                _Expat_Obtain(struct ExpatIFace *);
+extern uint32                _Expat_Release(struct ExpatIFace *);
+extern XML_Parser            _Expat_XML_ParserCreate(struct ExpatIFace *, const XML_Char * encodingName);
+extern XML_Parser            _Expat_XML_ParserCreateNS(struct ExpatIFace *, const XML_Char * encodingName, XML_Char nsSep);
+extern XML_Parser            _Expat_XML_ParserCreate_MM(struct ExpatIFace *, const XML_Char * encoding, const XML_Memory_Handling_Suite * memsuite, const XML_Char * namespaceSeparator);
+extern XML_Parser            _Expat_XML_ExternalEntityParserCreate(struct ExpatIFace *, XML_Parser parser, const XML_Char * context, const XML_Char * encoding);
+extern void                  _Expat_XML_ParserFree(struct ExpatIFace *, XML_Parser parser);
+extern enum XML_Status       _Expat_XML_Parse(struct ExpatIFace *, XML_Parser parser, const char * s, int len, int isFinal);
+extern enum XML_Status       _Expat_XML_ParseBuffer(struct ExpatIFace *, XML_Parser parser, int len, int isFinal);
+extern void *                _Expat_XML_GetBuffer(struct ExpatIFace *, XML_Parser parser, int len);
+extern void                  _Expat_XML_SetStartElementHandler(struct ExpatIFace *, XML_Parser parser, XML_StartElementHandler start);
+extern void                  _Expat_XML_SetEndElementHandler(struct ExpatIFace *, XML_Parser parser, XML_EndElementHandler end);
+extern void                  _Expat_XML_SetElementHandler(struct ExpatIFace *, XML_Parser parser, XML_StartElementHandler start, XML_EndElementHandler end);
+extern void                  _Expat_XML_SetCharacterDataHandler(struct ExpatIFace *, XML_Parser parser, XML_CharacterDataHandler handler);
+extern void                  _Expat_XML_SetProcessingInstructionHandler(struct ExpatIFace *, XML_Parser parser, XML_ProcessingInstructionHandler handler);
+extern void                  _Expat_XML_SetCommentHandler(struct ExpatIFace *, XML_Parser parser, XML_CommentHandler handler);
+extern void                  _Expat_XML_SetStartCdataSectionHandler(struct ExpatIFace *, XML_Parser parser, XML_StartCdataSectionHandler start);
+extern void                  _Expat_XML_SetEndCdataSectionHandler(struct ExpatIFace *, XML_Parser parser, XML_EndCdataSectionHandler end);
+extern void                  _Expat_XML_SetCdataSectionHandler(struct ExpatIFace *, XML_Parser parser, XML_StartCdataSectionHandler start, XML_EndCdataSectionHandler end);
+extern void                  _Expat_XML_SetDefaultHandler(struct ExpatIFace *, XML_Parser parser, XML_DefaultHandler handler);
+extern void                  _Expat_XML_SetDefaultHandlerExpand(struct ExpatIFace *, XML_Parser parser, XML_DefaultHandler handler);
+extern void                  _Expat_XML_SetExternalEntityRefHandler(struct ExpatIFace *, XML_Parser parser, XML_ExternalEntityRefHandler handler);
+extern void                  _Expat_XML_SetExternalEntityRefHandlerArg(struct ExpatIFace *, XML_Parser parser, void * arg);
+extern void                  _Expat_XML_SetUnknownEncodingHandler(struct ExpatIFace *, XML_Parser parser, XML_UnknownEncodingHandler handler, void * data);
+extern void                  _Expat_XML_SetStartNamespaceDeclHandler(struct ExpatIFace *, XML_Parser parser, XML_StartNamespaceDeclHandler start);
+extern void                  _Expat_XML_SetEndNamespaceDeclHandler(struct ExpatIFace *, XML_Parser parser, XML_EndNamespaceDeclHandler end);
+extern void                  _Expat_XML_SetNamespaceDeclHandler(struct ExpatIFace *, XML_Parser parser, XML_StartNamespaceDeclHandler start, XML_EndNamespaceDeclHandler end);
+extern void                  _Expat_XML_SetXmlDeclHandler(struct ExpatIFace *, XML_Parser parser, XML_XmlDeclHandler handler);
+extern void                  _Expat_XML_SetStartDoctypeDeclHandler(struct ExpatIFace *, XML_Parser parser, XML_StartDoctypeDeclHandler start);
+extern void                  _Expat_XML_SetEndDoctypeDeclHandler(struct ExpatIFace *, XML_Parser parser, XML_EndDoctypeDeclHandler end);
+extern void                  _Expat_XML_SetDoctypeDeclHandler(struct ExpatIFace *, XML_Parser parser, XML_StartDoctypeDeclHandler start, XML_EndDoctypeDeclHandler end);
+extern void                  _Expat_XML_SetElementDeclHandler(struct ExpatIFace *, XML_Parser parser, XML_ElementDeclHandler eldecl);
+extern void                  _Expat_XML_SetAttlistDeclHandler(struct ExpatIFace *, XML_Parser parser, XML_AttlistDeclHandler attdecl);
+extern void                  _Expat_XML_SetEntityDeclHandler(struct ExpatIFace *, XML_Parser parser, XML_EntityDeclHandler handler);
+extern void                  _Expat_XML_SetUnparsedEntityDeclHandler(struct ExpatIFace *, XML_Parser parser, XML_UnparsedEntityDeclHandler handler);
+extern void                  _Expat_XML_SetNotationDeclHandler(struct ExpatIFace *, XML_Parser parser, XML_NotationDeclHandler handler);
+extern void                  _Expat_XML_SetNotStandaloneHandler(struct ExpatIFace *, XML_Parser parser, XML_NotStandaloneHandler handler);
...
 
[truncated message content]