libxml++ r178 - in trunk: . MSVC_Net2003 MSVC_Net2005 MSVC_Net2005/libxml++

From: arminb svn gnome org
To: svn-commits-list gnome org
Subject: libxml++ r178 - in trunk: . MSVC_Net2003 MSVC_Net2005 MSVC_Net2005/libxml++
Date: Sun, 10 Aug 2008 12:04:26 +0000 (UTC)
Author: arminb
Date: Sun Aug 10 12:04:26 2008
New Revision: 178
URL: http://svn.gnome.org/viewvc/libxml++?rev=178&view=rev

Log:
2008-08-10  Armin Burgmeier  <armin arbur net>

	* MSVC_Net2005/: Renamed from MSVC_Net2003.

	* MSVC_Net2005/libxml++/libxml++.vcproj: Link against libxml2.lib
	instead of xml2.lib because that's how it is called in Tor's GTK+
	bundle.

	* MSVC_Net2005/libxml++/libxml++.rc.in: Removed "#include resource.h"
	because there is no resource.h.

	* MSVC_Net2005/libxml++/libxml++.sln: Build all examples by default.

	* Makefile.am:
	* configure.in: Adapt build files for the MSVC_Net2003 -> MSVC_Net2005
	rename.

Added:
   trunk/MSVC_Net2005/   (props changed)
      - copied from r177, /trunk/MSVC_Net2003/
Removed:
   trunk/MSVC_Net2003/
Modified:
   trunk/ChangeLog
   trunk/MSVC_Net2005/libxml++.sln
   trunk/MSVC_Net2005/libxml++/libxml++.rc.in
   trunk/MSVC_Net2005/libxml++/libxml++.vcproj
   trunk/Makefile.am
   trunk/configure.in

Modified: trunk/MSVC_Net2005/libxml++.sln
==============================================================================
--- /trunk/MSVC_Net2003/libxml++.sln	(original)
+++ trunk/MSVC_Net2005/libxml++.sln	Sun Aug 10 12:04:26 2008
@@ -1,8 +1,8 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
+# Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gendef", "gendef\gendef.vcproj", "{07324745-C9BE-4D65-B08A-9C88188C0C28}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml++-2.6", "libxml++\libxml++.vcproj", "{58B2B53C-C4FF-47FD-817B-095E45B7F7D4}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml++-2.6", "libxml++\libxml++.vcproj", "{58B2B53C-C4FF-47FD-817B-095E45B7F7D4}"
 	ProjectSection(ProjectDependencies) = postProject
 		{07324745-C9BE-4D65-B08A-9C88188C0C28} = {07324745-C9BE-4D65-B08A-9C88188C0C28}
 	EndProjectSection
@@ -86,27 +86,49 @@
 		{129ECC08-6D30-4884-B824-4AF96EF0A45C}.Release|Win32.ActiveCfg = Release|Win32
 		{129ECC08-6D30-4884-B824-4AF96EF0A45C}.Release|Win32.Build.0 = Release|Win32
 		{E7989806-1E3E-45AA-AE0D-E6C9250EDDF5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E7989806-1E3E-45AA-AE0D-E6C9250EDDF5}.Debug|Win32.Build.0 = Debug|Win32
 		{E7989806-1E3E-45AA-AE0D-E6C9250EDDF5}.Release|Win32.ActiveCfg = Release|Win32
+		{E7989806-1E3E-45AA-AE0D-E6C9250EDDF5}.Release|Win32.Build.0 = Release|Win32
 		{947E2653-58AE-4BCC-8A77-B131850C8206}.Debug|Win32.ActiveCfg = Debug|Win32
+		{947E2653-58AE-4BCC-8A77-B131850C8206}.Debug|Win32.Build.0 = Debug|Win32
 		{947E2653-58AE-4BCC-8A77-B131850C8206}.Release|Win32.ActiveCfg = Release|Win32
