Menu
▾
▴
gtk2hs-commit
|
From: Peter g. <pg...@co...> - 2009-01-25 00:42:09
|
Thu Jan 15 23:55:31 EST 2009 Peter Gavin <pg...@gm...>
* win32: update scripts
hunk ./Makefile.am 3011
- -e '/^extra-libraries:/ \
- p; \
- s/extra-libraries/extra-ghci-libraries/; \
- s/"\([a-z0-9._-]*\.0\)"/"lib\1-0"/g; \
- s/"cairo"/"libcairo-2"/; \
- s/"rsvg-2"/"librsvg-2-2"/; \
- s/"xml2"/"libxml2"/' \
hunk ./tools/win32/clean.sh 10
-rm -rf gtk2hs-clibs-${GTK_VERSION}
-rm -f gtk2hs-clibs-${GTK_VERSION}.tar.gz
-
-rm -rf gtk2hs-clibs-dev-${GTK_VERSION}
-rm -f gtk2hs-clibs-dev-${GTK_VERSION}.tar.gz
+rm -rf gtk2hs
+rm -f gtk2hs-${GTK2HS_VERSION}-clibs-win32{,-dev}.zip
hunk ./tools/win32/combine.sh 2
-
+set -x
hunk ./tools/win32/combine.sh 17
-rm -rf gtk2hs-clibs-dev-${GTK2HS_VERSION}-win32
-mkdir gtk2hs-clibs-dev-${GTK2HS_VERSION}-win32
-pushd gtk2hs-clibs-dev-${GTK2HS_VERSION}-win32
-for tar in ../zips/*.tar
+rm -rf gtk2hs
+mkdir -p gtk2hs/${GTK2HS_VERSION}
+pushd gtk2hs/${GTK2HS_VERSION}
+for tar in ../../zips/*.tar
hunk ./tools/win32/combine.sh 25
-cp -v ../pc/*.pc lib/pkgconfig/
+cp -v ../../pc/*.pc lib/pkgconfig/
hunk ./tools/win32/combine.sh 27
- sed "s,^prefix=.*,prefix=/gtk2hs-clibs-dev-${GTK2HS_VERSION}-win32/${GTK2HS_VERSION}," < "$file" > "$file".new
+ sed "s,^prefix=.*,prefix=/c/gtk2hs/${GTK2HS_VERSION}," < "$file" > "$file".new
hunk ./tools/win32/combine.sh 32
-rm -rf gtk2hs-clibs-${GTK2HS_VERSION}-win32
-cp -rl gtk2hs-clibs-dev-${GTK2HS_VERSION}-win32 gtk2hs-clibs-${GTK2HS_VERSION}-win32
-pushd gtk2hs-clibs-${GTK2HS_VERSION}-win32
- rm -f bin/pkg-config.exe
- rm -r include
- rm lib/*.lib
- rm -rf lib/pkgconfig
- rm -rf lib/*/include
- rm -rf lib/glib-2.0 lib/gtkglext-1.0
-popd
+rm -f gtk2hs-${GTK2HS_VERSION}-clibs-win32{,-dev}.zip
+zip -9 -q -r gtk2hs-${GTK2HS_VERSION}-clibs-win32-dev.zip gtk2hs
+echo "created gtk2hs-${GTK2HS_VERSION}-clibs-win32-dev.zip"
hunk ./tools/win32/combine.sh 36
-rm -f gtk2hs-clibs-dev-${GTK2HS_VERSION}-win32.zip
-zip -9 -q -r gtk2hs-clibs-dev-${GTK2HS_VERSION}-win32.zip gtk2hs-clibs-dev-${GTK2HS_VERSION}-win32/
-echo "created gtk2hs-clibs-dev-${GTK2HS_VERSION}-win32.zip"
+mkdir no-dev
+cp -a gtk2hs no-dev/gtk2hs
+pushd no-dev
+rm -rvf \
+ gtk2hs/${GTK2HS_VERSION}/bin/gdk-pixbuf-csource.exe \
+ gtk2hs/${GTK2HS_VERSION}/bin/glib-* \
+ gtk2hs/${GTK2HS_VERSION}/bin/gobject-query.exe \
+ gtk2hs/${GTK2HS_VERSION}/bin/gtk-demo.exe \
+ gtk2hs/${GTK2HS_VERSION}/bin/ior-decode-2.exe \
+ gtk2hs/${GTK2HS_VERSION}/bin/orbit-idl-2.exe \
+ gtk2hs/${GTK2HS_VERSION}/bin/pkg-config.exe \
+ gtk2hs/${GTK2HS_VERSION}/bin/typelib-dump.exe \
+ gtk2hs/${GTK2HS_VERSION}/include \
+ gtk2hs/${GTK2HS_VERSION}/lib/*.lib \
+ gtk2hs/${GTK2HS_VERSION}/lib/gtk-2.0/include \
+ gtk2hs/${GTK2HS_VERSION}/lib/glib-2.0 \
+ gtk2hs/${GTK2HS_VERSION}/lib/gtkglext-1.0 \
+ gtk2hs/${GTK2HS_VERSION}/lib/pkgconfig \
+ gtk2hs/${GTK2HS_VERSION}/share/idl
+zip -9 -q -r ../gtk2hs-${GTK2HS_VERSION}-clibs-win32.zip gtk2hs
+echo "created gtk2hs-${GTK2HS_VERSION}-clibs-win32-dev.zip"
+popd
hunk ./tools/win32/combine.sh 59
-rm -f gtk2hs-clibs-${GTK2HS_VERSION}-win32.zip
-zip -9 -q -r gtk2hs-clibs-${GTK2HS_VERSION}-win32.zip gtk2hs-clibs-${GTK2HS_VERSION}-win32/
-echo "created gtk2hs-clibs-${GTK2HS_VERSION}-win32.zip"
+rm -rf no-dev
hunk ./tools/win32/download.sh 8
+GTKGLEXT_DIR=/cygdrive/c/GtkGLExt/1.0
hunk ./tools/win32/download.sh 11
-#wget -c $BASE_URL/glib/2.12/glib-${GLIB_VERSION}.zip [_$_]
-#wget -c $BASE_URL/glib/2.12/glib-dev-${GLIB_VERSION}.zip [_$_]
+wget -c $BASE_URL/gtk+/2.14/gtk+-bundle_${GTK_BUNDLE_VERSION}_win32.zip [_$_]
hunk ./tools/win32/download.sh 13
-#wget -c $BASE_URL/pango/1.16/pango-${PANGO_VERSION}.zip [_$_]
-#wget -c $BASE_URL/pango/1.16/pango-dev-${PANGO_VERSION}.zip [_$_]
-
-#wget -c $BASE_URL/atk/1.18/atk-${ATK_VERSION}.zip [_$_]
-#wget -c $BASE_URL/atk/1.18/atk-dev-${ATK_VERSION}.zip [_$_]
-
-#wget -c $BASE_URL/dependencies/cairo-${CAIRO_VERSION}.zip [_$_]
-#wget -c $BASE_URL/dependencies/cairo-dev-${CAIRO_VERSION}.zip [_$_]
-
-#wget -c $BASE_URL/gtk+/2.10/gtk+-${GTK_VERSION}.zip [_$_]
-#wget -c $BASE_URL/gtk+/2.10/gtk+-dev-${GTK_VERSION}.zip [_$_]
-
-wget -c $BASE_URL/gtk+/2.12/gtk+-bundle-${GTK_VERSION}.zip [_$_]
-
-wget -c $BASE_URL/libglade/2.6/libglade-${LIBGLADE_VERSION}.zip [_$_]
-wget -c $BASE_URL/libglade/2.6/libglade-dev-${LIBGLADE_VERSION}.zip [_$_]
+wget -c $BASE_URL/libglade/2.6/libglade_${LIBGLADE_VERSION}_win32.zip [_$_]
+wget -c $BASE_URL/libglade/2.6/libglade-dev_${LIBGLADE_VERSION}_win32.zip [_$_]
hunk ./tools/win32/download.sh 17
+#gtkglext binaries are not provided as a zip any more
+if test ! -d gtkglext-${GTKGLEXT_VERSION}-win32.zip; then
+ pushd $GTKGLEXT_DIR
+ zip -r ~-/gtkglext-${GTKGLEXT_VERSION}-win32.zip bin/ include/ lib/ share/
+ popd
+fi
hunk ./tools/win32/download.sh 24
-#wget -c $BASE_URL/gtksourceview/1.8/gtksourceview-${SOURCEVIEW_VERSION}.zip
-#wget -c $BASE_URL/gtksourceview/1.8/gtksourceview-dev-${SOURCEVIEW_VERSION}.zip
+wget -c $BASE_URL/gtksourceview/2.4/gtksourceview-${GTKSOURCEVIEW2_VERSION}.zip
+wget -c $BASE_URL/gtksourceview/2.4/gtksourceview-dev-${GTKSOURCEVIEW2_VERSION}.zip
hunk ./tools/win32/download.sh 41
-wget -c $BASE_URL/librsvg/2.22/librsvg-${LIBRSVG_VERSION}.zip
-wget -c $BASE_URL/librsvg/2.22/librsvg-dev-${LIBRSVG_VERSION}.zip
+wget -c $BASE_URL/librsvg/2.22/librsvg_${LIBRSVG_VERSION}_win32.zip
+wget -c $BASE_URL/librsvg/2.22/librsvg-dev_${LIBRSVG_VERSION}_win32.zip
hunk ./tools/win32/download.sh 47
-wget -c $BASE_URL/ORBit2/2.14/ORBit2-${ORBIT_VERSION}.zip
-wget -c $BASE_URL/ORBit2/2.14/ORBit2-dev-${ORBIT_VERSION}.zip
-
-wget -c $BASE_URL/gnome-vfs/2.22/gnome-vfs-${GNOMEVFS_VERSION}.zip
-wget -c $BASE_URL/gnome-vfs/2.22/gnome-vfs-dev-${GNOMEVFS_VERSION}.zip
+wget -c $BASE_URL/ORBit2/2.14/ORBit2_${ORBIT_VERSION}_win32.zip
+wget -c $BASE_URL/ORBit2/2.14/ORBit2-dev_${ORBIT_VERSION}_win32.zip
hunk ./tools/win32/fix.sh 2
-
+set -x
hunk ./tools/win32/fix.sh 16
-pushd gtk+-bundle-${GTK_VERSION}
+pushd gtk+-bundle_${GTK_BUNDLE_VERSION}_win32
hunk ./tools/win32/fix.sh 22
-mkdir gtkglext-${GTKGLEXT_VERSION}
-mkdir gtkglext-dev-${GTKGLEXT_VERSION}
-cp -av /c/GtkGLExt/1.0/bin gtkglext-${GTKGLEXT_VERSION}
-cp -av /c/GtkGLExt/1.0/{lib,include} gtkglext-dev-${GTKGLEXT_VERSION}
+#mkdir gtkglext-${GTKGLEXT_VERSION}
+#mkdir gtkglext-dev-${GTKGLEXT_VERSION}
+#cp -av /c/GtkGLExt/1.0/bin gtkglext-${GTKGLEXT_VERSION}
+#cp -av /c/GtkGLExt/1.0/{lib,include} gtkglext-dev-${GTKGLEXT_VERSION}
hunk ./tools/win32/gtk2hs.iss 7
-AppVerName=Gtk2Hs 0.9.13[_^M_][_$_]
-AppVersion=0.9.13[_^M_][_$_]
+AppVerName=Gtk2Hs 0.10.0[_^M_][_$_]
+AppVersion=0.10.0[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 14
-DefaultDirName={pf}\Gtk2Hs[_^M_][_$_]
-OutputBaseFilename=gtk2hs-0.9.13[_^M_][_$_]
+DefaultDirName=c:\gtk2hs\0.10.0[_^M_][_$_]
+OutputBaseFilename=gtk2hs-0.10.0[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 17
-VersionInfoVersion=0.9.13[_^M_][_$_]
-VersionInfoCopyright=Copyright (C) 2001-2008 The Gtk2Hs Team[_^M_][_$_]
+VersionInfoVersion=0.10.0[_^M_][_$_]
+VersionInfoCopyright=Copyright (C) 2001-2009 The Gtk2Hs Team[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 29
-Name: "gtk2hs"; Description: "Gtk2Hs libraries for GHC 6.8.3"; Check: UseWithGhcVersion('6.8.3'); Types: full compact custom; Flags: fixed[_^M_][_$_]
-Name: "docs"; Description: "API reference documentation"; Types: full[_^M_][_$_]
-Name: "demos"; Description: "Source files for the Gtk2Hs demo programs"; Types: full[_^M_][_$_]
+Name: "gtk2hs"; Description: "Gtk2Hs libraries for GHC 6.10.1"; Check: UseWithGhcVersion('6.10.1'); Types: full compact custom; Flags: fixed[_^M_][_$_]
+Name: "doc"; Description: "API reference documentation"; Types: full[_^M_][_$_]
+Name: "demo"; Description: "Source files for the Gtk2Hs demo programs"; Types: full[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 34
-Source: "gtk2hs-clibs-0.9.13\*"; DestDir: "{app}"; Components: clibs; Flags: ignoreversion recursesubdirs createallsubdirs;[_^M_][_$_]
-Source: "gtk2hs-0.9.13-ghc-6.8.3\*"; DestDir: "{app}"; Components: gtk2hs; Flags: ignoreversion recursesubdirs createallsubdirs; AfterInstall: AfterPkgInstall;[_^M_][_$_]
-Source: "gtk2hs-demo-0.9.13\*"; DestDir: "{app}\demos"; Components: demos; Flags: ignoreversion recursesubdirs createallsubdirs;[_^M_][_$_]
-Source: "gtk2hs-docs-0.9.13\*"; DestDir: "{app}\docs"; Components: docs; Flags: ignoreversion recursesubdirs createallsubdirs;[_^M_][_$_]
+Source: "gtk2hs-0.10.0-clibs\*"; DestDir: "{app}"; Components: clibs; Flags: ignoreversion recursesubdirs createallsubdirs;[_^M_][_$_]
+Source: "gtk2hs-0.10.0-ghc-6.10.1\*"; DestDir: "{app}"; Components: gtk2hs; Flags: ignoreversion recursesubdirs createallsubdirs; AfterInstall: AfterPkgInstall;[_^M_][_$_]
+Source: "gtk2hs-0.10.0-demo\*"; DestDir: "{app}"; Components: demo; Flags: ignoreversion recursesubdirs createallsubdirs;[_^M_][_$_]
+Source: "gtk2hs-0.10.0-doc\*"; DestDir: "{app}"; Components: doc; Flags: ignoreversion recursesubdirs createallsubdirs;[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 45
-Filename: "{code:ghcpkg}"; Parameters: "update ""{app}\glib.package.conf"""; StatusMsg: "Registering glib package..."; Flags: runhidden[_^M_][_$_]
-Filename: "{code:ghcpkg}"; Parameters: "update ""{app}\cairo.package.conf"""; StatusMsg: "Registering cairo package..."; Flags: runhidden[_^M_][_$_]
-Filename: "{code:ghcpkg}"; Parameters: "update ""{app}\svgcairo.package.conf"""; StatusMsg: "Registering svgcairo package..."; Flags: runhidden[_^M_][_$_]
-Filename: "{code:ghcpkg}"; Parameters: "update ""{app}\gtk.package.conf"""; StatusMsg: "Registering gtk package..."; Flags: runhidden[_^M_][_$_]
-Filename: "{code:ghcpkg}"; Parameters: "update ""{app}\glade.package.conf"""; StatusMsg: "Registering glade package..."; Flags: runhidden[_^M_][_$_]
-Filename: "{code:ghcpkg}"; Parameters: "update ""{app}\soegtk.package.conf"""; StatusMsg: "Registering soegtk package..."; Flags: runhidden[_^M_][_$_]
-Filename: "{code:ghcpkg}"; Parameters: "update ""{app}\gtkglext.package.conf"""; StatusMsg: "Registering gtkglext package..."; Flags: runhidden[_^M_][_$_]
-;Filename: "{code:ghcpkg}"; Parameters: "update ""{app}\sourceview.package.conf"""; StatusMsg: "Registering sourceview package..."; Flags: runhidden[_^M_][_$_]
-Filename: "{code:ghcpkg}"; Parameters: "update ""{app}\gnomevfs.package.conf"""; StatusMsg: "Registering gnomevfs package..."; Flags: runhidden[_^M_][_$_]
-Filename: "{code:ghcpkg}"; Parameters: "update ""{app}\gstreamer.package.conf"""; StatusMsg: "Registering gstreamer package..."; Flags: runhidden[_^M_][_$_]
+Filename: "{code:ghcpkg}"; Parameters: "update ""{app}\lib\gtk2hs\glib.package.conf"""; StatusMsg: "Registering glib package..."; Flags: runhidden[_^M_][_$_]
+Filename: "{code:ghcpkg}"; Parameters: "update ""{app}\lib\gtk2hs\cairo.package.conf"""; StatusMsg: "Registering cairo package..."; Flags: runhidden[_^M_][_$_]
+Filename: "{code:ghcpkg}"; Parameters: "update ""{app}\lib\gtk2hs\svgcairo.package.conf"""; StatusMsg: "Registering svgcairo package..."; Flags: runhidden[_^M_][_$_]
+Filename: "{code:ghcpkg}"; Parameters: "update ""{app}\lib\gtk2hs\gtk.package.conf"""; StatusMsg: "Registering gtk package..."; Flags: runhidden[_^M_][_$_]
+Filename: "{code:ghcpkg}"; Parameters: "update ""{app}\lib\gtk2hs\glade.package.conf"""; StatusMsg: "Registering glade package..."; Flags: runhidden[_^M_][_$_]
+Filename: "{code:ghcpkg}"; Parameters: "update ""{app}\lib\gtk2hs\soegtk.package.conf"""; StatusMsg: "Registering soegtk package..."; Flags: runhidden[_^M_][_$_]
+Filename: "{code:ghcpkg}"; Parameters: "update ""{app}\lib\gtk2hs\gtkglext.package.conf"""; StatusMsg: "Registering gtkglext package..."; Flags: runhidden[_^M_][_$_]
+Filename: "{code:ghcpkg}"; Parameters: "update ""{app}\lib\gtk2hs\gtksourceview2.package.conf"""; StatusMsg: "Registering gtksourceview2 package..."; Flags: runhidden[_^M_][_$_]
+Filename: "{code:ghcpkg}"; Parameters: "update ""{app}\lib\gtk2hs\gio.package.conf"""; StatusMsg: "Registering gio package..."; Flags: runhidden[_^M_][_$_]
+Filename: "{code:ghcpkg}"; Parameters: "update ""{app}\lib\gtk2hs\gstreamer.package.conf"""; StatusMsg: "Registering gstreamer package..."; Flags: runhidden[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 57
-Filename: "{code:ghcpkg}"; Parameters: "unregister gstreamer-0.9.13"; RunOnceId: "gstreamer"; Flags: runhidden[_^M_][_$_]
-Filename: "{code:ghcpkg}"; Parameters: "unregister gnomevfs-0.9.13"; RunOnceId: "gnomevfs"; Flags: runhidden[_^M_][_$_]
-;Filename: "{code:ghcpkg}"; Parameters: "unregister sourceview-0.9.13"; RunOnceId: "gtkglext"; Flags: runhidden[_^M_][_$_]
-Filename: "{code:ghcpkg}"; Parameters: "unregister gtkglext-0.9.13"; RunOnceId: "gtkglext"; Flags: runhidden[_^M_][_$_]
-Filename: "{code:ghcpkg}"; Parameters: "unregister soegtk-0.9.13"; RunOnceId: "soegtk"; Flags: runhidden[_^M_][_$_]
-Filename: "{code:ghcpkg}"; Parameters: "unregister glade-0.9.13"; RunOnceId: "glade"; Flags: runhidden[_^M_][_$_]
-Filename: "{code:ghcpkg}"; Parameters: "unregister gtk-0.9.13"; RunOnceId: "gtk"; Flags: runhidden[_^M_][_$_]
-Filename: "{code:ghcpkg}"; Parameters: "unregister svgcairo-0.9.13"; RunOnceId: "svgcairo"; Flags: runhidden[_^M_][_$_]
-Filename: "{code:ghcpkg}"; Parameters: "unregister cairo-0.9.13"; RunOnceId: "cairo"; Flags: runhidden[_^M_][_$_]
-Filename: "{code:ghcpkg}"; Parameters: "unregister glib-0.9.13"; RunOnceId: "glib"; Flags: runhidden[_^M_][_$_]
+Filename: "{code:ghcpkg}"; Parameters: "unregister gstreamer-0.10.0"; RunOnceId: "gstreamer"; Flags: runhidden[_^M_][_$_]
+Filename: "{code:ghcpkg}"; Parameters: "unregister gio-0.10.0"; RunOnceId: "gio"; Flags: runhidden[_^M_][_$_]
+Filename: "{code:ghcpkg}"; Parameters: "unregister gtksourceview2-0.10.0"; RunOnceId: "gtkglext"; Flags: runhidden[_^M_][_$_]
+Filename: "{code:ghcpkg}"; Parameters: "unregister gtkglext-0.10.0"; RunOnceId: "gtkglext"; Flags: runhidden[_^M_][_$_]
+Filename: "{code:ghcpkg}"; Parameters: "unregister soegtk-0.10.0"; RunOnceId: "soegtk"; Flags: runhidden[_^M_][_$_]
+Filename: "{code:ghcpkg}"; Parameters: "unregister glade-0.10.0"; RunOnceId: "glade"; Flags: runhidden[_^M_][_$_]
+Filename: "{code:ghcpkg}"; Parameters: "unregister gtk-0.10.0"; RunOnceId: "gtk"; Flags: runhidden[_^M_][_$_]
+Filename: "{code:ghcpkg}"; Parameters: "unregister svgcairo-0.10.0"; RunOnceId: "svgcairo"; Flags: runhidden[_^M_][_$_]
+Filename: "{code:ghcpkg}"; Parameters: "unregister cairo-0.10.0"; RunOnceId: "cairo"; Flags: runhidden[_^M_][_$_]
+Filename: "{code:ghcpkg}"; Parameters: "unregister glib-0.10.0"; RunOnceId: "glib"; Flags: runhidden[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 143
- Result := (Version = '6.8.3');[_^M_][_$_]
+ Result := (Version = '6.10.1');[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 179
- RegQueryStringValue(HKEY_CURRENT_USER, 'Software\Haskell\GHC\ghc-6.8.3', 'InstallDir', GhcInstallDir);[_^M_][_$_]
+ RegQueryStringValue(HKEY_CURRENT_USER, 'Software\Haskell\GHC\ghc-6.10.1', 'InstallDir', GhcInstallDir);[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 186
- RegQueryStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\Haskell\GHC\ghc-6.8.3', 'InstallDir', GhcInstallDir);[_^M_][_$_]
+ RegQueryStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\Haskell\GHC\ghc-6.10.1', 'InstallDir', GhcInstallDir);[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 195
- InstallationErrorMessage := 'This version of Gtk2Hs requires GHC version 6.8.3.' #13#10 #13#10[_^M_][_$_]
+ InstallationErrorMessage := 'This version of Gtk2Hs requires GHC version 6.10.1.' #13#10 #13#10[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 203
- InstallationErrorMessage := 'GHC does not appear to be installed correctly, try reinstalling GHC version 6.8.3' #13#10 #13#10[_^M_][_$_]
+ InstallationErrorMessage := 'GHC does not appear to be installed correctly, try reinstalling GHC version 6.10.1' #13#10 #13#10[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 211
- InstallationErrorMessage := 'GHC does not appear to be installed (or the installation is corrupted), please install GHC version 6.8.3';[_^M_][_$_]
+ InstallationErrorMessage := 'GHC does not appear to be installed (or the installation is corrupted), please install GHC version 6.10.1';[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 217
- InstallationErrorMessage := 'Gtk2Hs requires GHC to be installed first, please install GHC version 6.8.3' #13#10 #13#10[_^M_][_$_]
+ InstallationErrorMessage := 'Gtk2Hs requires GHC to be installed first, please install GHC version 6.10.1' #13#10 #13#10[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 270
+ 'charset.dll',[_^M_][_$_]
+ 'gconftool-2.exe',[_^M_][_$_]
+ 'gdk-pixbuf-csource.exe',[_^M_][_$_]
+ 'gdk-pixbuf-query-loaders.exe',[_^M_][_$_]
+ 'glib-genmarshal.exe',[_^M_][_$_]
+ 'gobject-query.exe',[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 280
- 'charset.dll',[_^M_][_$_]
+ 'gtk-demo.exe',[_^M_][_$_]
+ 'gtk-query-immodules-2.0.exe',[_^M_][_$_]
+ 'gtk-update-icon-cache.exe',[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 285
+ 'ior-decode-2.exe',[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 287
- 'libORBit-2-0.dll',[_^M_][_$_]
- 'libORBit-imodule-2-0.dll',[_^M_][_$_]
- 'libORBitCosNaming-2-0.dll',[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 289
+ 'libgailutil-18.dll',[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 292
- 'libgdk_pixbuf-2.0-0.dll',[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 293
+ 'libgdk_pixbuf-2.0-0.dll',[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 298
- 'libgnomevfs-2-0.dll',[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 319
+ 'libgtksourceview-2.0-0.dll',[_^M_][_$_]
+ 'libORBit-2-0.dll',[_^M_][_$_]
+ 'libORBit-imodule-2-0.dll',[_^M_][_$_]
+ 'libORBitCosNaming-2-0.dll',[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 331
- 'zlib1.dll'[_^M_][_$_]
+ 'orbit-idl-2.exe',[_^M_][_$_]
+ 'pkg-config.exe',[_^M_][_$_]
+ 'rsvg-convert.exe',[_^M_][_$_]
+ 'rsvg-view.exe',[_^M_][_$_]
+ 'typelib-dump.exe',[_^M_][_$_]
+ 'zlib1.dll',[_^M_][_$_]
+ 'libgconfbackend-oldxml.dll',[_^M_][_$_]
+ 'libgconfbackend-xml.dll',[_^M_][_$_]
+ 'libgstadder.dll',[_^M_][_$_]
+ 'libgstaudioconvert.dll',[_^M_][_$_]
+ 'libgstaudiorate.dll',[_^M_][_$_]
+ 'libgstaudioresample.dll',[_^M_][_$_]
+ 'libgstaudiotestsrc.dll',[_^M_][_$_]
+ 'libgstcoreelements.dll',[_^M_][_$_]
+ 'libgstdecodebin.dll',[_^M_][_$_]
+ 'libgstdecodebin2.dll',[_^M_][_$_]
+ 'libgstffmpegcolorspace.dll',[_^M_][_$_]
+ 'libgstgdp.dll',[_^M_][_$_]
+ 'libgstogg.dll',[_^M_][_$_]
+ 'libgstplaybin.dll',[_^M_][_$_]
+ 'libgsttheora.dll',[_^M_][_$_]
+ 'libgsttypefindfunctions.dll',[_^M_][_$_]
+ 'libgstvideorate.dll',[_^M_][_$_]
+ 'libgstvideoscale.dll',[_^M_][_$_]
+ 'libgstvideotestsrc.dll',[_^M_][_$_]
+ 'libgstvolume.dll',[_^M_][_$_]
+ 'libgstvorbis.dll',[_^M_][_$_]
+ 'libpixmap.dll',[_^M_][_$_]
+ 'libwimp.dll',[_^M_][_$_]
+ 'libpixbufloader-ani.dll',[_^M_][_$_]
+ 'libpixbufloader-bmp.dll',[_^M_][_$_]
+ 'libpixbufloader-gif.dll',[_^M_][_$_]
+ 'libpixbufloader-icns.dll',[_^M_][_$_]
+ 'libpixbufloader-ico.dll',[_^M_][_$_]
+ 'libpixbufloader-jpeg.dll',[_^M_][_$_]
+ 'libpixbufloader-pcx.dll',[_^M_][_$_]
+ 'libpixbufloader-png.dll',[_^M_][_$_]
+ 'libpixbufloader-pnm.dll',[_^M_][_$_]
+ 'libpixbufloader-ras.dll',[_^M_][_$_]
+ 'libpixbufloader-tga.dll',[_^M_][_$_]
+ 'libpixbufloader-tiff.dll',[_^M_][_$_]
+ 'libpixbufloader-wbmp.dll',[_^M_][_$_]
+ 'libpixbufloader-xbm.dll',[_^M_][_$_]
+ 'libpixbufloader-xpm.dll',[_^M_][_$_]
+ 'libgail.dll',[_^M_][_$_]
+ 'gconfd-2.exe'[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 442
- PackageLibDir := ExpandConstant('{app}');[_^M_][_$_]
+ PackageLibDir := ExpandConstant('{app}') + '\lib\gtk2hs';[_^M_][_$_]
hunk ./tools/win32/prune.sh 2
-
+set -x
hunk ./tools/win32/prune.sh 11
-rm -rf */make/ */share/man/ */man/ */share/gtk-doc/ */share/doc/
+rm -rvf */make/ */share/man/ */man/ */share/gtk-doc/ */share/doc/ */src
hunk ./tools/win32/prune.sh 14
-rm -rf */share/aclocal/
+rm -rvf */share/aclocal/
hunk ./tools/win32/prune.sh 17
-rm -rf *-dev-*/bin/
+rm -rvf *-dev-*/bin/
hunk ./tools/win32/prune.sh 20
-rm -rf */manifest/
+rm -rvf */manifest/
hunk ./tools/win32/prune.sh 23
-rm -rf *-dev-*/lib/*.a *-dev-*/lib/*.def
+rm -rvf *-dev-*/lib/*.a *-dev-*/lib/*.def
hunk ./tools/win32/prune.sh 26
-rm -rf */lib/locale/ */share/locale/
+rm -rvf */lib/locale/ */share/locale/
hunk ./tools/win32/prune.sh 28
+rm -rvf */contrib/
hunk ./tools/win32/prune.sh 33
-pushd gtk+-bundle-${GTK_VERSION}
+pushd gtk+-bundle_${GTK_BUNDLE_VERSION}_win32
hunk ./tools/win32/prune.sh 35
-rm -rf share/gtk-2.0/
-rmdir share/gtk-2.0
-# don't need the glib gettext stuff
-rm -rf share/glib-2.0/
-rmdir share/glib-2.0
-rm bin/pango-querymodules.exe
-rm lib/libz.a lib/zdll.lib
+rm -rvf share/gtk-2.0/demo
+rm -vf bin/pango-querymodules.exe
+rm -vf lib/libz.a lib/zdll.lib
+rm -rvf share/glib-2.0
hunk ./tools/win32/prune.sh 49
-pushd gtkglext-${GTKGLEXT_VERSION}
+pushd gtkglext-${GTKGLEXT_VERSION}-win32
hunk ./tools/win32/unpack.sh 2
-
+set -x
hunk ./tools/win32/unpack.sh 5
+if test -z "$UNZIPPER" ; then
+ UNZIPPER=unzip
+fi
+
hunk ./tools/win32/unpack.sh 16
- unzip -q ../$f
+ $UNZIPPER ../$f
hunk ./tools/win32/versions.conf 1
-GTK2HS_VERSION=0.9.13
-#GLIB_VERSION=2.16.3
-#PANGO_VERSION=1.20.3
-#ATK_VERSION=1.22.0
-#CAIRO_VERSION=1.6.4
-GTK_VERSION=2.12.10
-LIBGLADE_VERSION=2.6.2
+GTK2HS_VERSION=0.10.0
+GTK_BUNDLE_VERSION=2.14.6-20081216
+LIBGLADE_VERSION=2.6.3-1
hunk ./tools/win32/versions.conf 5
-#SOURCEVIEW_VERSION=1.8.5
+GTKSOURCEVIEW2_VERSION=2.4.1
hunk ./tools/win32/versions.conf 7
-#GETTEXT_VERSION=0.14.5
-#LIBPNG_VERSION=1.2.8
-#LIBJPEG_VERSION=6b-4
hunk ./tools/win32/versions.conf 8
-#ZLIB_VERSION=1.2.3
-#PKGCONFIG_VERSION=0.20
hunk ./tools/win32/versions.conf 9
-ORBIT_VERSION=2.14.13
+ORBIT_VERSION=2.14.16-1
hunk ./tools/win32/versions.conf 11
-GNOMEVFS_VERSION=2.22.0
-LIBRSVG_VERSION=2.22.2
+LIBRSVG_VERSION=2.22.3-1
hunk ./tools/win32/win32-build-version.sh 1
-#! /bin/sh[_^M_][_$_]
-[_^M_][_$_]
-. ./win32-build.conf[_^M_][_$_]
-[_^M_][_$_]
-PATH=${BASE_PATH}[_^M_][_$_]
-case $1 in[_^M_][_$_]
- ghc-6.8.3) PATH="${PATH}:${GHC_683_PATH}";;[_^M_][_$_]
- *) echo "GHC version parameter must be ghc-6.8.3"; exit;;[_^M_][_$_]
-esac[_^M_][_$_]
-[_^M_][_$_]
-export PATH="${PATH}:${CLIBS_BASEPATH}/bin"[_^M_][_$_]
-export INCLUDE="${CLIBS_BASEPATH}/include"[_^M_][_$_]
-export LIB="${CLIBS_BASEPATH}/lib"[_^M_][_$_]
-[_^M_][_$_]
-GTK_VERSION=$(pkg-config --modversion gtk+-2.0 | sed 's:\([0-9]*\.[0-9]*\).[0-9]*:\1:')[_^M_][_$_]
-GHC_VERSION=$(ghc --numeric-version)[_^M_][_$_]
-[_^M_][_$_]
-case $3 in[_^M_][_$_]
- env-only) echo ${PATH}; exit;;[_^M_][_$_]
- *);;[_^M_][_$_]
-esac[_^M_][_$_]
-[_^M_][_$_]
-echo "Building Gtk2Hs ${VERSION} with GHC ${GHC_VERSION} and Gtk+ ${GTK_VERSION} ..."[_^M_][_$_]
-[_^M_][_$_]
-VERSION_SUFFIX="ghc-${GHC_VERSION}"[_^M_][_$_]
-VERSIONED_DIR="gtk2hs-${VERSION}-${VERSION_SUFFIX}"[_^M_][_$_]
-BUILD_DIR="build-${VERSIONED_DIR}"[_^M_][_$_]
-[_^M_][_$_]
-CONFIGURE_FLAGS="--enable-packager-mode --enable-split-objs --enable-profiling --enable-docs"[_^M_][_$_]
-ENABLE_PACKAGES="--enable-libglade --enable-opengl --enable-gnomevfs --enable-gstreamer --enable-cairo --enable-svg --enable-gconf"[_^M_][_$_]
-[_^M_][_$_]
-#rm -rf ${BUILD_DIR}[_^M_][_$_]
+#! /bin/sh
+set -x
+. ./win32-build.conf
+
+GTK_VERSION=$(pkg-config --modversion gtk+-2.0 | sed 's:\([0-9]*\.[0-9]*\).[0-9]*:\1:')
+GHC_VERSION=$(ghc --numeric-version)
+
+echo "Building Gtk2Hs ${VERSION} with GHC ${GHC_VERSION} and Gtk+ ${GTK_VERSION} ..."
+
+VERSION_SUFFIX="ghc-${GHC_VERSION}"
+VERSIONED_DIR="gtk2hs-${VERSION}-${VERSION_SUFFIX}"
+BUILD_DIR="build-${VERSIONED_DIR}"
+
+CONFIGURE_FLAGS="--enable-packager-mode --enable-split-objs --enable-profiling --enable-docs"
+ENABLE_PACKAGES="--enable-gtk --enable-libglade --enable-opengl --enable-gio --enable-gstreamer --enable-cairo --enable-svg --enable-gconf --enable-gtksourceview2"
+
+rm -rf ${BUILD_DIR}
hunk ./tools/win32/win32-build-version.sh 19
- mkdir ${BUILD_DIR}[_^M_][_$_]
- cd ${BUILD_DIR}[_^M_][_$_]
- tar -xzf ../gtk2hs-${VERSION}.tar.gz[_^M_][_$_]
+ mkdir ${BUILD_DIR}
+ cd ${BUILD_DIR}
+ tar -xzf ../gtk2hs-${VERSION}.tar.gz
hunk ./tools/win32/win32-build-version.sh 23
- cd ${BUILD_DIR}[_^M_][_$_]
+ cd ${BUILD_DIR}
hunk ./tools/win32/win32-build-version.sh 25
-cd gtk2hs-${VERSION}[_^M_][_$_]
+cd gtk2hs-${VERSION}
+
+PREFIX=/c/gtk2hs/$VERSION
+DESTDIR="${INSTALL_SOURCE_DIR}/destdir-ghc-$GHC_VERSION"
+
hunk ./tools/win32/win32-build-version.sh 31
- ./configure --prefix=/ ${CONFIGURE_FLAGS} ${ENABLE_PACKAGES} ${CONFIGURE_EXTRAFLAGS}[_^M_][_$_]
+ XARGS="/bin/xargs -L128" ./configure --prefix=$PREFIX ${CONFIGURE_FLAGS} ${ENABLE_PACKAGES} ${CONFIGURE_EXTRAFLAGS} || exit 1
hunk ./tools/win32/win32-build-version.sh 33
-make HSTOOLFLAGS=-M256m[_^M_][_$_]
-make install DESTDIR="${INSTALL_SOURCE_DIR}/tmp-${VERSIONED_DIR}"[_^M_][_$_]
-rm -rf ${INSTALL_SOURCE_DIR}/${VERSIONED_DIR}[_^M_][_$_]
-mv ${INSTALL_SOURCE_DIR}/tmp-${VERSIONED_DIR}/lib/gtk2hs ${INSTALL_SOURCE_DIR}/${VERSIONED_DIR}[_^M_][_$_]
-mv ${INSTALL_SOURCE_DIR}/tmp-${VERSIONED_DIR}/share/doc/gtk2hs/html ${INSTALL_SOURCE_DIR}/${VERSIONED_DIR}[_^M_][_$_]
-rmdir ${INSTALL_SOURCE_DIR}/tmp-${VERSIONED_DIR}/lib[_^M_][_$_]
-rmdir ${INSTALL_SOURCE_DIR}/tmp-${VERSIONED_DIR}/share{/doc{/gtk2hs,},}
-rmdir ${INSTALL_SOURCE_DIR}/tmp-${VERSIONED_DIR}[_^M_][_$_]
+
+make HSTOOLFLAGS=-M256m
+make install DESTDIR="$DESTDIR"
+
+rm -rf "$/ghclibs"
+INSTALL_GHC_LIBS_DIR=${INSTALL_SOURCE_DIR}/gtk2hs-${VERSION}-ghc-${GHC_VERSION}
+INSTALL_CLIBS_DIR=${INSTALL_SOURCE_DIR}/gtk2hs-${VERSION}-clibs
+INSTALL_DOC_DIR=${INSTALL_SOURCE_DIR}/gtk2hs-${VERSION}-doc
+INSTALL_DEMO_DIR=${INSTALL_SOURCE_DIR}/gtk2hs-${VERSION}-demo
+mkdir -p ${INSTALL_GHC_LIBS_DIR} || exit 1
+mkdir -p ${INSTALL_CLIBS_DIR} || exit 1
+mkdir -p ${INSTALL_DOC_DIR} || exit 1
+mkdir -p ${INSTALL_DEMO_DIR} || exit 1
+
+cp -av $PREFIX/* ${INSTALL_CLIBS_DIR} || exit 1
+mv -v ${DESTDIR}/${PREFIX}/lib ${INSTALL_GHC_LIBS_DIR} || exit 1
+mkdir -p ${INSTALL_DOC_DIR}/share/doc || exit 1
+mv -v ${DESTDIR}/${PREFIX}/share/doc/gtk2hs/html ${INSTALL_DOC_DIR}/share/doc || exit 1
+mkdir -p ${INSTALL_DEMO_DIR}/share/demo || exit 1
+cp -av ${BUILD_DIR}/gtk2hs-${VERSION}/demo/* ${INSTALL_DEMO_DIR}/share/demo/ || exit 1
+
+rm -rf ${BUILD_DIR}
hunk ./tools/win32/win32-build.conf 2
-VERSION=0.9.13[_^M_][_$_]
+VERSION=0.10.0[_^M_][_$_]
hunk ./tools/win32/win32-build.conf 5
-INSTALL_SOURCE_DIR=/gtk2hs-win32[_^M_][_$_]
+INSTALL_SOURCE_DIR=`pwd`
hunk ./tools/win32/win32-build.conf 9
-# The path that wel will start with (without ghc or gtk on it)[_^M_][_$_]
-# this should be just the initial mingw path[_^M_][_$_]
-BASE_PATH=".:/usr/local/bin:/mingw/bin:/bin:/c/WINDOWS/system32:/c/WINDOWS:/c/WINDOWS/System32/Wbem"[_^M_][_$_]
-[_^M_][_$_]
-# extra path components to tack on for version of GTK[_^M_][_$_]
-# this is the base path under which we find bin, lib and include[_^M_][_$_]
-CLIBS_BASEPATH="/gtk2hs-clibs-dev-${VERSION}-win32"[_^M_][_$_]
-[_^M_][_$_]
-# extra path components to tack on for version of GHC[_^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_][_$_]
-GHC_683_PATH="/c/ghc/ghc-6.8.3/bin"
+PATH=/c/gtk2hs/0.10.0/bin:/c/ghc/ghc-6.10.1/bin:/c/ghc/alex-2.2:/c/ghc/happy-1.17:/c/MinGW/bin:/bin
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X