[gtkmm] Update MSVC projects and installer scripts for 2.18

From: Armin Burgmeier <arminb src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [gtkmm] Update MSVC projects and installer scripts for 2.18
Date: Tue, 27 Oct 2009 23:05:57 +0000 (UTC)
commit 0b37b8841560bcd82536a19fa8335149f39f471d
Author: Armin Burgmeier <armin arbur net>
Date:   Tue Oct 27 23:59:53 2009 +0100

    Update MSVC projects and installer scripts for 2.18
    
    2009-10-27  Armin Burgmeier  <armin arbur net>
    
    	* MSVC_Net2005/gtkmm/gtkmm.vcproj:
    	* MSVC_Net2008/gtkmm/gtkmm.vcproj: Added infobar.{h,cc} to the
    	project.
    
    	* win32_installer/build-installer: Don't copy /bundle/contrib since
    	this does not exist anymore in more recent GTK+ bundles.
    
    	* win32_installer/install-msvc-module:
    	* win32_installer/gtkmm-installer.nsi.in: Update for GTK+ 2.18 and
    	gtkmm 2.18.

 ChangeLog                              |   13 ++++
 MSVC_Net2005/gtkmm/gtkmm.vcproj        |    8 ++
 MSVC_Net2008/gtkmm/gtkmm.vcproj        |    8 ++
 win32_installer/build-installer        |    2 +-
 win32_installer/gtkmm-installer.nsi.in |  116 ++++++++++++++++++++-----------
 win32_installer/install-msvc-module    |   18 +++---
 6 files changed, 114 insertions(+), 51 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 636cc76..b4ab261 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2009-10-27  Armin Burgmeier  <armin arbur net>
+
+	* MSVC_Net2005/gtkmm/gtkmm.vcproj:
+	* MSVC_Net2008/gtkmm/gtkmm.vcproj: Added infobar.{h,cc} to the
+	project.
+
+	* win32_installer/build-installer: Don't copy /bundle/contrib since
+	this does not exist anymore in more recent GTK+ bundles.
+
+	* win32_installer/install-msvc-module:
+	* win32_installer/gtkmm-installer.nsi.in: Update for GTK+ 2.18 and
+	gtkmm 2.18.
+
 2009-10-18  Daniel Elstner  <daniel kitta gmail com>
 
 	Correct Gtk::TreeModelColumnRecord documentation
diff --git a/MSVC_Net2005/gtkmm/gtkmm.vcproj b/MSVC_Net2005/gtkmm/gtkmm.vcproj
index e0dfcbe..9be0e24 100755
--- a/MSVC_Net2005/gtkmm/gtkmm.vcproj
+++ b/MSVC_Net2005/gtkmm/gtkmm.vcproj
@@ -464,6 +464,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\gtk\gtkmm\infobar.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\gtk\gtkmm\inputdialog.cc"
 				>
 			</File>
@@ -1182,6 +1186,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\gtk\gtkmm\infobar.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\gtk\gtkmm\inputdialog.h"
 				>
 			</File>
diff --git a/MSVC_Net2008/gtkmm/gtkmm.vcproj b/MSVC_Net2008/gtkmm/gtkmm.vcproj
index deafe69..ca82a76 100644
--- a/MSVC_Net2008/gtkmm/gtkmm.vcproj
+++ b/MSVC_Net2008/gtkmm/gtkmm.vcproj
@@ -463,6 +463,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\gtk\gtkmm\infobar.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\gtk\gtkmm\inputdialog.cc"
 				>
 			</File>
@@ -1181,6 +1185,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\gtk\gtkmm\infobar.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\gtk\gtkmm\inputdialog.h"
 				>
 			</File>
diff --git a/win32_installer/build-installer b/win32_installer/build-installer
index e2d2f09..ad54b6e 100644
--- a/win32_installer/build-installer
+++ b/win32_installer/build-installer
@@ -21,7 +21,7 @@ cp -R /bundle/lib . || exit -1
 cp -R /bundle/share . || exit -1
 cp -R /bundle/include . || exit -1
 cp -R /bundle/etc . || exit -1
