Menu
▾
▴
[Gtk2hs-commit] (0.9.12 branch): Update Win32 build scripts
|
From: Duncan C. <dun...@wo...> - 2007-07-04 15:34:25
|
Tue Jul 3 13:33:05 PDT 2007 Duncan Coutts <du...@ha...>
* Update Win32 build scripts
Both the scripts for building Gtk2Hs on Windows and the scripts used to
build a Gtk+ SDK for Windows. Now using Gtk+ 2.10.13 for the Windows builds.
hunk ./tools/win32/combine.sh 30
- rm -r include lib
hunk ./tools/win32/combine.sh 31
+ rm -r include
+ rm lib/*.lib
+ rm -r lib/pkgconfig
+ rm -r lib/*/include
+ rmdir lib/glib-2.0 lib/gtkglext-1.0
hunk ./tools/win32/combine.sh 39
-zip -q -r gtk+-dev-${GTK_VERSION}-win32.zip gtk+-dev-${GTK_VERSION}-win32/
+zip -9 -q -r gtk+-dev-${GTK_VERSION}-win32.zip gtk+-dev-${GTK_VERSION}-win32/
hunk ./tools/win32/combine.sh 43
-zip -q -r gtk+-${GTK_VERSION}-win32.zip gtk+-${GTK_VERSION}-win32/
+zip -9 -q -r gtk+-${GTK_VERSION}-win32.zip gtk+-${GTK_VERSION}-win32/
hunk ./tools/win32/download.sh 13
-wget -c $BASE_URL/pango/1.14/pango-${PANGO_VERSION}.zip || exit
-wget -c $BASE_URL/pango/1.14/pango-dev-${PANGO_VERSION}.zip || exit
+wget -c $BASE_URL/pango/1.16/pango-${PANGO_VERSION}.zip || exit
+wget -c $BASE_URL/pango/1.16/pango-dev-${PANGO_VERSION}.zip || exit
hunk ./tools/win32/download.sh 16
-wget -c $BASE_URL/atk/1.12/atk-${ATK_VERSION}.zip || exit
-wget -c $BASE_URL/atk/1.12/atk-dev-${ATK_VERSION}.zip || exit
+wget -c $BASE_URL/atk/1.18/atk-${ATK_VERSION}.zip || exit
+wget -c $BASE_URL/atk/1.18/atk-dev-${ATK_VERSION}.zip || exit
hunk ./tools/win32/download.sh 38
-wget -c http://www.zlatkovic.com/pub/libxml/oldreleases/libxml2-${LIBXML_VERSION}.win32.zip || exit
+wget -c $BASE_URL/dependencies/libxml2-dev-${LIBXML_VERSION}.zip || exit
hunk ./tools/win32/download.sh 44
+if test ${GTK_EXTRAS}
+then
+wget -c $BASE_URL/librsvg/2.16/librsvg-${LIBRSVG_VERSION}.zip
+wget -c $BASE_URL/librsvg/2.16/librsvg-dev-${LIBRSVG_VERSION}.zip
+wget -c $BASE_URL/librsvg/2.16/svg-gdk-pixbuf-loader-${LIBRSVG_VERSION}.zip
+
+wget -c $BASE_URL/gtksourceview/1.8/gtksourceview-${SOURCEVIEW_VERSION}.zip
+wget -c $BASE_URL/gtksourceview/1.8/gtksourceview-dev-${SOURCEVIEW_VERSION}.zip
+fi
+
hunk ./tools/win32/fix.sh 12
-sed -i -e 's/Libs.private: -lz -lz -lm/Libs.private: -lz -lz -lm -lpng13/' lib/pkgconfig/cairo.pc
+sed -i -e 's/Libs.private: -lz -lm/Libs.private: -lm -lpng13/' lib/pkgconfig/cairo.pc
+sed -i -e 's/-lz//' lib/pkgconfig/cairo-pdf.pc
hunk ./tools/win32/fix.sh 20
-pushd gtk+-dev-${GTK_VERSION}
-sed -i -e 's/-user32/-luser32/' -e 's/-Wl,-luuid/-luuid/' lib/pkgconfig/*.pc
-popd
-
hunk ./tools/win32/fix.sh 32
-rm -r readme.txt include/
hunk ./tools/win32/fix.sh 34
-mkdir lib/pkgconfig
-cp ../../libxml-2.0.pc lib/pkgconfig/
+sed -i -e 's/-lz//' lib/pkgconfig/libxml-2.0.pc
hunk ./tools/win32/fix.sh 37
+if test ${GTK_EXTRAS}
+then
+pushd librsvg-dev-${LIBRSVG_VERSION}
+mv lib/librsvg-2.dll.a lib/rsvg-2.lib
+popd
+
+pushd gtksourceview-dev-${SOURCEVIEW_VERSION}
+mv lib/libgtksourceview-1.0.dll.a lib/gtksourceview-1.0.lib
+sed -i -e 's/libgnomeprint-2.2//' lib/pkgconfig/gtksourceview-1.0.pc [_$_]
+popd
+fi
hunk ./tools/win32/libxml-2.0.pc 1
-prefix=/ignore
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: libXML
-Version: 2.6.20
-Description: libXML library version 2.
-Requires:
-Libs: -L${libdir} -lxml2
-Cflags:
rmfile ./tools/win32/libxml-2.0.pc
hunk ./tools/win32/prune.sh 58
+pushd libxml2-dev-${LIBXML_VERSION}
+rm -rf include
+popd
+
hunk ./tools/win32/unpack.sh 16
-rm -rf libxml2-dev-${LIBXML_VERSION}/
-mv libxml2-${LIBXML_VERSION}.win32 libxml2-dev-${LIBXML_VERSION}
-mv libxml2-dev-${LIBXML_VERSION}/libxml2-${LIBXML_VERSION}.win32/* libxml2-dev-${LIBXML_VERSION}/
-rmdir libxml2-dev-${LIBXML_VERSION}/libxml2-${LIBXML_VERSION}.win32/
-
hunk ./tools/win32/versions.conf 1
-GLIB_VERSION=2.12.9
-PANGO_VERSION=1.14.9
-ATK_VERSION=1.12.3
-CAIRO_VERSION=1.2.6
-GTK_VERSION=2.10.9
+GLIB_VERSION=2.12.12
+PANGO_VERSION=1.16.4
+ATK_VERSION=1.18.0
+CAIRO_VERSION=1.4.8
+GTK_VERSION=2.10.13
hunk ./tools/win32/versions.conf 12
-LIBXML_VERSION=2.6.20
+LIBXML_VERSION=2.6.27
hunk ./tools/win32/versions.conf 16
+if test ${GTK_EXTRAS}
+then
+LIBRSVG_VERSION=2.16.1
+SOURCEVIEW_VERSION=1.8.5
+fi
+
hunk ./tools/win32/win32-build-version.sh 8
- ghc-6.4.2) PATH="${PATH}:${GHC_642_PATH}";;[_^M_][_$_]
- ghc-6.6) PATH="${PATH}:${GHC_66_PATH}";;[_^M_][_$_]
- *) echo "GHC version parameter must be one of ghc-6.2.2, ghc-6.4.2 or ghc-6.6"; exit;;[_^M_][_$_]
+ ghc-6.4.2) PATH="${PATH}:${GHC_642_PATH}";;[_^M_][_$_]
+ ghc-6.6.1) PATH="${PATH}:${GHC_66_PATH}";;[_^M_][_$_]
+ *) echo "GHC version parameter must be one of ghc-6.2.2, ghc-6.4.2 or ghc-6.6.1"; exit;;[_^M_][_$_]
hunk ./tools/win32/win32-build-version.sh 40
+CONFIGURE_FLAGS="--enable-packager-mode --enable-split-objs --enable-libglade --enable-opengl"[_^M_][_$_]
+[_^M_][_$_]
hunk ./tools/win32/win32-build-version.sh 47
-./configure --enable-packager-mode --enable-split-objs --enable-libglade --prefix=/ ${CONFIGURE_EXTRAFLAGS}[_^M_][_$_]
+./configure --prefix=/ ${CONFIGURE_FLAGS} ${CONFIGURE_EXTRAFLAGS}[_^M_][_$_]
hunk ./tools/win32/win32-build.conf 2
-VERSION=0.9.10.5[_^M_][_$_]
+VERSION=0.9.11.3[_^M_][_$_]
hunk ./tools/win32/win32-build.conf 7
-INNOSETUP_BIN_DIR="e:/dcoutts/Inno Setup 5"[_^M_][_$_]
+INNOSETUP_BIN_DIR="d:/dcoutts/Inno Setup 5"[_^M_][_$_]
hunk ./tools/win32/win32-build.conf 15
-GTK_26_BASEPATH="/e/dcoutts/gtk+-2.6.10"[_^M_][_$_]
-GTK_28_BASEPATH="/e/dcoutts/gtk+-2.8.20"[_^M_][_$_]
-GTK_210_BASEPATH="/e/dcoutts/gtk+-2.10.9"[_^M_][_$_]
+GTK_26_BASEPATH="/d/dcoutts/gtk+-2.6.10"[_^M_][_$_]
+GTK_28_BASEPATH="/d/dcoutts/gtk+-2.8.20"[_^M_][_$_]
+GTK_210_BASEPATH="/d/dcoutts/gtk+-2.10.13"[_^M_][_$_]
hunk ./tools/win32/win32-build.conf 20
-GHC_622_PATH="/home/dcoutts/ghc-6.2.2/bin"[_^M_][_$_]
-GHC_642_PATH="/home/dcoutts/ghc-6.4.2/bin"[_^M_][_$_]
-GHC_66_PATH="/home/dcoutts/ghc-6.6/bin"[_^M_][_$_]
+GHC_622_PATH="/d/dcoutts/ghc-6.2.2/bin"[_^M_][_$_]
+GHC_642_PATH="/d/dcoutts/ghc-6.4.2/bin"[_^M_][_$_]
+GHC_661_PATH="/d/dcoutts/ghc-6.6.1/bin"[_^M_][_$_]
|
