bh: thuban setup.py,1.45,1.46 ChangeLog,1.737,1.738

[cvs@intevation.de]

Author: bh

Update of /thubanrepository/thuban
In directory doto:/tmp/cvs-serv10472

Modified Files:
	setup.py ChangeLog 
Log Message:
* Thuban/UI/about.py (unicodeToLocale): Use getdefaultlocale
instead of getlocale because getlocale doesn't return a usable
encoding name on a german windows 2000

* setup.py: windows build: Removed the absolute path names and
made all prfixes relative to the directory containing setup.py.
Makes it a little easier to adapt to a different system.


Index: setup.py
===================================================================
RCS file: /thubanrepository/thuban/setup.py,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- setup.py	17 May 2004 15:47:57 -0000	1.45
+++ setup.py	17 Dec 2004 18:48:49 -0000	1.46
@@ -15,6 +15,7 @@
 # hand below.
 #
 
+import sys
 import os
 from types import TupleType
 import glob
@@ -81,21 +82,23 @@
     #################################################################
     # Windows configuration.
     #
-    
+
+    basedir = os.path.dirname(sys.argv[0])
+
     # Directories where Proj4 is installed
-    proj4_prefix = r"D:\cygwin\home\user\projects\thuban\proj-4.4.7\src"
+    proj4_prefix = os.path.join(basedir, "..", "proj-4.4.7", "src")
     proj4_incdir =  proj4_prefix
     proj4_libdir =  proj4_prefix
     proj4_lib = "proj_i"
 
     # Define include and lib directories for wxWindows and 
-    wx_prefix = r"d:\cygwin\home\user\projects\thuban\wxPython-2.4.0.7"
+    wx_prefix = os.path.join(basedir, "..", "wxPython-2.4.2.4")
     wx_inc = [os.path.join(wx_prefix, 'lib', 'mswdllh'),
               os.path.join(wx_prefix, "include")]
     wx_lib = [os.path.join(wx_prefix, "lib")]
 
     # Define include and lib directories for GDAL 
-    gdal_prefix = r"D:\cygwin\home\user\projects\thuban\gdal-1.1.8"
+    gdal_prefix = os.path.join(basedir, "..", "gdal-1.1.8")
     gdal_inc = [os.path.join(gdal_prefix, 'alg'),
                 os.path.join(gdal_prefix, 'ogr'),
                 os.path.join(gdal_prefix, 'port'),

Index: ChangeLog
===================================================================
RCS file: /thubanrepository/thuban/ChangeLog,v
retrieving revision 1.737
retrieving revision 1.738
diff -u -d -r1.737 -r1.738
--- ChangeLog	16 Dec 2004 15:18:57 -0000	1.737
+++ ChangeLog	17 Dec 2004 18:48:49 -0000	1.738
@@ -1,3 +1,15 @@
+2004-12-17  Bernhard Herzog  <bh at intevation.de>
+
+	Two windows specific fixes ported from thuban-1­0-branch:
+
+	* Thuban/UI/about.py (unicodeToLocale): Use getdefaultlocale
+	instead of getlocale because getlocale doesn't return a usable
+	encoding name on a german windows 2000
+
+	* setup.py: windows build: Removed the absolute path names and
+	made all prfixes relative to the directory containing setup.py.
+	Makes it a little easier to adapt to a different system.
+
 2004-12-16  Bernhard Herzog  <bh at intevation.de>
 
 	Add support for PostGIS tables with LINESTRING geomentries.