-cp -R /bundle/contrib . || exit -1
+#cp -R /bundle/contrib . || exit -1
 
 # libglade
 cp -R /libglade/bin . || exit -1
diff --git a/win32_installer/gtkmm-installer.nsi.in b/win32_installer/gtkmm-installer.nsi.in
index 5cea045..16a8830 100644
--- a/win32_installer/gtkmm-installer.nsi.in
+++ b/win32_installer/gtkmm-installer.nsi.in
@@ -34,7 +34,7 @@
 !define PRODUCT_VERSION_MICRO "@GTKMM_MICRO_VERSION@"
 !endif
 !ifndef PRODUCT_VERSION_INSTALLER
-!define PRODUCT_VERSION_INSTALLER "3"
+!define PRODUCT_VERSION_INSTALLER "1"
 !endif
 
 !ifdef PRODUCT_API_VERSION
@@ -214,11 +214,14 @@ Section "Runtime" SecGTKRuntime
   File bin\intl.dll
   File bin\charset.dll
   File bin\iconv.dll
-  File bin\libxml2.dll
 
-  File ${BINDIR}\jpeg62.dll
+  File ${BINDIR}\libxml2-2.dll
+  File ${BINDIR}\libjpeg-7.dll
   File ${BINDIR}\libpng12-0.dll
-  File ${BINDIR}\libtiff3.dll
+  File ${BINDIR}\libtiff-3.dll
+  File ${BINDIR}\freetype6.dll
+  File ${BINDIR}\libexpat-1.dll
+  File ${BINDIR}\libfontconfig-1.dll
   File ${BINDIR}\libglib-2.0-0.dll
   File ${BINDIR}\libgobject-2.0-0.dll
   File ${BINDIR}\libgmodule-2.0-0.dll
@@ -251,11 +254,13 @@ Section "Runtime" SecGTKRuntime
   File /r etc\gtk-2.0
   File /r etc\pango
 
+  ; TODO: Add others... libiconv, fontconfig, libxml2, tiff... however note
+  ; that some contain devel-only things.
   SetOutPath $INSTDIR\share\doc
-  File /r share\doc\glib-2.20.0
-  File /r share\doc\cairo_1.8.6-1_win32
-  File /r share\doc\pango-1.24.0
-  File /r share\doc\gtk+-2.16.0
+  File /r share\doc\glib-2.22.2
+  File /r share\doc\cairo_1.8.8-3_win32
+  File /r share\doc\pango-1.26.0
+  File /r share\doc\gtk+-2.18.3
 
   SetOutPath $INSTDIR\share
   File /r share\locale
@@ -263,9 +268,6 @@ Section "Runtime" SecGTKRuntime
 ; Only required for gtk-demo:
   File /r share\gtk-2.0
 
-  SetOutPath $INSTDIR\contrib
-  File /r contrib\tiff
-
 !ifndef RUNTIME_ONLY
   SetOutPath $INSTDIR\redist
 
@@ -274,11 +276,14 @@ Section "Runtime" SecGTKRuntime
   File bin\intl.dll
   File bin\charset.dll
   File bin\iconv.dll
-  File bin\libxml2.dll
 
-  File bin_stripped\jpeg62.dll
+  File bin_stripped\libxml2-2.dll
+  File bin_stripped\libjpeg-7.dll
   File bin_stripped\libpng12-0.dll
-  File bin_stripped\libtiff3.dll
+  File bin_stripped\libtiff-3.dll
+  File bin_stripped\freetype6.dll
+  File bin_stripped\libexpat-1.dll
+  File bin_stripped\libfontconfig-1.dll
   File bin_stripped\libglib-2.0-0.dll
   File bin_stripped\libgobject-2.0-0.dll
   File bin_stripped\libgmodule-2.0-0.dll
@@ -363,8 +368,8 @@ Section "Development" SecGTKDevelopment
   File lib\intl.def
   File lib\intl.lib
   File lib\libintl.dll.a
