[Gaim-commits] SF.net SVN: gaim: [16236] branches/v2_0_0

[<dat...@us...>]

Revision: 16236
Author:   datallah
Date:     2006-06-08 08:20:38 -0700 (Thu, 08 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16236&view=rev

Log Message:
-----------
Backport of 16234:16235.
-----------------------------------------------------
Use libxml2 on win32 too.
This increases the installer size by ~400K (oh well).
-----------------------------------------------------
svn:ignore installer executables

Modified Paths:
--------------
    branches/v2_0_0/Makefile.mingw
    branches/v2_0_0/config.h.mingw
    branches/v2_0_0/gaim-installer.nsi
    branches/v2_0_0/src/Makefile.mingw
    branches/v2_0_0/src/protocols/jabber/Makefile.mingw

Property Changed:
----------------
    branches/v2_0_0/

Property changes on: branches/v2_0_0
___________________________________________________________________
Name: svn:ignore
   - ABOUT-NLS
aclocal.m4
autom4te.cache
compile
confdefs.h
config.cache
config.guess
config.h
config.h.in
config.h.in~
config.log
config.status
config.sub
configure
configure.2.1x
depcomp
Doxyfile
gaim.apspec
gaim.desktop
gaim.pc
gaim.service
gaim.spec
install-sh
intl
intltool-extract
intltool-extract.in
intltool-merge
intltool-merge.in
intltool-update
intltool-update.in
libtool
ltconfig
ltmain.sh
Makefile
Makefile.in
missing
stamp-h
stamp-h1
stamp-h.in
*.swp
.temp-gettextize
win32-install-dir

   + ABOUT-NLS
aclocal.m4
autom4te.cache
compile
confdefs.h
config.cache
config.guess
config.h
config.h.in
config.h.in~
config.log
config.status
config.sub
configure
configure.2.1x
depcomp
Doxyfile
gaim.apspec
gaim.desktop
gaim.pc
gaim.service
gaim.spec
install-sh
intl
intltool-extract
intltool-extract.in
intltool-merge
intltool-merge.in
intltool-update
intltool-update.in
libtool
ltconfig
ltmain.sh
Makefile
Makefile.in
missing
stamp-h
stamp-h1
stamp-h.in
*.swp
.temp-gettextize
win32-install-dir
gaim-*.exe


Modified: branches/v2_0_0/Makefile.mingw
===================================================================
--- branches/v2_0_0/Makefile.mingw	2006-06-08 15:19:56 UTC (rev 16235)
+++ branches/v2_0_0/Makefile.mingw	2006-06-08 15:20:38 UTC (rev 16236)
@@ -12,6 +12,7 @@
 GAIM_SOUNDS = ./sounds
 GAIM_INSTALL_DIR = ./win32-install-dir
 GTKSPELL_TOP = ../win32-dev/gtkspell-2.0.6/gtkspell
+LIBXML2_DIR = ../win32-dev/libxml2
 IDLETRACK_TOP = $(GAIM_SRC)/win32/IdleTracker
 GTKRC_TOP = ../win32-dev/gtkrc
 OSCAR = $(GAIM_PROTOS)/oscar
@@ -33,7 +34,8 @@
 VERSION := $(shell cat ./VERSION)
 
 NEEDED_DLLS =		$(GTKSPELL_TOP)/libgtkspell.dll \
-			$(IDLETRACK_TOP)/idletrack.dll
+			$(IDLETRACK_TOP)/idletrack.dll \
+			$(LIBXML2_DIR)/bin/libxml2.dll
 
 SOUNDS =		$(GAIM_SOUNDS)/alert.wav \
 			$(GAIM_SOUNDS)/login.wav \

Modified: branches/v2_0_0/config.h.mingw
===================================================================
--- branches/v2_0_0/config.h.mingw	2006-06-08 15:19:56 UTC (rev 16235)
+++ branches/v2_0_0/config.h.mingw	2006-06-08 15:20:38 UTC (rev 16236)
@@ -635,6 +635,8 @@
    <inttypes.h> don't define. */
 /* #undef uintmax_t */
 
+#define HAVE_LIBXML 1
+
 /*
  * Following are added for Win32 version of Gaim
  */

Modified: branches/v2_0_0/gaim-installer.nsi
===================================================================
--- branches/v2_0_0/gaim-installer.nsi	2006-06-08 15:19:56 UTC (rev 16235)
+++ branches/v2_0_0/gaim-installer.nsi	2006-06-08 15:20:38 UTC (rev 16236)
@@ -744,6 +744,7 @@
     Delete "$INSTDIR\idletrack.dll"
     Delete "$INSTDIR\libgtkspell.dll"
     Delete "$INSTDIR\libmeanwhile-1.dll"
+    Delete "$INSTDIR\libxml2.dll"
     Delete "$INSTDIR\nspr4.dll"
     Delete "$INSTDIR\nss3.dll"
     Delete "$INSTDIR\nssckbi.dll"

Modified: branches/v2_0_0/src/Makefile.mingw
===================================================================
--- branches/v2_0_0/src/Makefile.mingw	2006-06-08 15:19:56 UTC (rev 16235)
+++ branches/v2_0_0/src/Makefile.mingw	2006-06-08 15:20:38 UTC (rev 16236)
@@ -18,6 +18,7 @@
 GAIM_INSTALL_DIR :=	$(GAIM_TOP)/win32-install-dir
 NSS_DIR :=		../../win32-dev/nss-3.9
 NSPR_DIR :=		../../win32-dev/nspr-4.4.1
+LIBXML2_DIR :=		../../win32-dev/libxml2
 
 ##
 ## VARIABLE DEFINITIONS
@@ -66,7 +67,8 @@
 			-I$(ASPELL_TOP)/include \
 			-I$(GTKSPELL_TOP) \
 			-I$(NSS_DIR)/include \
-			-I$(NSPR_DIR)/include
+			-I$(NSPR_DIR)/include \
+			-I$(LIBXML2_DIR)/include
 
 
 LIB_PATHS =		-L$(GTK_TOP)/lib \
@@ -74,7 +76,8 @@
 			-L$(IDLETRACK_TOP) \
 			-L$(ASPELL_TOP)/lib \
 			-L$(NSS_DIR)/lib \
-			-L$(NSPR_DIR)/lib
+			-L$(NSPR_DIR)/lib \
+			-L$(LIBXML2_DIR)/lib
 
 ##
 ##  SOURCES, OBJECTS
@@ -191,8 +194,8 @@
 			-lidletrack \
 			-lnss3 \
 			-lnspr4 \
-			-lssl3
-			
+			-lssl3 \
+			-lxml2
 
 EXE_LIBS =
 

Modified: branches/v2_0_0/src/protocols/jabber/Makefile.mingw
===================================================================
--- branches/v2_0_0/src/protocols/jabber/Makefile.mingw	2006-06-08 15:19:56 UTC (rev 16235)
+++ branches/v2_0_0/src/protocols/jabber/Makefile.mingw	2006-06-08 15:20:38 UTC (rev 16236)
@@ -10,6 +10,7 @@
 
 INCLUDE_DIR :=		.
 GTK_TOP :=		../../../../win32-dev/gtk_2_0
+LIBXML2_DIR:=		../../../../win32-dev/libxml2
 GAIM_TOP :=		../../..
 JABBER_ROOT :=		.
 GAIM_INSTALL_DIR :=	$(GAIM_TOP)/win32-install-dir
@@ -50,18 +51,16 @@
 INCLUDE_PATHS +=	-I$(JABBER_ROOT) \
 			-I$(JABBER_ROOT)/win32 \
 			-I$(GTK_TOP)/include \
-			-I$(GTK_TOP)/include/gtk-2.0 \
 			-I$(GTK_TOP)/include/glib-2.0 \
-			-I$(GTK_TOP)/include/pango-1.0 \
-			-I$(GTK_TOP)/include/atk-1.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
-			-I$(GTK_TOP)/lib/gtk-2.0/include \
+			-I$(LIBXML2_DIR)/include \
 			-I$(GAIM_TOP)/src \
 			-I$(GAIM_TOP)/src/win32 \
 			-I$(GAIM_TOP)
 
 
 LIB_PATHS =		-L$(GTK_TOP)/lib \
+			-L$(LIBXML2_DIR)/lib \
 			-L$(GAIM_TOP)/src
 
 
@@ -93,11 +92,9 @@
 ## LIBRARIES
 ##
 
-LIBS =			-lgtk-win32-2.0 \
+LIBS = \
 			-lglib-2.0 \
-			-lgdk-win32-2.0 \
-			-lgmodule-2.0 \
-			-lgobject-2.0 \
+			-lxml2 \
 			-lws2_32 \
 			-lintl \
 			-lgaim


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