[gnumeric] [win32] closer to turnkey



commit 8f94cf4bc1ddbe1e41940c5d26bc1e0d3ef18604
Author: Jody Goldberg <jody gnome org>
Date:   Sat May 9 22:41:42 2009 -0400

    [win32] closer to turnkey

 ChangeLog                                          |    5 ++
 configure.in                                       |    5 +-
 doc/C/gnumeric.xml                                 |    1 -
 doc/C/workbooks.xml                                |    1 -
 doc/add_dbhh.pl                                    |   73 ++++++++++++++++++++
 src/.gitignore                                     |    8 ++
 tools/win32/{setup => build.in}                    |    0
 tools/win32/gnumeric.nsi.in                        |   13 ++--
 tools/win32/jhbuildrc-debug                        |    2 +-
 tools/win32/jhbuildrc-release                      |   18 +++--
 tools/win32/moduleset                              |   52 ++++++---------
 ...chefile.patch => glib-win32-cachefile.patch.gz} |    0
 .../patches/gnumeric-pending-win32-fixes.patch     |   39 -----------
 tools/win32/patches/gtk-disable-demo.patch         |   19 +++++
 tools/win32/patches/iconv.patch                    |   32 +++++----
 tools/win32/patches/pxlib-intl.patch               |   19 +++++
 16 files changed, 185 insertions(+), 102 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index c56be1e..ae888dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -588,6 +588,11 @@
 
 	* src/expr.c (gnm_expr_get_range): Handle parenthesis.
 
+2009-05-09  Jody Goldberg <jody gnome org>
+
+	* configure.in : add $ac_exeext when checking for executables so that
+	  wine can be used when cross compiling.
+
 2009-05-07  Andreas J. Guelzow <aguelzow pyrshep ca>
 
 	* src/gnm-so-filled.c (gnm_so_filled_write_xml_sax): write
diff --git a/configure.in b/configure.in
index 2c9f826..1232224 100644
--- a/configure.in
+++ b/configure.in
@@ -340,10 +340,10 @@ dnl prep the pixmap generator
 dnl ****************************
 
 AC_ARG_VAR(GLIB_GENMARSHAL, [The glib-genmarshal executable.])
-AC_CHECK_PROG(GLIB_GENMARSHAL, glib-genmarshal, glib-genmarshal)
+AC_CHECK_PROG(GLIB_GENMARSHAL, glib-genmarshal$ac_exeext, glib-genmarshal$ac_exeext)
 
 AC_ARG_VAR(GDK_PIXBUF_CSOURCE, [The gdk-pixbuf-csource executable.])
-AC_CHECK_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, gdk-pixbuf-csource)
+AC_CHECK_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource$ac_exeext, gdk-pixbuf-csource$ac_exeext)
 
 ## this should come after `AC_PROG_CC'
 ifdef([GNOME_COMPILE_WARNINGS],
@@ -1089,6 +1089,7 @@ templates/autoformat/Makefile
 test/Makefile
 tools/Makefile
 tools/win32/gnumeric.nsi
+tools/win32/build
 component/Makefile
 ])
 
diff --git a/doc/C/gnumeric.xml b/doc/C/gnumeric.xml
index ea2f60e..7eac341 100644
--- a/doc/C/gnumeric.xml
+++ b/doc/C/gnumeric.xml
@@ -890,4 +890,3 @@
 
 
 </book>
-<?dbhh topicname="BARF" topicid="4200"?>
diff --git a/doc/C/workbooks.xml b/doc/C/workbooks.xml
index 654dc01..897443b 100644
--- a/doc/C/workbooks.xml
+++ b/doc/C/workbooks.xml
@@ -125,7 +125,6 @@
 
 
 <sect1 id="sect-workbooks-names">
-  <?dbhh topicname="FOOBAR" topicid="4242"?>
   <title>Document Named Elements</title>
 
   <para>
