GNOME.org
 

[gnumeric] [win32] fix use of expr-entry from glade

commit 3a1e4702dfe8f72492a01d5fbad639d5f841b419
Author: Jody Goldberg <jody gnome org>
Date:   Tue Dec 29 13:25:33 2009 -0500

    [win32] fix use of expr-entry from glade
    
        - export gnumeric-expr-entry header for win32
        - functional wine install of html help workshop
        - start on gcrypt for xslt for gda

 NEWS                              |    3 ++
 src/Makefile.am                   |    2 +-
 src/widgets/gnumeric-expr-entry.h |    1 -
 tools/win32/Makefile.am           |   16 +++-------
 tools/win32/build                 |   57 ++++++++++++++++++++++++++++++------
 tools/win32/htmlhelp.reg          |   12 ++++++++
 tools/win32/jhbuildrc.py          |   12 ++++---
 tools/win32/moduleset.in          |   43 ++++++++++++++++++----------
 8 files changed, 103 insertions(+), 43 deletions(-)
---
diff --git a/NEWS b/NEWS
index 0d5ecf1..1ede463 100644
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,9 @@ Jean
 	* Force sharing of first series in line plots when requested. [#605330]
 	* Fixed mouse cursor for object resizing in RTL mode. [#605514]
 
+Jody:
+	* Fix use of ExprEntry from glade on win32.
+
 --------------------------------------------------------------------------
 Gnumeric 1.9.17
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 6580408..55b8934 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -376,7 +376,7 @@ local.def: stamp-local.def
 	@true
 
 stamp-local.def: $(libspreadsheet_include_HEADERS) Makefile $(top_srcdir)/tools/dumpdef.pl
-	hdrs='$(libspreadsheet_include_HEADERS) dialogs/dialogs.h dialogs/tool-dialogs.h tools/goal-seek.h tools/analysis-tools.h tools/gnm-solver.h'; \
+	hdrs='$(libspreadsheet_include_HEADERS) dialogs/dialogs.h dialogs/tool-dialogs.h tools/goal-seek.h tools/analysis-tools.h tools/gnm-solver.h widgets/gnumeric-expr-entry.h'; \
 	hdrs_list=''; \
 	for hdr in $$hdrs; do \
 	  if test -f $(srcdir)/$$hdr; then \
diff --git a/src/widgets/gnumeric-expr-entry.h b/src/widgets/gnumeric-expr-entry.h
index 1f42dfd..3edcdb1 100644
--- a/src/widgets/gnumeric-expr-entry.h
+++ b/src/widgets/gnumeric-expr-entry.h
@@ -43,7 +43,6 @@ GtkEntry *gnm_expr_entry_get_entry	(GnmExprEntry *gee);
 gboolean  gnm_expr_entry_get_rangesel	(GnmExprEntry const *gee,
 					 GnmRange *r, Sheet **sheet);
 void	  gnm_expr_entry_find_range	(GnmExprEntry *gee);
-void	  gnm_expr_entry_rangesel_start	(GnmExprEntry *gee);
 void	  gnm_expr_entry_rangesel_stop	(GnmExprEntry *gee,
 					 gboolean clear_string);
 
diff --git a/tools/win32/Makefile.am b/tools/win32/Makefile.am
index dad6c68..9bf677c 100755
--- a/tools/win32/Makefile.am
+++ b/tools/win32/Makefile.am
@@ -1,23 +1,17 @@
-export start module
+export start module target
 
-all: moduleset gnumeric.nsi
+all: debug
 
-debug:: moduleset
+debug:: moduleset gnumeric.nsi
 	$(abs_srcdir)/build $(abs_builddir) $(abs_srcdir) debug
 
-release:: moduleset
+release:: moduleset gnumeric.nsi
 	$(abs_srcdir)/build $(abs_builddir) $(abs_srcdir) release
 
-debug_shell:: moduleset
-	$(abs_srcdir)/build $(abs_builddir) $(abs_srcdir) debug shell
-
-release_shell:: moduleset
-	$(abs_srcdir)/build $(abs_builddir) $(abs_srcdir) release shell
-
 clean:
 	rm -rf debug release
 
 EXTRA_DIST = gnumeric.nsi.in gtkrc moduleset.in \
 	build jhbuildrc.py
 
-.PHONY : debug release debug_shell release_shell
+.PHONY : debug release all clean
diff --git a/tools/win32/build b/tools/win32/build
index 72a2bca..32b73ab 100755
--- a/tools/win32/build
+++ b/tools/win32/build
@@ -7,19 +7,19 @@ py_pkg_ver=2.6.4
 ###################################################
 builddir="$1"
 srcdir="$2"
-target="$3"
+build="$3"
 
-if [ -z "${builddir}" -o -z "${srcdir}" -o -z "${target}" ]; then
-    echo "usage  : $0 <builddir> <srcdir> <target>"
+if [ -z "${builddir}" -o -z "${srcdir}" -o -z "${build}" ]; then
+    echo "usage  : $0 <builddir> <srcdir> <build>"
     exit 1
 fi
 
 export WINEPREFIX="${builddir}/wine"
 WINEDIR="${WINEPREFIX}/drive_c"
 archive_dir="${builddir}/archive"
-export JH_PREFIX="${builddir}/${target}"
+export JH_PREFIX="${builddir}/${build}"
 export JH_MODULE_SET="${srcdir}/moduleset"
-export JH_TARGET="${target}"
+export JH_BUILD="${build}"
 
 build_mkdir() {
      if [ ! -d "$1" ]; then
@@ -34,20 +34,45 @@ build_ls_s() {
     fi
 }
 
+download() {
+	cd "${archive_dir}"
+	echo wget -N $*
+	wget -N $*
+}
+
+# From : http://code.google.com/p/htmlhelp/wiki/HHW4Wine
+setup_html_help() {
+    cd "${archive_dir}"
+
+    wine htmlhelp.exe
+    wine regedit "${builddir}/htmlhelp.reg"
+
+    # Install ITSS.DLL
+    cabextract -F hhupd.exe htmlhelp.exe
+    cabextract -F itircl.dll hhupd.exe
+    cabextract -F itss.dll hhupd.exe
+
+    cp -a itircl.dll "$WINEPREFIX/drive_c/windows/system32/"
+    cp -a itss.dll   "$WINEPREFIX/drive_c/windows/system32/"
+    wine regsvr32 /s 'C:\WINDOWS\SYSTEM32\itircl.dll'
+    wine regsvr32 /s 'C:\WINDOWS\SYSTEM32\itss.dll'
+}
+
 # Setup up the JH_PREFIX/deploy
     build_mkdir "${JH_PREFIX}/deploy" ; cd "${JH_PREFIX}/deploy"
     build_mkdir "bin"
     build_mkdir "lib"
+    build_mkdir "include"
     build_mkdir "etc/gtk-2.0"
     install "${srcdir}/gtkrc" "etc/gtk-2.0"
 
+    build_mkdir "${archive_dir}"
+
 # Setup Python
     py_pkg="${archive_dir}/python-${py_pkg_ver}.msi"
-    build_mkdir "${archive_dir}"
 
     if [ ! -f "$py_pkg" ]; then
-	echo wget "http://www.python.org/ftp/python/${py_pkg_ver}/python-${py_pkg_ver}.msi";
-	( cd "${archive_dir}" ; wget "http://www.python.org/ftp/python/${py_pkg_ver}/python-${py_pkg_ver}.msi"; )
+	( download "http://www.python.org/ftp/python/${py_pkg_ver}/python-${py_pkg_ver}.msi"; )
     fi
     if [ ! -d "${WINEDIR}/Python${py_ver}" ]; then
 	echo wine msiexec /i ${py_pkg}
@@ -57,13 +82,25 @@ build_ls_s() {
     build_ls_s "${WINEDIR}/windows/system32/python${py_ver}.dll" 	"bin/libpython${py_ver}.dll"
     build_ls_s "${WINEDIR}/Python${py_ver}/libs/python${py_ver}.lib"	"lib/libpython${py_ver}.dll.a"
 
+# Download HTML Help
+    if [ ! -f "${archive_dir}/htmlhelp.exe" ]; then
+	( download 'http://go.microsoft.com/fwlink/?LinkId=14188' )
+    fi
+    if [ ! -d "${WINEDIR}/Program Files/HTML Help Workshop" ]; then
+	( setup_html_help )
+    fi
+
 # example usage:
 #	make debug
 #	make start=foo debug
 #	make module=foo debug
-#	make debug_shell
-    if [ ! "x${is_shell}" = "x" ]; then
+#	make target=shell debug
+#	make target=doc debug
+    if [ "x${target}" = "xshell" ]; then
  	${HOME}/bin/jhbuild -f "${srcdir}/jhbuildrc.py" shell
+    elif [ "x${target}" = "xdoc" ]; then
+	echo exiting
+	exit 0
     elif [ ! "x${start}" = "x" ]; then
  	${HOME}/bin/jhbuild -f "${srcdir}/jhbuildrc.py" build --start-at="${start}"
     elif [ ! "x${module}" = "x" ]; then
diff --git a/tools/win32/htmlhelp.reg b/tools/win32/htmlhelp.reg
new file mode 100644
index 0000000..e38e0ef
--- /dev/null
+++ b/tools/win32/htmlhelp.reg
@@ -0,0 +1,12 @@
+REGEDIT4
+
+[HKEY_CURRENT_USER\Software\Wine]
+"Version"="win2k"
+
+[HKEY_CURRENT_USER\Software\Wine\AppDefaults\hhc.exe\DllOverrides]
+"itircl"="native"
+"itss"="native"
+
+[HKEY_CURRENT_USER\Software\Wine\AppDefaults\hhw.exe\DllOverrides]
+"itircl"="native"
+"itss"="native"
diff --git a/tools/win32/jhbuildrc.py b/tools/win32/jhbuildrc.py
index edf0a24..1889cdd 100644
--- a/tools/win32/jhbuildrc.py
+++ b/tools/win32/jhbuildrc.py
@@ -47,18 +47,20 @@ for tool in mingw_tools.keys():
 	fullpath_tool = mingw_tool_prefix + mingw_tools[tool]
 	os.environ[tool] = fullpath_tool
 
-if os.getenv('JH_TARGET') == "debug":
+if os.getenv('JH_BUILD') == "debug":
     optim = ' -O0 -gstabs'
-elif os.getenv('JH_TARGET') == "release":
+elif os.getenv('JH_BUILD') == "release":
     optim = ' -O2'
 else:
     print "Best to invoke this via build script from make"
     sys.exit (0)
 
 #Exporting tool flags enviroment variables
-os.environ['LDFLAGS']	 = ' -mno-cygwin -no-undefined' + \
-    ' -L' + os.path.join(os.sep, prefix, 'lib') + \
-    ' -L' + os.path.join(os.sep, prefix, 'lib64')
+# -no-undefined' 
+os.environ['LDFLAGS']	 \
+	= ' -mno-cygwin' \
+	+ ' -L' + os.path.join(os.sep, prefix, 'lib') \
+	+ ' -L' + os.path.join(os.sep, prefix, 'lib64')
 os.environ['CFLAGS']	 = optim + ' -mno-cygwin -mms-bitfields -march=i686 ' + ' -I' + os.path.join(os.sep, prefix, 'include')
 os.environ['CPPLAGS']	 = optim + ' -mno-cygwin -mms-bitfields -march=i686 ' + ' -I' + os.path.join(os.sep, prefix, 'include')
 os.environ['CXXLAGS']	 = optim + ' -mno-cygwin -mms-bitfields -march=i686 ' + ' -I' + os.path.join(os.sep, prefix, 'include')
diff --git a/tools/win32/moduleset.in b/tools/win32/moduleset.in
index 8c18a5f..e6c1a71 100644
--- a/tools/win32/moduleset.in
+++ b/tools/win32/moduleset.in
@@ -28,7 +28,8 @@
 	<patches>
 	    <patch file="http://www.gnome.org/~aruiz/gtk+/patches/gettext_0_17_crossbuild_override_tools_fix.patch"/>
 	</patches>
-	<dependencies/>
+	<dependencies>
+	</dependencies>
     </tarball>
 
     <tarball id="pcre" version="8.00">
@@ -57,6 +58,9 @@
 	<branch repo="gnome.org" module="sources/gtk-doc/1.11/gtk-doc-1.11.tar.bz2" version="1.11">
 	    <patch file="&patch_dir;gtk-doc-disable-python.patch"/>
 	</branch>
+	<suggests>
+	    <dep package="libxslt"/>
+	</suggests>
     </autotools>
 
     <autotools id="glib">
@@ -164,19 +168,9 @@
 	</dependencies>
     </autotools>
 
-<!--
-    <tarball id="pango" version="1.16.4">
-	<source href="http://ftp.gnome.org/pub/gnome/sources/pango/1.16/pango-1.16.4.tar.bz2";
-		md5sum="025e2ac5e40cac163aae4653aeef559c"/>
-	<dependencies>
-	    <dep package="cairo"/>
-	    <dep package="glib"/>
-	    <dep package="libthai"/>
-	</dependencies>
-    </tarball>
-    -->
     <autotools id="pango">
-	<branch/>
+	<branch repo="gnome.org" module="sources/pango/1.26/pango-1.26.2.tar.bz2" version="1.26.2">
+	</branch>
 	<dependencies>
 	    <dep package="freetype"/>
 	    <dep package="cairo"/>
@@ -194,8 +188,8 @@
     </autotools>
 
     <autotools id="gtk+">
-	<branch repo="gnome.org" module="sources/gtk+/2.18/gtk+-2.18.4.tar.bz2"
-		version="2.18.4">
+	<branch repo="gnome.org" module="sources/gtk+/2.18/gtk+-2.18.5.tar.bz2"
+		version="2.18.5">
 	    <patch file="&patch_dir;gtk-disable-demo.patch"/>
 	    <patch file="&patch_dir;gtk-use-wine-to-cross-compile.patch"/>
 	</branch>
@@ -239,6 +233,24 @@
 	</dependencies>
     </autotools>
 
+    <tarball id="libgpg-error" version="1.4">
+	<source href="ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.4.tar.bz2";
+	    size="467196" md5sum="2ea1e25b7a6f9365c969403af4a6dbc5" />
+    </tarball>
+    <tarball id="libgcrypt" version="1.2.2">
+	<source href="ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.2.2.tar.bz2";
+	    size="780315" md5sum="4a8a9a7572892ae3803a5aa558e52e02" />
+	<dependencies>
+	    <dep package="libgpg-error" />
+	</dependencies>
+    </tarball>
+    <tarball id="libxslt" version="1.1.26">
+	<source href="ftp://xmlsoft.org/libxslt/libxslt-1.1.26.tar.gz"/>
+	<dependencies>
+	    <dep package="libgcrypt"/>
+	    <dep package="libxml2"/>
+	</dependencies>
+    </tarball>
     <autotools id="libgda">
 	<branch repo="gnome.org" module="sources/libgda/4.1/libgda-4.1.3.tar.bz2"
 		version="4.1.3">
@@ -246,6 +258,7 @@
 	<dependencies>
 	    <dep package="glib"/>
 	    <dep package="libxml2"/>
+	    <dep package="libxslt"/>
 	</dependencies>
     </autotools>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]