-  File lib\libtiff.def
-  File lib\libtiff.lib
+;  File lib\libtiff.def Is no longer provided by the bundle since 2.16.6
+;  File lib\libtiff.lib Is no longer provided by the bundle since 2.16.6
   File lib\libtiff.dll.a
   File lib\libpng.def
   File lib\libpng.lib
@@ -372,6 +377,13 @@ Section "Development" SecGTKDevelopment
   File lib\zlib.def
   File lib\zdll.lib
   File lib\libz.a
+  File lib\libfreetype.dll.a
+  File lib\libexpat.def
+  File lib\expat.lib
+  File lib\libexpat.dll.a
+  File lib\fontconfig.def
+  File lib\fontconfig.lib
+  File lib\libfontconfig.dll.a
   File lib\glib-2.0.def
   File lib\glib-2.0.lib
   File lib\libglib-2.0.dll.a
@@ -421,6 +433,7 @@ Section "Development" SecGTKDevelopment
   File lib\pkgconfig\libxml-2.0.pc
   File lib\pkgconfig\libpng.pc
   File lib\pkgconfig\libpng12.pc
+  File lib\pkgconfig\freetype2.pc
   File lib\pkgconfig\glib-2.0.pc
   File lib\pkgconfig\gmodule-2.0.pc
   File lib\pkgconfig\gmodule-no-export-2.0.pc
@@ -447,9 +460,9 @@ Section "Development" SecGTKDevelopment
   File lib\pkgconfig\libglade-2.0.pc
 
   SetOutPath $INSTDIR\share\doc
-  File /r share\doc\glib-dev-2.20.0
-  File /r share\doc\pango-dev-1.24.0
-  File /r share\doc\gtk+-dev-2.16.0
+  File /r share\doc\glib-dev-2.22.2
+  File /r share\doc\pango-dev-1.26.0
+  File /r share\doc\gtk+-dev-2.18.3
 
   SetOutPath $INSTDIR\share\xml
   File /r share\xml\libglade
@@ -458,6 +471,8 @@ Section "Development" SecGTKDevelopment
   File /r share\glib-2.0
 
   SetOutPath $INSTDIR\share\aclocal
+  File share\aclocal\libxml.m4
+  File share\aclocal\freetype2.m4
   File share\aclocal\glib-2.0.m4
   File share\aclocal\glib-gettext.m4
   File share\aclocal\gtk-2.0.m4
@@ -472,6 +487,7 @@ Section "Documentation" SecGTKDocumentation
   File /r share\doc\libiconv
 
   SetOutPath $INSTDIR\share\gtk-doc\html
+  File /r share\gtk-doc\html\libxml2
   File /r share\gtk-doc\html\glib
   File /r share\gtk-doc\html\gobject
   File /r share\gtk-doc\html\cairo
@@ -480,6 +496,7 @@ Section "Documentation" SecGTKDocumentation
   File /r share\gtk-doc\html\gdk-pixbuf
   File /r share\gtk-doc\html\gtk
   File /r share\gtk-doc\html\libglade
+  File /r share\gtk-doc\html\gail-libgail-util
 
 SectionEnd
 !endif
@@ -1074,6 +1091,9 @@ Section -Post SecPost
   IfFileExists "$INSTDIR\share\gtk-doc\html\*.*" "" +2
     CreateDirectory "$SMPROGRAMS\$ICONS_GROUP\Documentation"
 
+  IfFileExists "$INSTDIR\share\gtk-doc\html\libxml2\index.html" "" +2
+       CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Documentation\libxml2 Reference Manual.lnk" "$INSTDIR\share\gtk-doc\html\libxml2\index.html"
+
   IfFileExists "$INSTDIR\share\gtk-doc\html\glib\index.html" "" +2
        CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Documentation\glib Reference Manual.lnk" "$INSTDIR\share\gtk-doc\html\glib\index.html"
 