diff --git a/doc/add_dbhh.pl b/doc/add_dbhh.pl
new file mode 100755
index 0000000..0e7eed1
--- /dev/null
+++ b/doc/add_dbhh.pl
@@ -0,0 +1,73 @@
+#!/usr/bin/perl
+use strict;
+use warnings;
+
+use Data::Dumper;
+use HTML::Parser ();
+use HTML::Entities ();
+
+use Getopt::Long;
+
+my $indent = 2;
+my $out_dir = 'output';
+
+binmode(STDOUT, ":utf8");
+
+GetOptions(
+    'indent=s'  => \$indent,
+    'out-dir=s' => \$out_dir,
+);
+
+my @list;
+
+sub start {
+    my ($tagname, $attr, $offset_end, $column) = @_;
+
+    if ($tagname =~ /\Asect[0-9]\Z/i) {
+        my %attr;
+
+        while (my ($k, $v) = each %$attr) {
+            $attr{lc($k)} = $v;
+        }
+
+        push @list, [$offset_end, $column, $attr{id}];
+    }
+}
+
+my $id = 10;
+
+mkdir $out_dir;
+
+foreach my $file (<*.xml>) {
+    open FH, "<:utf8", $file;
+    my $xml = do { local $/; <FH>; };
+    close FH;
+
+    @list = ();
+
+    my $p = HTML::Parser->new(
+        api_version => 3,
+        start_h => [\&start, "tagname, attr, offset_end, column"],
+        marked_sections => 1,
+    );
+
+    $p->parse($xml);
+
+    my $last = 0;
+
+    open FH, '>:utf8', "$out_dir/$file";
+
+    foreach my $sect (@list) {
+        my ($offset, $column, $name) = @$sect;
+        print FH substr($xml, $last, ($offset - $last));
+        print FH "\n" . (' ' x ($column + $indent)) . "<?dbhh topicname=\"$name\" topicid=\"$id\"?>\n";
+        $last = $offset;
+        ++$id;
+    }
+
+    print FH substr($xml, $last);
+
+    close FH;
+}
+
+# vi: set autoindent shiftwidth=4 tabstop=8 softtabstop=4 expandtab:
diff --git a/src/.gitignore b/src/.gitignore
index 7bba9aa..2d16927 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -15,9 +15,17 @@ gnm-marshalers.c
 gnm-marshalers.h
 gnumeric-paths.h
 ssconvert
+ssconvert.exe
 ssindex
+ssindex.exe
 ssgrep
+ssgrep.exe
 sstest
+sstest.exe
 test-pango
+test-pango.exe
 GNOME_Gnumeric-gtk.xml
 HILDON_Gnumeric-gtk.xml
+libspreadsheet.def
+local.def
+stamp-local.def
diff --git a/tools/win32/setup b/tools/win32/build.in
similarity index 100%
rename from tools/win32/setup
rename to tools/win32/build.in
diff --git a/tools/win32/gnumeric.nsi.in b/tools/win32/gnumeric.nsi.in
index b484851..96e5005 100644
--- a/tools/win32/gnumeric.nsi.in
+++ b/tools/win32/gnumeric.nsi.in
@@ -8,7 +8,7 @@ SetCompressor /SOLID lzma
 !define GNM_LONGNAME		"Gnumeric Spreadsheet"
 !define GNM_APPNAME		"Gnumeric Spreadsheet"
 !define GNM_VERSION		"@VERSION@"
-!define GNM_VERSION_TAG		"20081126-debug"
+!define GNM_VERSION_TAG		"20090507-debug"
 !define GNM_VERSION_FULL	"${GNM_VERSION}-${GNM_VERSION_TAG}"
 !define GNM_UNINST_KEY		"Software\Microsoft\Windows\CurrentVersion\Uninstall\${GNM_NAME}"
 !define GNM_STARTMENU_REG_VAL	"NSIS:StartMenuDir"
@@ -17,8 +17,8 @@ SetCompressor /SOLID lzma
 
 !define GOFFICE_VERSION		"@GOFFICE_VERSION@"
 
-!define GTK_VERSION		"2.14"
-!define GTK_VENDORRC		"6"
+!define GTK_VERSION		"2.16"
+!define GTK_VENDORRC		"1"
 !define GTK_VENDORVERSION	"${GTK_VERSION}.${GTK_VENDORRC}"
 
 ; MUI 1.67 compatible ------
