[Informixdb-cvs] informixdb setup.py,1.3,1.4

[Carsten H. <ch...@us...>]

Update of /cvsroot/informixdb/informixdb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12579

Modified Files:
	setup.py 
Log Message:
Play nice with Win32


Index: setup.py
===================================================================
RCS file: /cvsroot/informixdb/informixdb/setup.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** setup.py	16 Oct 2005 19:39:20 -0000	1.3
--- setup.py	18 Oct 2005 03:12:51 -0000	1.4
***************
*** 1,4 ****
--- 1,5 ----
  import sys
  import os
+ import shlex
  from distutils.core import setup, Extension
  from distutils.spawn import find_executable
***************
*** 35,42 ****
              self.esql_informixdir = os.getenv("INFORMIXDIR")
          if not self.esql_informixdir:
              self.esql_informixdir = "/usr/informix"
          os.environ['INFORMIXDIR'] = self.esql_informixdir
  
!         self.esql_parts.append(os.path.join(self.esql_informixdir, 'bin', 'esql'))
  
          if self.esql_threadlib:
--- 36,49 ----
              self.esql_informixdir = os.getenv("INFORMIXDIR")
          if not self.esql_informixdir:
+           if get_platform()=="win32":
+             self.esql_informixdir = "C:\\Program Files\\Informix\\Client-SDK"
+           else:
              self.esql_informixdir = "/usr/informix"
          os.environ['INFORMIXDIR'] = self.esql_informixdir
  
!         self.esql_parts.append(os.path.join(self.esql_informixdir,'bin','esql'))
!         if get_platform()=="win32":
!           if self.esql_parts[0].find(' ') != -1:
!             self.esql_parts[0] = '"' + self.esql_parts[0] + '"'
  
          if self.esql_threadlib:
***************
*** 51,78 ****
  
          # find esql libs/objects
!         cin,cout = os.popen2(' '.join(self.esql_parts + [ '-libs' ]))
!         esql_config = cout.readlines()
!         cin.close()
          cout.close()
  
!         for arg in esql_config:
!             if arg.startswith('-l'):
!                 if self.libraries is None:
!                     self.libraries = []
!                 self.libraries.append(arg[2:-1])
!             else:
!                 if self.link_objects is None:
!                     self.link_objects = []
!                 self.link_objects.append(arg[:-1])
  
          if self.include_dirs is None:
              self.include_dirs = []
!         self.include_dirs = [ self.esql_informixdir+'/incl/esql' ] \
                              + self.include_dirs
  
          if self.library_dirs is None:
              self.library_dirs = []
!         self.library_dirs += [ self.esql_informixdir+'/lib/esql',
!                                self.esql_informixdir+'/lib' ]
  
      def build_extension(self, ext):
--- 58,99 ----
  
          # find esql libs/objects
!         cout = os.popen(' '.join(self.esql_parts + [ '-libs' ]),'r')
!         esql_config = []
!         lexer = shlex.shlex(cout)
!         lexer.wordchars += '-.\\/'
!         while True:
!           token = lexer.get_token()
!           if token=='' or token==None: break
!           if token.startswith('"') and token.endswith('"'):
!             token = token[1:-1]
!           esql_config.append(token)
          cout.close()
  
!         if get_platform()=="win32":
!           for arg in esql_config:
!               if arg.endswith('.lib'):
!                   if self.libraries is None:
!                       self.libraries = []
!                   self.libraries.append(arg[:-4])
!         else:
!           for arg in esql_config:
!               if arg.startswith('-l'):
!                   if self.libraries is None:
!                       self.libraries = []
!                   self.libraries.append(arg[2:])
!               else:
!                   if self.link_objects is None:
!                       self.link_objects = []
!                   self.link_objects.append(arg)
  
          if self.include_dirs is None:
              self.include_dirs = []
!         self.include_dirs = [os.path.join(self.esql_informixdir,'incl','esql')]\
                              + self.include_dirs
  
          if self.library_dirs is None:
              self.library_dirs = []
!         self.library_dirs += [os.path.join(self.esql_informixdir,'lib','esql'),
!                               os.path.join(self.esql_informixdir,'lib')]
  
      def build_extension(self, ext):
***************
*** 124,128 ****
  
  module1 = Extension('_informixdb',
!                     sources = ['ext/_informixdb.ec'],
                      include_dirs = ['ext'],
                      define_macros = extra_macros )
--- 145,149 ----
  
  module1 = Extension('_informixdb',
!                     sources = [os.path.join('ext','_informixdb.ec')],
                      include_dirs = ['ext'],
                      define_macros = extra_macros )