@@ -1098,6 +1118,9 @@ Section -Post SecPost
   IfFileExists "$INSTDIR\share\gtk-doc\html\libglade\index.html" "" +2
        CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Documentation\libglade Reference Manual.lnk" "$INSTDIR\share\gtk-doc\html\libglade\index.html"
 
+  IfFileExists "$INSTDIR\share\gtk-doc\html\gail-libgail-util\index.html" "" +2
+       CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Documentation\libgail-util Reference Manual.lnk" "$INSTDIR\share\gtk-doc\html\gail-libgail-util\index.html"
+
   IfFileExists "$INSTDIR\share\doc\libsigc-2.0\docs\reference\html\index.html" "" +2
        CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Documentation\libsigc++ Reference Manual.lnk" "$INSTDIR\share\doc\libsigc-2.0\docs\reference\html\index.html"
 
@@ -1268,11 +1291,14 @@ continue:
   Delete $INSTDIR\redist\intl.dll
   Delete $INSTDIR\redist\iconv.dll
   Delete $INSTDIR\redist\charset.dll
-  Delete $INSTDIR\redist\libxml2.dll
 
-  Delete $INSTDIR\redist\jpeg62.dll
+  Delete $INSTDIR\redist\libxml2-2.dll
+  Delete $INSTDIR\redist\libjpeg-7.dll
   Delete $INSTDIR\redist\libpng12-0.dll
-  Delete $INSTDIR\redist\libtiff3.dll
+  Delete $INSTDIR\redist\libtiff-3.dll
+  Delete $INSTDIR\redist\freetype6.dll
+  Delete $INSTDIR\redist\libexpat-1.dll
+  Delete $INSTDIR\redist\libfontconfig-1.dll
   Delete $INSTDIR\redist\libglib-2.0-0.dll
   Delete $INSTDIR\redist\libgobject-2.0-0.dll
   Delete $INSTDIR\redist\libgmodule-2.0-0.dll
@@ -1374,6 +1400,9 @@ continue:
   Delete $INSTDIR\lib\libtiff.dll.a
   Delete $INSTDIR\lib\libpng12.dll.a
   Delete $INSTDIR\lib\libz.a
+  Delete $INSTDIR\lib\libfreetype.dll.a
+  Delete $INSTDIR\lib\libexpat.dll.a
+  Delete $INSTDIR\lib\libfontconfig.dll.a
   Delete $INSTDIR\lib\libglib-2.0.dll.a
   Delete $INSTDIR\lib\libgobject-2.0.dll.a
   Delete $INSTDIR\lib\libgmodule-2.0.dll.a
@@ -1405,12 +1434,16 @@ continue:
  
   Delete $INSTDIR\lib\intl.def
   Delete $INSTDIR\lib\intl.lib
-  Delete $INSTDIR\lib\libtiff.def
-  Delete $INSTDIR\lib\libtiff.lib
+;  Delete $INSTDIR\lib\libtiff.def
+;  Delete $INSTDIR\lib\libtiff.lib
   Delete $INSTDIR\lib\libpng.def
   Delete $INSTDIR\lib\libpng.lib
   Delete $INSTDIR\lib\zlib.def
   Delete $INSTDIR\lib\zdll.lib
+  Delete $INSTDIR\lib\libexpat.def
+  Delete $INSTDIR\lib\expat.lib
+  Delete $INSTDIR\lib\fontconfig.def
+  Delete $INSTDIR\lib\fontconfig.lib
   Delete $INSTDIR\lib\glib-2.0.def
   Delete $INSTDIR\lib\glib-2.0.lib
   Delete $INSTDIR\lib\gobject-2.0.def
@@ -1448,13 +1481,12 @@ continue:
   Delete $INSTDIR\lib\gtkmm-*.lib
   Delete $INSTDIR\lib\pangomm-*.lib
   Delete $INSTDIR\lib\glademm-*.lib
-;  Delete $INSTDIR\lib\libglademm-*.lib.lnk
   Delete $INSTDIR\lib\xml++-*.lib
