/[thuban]/branches/WIP-pyshapelib-bramz/setup.py
ViewVC logotype

Diff of /branches/WIP-pyshapelib-bramz/setup.py

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2651 by bh, Tue Jul 5 20:24:50 2005 UTC revision 2711 by dpinte, Tue Oct 10 10:30:54 2006 UTC
# Line 86  elif os.name == "nt": Line 86  elif os.name == "nt":
86      basedir = os.path.dirname(sys.argv[0])      basedir = os.path.dirname(sys.argv[0])
87    
88      # Directories where Proj4 is installed      # Directories where Proj4 is installed
89      proj4_prefix = os.path.join(basedir, "..", "proj-4.4.7", "src")      proj4_prefix = os.path.join(basedir, "..", "proj-4.4.9", "src")
90      proj4_incdir =  proj4_prefix      proj4_incdir =  proj4_prefix
91      proj4_libdir =  proj4_prefix      proj4_libdir =  proj4_prefix
92      proj4_lib = "proj_i"      proj4_lib = "proj_i"
93    
94      # Define include and lib directories for wxWindows and      # Define include and lib directories for wxWindows and
95      wx_prefix = os.path.join(basedir, "..", "wxPython-2.4.2.4")      wx_prefix = os.path.join(basedir, "..", "wxPython-2.6.3.3")
96      wx_inc = [os.path.join(wx_prefix, 'lib', 'mswdllh'),      wx_inc = [os.path.join(wx_prefix, 'lib', 'vc_dll', 'mswuh'),
97                os.path.join(wx_prefix, "include")]                os.path.join(wx_prefix, "include")]
98      wx_lib = [os.path.join(wx_prefix, "lib")]      wx_lib = [os.path.join(wx_prefix, "lib", "vc_dll")]
99    
100      # Define include and lib directories for GDAL      # Define include and lib directories for GDAL
101      gdal_prefix = os.path.join(basedir, "..", "gdal-1.1.8")      gdal_prefix = os.path.join(basedir, "..", "gdal-1.3.2")
102      gdal_inc = [os.path.join(gdal_prefix, 'alg'),      gdal_inc = [os.path.join(gdal_prefix, 'alg'),
103                  os.path.join(gdal_prefix, 'ogr'),                  os.path.join(gdal_prefix, 'ogr'),
104                  os.path.join(gdal_prefix, 'port'),                  os.path.join(gdal_prefix, 'port'),
105                    os.path.join(gdal_prefix, 'gcore'),
106                  os.path.join(gdal_prefix, 'core')]                  os.path.join(gdal_prefix, 'core')]
107      gdal_lib = [gdal_prefix]      gdal_lib = [gdal_prefix]
108    
# Line 153  elif os.name == "nt": Line 154  elif os.name == "nt":
154            
155      wx_cs_params[CS_INCDIRS] = wx_inc      wx_cs_params[CS_INCDIRS] = wx_inc
156      wx_cs_params[CS_LIBDIRS] = wx_lib      wx_cs_params[CS_LIBDIRS] = wx_lib
157      wx_cs_params[CS_LIBS] = ["wxmsw24h"] \      wx_cs_params[CS_LIBS] = ["wxmsw26uh"] \
158                        + ['kernel32', 'user32', 'gdi32', 'comdlg32',                        + ['kernel32', 'user32', 'gdi32', 'comdlg32',
159                           'winspool', 'winmm', 'shell32', 'oldnames',                           'winspool', 'winmm', 'shell32', 'oldnames',
160                           'comctl32', 'ctl3d32', 'odbc32', 'ole32', 'oleaut32',                           'comctl32', 'odbc32', 'ole32', 'oleaut32',
161                           'uuid', 'rpcrt4', 'advapi32', 'wsock32']                           'uuid', 'rpcrt4', 'advapi32', 'wsock32']
162    
163      gdal_config_script = ""      gdal_config_script = ""
# Line 319  if os.path.isdir("Resources/Locale"): Line 320  if os.path.isdir("Resources/Locale"):
320          data_files.append(("Resources/Locale/" + d +"/LC_MESSAGES",          data_files.append(("Resources/Locale/" + d +"/LC_MESSAGES",
321                             ["Resources/Locale/"+ d +"/LC_MESSAGES/thuban.mo"]))                             ["Resources/Locale/"+ d +"/LC_MESSAGES/thuban.mo"]))
322    
323    #add the Lib content to the output
324    if os.path.isdir("Lib"):
325            for d in os.listdir("Lib"):
326                    data_files.append(("Lib", ["Lib/"+d]))
327    
328    
329  #  #
330  #       Command definitions  #       Command definitions
331  #  #
# Line 925  class bdist_inno(Command): Line 932  class bdist_inno(Command):
932          if self.output_basename is None:          if self.output_basename is None:
933              self.output_basename = "%s-%s-%d" \              self.output_basename = "%s-%s-%d" \
934                                     % (name, self.distribution.get_version(),                                     % (name, self.distribution.get_version(),
935                                        self.iss_revision)                                        int(self.iss_revision))
936    
937      def run(self, install_options = None):      def run(self, install_options = None):
938          """Execute the command. install_options if given, should be a          """Execute the command. install_options if given, should be a
939          directory of additional options to set in the install step"""          directory of additional options to set in the install step"""
940          # Obviously have to build before we can install          # Obviously have to build before we can install
941    
942            # add gdal to the build
943            for (dirpath, dnames, fnames) in os.walk('gdal'):                      
944                    files_in_dir = []
945                    dp = '/'.join(dirpath.split('\\'))
946                    for f in fnames:
947                            if os.path.isfile(os.path.join(dirpath,f)):                    
948                                    files_in_dir.append( dp + '/' + f)              
949                    if len(files_in_dir) > 0:
950                            data_files.append(( dp , files_in_dir))
951            # add thubaninit to the build
952    
953    
954          if not self.skip_build:          if not self.skip_build:
955              self.run_command('build')              self.run_command('build')
956    
# Line 1050  class thuban_bdist_inno(bdist_inno): Line 1069  class thuban_bdist_inno(bdist_inno):
1069              "warn_dir": 0,              "warn_dir": 0,
1070              "extra_files": ["COPYING", "Lib/proj.dll"],              "extra_files": ["COPYING", "Lib/proj.dll"],
1071              }              }
1072            install_options["extra_files"].extend(self.get_gdal_content())
1073    
1074          # don't make a symlink because we're simulating windows, so          # don't make a symlink because we're simulating windows, so
1075          # that we can generate the iss-file even on Linux          # that we can generate the iss-file even on Linux
1076          install_options["do_symlink"] = 0          install_options["do_symlink"] = 0
1077    
1078          bdist_inno.run(self, install_options)          bdist_inno.run(self, install_options)
1079    
1080        def get_gdal_content(self):
1081            '''
1082            Return the list of files in the gdal directory of the Thuban installation
1083            '''
1084            gdal_files = []
1085            for (dirpath, dnames, fnames) in os.walk('gdal'):                  
1086                if len(fnames) > 0:
1087                    for file in fnames :
1088                        gdal_files.append(dirpath + os.sep + file)
1089            return gdal_files
1090    
1091  class thuban_build_docs(Command):  class thuban_build_docs(Command):
1092    
1093      """Command to generate documentation from source code."""      """Command to generate documentation from source code."""
# Line 1145  setup(name = "Thuban", Line 1177  setup(name = "Thuban",
1177        scripts = ["thuban.py"],        scripts = ["thuban.py"],
1178        packages = ["Thuban", "Thuban.Lib", "Thuban.Model", "Thuban.UI",        packages = ["Thuban", "Thuban.Lib", "Thuban.Model", "Thuban.UI",
1179                    "Extensions", "Extensions.gns2shp", "Extensions.wms",                    "Extensions", "Extensions.gns2shp", "Extensions.wms",
1180                    "Extensions.importAPR", "Extensions.profiling"],                    "Extensions.importAPR", "Extensions.profiling",
1181                              "Extensions.svgexport", "Extensions.mouseposition",
1182                              "Extensions.bboxdump", "Extensions.ogr",
1183                      "Extensions.umn_mapserver"],
1184        ext_modules = extensions,        ext_modules = extensions,
1185        py_modules = py_modules,        py_modules = py_modules,
1186        data_files = data_files,        data_files = data_files,
# Line 1159  setup(name = "Thuban", Line 1194  setup(name = "Thuban",
1194                    "install_lib": "$base/lib/thuban",                    "install_lib": "$base/lib/thuban",
1195                    "install_scripts": "$base/lib/thuban",                    "install_scripts": "$base/lib/thuban",
1196                    "install_data": "$base/lib/thuban",                    "install_data": "$base/lib/thuban",
   
1197                    # Don't print warning messages about the lib dir not                    # Don't print warning messages about the lib dir not
1198                    # being on Python's path. The libraries are Thuban                    # being on Python's path. The libraries are Thuban
1199                    # specific and are installed just for Thuban. They'll                    # specific and are installed just for Thuban. They'll
Legend:
Removed from v.2651  
changed lines
  Added in v.2711
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26