@@ -105,7 +105,8 @@ Section "Gnumeric (required)" SEC01
     File /r "share\goffice"
     File /r /x C "share\gnumeric"
     File /r "share\libthai"
-    File /r /x "gtk-doc" "share\libgda-3.0"
+    File /r "share\libgda-4.0"
+    File /r "share\libgda-4.1"
     ;File /r /x "demo" "share\gnome-db-3.0"
     File /r "share\pixmaps"
 
@@ -133,7 +134,7 @@ Section "Gnumeric (required)" SEC01
     WriteRegStr HKCR "GNOME.Gnumeric"			"" "Gnumeric Spreadsheet"
     WriteRegStr HKCR "GNOME.Gnumeric\shell"		"" "Open"
     WriteRegStr HKCR "GNOME.Gnumeric\DefaultIcon"		"" "${GNM_ROOT}\bin\gnumeric.exe,0"
-    WriteRegStr HKCR "GNOME.Gnumeric\shell\Open\command"	"" '${GNM_ROOT}\bin\gnumeric.exe "%1"'
+    WriteRegStr HKCR "GNOME.Gnumeric\shell\Open\command"	"" '"${GNM_ROOT}\bin\gnumeric.exe" "%1"'
 SectionEnd
 
 #############################################################################
@@ -296,7 +297,7 @@ SectionGroup "Translations"
     !insertmacro Locale "ru"
     !insertmacro Locale "sk"
     !insertmacro Locale "sr"
-    !insertmacro Locale "sr Latn"
+    !insertmacro Locale "sr latin"
     !insertmacro Locale "sv"
     !insertmacro Locale "tr"
     !insertmacro Locale "uk"
diff --git a/tools/win32/jhbuildrc-debug b/tools/win32/jhbuildrc-debug
index 1e07888..b0978e3 100644
--- a/tools/win32/jhbuildrc-debug
+++ b/tools/win32/jhbuildrc-debug
@@ -130,5 +130,5 @@ module_autogenargs['libglade']	= autogenargs
 module_autogenargs['pygobject']	= autogenargs
 module_autogenargs['libgsf']	= autogenargs + """ --without-gnome-vfs --without-bonobo"""
 module_autogenargs['goffice']	= autogenargs + """ --without-gconf --with-gmathml"""
-module_autogenargs['gnumeric']	= autogenargs
+module_autogenargs['gnumeric']	= autogenargs + """ --disable-component"""
 module_autogenargs['evince']	= autogenargs + """ --without-keyring"""
diff --git a/tools/win32/jhbuildrc-release b/tools/win32/jhbuildrc-release
index 50f1d13..1194fe5 100644
--- a/tools/win32/jhbuildrc-release
+++ b/tools/win32/jhbuildrc-release
@@ -9,7 +9,7 @@
 
 #moduleset = 'http://osl.ulpgc.es/~arc/gnome/gtk/gtk+-win32.moduleset'
 moduleset = '/gnome/src/gnumeric/tools/win32/moduleset'
-modules = ['gnumeric']
+modules = ['gnumeric', 'evince']
 
 # checkoutroot: path to download packages elsewhere
 # prefix:       target path to install the compiled binaries
@@ -56,7 +56,7 @@ os.environ['INSTALL']	 = os.path.expanduser('~/bin/install-check')
 os.environ['ACLOCAL_AMFLAGS'] = ' -I '+prefix+'/share/aclocal'	# for libgnomedb
 
 os.environ['WINEDEBUG']	 = '-all'
-os.environ['MAKE']	 = 'colormake'
+#os.environ['MAKE']	 = 'colormake'
 
 py_prefix = prefix+'/Python25'
 os.environ['PYTHON']	 = py_prefix+'/python.exe'
@@ -91,13 +91,15 @@ module_autogenargs['gettext'] = autogenargs + """ --without-emacs \
 
 #module_autogenargs['jpeg']   = ' --enable-shared' + ' --disable-static' + ' --prefix='+prefix 
 
-module_autogenargs['glib'] =    autogenargs + """ --enable-explicit-deps=no \
+module_autogenargs['glib']	=    autogenargs + """ --enable-explicit-deps=no \
                                                   --cache-file=win32.cache \
                                                   --disable-gtk-doc"""