-;  Delete $INSTDIR\lib\libxml++-*.lib.lnk
 
   Delete $INSTDIR\lib\pkgconfig\libxml-2.0.pc
   Delete $INSTDIR\lib\pkgconfig\libpng.pc
   Delete $INSTDIR\lib\pkgconfig\libpng12.pc
+  Delete $INSTDIR\lib\pkgconfig\freetype2.pc
   Delete $INSTDIR\lib\pkgconfig\glib-2.0.pc
   Delete $INSTDIR\lib\pkgconfig\gmodule-2.0.pc
   Delete $INSTDIR\lib\pkgconfig\gmodule-no-export-2.0.pc
@@ -1496,20 +1528,23 @@ continue:
 
   RMDir /r $INSTDIR\share\doc\libiconv
 
-  RMDir /r $INSTDIR\share\doc\glib-dev-2.20.0
-  RMDir /r $INSTDIR\share\doc\pango-dev-1.24.0
-  RMDir /r $INSTDIR\share\doc\gtk+-dev-2.16.0
+  RMDir /r $INSTDIR\share\doc\glib-dev-2.22.2
+  RMDir /r $INSTDIR\share\doc\pango-dev-1.26.0
+  RMDir /r $INSTDIR\share\doc\gtk+-dev-2.18.3
 
   RMDir /r $INSTDIR\share\xml\libglade
   RMDir $INSTDIR\share\xml
 
   RMDir /r $INSTDIR\share\glib-2.0
 
+  Delete $INSTDIR\share\aclocal\libxml.m4
+  Delete $INSTDIR\share\aclocal\freetype2.m4
   Delete $INSTDIR\share\aclocal\glib-2.0.m4
   Delete $INSTDIR\share\aclocal\glib-gettext.m4
   Delete $INSTDIR\share\aclocal\gtk-2.0.m4
   Delete $INSTDIR\share\aclocal\pkg.m4
 
+  RMDir /r $INSTDIR\share\gtk-doc\html\libxml2
   RMDir /r $INSTDIR\share\gtk-doc\html\glib
   RMDir /r $INSTDIR\share\gtk-doc\html\gobject
   RMDir /r $INSTDIR\share\gtk-doc\html\cairo
@@ -1518,6 +1553,7 @@ continue:
   RMDir /r $INSTDIR\share\gtk-doc\html\gdk-pixbuf
   RMDir /r $INSTDIR\share\gtk-doc\html\gtk
   RMDir /r $INSTDIR\share\gtk-doc\html\libglade
+  RMDir /r $INSTDIR\share\gtk-doc\html\gail-libgail-util
   RMDir $INSTDIR\share\gtk-doc\html
   RMDir $INSTDIR\share\gtk-doc
 
@@ -1584,11 +1620,14 @@ continue:
   Delete $INSTDIR\bin\intl.dll
   Delete $INSTDIR\bin\iconv.dll
   Delete $INSTDIR\bin\charset.dll
-  Delete $INSTDIR\bin\libxml2.dll
 
-  Delete $INSTDIR\bin\jpeg62.dll
+  Delete $INSTDIR\bin\libxml2-2.dll
+  Delete $INSTDIR\bin\libjpeg-7.dll
   Delete $INSTDIR\bin\libpng12-0.dll
-  Delete $INSTDIR\bin\libtiff3.dll
+  Delete $INSTDIR\bin\libtiff-3.dll
+  Delete $INSTDIR\bin\freetype6.dll
+  Delete $INSTDIR\bin\libexpat-1.dll
+  Delete $INSTDIR\bin\libfontconfig-1.dll
   Delete $INSTDIR\bin\libglib-2.0-0.dll
   Delete $INSTDIR\bin\libgobject-2.0-0.dll
   Delete $INSTDIR\bin\libgmodule-2.0-0.dll
@@ -1659,10 +1698,10 @@ continue:
   RMDir $INSTDIR\bin
   
   ; share (non-development files)
