fiddling with setup.py

setup.py

@@ -55,7 +55,12 @@ problems.
                                 "AUTHORS.CoinMP.txt",
                                 "README.CoinMP.txt",
                                 ],
-                      'pulp.solverdir' : ['*','*.*']},
+                      'pulp.solverdir.cbc.linux.32' : ['*','*.*'],
+                      'pulp.solverdir.cbc.linux.64' : ['*','*.*'],
+                      'pulp.solverdir.cbc.win.32' : ['*','*.*'],
+                      'pulp.solverdir.cbc.win.64' : ['*','*.*'],
+                      'pulp.solverdir.cbc.osx.64' : ['*','*.*'],
+                      },
       install_requires = [pyparsing_ver],
       entry_points = ("""
       [console_scripts]

src/pulp/pulp.cfg.osx

@@ -12,7 +12,7 @@ CplexPath = /usr/ilog/cplex/bin/x86_rhel4.0_3.4/libcplex110.so
 GurobiPath = /opt/gurobi201/linux32/lib/python2.5
 CbcPath = cbc
 GlpkPath = glpsol
-PulpCbcPath = %(here)s/solverdir/cbc/%(os)s/cbc
+PulpCbcPath = %(here)s/solverdir/cbc/%(os)s/%(arch)scbc
 [licenses]
 ilm_cplex_license = "LICENSE your-enterprise\nRUNTIME NEVER ..."
 ilm_cplex_license_signature = 0

src/pulp/solvers.py

@@ -108,21 +108,22 @@ def initialize(filename, operating_system='linux', arch='64'):
 
 #pick up the correct config file depending on operating system
 PULPCFGFILE = "pulp.cfg"
+is_64bits = sys.maxsize > 2**32
+if is_64bits:
+    arch = '64'
+else:
+    arch = '32'
 operating_system = None
 if sys.platform in ['win32', 'cli']:
     operating_system = 'win'
     PULPCFGFILE += ".win"
 elif sys.platform in ['darwin']:
     operating_system = "osx"
+    arch = '64'
     PULPCFGFILE += ".osx"
 else:
     operating_system = "linux"
     PULPCFGFILE += ".linux"
-is_64bits = sys.maxsize > 2**32
-if is_64bits:
-    arch = '64'
-else:
-    arch = '32'
 
 if __name__ != '__main__':
     DIRNAME = os.path.dirname(__file__)