+		{947E2653-58AE-4BCC-8A77-B131850C8206}.Release|Win32.Build.0 = Release|Win32
 		{6058A05F-D9DA-4965-B506-F927BBF37E75}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6058A05F-D9DA-4965-B506-F927BBF37E75}.Debug|Win32.Build.0 = Debug|Win32
 		{6058A05F-D9DA-4965-B506-F927BBF37E75}.Release|Win32.ActiveCfg = Release|Win32
+		{6058A05F-D9DA-4965-B506-F927BBF37E75}.Release|Win32.Build.0 = Release|Win32
 		{B0C776B1-FC22-4ADE-88E5-482AE826B353}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B0C776B1-FC22-4ADE-88E5-482AE826B353}.Debug|Win32.Build.0 = Debug|Win32
 		{B0C776B1-FC22-4ADE-88E5-482AE826B353}.Release|Win32.ActiveCfg = Release|Win32
+		{B0C776B1-FC22-4ADE-88E5-482AE826B353}.Release|Win32.Build.0 = Release|Win32
 		{6C243796-E9A8-4342-AD70-B32FC1885247}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6C243796-E9A8-4342-AD70-B32FC1885247}.Debug|Win32.Build.0 = Debug|Win32
 		{6C243796-E9A8-4342-AD70-B32FC1885247}.Release|Win32.ActiveCfg = Release|Win32
+		{6C243796-E9A8-4342-AD70-B32FC1885247}.Release|Win32.Build.0 = Release|Win32
 		{FCEF0A34-7F40-4419-991E-181663D70AC0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FCEF0A34-7F40-4419-991E-181663D70AC0}.Debug|Win32.Build.0 = Debug|Win32
 		{FCEF0A34-7F40-4419-991E-181663D70AC0}.Release|Win32.ActiveCfg = Release|Win32
+		{FCEF0A34-7F40-4419-991E-181663D70AC0}.Release|Win32.Build.0 = Release|Win32
 		{1DA79E56-7C9E-4D77-BF66-C8CD03BB2D58}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1DA79E56-7C9E-4D77-BF66-C8CD03BB2D58}.Debug|Win32.Build.0 = Debug|Win32
 		{1DA79E56-7C9E-4D77-BF66-C8CD03BB2D58}.Release|Win32.ActiveCfg = Release|Win32
+		{1DA79E56-7C9E-4D77-BF66-C8CD03BB2D58}.Release|Win32.Build.0 = Release|Win32
 		{A665E2E3-4148-4389-B5C4-271AFE4BC1B7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A665E2E3-4148-4389-B5C4-271AFE4BC1B7}.Debug|Win32.Build.0 = Debug|Win32
 		{A665E2E3-4148-4389-B5C4-271AFE4BC1B7}.Release|Win32.ActiveCfg = Release|Win32
+		{A665E2E3-4148-4389-B5C4-271AFE4BC1B7}.Release|Win32.Build.0 = Release|Win32
 		{394D1FAE-F35F-4A20-9192-2FA598A0D295}.Debug|Win32.ActiveCfg = Debug|Win32
+		{394D1FAE-F35F-4A20-9192-2FA598A0D295}.Debug|Win32.Build.0 = Debug|Win32
 		{394D1FAE-F35F-4A20-9192-2FA598A0D295}.Release|Win32.ActiveCfg = Release|Win32
+		{394D1FAE-F35F-4A20-9192-2FA598A0D295}.Release|Win32.Build.0 = Release|Win32
 		{C023B6BA-4F3D-4FD4-ACC3-732120ACD2C9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C023B6BA-4F3D-4FD4-ACC3-732120ACD2C9}.Debug|Win32.Build.0 = Debug|Win32
 		{C023B6BA-4F3D-4FD4-ACC3-732120ACD2C9}.Release|Win32.ActiveCfg = Release|Win32
+		{C023B6BA-4F3D-4FD4-ACC3-732120ACD2C9}.Release|Win32.Build.0 = Release|Win32
 		{AE21B35B-954D-454E-AADC-8374DE3B3B68}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AE21B35B-954D-454E-AADC-8374DE3B3B68}.Debug|Win32.Build.0 = Debug|Win32
 		{AE21B35B-954D-454E-AADC-8374DE3B3B68}.Release|Win32.ActiveCfg = Release|Win32