-  RMDir /r $INSTDIR\share\doc\glib-2.20.0
-  RMDir /r $INSTDIR\share\doc\cairo_1.8.6-1_win32
-  RMDir /r $INSTDIR\share\doc\pango-1.24.0
-  RMDir /r $INSTDIR\share\doc\gtk+-2.16.0
+  RMDir /r $INSTDIR\share\doc\glib-2.22.2
+  RMDir /r $INSTDIR\share\doc\cairo_1.8.8-3_win32
+  RMDir /r $INSTDIR\share\doc\pango-1.26.0
+  RMDir /r $INSTDIR\share\doc\gtk+-2.18.3
   RMDir $INSTDIR\share\doc
 
   RMdir /r $INSTDIR\share\locale
@@ -1671,11 +1710,6 @@ continue:
 
   RMDir $INSTDIR\share
 
-  ; contrib
-  RMDir /r $INSTDIR\contrib\tiff
-  RMDir $INSTDIR\contrib
-
-#  
   ; GTKMM_BASEPATH environment variable
   Push "GTKMM_BASEPATH"
   Push $CONTEXT
diff --git a/win32_installer/install-msvc-module b/win32_installer/install-msvc-module
index 46ff43d..712d477 100644
--- a/win32_installer/install-msvc-module
+++ b/win32_installer/install-msvc-module
@@ -13,7 +13,7 @@ basepath=../..
 case $module in
     libsigc++)
 	# Path to extracted tarball or SVN checkout
-	sourcepath="${basepath}/libsigc++-2.2.3"
+	sourcepath="${basepath}/libsigc++-2.2.4.2"
 	# Basename of DLL
 	basename='sigc'
 	# Version tag of DLL name
@@ -24,49 +24,49 @@ case $module in
 	subdir='.'
 	;;
     glibmm)
-	sourcepath="${basepath}/glibmm-2.20.0"
+	sourcepath="${basepath}/glibmm-2.22.1"
 	basename='glibmm'
 	vername='2_4'
 	abiname='glibmm-2.4'
 	subdir='glibmm'
 	;;
     giomm)
-	sourcepath="${basepath}/glibmm-2.20.0"
+	sourcepath="${basepath}/glibmm-2.22.1"
 	basename='giomm'
 	vername='2_4'
 	abiname='giomm-2.4'
 	subdir='giomm'
 	;;
     cairomm)
-	sourcepath="${basepath}/cairomm-1.8.0"
+	sourcepath="${basepath}/cairomm"
 	basename='cairomm'
 	vername='1_0'
 	abiname='cairomm-1.0'
 	subdir='cairomm'
 	;;
     pangomm)
-	sourcepath="${basepath}/pangomm-2.24.0"
+	sourcepath="${basepath}/pangomm-2.26.0"
 	basename='pangomm'
 	vername='1_4'
 	abiname='pangomm-1.4'
 	subdir='pangomm'
 	;;
     atkmm)
-	sourcepath="${basepath}/gtkmm-2.16.0"
+	sourcepath="${basepath}/gtkmm-2.18.2"
 	basename='atkmm'
 	vername='1_6'
 	abiname='atkmm-1.6'
 	subdir='atkmm'
 	;;
     gdkmm)
-	sourcepath="${basepath}/gtkmm-2.16.0"
+	sourcepath="${basepath}/gtkmm-2.18.2"
 	basename='gdkmm'
 	vername='2_4'
 	abiname='gdkmm-2.4'
 	subdir='gdkmm'
 	;;
     gtkmm)
-	sourcepath="${basepath}/gtkmm-2.16.0"
+	sourcepath="${basepath}/gtkmm-2.18.2"
 	basename='gtkmm'
 	vername='2_4'
 	abiname='gtkmm-2.4'
@@ -80,7 +80,7 @@ case $module in
 	subdir='libglademm'
 	;;
     libxml++)
-	sourcepath="${basepath}/libxml++-2.26.0"
+	sourcepath="${basepath}/libxml++-2.26.1"
 	basename='xml++'
 	vername='2_6'
 	abiname='libxml++-2.6'
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]