+module_autogenargs['freetype']  = autogenargs
+module_autogenargs['fontconfig']= autogenargs + """ --with-arch=x86"""
 module_autogenargs['pango']	= autogenargs + """ --disable-gtk-doc \
-						  --disable-ft	\
                                                   --enable-explicit-deps=no \
                                                   --with-included-modules"""
+#						  --disable-ft
 module_autogenargs['pixman']	= autogenargs + """ --enable-explicit-deps=no \
                                                   --enable-xlib=no \
                                                   --enable-xlib-xrender=no \
@@ -106,9 +108,10 @@ module_autogenargs['cairo']	= autogenargs + """ --enable-explicit-deps=no \
                                                   --enable-xlib=no \
                                                   --enable-xlib-xrender=no \
                                                   --enable-win32-font=yes \
-						  --enable-ft=no \
+						  --enable-ft=yes \
 						  --disable-static \
 						  --enable-shared"""
+#						  --enable-ft=no
 
 module_autogenargs['libxml2']	= autogenargs + """ --disable-scrollkeeper --without-iconv"""
 
@@ -117,7 +120,7 @@ autogenargs += """ --disable-scrollkeeper --disable-gtk-doc"""
 module_autogenargs['atk']	= autogenargs + """ --disable-glibtest"""
 module_autogenargs['gtk+']	= autogenargs + """ --disable-glibtest --without-libjasper"""
 
-module_autogenargs['libgda']	= autogenargs + """ --without-odbc --without-lda"""
+module_autogenargs['libgda']	= autogenargs + """ --without-odbc --without-lda --without-java"""
 module_autogenargs['pxlib']	= autogenargs + """ --with-gsf=""" + prefix
 module_autogenargs['psiconv']	= autogenargs + """ --disable-xhtml-docs \
 						    --disable-html4-docs \
@@ -127,4 +130,5 @@ module_autogenargs['libglade']	= autogenargs
 module_autogenargs['pygobject']	= autogenargs
 module_autogenargs['libgsf']	= autogenargs + """ --without-gnome-vfs --without-bonobo"""
 module_autogenargs['goffice']	= autogenargs + """ --without-gconf --with-gmathml"""
-module_autogenargs['gnumeric']	= autogenargs
+module_autogenargs['gnumeric']	= autogenargs + """ --disable-component"""
+module_autogenargs['evince']	= autogenargs + """ --without-keyring"""
diff --git a/tools/win32/moduleset b/tools/win32/moduleset
index f0448fb..fb63db1 100644
--- a/tools/win32/moduleset
+++ b/tools/win32/moduleset
@@ -11,7 +11,7 @@
     <repository type="tarball" name="zlib.net"
 		href="http://www.zlib.net"/>
     <repository type="tarball" name="savannah"
-		href="http://savannah.nongnu.org/download"/>
+		href="http://savannah.nongnu.org/download/"/>
 
     <repository type="git" name="freedesktop.org"
 		href="git://cgit.freedesktop.org/git"/>
@@ -34,8 +34,6 @@
 
     <tarball id="pcre" version="7.8">
 	<source href="http://downloads.sourceforge.net/pcre/pcre-7.8.tar.bz2"/>
-	<patches>
-	</patches>
     </tarball>
     <autotools id="gtk-doc">
 	<branch module="gtk-doc" checkoutdir="gtk-doc"/>
@@ -44,32 +42,19 @@
 	</dependencies>
     </autotools>
 
-<!--
-		- APPLY MANUALLY -
     <autotools id="glib">
-	<branch>
+	<branch repo="gnome.org" module="sources/glib/2.20/glib-2.20.1.tar.bz2" version="2.20.1">
 	    <patches>
-		<patch file="http://www.gnome.org/~aruiz/gtk+/patches/glib_win32_cachefile.patch.gz"/>
+		<patch file="&patch_dir;glib-win32-cachefile.patch.gz"/>
 		<patch file="&patch_dir;glib-goption-disable-localization.patch"/>
 	    </patches>
 	</branch>
 	<dependencies>
 	    <dep package="gettext"/>