+		{AE21B35B-954D-454E-AADC-8374DE3B3B68}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: trunk/MSVC_Net2005/libxml++/libxml++.rc.in
==============================================================================
--- /trunk/MSVC_Net2003/libxml++/libxml++.rc.in	(original)
+++ trunk/MSVC_Net2005/libxml++/libxml++.rc.in	Sun Aug 10 12:04:26 2008
@@ -1,4 +1,3 @@
-#include "resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 

Modified: trunk/MSVC_Net2005/libxml++/libxml++.vcproj
==============================================================================
--- /trunk/MSVC_Net2003/libxml++/libxml++.vcproj	(original)
+++ trunk/MSVC_Net2005/libxml++/libxml++.vcproj	Sun Aug 10 12:04:26 2008
@@ -68,7 +68,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xml2.lib glibmm-2.4d.lib"
+				AdditionalDependencies="libxml2.lib glibmm-2.4d.lib"
 				OutputFile="$(OutDir)/$(ProjectName)d.dll"
 				ModuleDefinitionFile="$(ConfigurationName)\$(InputName).def"
 				GenerateDebugInformation="true"
@@ -148,7 +148,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xml2.lib glibmm-2.4.lib"
+				AdditionalDependencies="libxml2.lib glibmm-2.4.lib"
 				ModuleDefinitionFile="$(ConfigurationName)\$(InputName).def"
 			/>
 			<Tool

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Sun Aug 10 12:04:26 2008
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = libxml++ docs scripts examples MSVC_Net2003
+SUBDIRS = libxml++ docs scripts examples MSVC_Net2005
 
 EXTRA_DIST = libxml++-2.6.pc.in libxml++.spec.in
 

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Aug 10 12:04:26 2008
@@ -156,23 +156,23 @@
   win32_msvc6/Makefile
     win32_msvc6/examples/Makefile
 
-  MSVC_Net2003/Makefile
-    MSVC_Net2003/libxml++/Makefile
-    MSVC_Net2003/libxml++/libxml++.rc
-    MSVC_Net2003/gendef/Makefile
-    MSVC_Net2003/examples/Makefile
-      MSVC_Net2003/examples/dom_build/Makefile
-      MSVC_Net2003/examples/dom_parse_entities/Makefile
-      MSVC_Net2003/examples/dom_parser/Makefile
-      MSVC_Net2003/examples/dom_read_write/Makefile
-      MSVC_Net2003/examples/dom_xpath/Makefile
-      MSVC_Net2003/examples/dtdvalidation/Makefile
-      MSVC_Net2003/examples/import_node/Makefile
-      MSVC_Net2003/examples/sax_exception/Makefile
-      MSVC_Net2003/examples/sax_parser/Makefile
-      MSVC_Net2003/examples/sax_parser_build_dom/Makefile
-      MSVC_Net2003/examples/sax_parser_entities/Makefile
-      MSVC_Net2003/examples/textreader/Makefile
+  MSVC_Net2005/Makefile
+    MSVC_Net2005/libxml++/Makefile
+    MSVC_Net2005/libxml++/libxml++.rc
+    MSVC_Net2005/gendef/Makefile
+    MSVC_Net2005/examples/Makefile
+      MSVC_Net2005/examples/dom_build/Makefile
+      MSVC_Net2005/examples/dom_parse_entities/Makefile
+      MSVC_Net2005/examples/dom_parser/Makefile
+      MSVC_Net2005/examples/dom_read_write/Makefile
+      MSVC_Net2005/examples/dom_xpath/Makefile
+      MSVC_Net2005/examples/dtdvalidation/Makefile
+      MSVC_Net2005/examples/import_node/Makefile
+      MSVC_Net2005/examples/sax_exception/Makefile
+      MSVC_Net2005/examples/sax_parser/Makefile
+      MSVC_Net2005/examples/sax_parser_build_dom/Makefile
+      MSVC_Net2005/examples/sax_parser_entities/Makefile
+      MSVC_Net2005/examples/textreader/Makefile
 
   libxml++-2.6.pc
   libxml++.spec
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]