[Thuban-commits] r2874 - trunk/thuban

[scm-commit@wald.intevation.org]

Author: dpinte
Date: 2009-05-18 15:50:16 +0200 (Mon, 18 May 2009)
New Revision: 2874

Modified:
   trunk/thuban/ChangeLog
   trunk/thuban/setup.py
Log:
2009-05-18 Didrik Pinte <dpinte at dipole-consulting.com>

  * setup.py : updated to run with wxpython 2.8

Modified: trunk/thuban/ChangeLog
===================================================================
--- trunk/thuban/ChangeLog	2009-04-04 10:38:54 UTC (rev 2873)
+++ trunk/thuban/ChangeLog	2009-05-18 13:50:16 UTC (rev 2874)
@@ -1,3 +1,7 @@
+2009-05-18 Didrik Pinte <dpinte at dipole-consulting.com>
+
+  * setup.py : updated to run with wxpython 2.8
+
 2009-04-04 Didrik Pinte <dpinte at dipole-consulting.com>
 
   * Thuban/UI/mainwindow.py : completed command methods by allowing to remove

Modified: trunk/thuban/setup.py
===================================================================
--- trunk/thuban/setup.py	2009-04-04 10:38:54 UTC (rev 2873)
+++ trunk/thuban/setup.py	2009-05-18 13:50:16 UTC (rev 2874)
@@ -86,19 +86,20 @@
     basedir = os.path.dirname(sys.argv[0])
 
     # Directories where Proj4 is installed
-    proj4_prefix = os.path.join(basedir, "..", "proj-4.4.9", "src")
+    proj4_prefix = os.path.join(basedir, "..", "proj-4.5.0", "src")
     proj4_incdir =  proj4_prefix
     proj4_libdir =  proj4_prefix
     proj4_lib = "proj_i"
 
     # Define include and lib directories for wxWindows and 
-    wx_prefix = os.path.join(basedir, "..", "wxPython-2.6.3.3")
+    wx_prefix = os.path.join(basedir, "..", "wxPython-2.8.9.2")
     wx_inc = [os.path.join(wx_prefix, 'lib', 'vc_dll', 'mswuh'),
               os.path.join(wx_prefix, "include")]
     wx_lib = [os.path.join(wx_prefix, "lib", "vc_dll")]
 
     # Define include and lib directories for GDAL 
-    gdal_prefix = os.path.join(basedir, "..", "gdal-1.4.0")
+    #gdal_prefix = os.path.join(basedir, "..", "gdal-1.4.1")
+    gdal_prefix = os.path.join(basedir, "..", "gdal-1.5.4")
     gdal_inc = [os.path.join(gdal_prefix, 'alg'),
                 os.path.join(gdal_prefix, 'ogr'),
                 os.path.join(gdal_prefix, 'port'),
@@ -136,29 +137,28 @@
     # the values of wx_defs and wx_libs. copied from the wxPython
     # setup.py
     wx_cs_params[CS_DEFS] = \
-              [ ('WIN32', None),        # Some of these are no longer
-                ('__WIN32__', None),    # necessary.  Anybody know which?
-                ('_WINDOWS', None),
-                ('__WINDOWS__', None),
-                ('WINVER', '0x0400'),
-                ('__WIN95__', None),
-                ('STRICT', None),
+              [ #('WIN32', None),        # Some of these are no longer
+                #('__WIN32__', None),    # necessary.  Anybody know which?
+                #('_WINDOWS', None),
+                #('__WINDOWS__', None),
+                #('WINVER', '0x0400'),
+                #('__WIN95__', None),
+                #('STRICT', None),                        
 
-                ('__WXMSW__', None),
-                ('WXUSINGDLL', '1'),
+                #('__WXMSW__', None),
+                #('WXUSINGDLL', '1'),
 
-                ('SWIG_GLOBAL', None),
-                ('HAVE_CONFIG_H', None),
-                ('WXP_USE_THREAD', '1'),
+                #('SWIG_GLOBAL', None),
+                #('HAVE_CONFIG_H', None),
+                #('WXP_USE_THREAD', '1'),
                 ]
-    
+                   
     wx_cs_params[CS_INCDIRS] = wx_inc
     wx_cs_params[CS_LIBDIRS] = wx_lib
-    wx_cs_params[CS_LIBS] = ["wxmsw26uh"] \
-                      + ['kernel32', 'user32', 'gdi32', 'comdlg32',
-                         'winspool', 'winmm', 'shell32', 'oldnames',
-                         'comctl32', 'odbc32', 'ole32', 'oleaut32',
-                         'uuid', 'rpcrt4', 'advapi32', 'wsock32']
+    wx_cs_params[CS_LIBS] = ['wxmsw28uh_core' , 'wxmsw28uh_stc', 'wxbase28uh' ,\
+                             'wxmsw28uh_html' , 'wxmsw28uh_richtext' , 'wxmsw28uh_adv' , \
+                             'wxmsw28uh_xrc' , 'wxmsw28uh_aui', 'wxmsw28uh_gl' , 'wxmsw28uh_gizmos' , \
+                             'wxbase28uh_net' , 'wxbase28uh_xml']                    
 
     gdal_config_script = ""
     gdal_cs_params = [[] for i in range(CS_NUM_PARAMS)]