-	    <dep package="gtk-doc"/>
 	    <dep package="iconv"/>
+<!--	    <dep package="gtk-doc"/> -->
 	</dependencies>
     </autotools>
--->
-    <tarball id="glib" version="2.20.1">
-	<source href="http://download.gnome.org/sources/glib/2.18/glib-2.20.1.tar.bz2"; />
-	<patches>
-		<patch file="http://www.gnome.org/~aruiz/gtk+/patches/glib_win32_cachefile.patch"/>
-		<patch file="&patch_dir;glib-goption-disable-localization.patch"/>
-	</patches>
-	<dependencies>
-	    <dep package="gettext"/>
-	</dependencies>
-    </tarball>
 
 <!-- Compression -->
     <autotools id="zlib"
@@ -96,8 +81,8 @@
 	    <patch file="http://gnome.org/~aruiz/gtk+/patches/jpeg_mingwport.patch"; strip="1"/>
 	</patches>
     </tarball>
-    <tarball id="png" version="1.2.35">
-	<source href="ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.2.35.tar.bz2"/>
+    <tarball id="png" version="1.2.36">
+	<source href="ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.2.36.tar.bz2"/>
 	<dependencies>
 	    <dep package="zlib"/>
 	</dependencies>
@@ -135,6 +120,9 @@
 
     <tarball id="iconv" version="1.13">
 	<source href="http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.13.tar.gz"/>
+	<patches>
+	    <patch file="&patch_dir;iconv.patch"/>
+	</patches>
     </tarball>
     <autotools id="libdatrie">
 	<branch repo="debian"
@@ -152,7 +140,7 @@
 	    <dep package="libdatrie"/>
 	</dependencies>
 	<patches>
-	    <!-- <patch file="&patch_dir;libthai.patch"/> -->
+	    <patch file="&patch_dir;libthai.patch"/>
 	</patches>
     </autotools>
 
@@ -164,7 +152,7 @@
 
     <autotools id="freetype"
 	autogen-sh="configure"  skip-autogen="never">
-	<branch repo="savannah" module="freetype/freetype-2.3.7.tar.bz2" version="2.3.7"/>
+	<branch repo="savannah" module="freetype/freetype-2.3.9.tar.bz2" version="2.3.9"/>
 	<dependencies>
 	</dependencies>
     </autotools>
@@ -224,6 +212,7 @@
     <autotools id="gtk+">
 	<branch repo="gnome.org" module="sources/gtk+/2.16/gtk+-2.16.1.tar.bz2"
 		version="2.16.1">
+	    <patch file="&patch_dir;gtk-disable-demo.patch"/>
 	</branch>
 	<dependencies>
 	    <dep package="glib"/>
@@ -288,13 +277,18 @@
 	<patches>
 	</patches>
     </tarball>
-    <tarball id="psiconv" version="0.9.8">
+    <autotools id="psiconv">
+	<branch repo="debian"
+		module="p/psiconv/psiconv_0.9.8.orig.gz"
+		version="0.9.8" checkoutdir="psiconv-0.9.8"/>
+<!-- 
 	<source href="http://software.frodo.looijaard.name/psiconv/files/psiconv-0.9.8.tar.gz";
 		md5sum="8d7548e3c6b9cd408544736133728acd"/>
+-->
 	<patches>
 	    <patch file="&patch_dir;psiconv.patch"/>
 	</patches>
-    </tarball>
+    </autotools>
 
 <!-- print preview -->
   <tarball id="poppler" version="0.10.5">
@@ -347,8 +341,6 @@
 	<dependencies>
 	    <dep package="gtk+"/>
 	</dependencies>
-	<patches>
-	</patches>
     </autotools>
 
     <autotools id="goffice">
@@ -362,13 +354,9 @@
 	    <dep package="libglade"/>
 	    <dep package="gmathml"/>
 	</dependencies>
-	<patches>
-	</patches>
     </autotools>
     <autotools id="gnumeric">
