[Commits] (john) hardhat clean and build for release and debug on windows

[commits at osafoundation.org]

Commit by: john
Modified files:
wxPythonSrc-2.5.1.5/__hardhat__.py 1.5 1.6

Log message:
hardhat clean and build for release and debug on windows


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

Index: wxPythonSrc-2.5.1.5/__hardhat__.py
diff -u wxPythonSrc-2.5.1.5/__hardhat__.py:1.5 wxPythonSrc-2.5.1.5/__hardhat__.py:1.6
--- wxPythonSrc-2.5.1.5/__hardhat__.py:1.5	Fri Apr  9 17:07:00 2004
+++ wxPythonSrc-2.5.1.5/__hardhat__.py	Sat Apr 10 11:05:15 2004
@@ -143,7 +143,6 @@
          "Building wxPython")
 
         installOptions = [
-         python,
          'setup.py',
          'install',
          'BUILD_BASE=build_%s' % version,
@@ -157,27 +156,41 @@
 
     if buildenv['os'] == 'win':
 
-        os.chdir("build")
-        os.chdir("msw")
-
         hardhatlib.executeCommand( buildenv, info['name'],
          [buildenv['compiler'], 
-         "msw.sln",
+         "build/msw/msw.sln",
          "/build",
          version.capitalize(),
          "/out",
          "output.txt"],
          "Building %s %s" % (info['name'], version),
          0, "output.txt")
-         
 
+        os.putenv('WXWIN', os.getcwd())
+
+        os.chdir("wxPython")
+
+        if version == 'release':
+
+            hardhatlib.executeCommand( buildenv, info['name'],
+             [buildenv['python'], 'setup.py', 'build_ext', 
+             '--inplace', 'install'], "Building wxPython")
 
+        elif version == 'debug':
+
+            hardhatlib.executeCommand( buildenv, info['name'],
+             [buildenv['python_d'], 'setup.py', 'build_ext', 
+             '--inplace', '--debug', 'install'], "Building wxPython")
 
 def clean(buildenv):
 
+    version = buildenv['version']
+
     if buildenv['os'] == 'posix':
 
-        if buildenv['version'] == 'release':
+        os.chdir("../wxPython")
+
+        if version == 'release':
 
             buildDir=buildenv['root']+os.sep+'wxpython'+os.sep+'build_release'
             if os.access(buildDir, os.F_OK):
@@ -186,7 +199,7 @@
                  "Removing temporary build directory: " + buildDir)
                 hardhatlib.rmdir_recursive(buildDir)
 
-        if buildenv['version'] == 'debug':
+        elif version == 'debug':
 
             buildDir = buildenv['root']+os.sep+'wxpython'+os.sep+'build_debug'
             if os.access(buildDir, os.F_OK):
@@ -198,7 +211,7 @@
 
     if buildenv['os'] == 'osx':
 
-        if buildenv['version'] == 'release':
+        if version == 'release':
 
             buildDir = buildenv['root']+os.sep+'wxpython'+os.sep+'build_release'
             if os.access(buildDir, os.F_OK):
@@ -207,7 +220,7 @@
                  "Removing temporary build directory: " + buildDir)
                 hardhatlib.rmdir_recursive(buildDir)
 
-        if buildenv['version'] == 'debug':
+        elif version == 'debug':
 
             buildDir = buildenv['root']+os.sep+'wxpython'+os.sep+'build_debug'
             if os.access(buildDir, os.F_OK):
@@ -219,39 +232,32 @@
 
     if buildenv['os'] == 'win':
 
-        os.putenv('WXWIN', buildenv['root_dos'] + '\\wxpython')
+        hardhatlib.executeCommand( buildenv, info['name'],
+         [buildenv['compiler'], 
+         "build/msw/msw.sln",
+         "/clean",
+         version.capitalize(),
+         "/out",
+         "output.txt"],
+         "Cleaning %s %s" % (info['name'], version),
+         0, "output.txt")
+         
+         
+        os.putenv('WXWIN', os.getcwd())
 
+        os.chdir("wxPython")
 
-        if buildenv['version'] == 'release':
+        if version == 'release':
 
-            os.chdir("src")
-            os.chdir("msw")
             hardhatlib.executeCommand( buildenv, info['name'],
-             [buildenv['nmake'], '-f', 'makefile.vc', 'cleandll', 'FINAL=1'],
-             "Cleaning wxWindows dll")
-            hardhatlib.executeCommand( buildenv, info['name'],
-             [buildenv['nmake'], '-f', 'makefile.vc', 'cleanall', 'FINAL=1'],
-             "Cleaning wxWindows all")
+             [buildenv['python'], 'setup.py', 'clean', 
+             '--all'], "Cleaning wxPython")
 
-        if buildenv['version'] == 'debug':
+        elif version == 'debug':
 
-            os.chdir("src")
-            os.chdir("msw")
-            hardhatlib.executeCommand( buildenv, info['name'],
-             [buildenv['nmake'], '-f', 'makefile.vc', 'cleandll', 'FINAL=0'],
-             "Cleaning wxWindows dll")
             hardhatlib.executeCommand( buildenv, info['name'],
-             [buildenv['nmake'], '-f', 'makefile.vc', 'cleanall', 'FINAL=0'],
-             "Cleaning wxWindows all")
-
-
-        os.chdir("..")
-        os.chdir("..")
-        os.chdir("wxPython")
-        os.chdir("wxSWIG")
-        hardhatlib.executeCommand( buildenv, info['name'],
-         [buildenv['nmake'], '-f', 'makefile.vc', 'clean'],
-         "Cleaning wxSWIG")
+             [buildenv['python_d'], 'setup.py', 'clean', 
+             '--all'], "Cleaning wxPython")
 
 
 def run(buildenv):