gtkmm r1040 - in trunk: . win32_installer win32_installer/NSISLibrary
- From: arminb svn gnome org
- To: svn-commits-list gnome org
- Subject: gtkmm r1040 - in trunk: . win32_installer win32_installer/NSISLibrary
- Date: Tue, 16 Sep 2008 13:57:42 +0000 (UTC)
Author: arminb
Date: Tue Sep 16 13:57:42 2008
New Revision: 1040
URL: http://svn.gnome.org/viewvc/gtkmm?rev=1040&view=rev
Log:
2008-09-16 Armin Burgmeier <armin arbur net>
* win32_installer/NSISLibrary/PathQuestion.ini: Default to yes for the
"Add gtkmm runtime directory to the path environment variable"
checkbox.
* win32/gtkmm-2.4.vsprops:
* win32/gtkmm-2.4d.vsprops: Changed GTK_BASEPATH to GTKMM_BASEPATH
since we no longer rely on GTK+ from gladewin32.sourceforge.net being
installed, but ship GTK+ on our own.
* win32_installer/build-installer:
* win32_installer/gtkmm-installer.nsi.in: Also ship libxml2 and
libiconv, because they are required by libxml++.
Modified:
trunk/ChangeLog
trunk/win32_installer/NSISLibrary/PathQuestion.ini
trunk/win32_installer/build-installer
trunk/win32_installer/gtkmm-2.4.vsprops
trunk/win32_installer/gtkmm-2.4d.vsprops
trunk/win32_installer/gtkmm-installer.nsi.in
Modified: trunk/win32_installer/NSISLibrary/PathQuestion.ini
==============================================================================
--- trunk/win32_installer/NSISLibrary/PathQuestion.ini (original)
+++ trunk/win32_installer/NSISLibrary/PathQuestion.ini Tue Sep 16 13:57:42 2008
@@ -9,4 +9,5 @@
Right=200
Top=24
Bottom=38
+State=1
Modified: trunk/win32_installer/build-installer
==============================================================================
--- trunk/win32_installer/build-installer (original)
+++ trunk/win32_installer/build-installer Tue Sep 16 13:57:42 2008
@@ -5,7 +5,8 @@
echo "libglademm, libxml++) installed to /usr/local, and to have "
echo "successfully built everything with MSVC (both Debug and Release builds)."
echo "Make also sure that the official GTK+ bundle has been unzipped to"
-echo "/bundle, and that makensis is in your PATH"
+echo "/bundle, as well as libxml2 and iconv runtime and development files."
+echo "Finally, make sure that makensis is in your PATH"
# Copy all of /usr/local into here. It's probably more than we need, but we
# can be sure we have the required stuff this way.
@@ -30,7 +31,7 @@
echo "Removing non-GTK locales..."
# Remove all locales we don't want, so the installer can simply copy share/locale recursively, in case there is more than just the GTK+ bundle in /bundle.
-find share/locale -type f | grep -v glib20.mo | grep -v gtk20.mo | grep -v gtk20-properties.mo | xargs -r rm || exit -1
+find share/locale -type f | grep -v libiconv.mo | grep -v glib20.mo | grep -v gtk20.mo | grep -v gtk20-properties.mo | xargs -r rm || exit -1
find share/locale -type d | xargs rmdir -p --ignore-fail-on-non-empty || exit -1
# Change prefix in .pc files to be /target instead of /usr/local. pkg-config
Modified: trunk/win32_installer/gtkmm-2.4.vsprops
==============================================================================
--- trunk/win32_installer/gtkmm-2.4.vsprops (original)
+++ trunk/win32_installer/gtkmm-2.4.vsprops Tue Sep 16 13:57:42 2008
@@ -7,11 +7,11 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/vd2"
- AdditionalIncludeDirectories=""$(GTKMM_BASEPATH)\include\libglademm-2.4\";"$(GTKMM_BASEPATH)\lib\libglademm-2.4\include";"$(GTKMM_BASEPATH)\lib\gtkmm-2.4\include";"$(GTKMM_BASEPATH)\include\gtkmm-2.4";"$(GTKMM_BASEPATH)\lib\gdkmm-2.4\include";"$(GTKMM_BASEPATH)\include\gdkmm-2.4";"$(GTKMM_BASEPATH)\include\pangomm-1.4";"$(GTKMM_BASEPATH)\include\atkmm-1.6";"$(GTKMM_BASEPATH)\lib\libxml++-2.6\include";"$(GTKMM_BASEPATH)\include\libxml++-2.6";"$(GTKMM_BASEPATH)\lib\giomm-2.4\include";"$(GTKMM_BASEPATH)\include\giomm-2.4";"$(GTKMM_BASEPATH)\lib\glibmm-2.4\include";"$(GTKMM_BASEPATH)\include\glibmm-2.4";"$(GTKMM_BASEPATH)\include\cairomm-1.0";"$(GTKMM_BASEPATH)\lib\sigc++-2.0\include";"$(GTKMM_BASEPATH)\include\sigc++-2.0";"$(GTK_BASEPATH)\lib\gtkglext-1.0\include";"$(GTK_BASEPATH)\include\gtkgl
ext-1.0";"$(GTK_BASEPATH)\include\libglade-2.0";"$(GTK_BASEPATH)\lib\gtk-2.0\include";"$(GTK_BASEPATH)\include\gtk-2.0";"$(GTK_BASEPATH)\include\pango-1.0";"$(GTK_BASEPATH)\include\atk-1.0";"$(GTK_BASEPATH)\lib\glib-2.0\include";"$(GTK_BASEPATH)\include\glib-2.0";"$(GTK_BASEPATH)\include\libxml2";"$(GTK_BASEPATH)\include\cairo";"$(GTK_BASEPATH)\include""
+ AdditionalIncludeDirectories=""$(GTKMM_BASEPATH)\include\libglademm-2.4\";"$(GTKMM_BASEPATH)\lib\libglademm-2.4\include";"$(GTKMM_BASEPATH)\lib\gtkmm-2.4\include";"$(GTKMM_BASEPATH)\include\gtkmm-2.4";"$(GTKMM_BASEPATH)\lib\gdkmm-2.4\include";"$(GTKMM_BASEPATH)\include\gdkmm-2.4";"$(GTKMM_BASEPATH)\include\pangomm-1.4";"$(GTKMM_BASEPATH)\include\atkmm-1.6";"$(GTKMM_BASEPATH)\lib\libxml++-2.6\include";"$(GTKMM_BASEPATH)\include\libxml++-2.6";"$(GTKMM_BASEPATH)\lib\giomm-2.4\include";"$(GTKMM_BASEPATH)\include\giomm-2.4";"$(GTKMM_BASEPATH)\lib\glibmm-2.4\include";"$(GTKMM_BASEPATH)\include\glibmm-2.4";"$(GTKMM_BASEPATH)\include\cairomm-1.0";"$(GTKMM_BASEPATH)\lib\sigc++-2.0\include";"$(GTKMM_BASEPATH)\include\sigc++-2.0";"$(GTKMM_BASEPATH)\include\libglade-2.0";"$(GTKMM_BASEPATH)\lib\gtk-2.0\i
nclude";"$(GTKMM_BASEPATH)\include\gtk-2.0";"$(GTKMM_BASEPATH)\include\pango-1.0";"$(GTKMM_BASEPATH)\include\atk-1.0";"$(GTKMM_BASEPATH)\lib\glib-2.0\include";"$(GTKMM_BASEPATH)\include\glib-2.0";"$(GTKMM_BASEPATH)\include\libxml2";"$(GTKMM_BASEPATH)\include\cairo";"$(GTKMM_BASEPATH)\include""
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="glademm-2.4.lib xml++-2.6.lib gtkmm-2.4.lib glade-2.0.lib gdkmm-2.4.lib atkmm-1.6.lib pangomm-1.4.lib giomm-2.4.lib glibmm-2.4.lib cairomm-1.0.lib sigc-2.0.lib gtk-win32-2.0.lib xml2.lib gdk-win32-2.0.lib atk-1.0.lib gdk_pixbuf-2.0.lib pangowin32-1.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib intl.lib iconv.lib"
- AdditionalLibraryDirectories="$(GTKMM_BASEPATH)\lib;$(GTK_BASEPATH)\lib"
+ AdditionalDependencies="glademm-2.4.lib xml++-2.6.lib gtkmm-2.4.lib glade-2.0.lib gdkmm-2.4.lib atkmm-1.6.lib pangomm-1.4.lib giomm-2.4.lib glibmm-2.4.lib cairomm-1.0.lib sigc-2.0.lib gtk-win32-2.0.lib libxml2.lib gdk-win32-2.0.lib atk-1.0.lib gdk_pixbuf-2.0.lib pangowin32-1.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib gio-2.0.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib intl.lib iconv.lib"
+ AdditionalLibraryDirectories="$(GTKMM_BASEPATH)\lib"
/>
</VisualStudioPropertySheet>
Modified: trunk/win32_installer/gtkmm-2.4d.vsprops
==============================================================================
--- trunk/win32_installer/gtkmm-2.4d.vsprops (original)
+++ trunk/win32_installer/gtkmm-2.4d.vsprops Tue Sep 16 13:57:42 2008
@@ -7,11 +7,11 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/vd2"
- AdditionalIncludeDirectories=""$(GTKMM_BASEPATH)\include\libglademm-2.4\";"$(GTKMM_BASEPATH)\lib\libglademm-2.4\include";"$(GTKMM_BASEPATH)\lib\gtkmm-2.4\include";"$(GTKMM_BASEPATH)\include\gtkmm-2.4";"$(GTKMM_BASEPATH)\lib\gdkmm-2.4\include";"$(GTKMM_BASEPATH)\include\gdkmm-2.4";"$(GTKMM_BASEPATH)\include\pangomm-1.4";"$(GTKMM_BASEPATH)\include\atkmm-1.6";"$(GTKMM_BASEPATH)\lib\libxml++-2.6\include";"$(GTKMM_BASEPATH)\include\libxml++-2.6";"$(GTKMM_BASEPATH)\lib\giomm-2.4\include";"$(GTKMM_BASEPATH)\include\giomm-2.4";"$(GTKMM_BASEPATH)\lib\glibmm-2.4\include";"$(GTKMM_BASEPATH)\include\glibmm-2.4";"$(GTKMM_BASEPATH)\include\cairomm-1.0";"$(GTKMM_BASEPATH)\lib\sigc++-2.0\include";"$(GTKMM_BASEPATH)\include\sigc++-2.0";"$(GTK_BASEPATH)\lib\gtkglext-1.0\include";"$(GTK_BASEPATH)\include\gtkgl
ext-1.0";"$(GTK_BASEPATH)\include\libglade-2.0";"$(GTK_BASEPATH)\lib\gtk-2.0\include";"$(GTK_BASEPATH)\include\gtk-2.0";"$(GTK_BASEPATH)\include\pango-1.0";"$(GTK_BASEPATH)\include\atk-1.0";"$(GTK_BASEPATH)\lib\glib-2.0\include";"$(GTK_BASEPATH)\include\glib-2.0";"$(GTK_BASEPATH)\include\libxml2";"$(GTK_BASEPATH)\include\cairo";"$(GTK_BASEPATH)\include""
+ AdditionalIncludeDirectories=""$(GTKMM_BASEPATH)\include\libglademm-2.4\";"$(GTKMM_BASEPATH)\lib\libglademm-2.4\include";"$(GTKMM_BASEPATH)\lib\gtkmm-2.4\include";"$(GTKMM_BASEPATH)\include\gtkmm-2.4";"$(GTKMM_BASEPATH)\lib\gdkmm-2.4\include";"$(GTKMM_BASEPATH)\include\gdkmm-2.4";"$(GTKMM_BASEPATH)\include\pangomm-1.4";"$(GTKMM_BASEPATH)\include\atkmm-1.6";"$(GTKMM_BASEPATH)\lib\libxml++-2.6\include";"$(GTKMM_BASEPATH)\include\libxml++-2.6";"$(GTKMM_BASEPATH)\lib\giomm-2.4\include";"$(GTKMM_BASEPATH)\include\giomm-2.4";"$(GTKMM_BASEPATH)\lib\glibmm-2.4\include";"$(GTKMM_BASEPATH)\include\glibmm-2.4";"$(GTKMM_BASEPATH)\include\cairomm-1.0";"$(GTKMM_BASEPATH)\lib\sigc++-2.0\include";"$(GTKMM_BASEPATH)\include\sigc++-2.0";"$(GTKMM_BASEPATH)\include\libglade-2.0";"$(GTKMM_BASEPATH)\lib\gtk-2.0\i
nclude";"$(GTKMM_BASEPATH)\include\gtk-2.0";"$(GTKMM_BASEPATH)\include\pango-1.0";"$(GTKMM_BASEPATH)\include\atk-1.0";"$(GTKMM_BASEPATH)\lib\glib-2.0\include";"$(GTKMM_BASEPATH)\include\glib-2.0";"$(GTKMM_BASEPATH)\include\libxml2";"$(GTKMM_BASEPATH)\include\cairo";"$(GTKMM_BASEPATH)\include""
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="glademm-2.4d.lib xml++-2.6d.lib gtkmm-2.4d.lib glade-2.0.lib gdkmm-2.4d.lib atkmm-1.6d.lib pangomm-1.4d.lib giomm-2.4d.lib glibmm-2.4d.lib cairomm-1.0d.lib sigc-2.0d.lib gtk-win32-2.0.lib xml2.lib gdk-win32-2.0.lib atk-1.0.lib gdk_pixbuf-2.0.lib pangowin32-1.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib intl.lib iconv.lib"
- AdditionalLibraryDirectories="$(GTKMM_BASEPATH)\lib;$(GTK_BASEPATH)\lib"
+ AdditionalDependencies="glademm-2.4d.lib xml++-2.6d.lib gtkmm-2.4d.lib glade-2.0.lib gdkmm-2.4d.lib atkmm-1.6d.lib pangomm-1.4d.lib giomm-2.4d.lib glibmm-2.4d.lib cairomm-1.0d.lib sigc-2.0d.lib gtk-win32-2.0.lib libxml2.lib gdk-win32-2.0.lib atk-1.0.lib gdk_pixbuf-2.0.lib pangowin32-1.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib gio-2.0.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib intl.lib iconv.lib"
+ AdditionalLibraryDirectories="$(GTKMM_BASEPATH)\lib"
/>
</VisualStudioPropertySheet>
Modified: trunk/win32_installer/gtkmm-installer.nsi.in
==============================================================================
--- trunk/win32_installer/gtkmm-installer.nsi.in (original)
+++ trunk/win32_installer/gtkmm-installer.nsi.in Tue Sep 16 13:57:42 2008
@@ -211,6 +211,9 @@
; These break when stripped, therefore we always load them from bin/
File bin\zlib1.dll
File bin\intl.dll
+ File bin\charset.dll
+ File bin\iconv.dll
+ File bin\libxml2.dll
File ${BINDIR}\jpeg62.dll
File ${BINDIR}\libpng12-0.dll
@@ -268,6 +271,9 @@
SetOutPath $INSTDIR\bin
+ ; Again, we always use the non-stripped version here since stripping breaks it
+ File bin\iconv.exe
+
; These are only useful to developers
File ${BINDIR}\pkg-config.exe
File ${BINDIR}\glib-genmarshal.exe
@@ -282,6 +288,7 @@
File ${BINDIR}\libglade-convert
SetOutPath $INSTDIR\include
+ File /r include\libxml
File /r include\glib-2.0
File /r include\cairo
File /r include\atk-1.0
@@ -289,6 +296,9 @@
File /r include\gtk-2.0
File /r include\libglade-2.0
+ File include\iconv.h
+ File include\libcharset.h
+ File include\localcharset.h
File include\libintl.h
File include\png.h
File include\pngconf.h
@@ -310,6 +320,12 @@
File /r lib\gtk-2.0\2.10.0\immodules
File /r lib\gtk-2.0\2.10.0\loaders
+ SetOutPath $INSTDIR\lib
+ File lib\libxml2.lib
+ File lib\libxml2.dll.a
+ File lib\charset.lib
+ File lib\iconv.lib
+ File lib\libiconv.a
File lib\intl.def
File lib\intl.lib
File lib\libintl.dll.a
@@ -366,6 +382,7 @@
File lib\libglade-2.0.dll.a
SetOutPath $INSTDIR\lib\pkgconfig
+ File lib\pkgconfig\libxml-2.0.pc
File lib\pkgconfig\libpng.pc
File lib\pkgconfig\libpng12.pc
File lib\pkgconfig\glib-2.0.pc
@@ -412,6 +429,9 @@
SectionIn 1
SetOverwrite ifnewer
+ SetOutPath $INSTDIR\share\doc
+ File /r share\doc\libiconv
+
SetOutPath $INSTDIR\share\gtk-doc\html
File /r share\gtk-doc\html\glib
File /r share\gtk-doc\html\gobject
@@ -1070,7 +1090,7 @@
!ifndef RUNTIME_ONLY
; bin
- ; These are only useful to developers
+ Delete $INSTDIR\bin\iconv.exe
Delete $INSTDIR\bin\pkg-config.exe
Delete $INSTDIR\bin\glib-genmarshal.exe
Delete $INSTDIR\bin\glib-gettextize
@@ -1084,12 +1104,16 @@
Delete $INSTDIR\bin\libglade-convert
; include
+ RMDir /r $INSTDIR\include\libxml
RMDIR /r $INSTDIR\include\glib-2.0
RMDIR /r $INSTDIR\include\cairo
RMDIR /r $INSTDIR\include\atk-1.0
RMDIR /r $INSTDIR\include\pango-1.0
RMDIR /r $INSTDIR\include\gtk-2.0
RMDIR /r $INSTDIR\include\libglade-2.0
+ Delete $INSTDIR\include\iconv.h
+ Delete $INSTDIR\include\libcharset.h
+ Delete $INSTDIR\include\localcharset.h
Delete $INSTDIR\include\libintl.h
Delete $INSTDIR\include\png.h
Delete $INSTDIR\include\pngconf.h
@@ -1112,8 +1136,8 @@
; lib
- RMDIR /r $INSTDIR\lib\glib-2.0\include
- RMDIR /r $INSTDIR\lib\gtk-2.0\include
+ RMDir /r $INSTDIR\lib\glib-2.0\include
+ RMDir /r $INSTDIR\lib\gtk-2.0\include
RMDir $INSTDIR\lib\glib-2.0
RMDir /r $INSTDIR\lib\sigc++-2.0
@@ -1123,6 +1147,11 @@
RMDir /r $INSTDIR\lib\libglademm-2.4
RMDir /r $INSTDIR\lib\libxml++-2.6
+ Delete $INSTDIR\lib\libxml2.lib
+ Delete $INSTDIR\lib\libxml2.dll.a
+ Delete $INSTDIR\lib\charset.lib
+ Delete $INSTDIR\lib\iconv.lib
+ Delete $INSTDIR\lib\libiconv.a
Delete $INSTDIR\lib\libintl.dll.a
Delete $INSTDIR\lib\libtiff.dll.a
Delete $INSTDIR\lib\libpng12.dll.a
@@ -1201,6 +1230,7 @@
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\glib-2.0.pc
@@ -1241,6 +1271,8 @@
; share
+ RMDir /r $INSTDIR\share\doc\libiconv
+
RMDir /r $INSTDIR\share\doc\glib-dev-2.16.5
RMDir /r $INSTDIR\share\doc\pango-dev-1.20.5
RMDir /r $INSTDIR\share\doc\gtk+-dev-2.12.11
@@ -1317,9 +1349,11 @@
; bin
- ; These break when stripped, therefore we always load them from bin/
Delete $INSTDIR\bin\zlib1.dll
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\libpng12-0.dll
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