-	<branch>
-	    <patch file="&patch_dir;gnumeric-pending-win32-fixes.patch"/>
-	</branch>
+	<branch/>
 	<dependencies>
 	    <dep package="goffice"/>
 	</dependencies>
diff --git a/tools/win32/patches/glib_win32_cachefile.patch b/tools/win32/patches/glib-win32-cachefile.patch.gz
similarity index 100%
rename from tools/win32/patches/glib_win32_cachefile.patch
rename to tools/win32/patches/glib-win32-cachefile.patch.gz
diff --git a/tools/win32/patches/gtk-disable-demo.patch b/tools/win32/patches/gtk-disable-demo.patch
new file mode 100644
index 0000000..1c227aa
--- /dev/null
+++ b/tools/win32/patches/gtk-disable-demo.patch
@@ -0,0 +1,19 @@
+*** Makefile.am.orig	2009-04-11 17:33:04.000000000 -0400
+--- Makefile.am	2009-05-08 19:45:46.000000000 -0400
+***************
+*** 1,7 ****
+  ## Makefile.am for GTK+
+  include $(top_srcdir)/Makefile.decl
+  
+! SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
+  SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
+  
+  # require automake 1.4
+--- 1,7 ----
+  ## Makefile.am for GTK+
+  include $(top_srcdir)/Makefile.decl
+  
+! SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib
+  SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
+  
+  # require automake 1.4
diff --git a/tools/win32/patches/iconv.patch b/tools/win32/patches/iconv.patch
index 34a6b8c..880348b 100644
--- a/tools/win32/patches/iconv.patch
+++ b/tools/win32/patches/iconv.patch
@@ -1,13 +1,19 @@
---- Makefile.in	2005-06-09 15:04:35.000000000 -0400
-+++ Makefile.in	2007-08-03 14:23:31.000000000 -0400
-@@ -32,8 +32,8 @@
- 	cd lib && $(MAKE) all
- 	cd srclib && $(MAKE) all
- 	cd src && $(MAKE) all
--	cd po && $(MAKE) all
--	cd man && $(MAKE) all
-+#	cd po && $(MAKE) all
-+#	cd man && $(MAKE) all
- 	if test -d tests; then cd tests && $(MAKE) all; fi
- 
- lib/localcharset.h :
+*** lib/Makefile.in	2009-03-25 22:14:26.000000000 -0400
+--- lib/Makefile.in	2009-05-08 19:26:26.000000000 -0400
+***************
+*** 31,37 ****
+  LIBTOOL_INSTALL = $(LIBTOOL) --mode=install
+  LIBTOOL_UNINSTALL = $(LIBTOOL) --mode=uninstall
+  # Windows resource compiler (windres). Used via libtool.
+! RC = @RC@
+  CP = cp
+  MV = mv
+  LN = @LN@
+--- 31,37 ----
+  LIBTOOL_INSTALL = $(LIBTOOL) --mode=install
+  LIBTOOL_UNINSTALL = $(LIBTOOL) --mode=uninstall
+  # Windows resource compiler (windres). Used via libtool.
+! RC = i586-mingw32msvc-windres
+  CP = cp
+  MV = mv
+  LN = @LN@
diff --git a/tools/win32/patches/pxlib-intl.patch b/tools/win32/patches/pxlib-intl.patch
new file mode 100644
index 0000000..62b4a8a
--- /dev/null
+++ b/tools/win32/patches/pxlib-intl.patch
@@ -0,0 +1,19 @@
+*** src/Makefile.in.orig	2007-10-01 03:26:59.000000000 -0400
+--- src/Makefile.in	2009-05-08 21:56:16.000000000 -0400
+***************
+*** 273,279 ****
+  		px_crypt.c \
+  		gregor.c
+  
+! libpx_la_LIBADD = @RECODE_LIBS@ @GSF_LIBS@
+  BUILD_LIBS = -lm
+  all: all-am
+  
+--- 273,279 ----
+  		px_crypt.c \
+  		gregor.c
+  
+! libpx_la_LIBADD = @RECODE_LIBS@ @GSF_LIBS@ -lintl -liconv
+  BUILD_LIBS = -lm
+  all: all-am
+  



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]