[Commits] (markie) Resolve build problem on Linux and OSX

commits at osafoundation.org commits at osafoundation.org
Tue Apr 13 15:00:20 PDT 2004


Commit by: markie
Modified files:
wxPythonSrc-2.5.1.5/__hardhat__.py 1.7 1.8

Log message:
Resolve build problem on Linux and OSX


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/wxPythonSrc-2.5.1.5/__hardhat__.py.diff?r1=text&tr1=1.7&r2=text&tr2=1.8

Index: wxPythonSrc-2.5.1.5/__hardhat__.py
diff -u wxPythonSrc-2.5.1.5/__hardhat__.py:1.7 wxPythonSrc-2.5.1.5/__hardhat__.py:1.8
--- wxPythonSrc-2.5.1.5/__hardhat__.py:1.7	Sun Apr 11 11:51:12 2004
+++ wxPythonSrc-2.5.1.5/__hardhat__.py	Tue Apr 13 14:59:49 2004
@@ -130,8 +130,8 @@
          'BUILD_GLCANVAS=0',
          'BUILD_BASE=build_%s' % version,
          'WX_CONFIG='+buildenv['root']+'/%s/bin/wx-config' % version,
-         'build_ext',
-         '--inplace',
+         'build',
+         'install',
         ]
         if version == "debug":
             buildOptions.append("--debug")
@@ -140,16 +140,7 @@
             buildOptions.append("UNICODE=1")
 
         hardhatlib.executeCommand(buildenv, info['name'], buildOptions,
-         "Building wxPython")
-
-        installOptions = [
-         'setup.py',
-         'install',
-         'BUILD_BASE=build_%s' % version,
-        ]
-
-        hardhatlib.executeCommand(buildenv, info['name'], installOptions,
-         "Installing wxPython")
+         "Building and Installing wxPython")
 
 
     # Windows
@@ -214,46 +205,24 @@
 
     if buildenv['os'] == 'posix':
 
-        os.chdir("../wxPython")
-
-        if version == 'release':
-
-            buildDir=buildenv['root']+os.sep+'wxpython'+os.sep+'build_release'
-            if os.access(buildDir, os.F_OK):
-                hardhatlib.log(buildenv, hardhatlib.HARDHAT_MESSAGE, 
-                 info['name'], 
-                 "Removing temporary build directory: " + buildDir)
-                hardhatlib.rmdir_recursive(buildDir)
-
-        elif version == 'debug':
-
-            buildDir = buildenv['root']+os.sep+'wxpython'+os.sep+'build_debug'
-            if os.access(buildDir, os.F_OK):
-                hardhatlib.log(buildenv, hardhatlib.HARDHAT_MESSAGE, 
-                 info['name'], 
-                 "Removing temporary build directory: " + buildDir)
-                hardhatlib.rmdir_recursive(buildDir)
+        buildDir=os.path.abspath("build_%s" % version)
+ 
+        if os.access(buildDir, os.F_OK):
+            hardhatlib.log(buildenv, hardhatlib.HARDHAT_MESSAGE, 
+             info['name'], 
+             "Removing temporary build directory: " + buildDir)
+            hardhatlib.rmdir_recursive(buildDir)
 
 
     if buildenv['os'] == 'osx':
 
-        if version == 'release':
-
-            buildDir = buildenv['root']+os.sep+'wxpython'+os.sep+'build_release'
-            if os.access(buildDir, os.F_OK):
-                hardhatlib.log(buildenv, hardhatlib.HARDHAT_MESSAGE, 
-                 info['name'], 
-                 "Removing temporary build directory: " + buildDir)
-                hardhatlib.rmdir_recursive(buildDir)
-
-        elif version == 'debug':
+        buildDir=os.path.abspath("build_%s" % version)
 
-            buildDir = buildenv['root']+os.sep+'wxpython'+os.sep+'build_debug'
-            if os.access(buildDir, os.F_OK):
-                hardhatlib.log(buildenv, hardhatlib.HARDHAT_MESSAGE, 
-                 info['name'], 
-                 "Removing temporary build directory: " + buildDir)
-                hardhatlib.rmdir_recursive(buildDir)
+        if os.access(buildDir, os.F_OK):
+            hardhatlib.log(buildenv, hardhatlib.HARDHAT_MESSAGE, 
+             info['name'], 
+             "Removing temporary build directory: " + buildDir)
+            hardhatlib.rmdir_recursive(buildDir)
 
 
     if buildenv['os'] == 'win':



More information about the Commits mailing list