[Commits] (morgen) Builds just the wxwidgets portions under Windows so far.

commits at osafoundation.org commits at osafoundation.org
Fri Apr 9 16:51:45 PDT 2004


Commit by: morgen
Modified files:
wxPythonSrc-2.5.1.5/__hardhat__.py 1.3 1.4

Log message:
Builds just the wxwidgets portions under Windows so far.


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

Index: wxPythonSrc-2.5.1.5/__hardhat__.py
diff -u wxPythonSrc-2.5.1.5/__hardhat__.py:1.3 wxPythonSrc-2.5.1.5/__hardhat__.py:1.4
--- wxPythonSrc-2.5.1.5/__hardhat__.py:1.3	Fri Apr  9 16:44:43 2004
+++ wxPythonSrc-2.5.1.5/__hardhat__.py	Fri Apr  9 16:51:14 2004
@@ -14,9 +14,10 @@
 
 def build(buildenv):
 
+    version = buildenv['version']
+
     if buildenv['os'] in ('osx', 'posix'):
 
-        version = buildenv['version']
 
         # Create the build directory
 
@@ -149,49 +150,24 @@
         hardhatlib.executeCommand(buildenv, info['name'], installOptions,
          "Installing wxPython")
 
+
+    # Windows
+
     if buildenv['os'] == 'win':
 
-        if buildenv['version'] == 'release':
+        os.chdir("build")
+        os.chdir("msw")
 
-            os.chdir("build")
-            os.chdir("msw")
-            #  build msw.sln
-
-            hardhatlib.executeCommand( buildenv, info['name'],
-             [buildenv['nmake'], '-f', 'makefile.vc', 'dll', 'FINAL=1'],
-             
-             "Building wxWindows")
-
-            os.chdir("..")
-            os.chdir("..")
-            os.chdir("lib")
-            hardhatlib.copyFile("wxmsw24.dll", buildenv['root'] +os.sep+ \
-             "release" + os.sep + "bin")
-            hardhatlib.copyFile("wxmsw24.lib", buildenv['root'] +os.sep+ \
-             "release" + os.sep + "lib")
-            hardhatlib.copyFile("wxmsw24.exp", buildenv['root'] +os.sep+ \
-             "release" + os.sep + "lib")
-
-
-        if buildenv['version'] == 'debug':
-
-            os.chdir("..")
-            os.chdir("..")
-            os.chdir("src")
-            os.chdir("msw")
-            hardhatlib.executeCommand( buildenv, info['name'],
-             [buildenv['nmake'], '-f', 'makefile.vc', 'dll', 'FINAL=0'],
-             "Building wxWindows")
-
-            os.chdir("..")
-            os.chdir("..")
-            os.chdir("lib")
-            hardhatlib.copyFile("wxmsw24d.dll", buildenv['root'] +os.sep+ \
-             "debug" + os.sep + "bin")
-            hardhatlib.copyFile("wxmsw24d.lib", buildenv['root'] +os.sep+ \
-             "debug" + os.sep + "lib")
-            hardhatlib.copyFile("wxmsw24d.exp", buildenv['root'] +os.sep+ \
-             "debug" + os.sep + "lib")
+        hardhatlib.executeCommand( buildenv, info['name'],
+         [buildenv['compiler'], 
+         "msw.sln",
+         "/build",
+         version.capitalize(),
+         "/out",
+         "output.txt"],
+         "Building %s %s" % (info['name'], version),
+         0, "output.txt")
+         
 
 
 



More information about the Commits mailing list