[gnumeric] win32: disable all things python.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] win32: disable all things python.
- Date: Mon, 5 Jul 2010 23:44:54 +0000 (UTC)
commit 9aa8be387ebef68efad62d9df2cb989a4625a9df
Author: Morten Welinder <terra gnome org>
Date: Mon Jul 5 19:44:01 2010 -0400
win32: disable all things python.
tools/win32/build | 28 +++++++++++++++-------------
tools/win32/moduleset.in | 2 +-
2 files changed, 16 insertions(+), 14 deletions(-)
---
diff --git a/tools/win32/build b/tools/win32/build
index 6074b0e..b00190e 100755
--- a/tools/win32/build
+++ b/tools/win32/build
@@ -1,8 +1,8 @@
#!/bin/sh
# configurable settings
-py_ver=26
-py_pkg_ver=2.6.4
+#py_ver=26
+#py_pkg_ver=2.6.4
###################################################
builddir="$1"
@@ -70,19 +70,21 @@ setup_html_help() {
build_mkdir "${archive_dir}"
+ if [ "x$py_ver" != "x" ]; then
# Setup Python
- py_pkg="${archive_dir}/python-${py_pkg_ver}.msi"
-
- if [ ! -f "$py_pkg" ]; then
- ( 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}
- wine msiexec /i ${py_pkg}
+ py_pkg="${archive_dir}/python-${py_pkg_ver}.msi"
+
+ if [ ! -f "$py_pkg" ]; then
+ ( 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}
+ wine msiexec /i ${py_pkg}
+ fi
+ build_ls_s "${WINEDIR}/Python${py_ver}" "Python${py_ver}"
+ build_ls_s "${WINEDIR}/windows/system32/python${py_ver}.dll" "bin/python${py_ver}.dll"
+ build_ls_s "${WINEDIR}/Python${py_ver}/libs/libpython${py_ver}.a" "lib/libpython${py_ver}.dll.a"
fi
- build_ls_s "${WINEDIR}/Python${py_ver}" "Python${py_ver}"
- build_ls_s "${WINEDIR}/windows/system32/python${py_ver}.dll" "bin/python${py_ver}.dll"
- build_ls_s "${WINEDIR}/Python${py_ver}/libs/libpython${py_ver}.a" "lib/libpython${py_ver}.dll.a"
# Download HTML Help
if [ ! -f "${archive_dir}/htmlhelp.exe" ]; then
diff --git a/tools/win32/moduleset.in b/tools/win32/moduleset.in
index a56a378..a3b84c2 100644
--- a/tools/win32/moduleset.in
+++ b/tools/win32/moduleset.in
@@ -372,7 +372,7 @@
<!-- <dep package="lp_solve"/> -->
<!-- <dep package="psiconv"/> -->
<dep package="pxlib"/>
- <dep package="pygobject"/>
+ <!-- <dep package="pygobject"/> -->
</suggests>
</autotools>
</moduleset>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]