[Commits] (markie) Make correct test for os env

[commits at osafoundation.org]

Commit by: markie
Modified files:
osaf/chandler/wxpython/__hardhat__.py 1.34 1.35

Log message:
Make correct test for os env


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/osaf/chandler/wxpython/__hardhat__.py.diff?r1=text&tr1=1.34&r2=text&tr2=1.35

Index: osaf/chandler/wxpython/__hardhat__.py
diff -u osaf/chandler/wxpython/__hardhat__.py:1.34 osaf/chandler/wxpython/__hardhat__.py:1.35
--- osaf/chandler/wxpython/__hardhat__.py:1.34	Wed Dec 10 21:11:18 2003
+++ osaf/chandler/wxpython/__hardhat__.py	Thu Mar 11 15:34:42 2004
@@ -13,7 +13,7 @@
 def build(buildenv):
 
 
-    if buildenv['os'] == 'posix':
+    if buildenv['os'] == 'osx':
 
         if buildenv['version'] == 'release':
 
@@ -25,7 +25,7 @@
              [buildenv['make']],
              "Making wxSWIG")
 
-            buildDir=buildenv['root']+os.sep+'wxpython'+os.sep+'build_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'], 
@@ -44,21 +44,22 @@
                  info['name'], "Already configured")
             else:
                 hardhatlib.executeCommand(buildenv, info['name'],
-                 [buildenv['sh'], '../configure', '--with-gtk',
-                 '--disable-std_iostreams',
-                 '--enable-gtk2',
-                 '--with-libpng=builtin',
+                 [buildenv['sh'], 
+                 '../configure', 
+                 '--with-mac',
+                 '--with-opengl',
+                 '--enable-geometry',
+                 '--disable-precomp',
                  '--prefix='+buildenv['root']+os.sep+'release'],
-                 "Configuring wxWindows")
+                 "Configuring wxWindows release")
 
             hardhatlib.executeCommand(buildenv, info['name'],
              [buildenv['make']],
-             "Making wxWindows")
+             "Making wxWindows release")
 
             hardhatlib.executeCommand(buildenv, info['name'],
              [buildenv['make'], 'install'],
-             "Installing wxWindows")
-
+             "Install wxWindows release")
 
         if buildenv['version'] == 'debug':
 
@@ -89,24 +90,25 @@
                  info['name'], "Already configured")
             else:
                 hardhatlib.executeCommand(buildenv, info['name'],
-                 [buildenv['sh'], '../configure', '--with-gtk', 
-                 '--enable-debug', '--enable-mem_tracing',
-                 '--disable-std_iostreams',
-                 '--enable-gtk2',
-                 '--with-libpng=builtin',
+                 [buildenv['sh'], 
+                 '../configure', 
+                 '--with-mac',
+                 '--with-opengl',
+                 '--enable-geometry',
+                 '--enable-debug',
+                 '--disable-precomp',
                  '--prefix='+buildenv['root']+os.sep+'debug'],
-                 "Configuring wxWindows")
+                 "Configuring wxWindows debug")
 
             hardhatlib.executeCommand(buildenv, info['name'],
              [buildenv['make']],
-             "Making wxWindows")
+             "Making wxWindows debug")
 
             hardhatlib.executeCommand(buildenv, info['name'],
              [buildenv['make'], 'install'],
-             "Installing wxWindows")
-
+             "Install wxWindows debug")
 
-    if buildenv['os'] == 'osx':
+    elif buildenv['os'] == 'posix':
 
         if buildenv['version'] == 'release':
 
@@ -118,7 +120,7 @@
              [buildenv['make']],
              "Making wxSWIG")
 
-            buildDir = buildenv['root']+os.sep+'wxpython'+os.sep+'build_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'], 
@@ -137,22 +139,21 @@
                  info['name'], "Already configured")
             else:
                 hardhatlib.executeCommand(buildenv, info['name'],
-                 [buildenv['sh'], 
-                 '../configure', 
-                 '--with-mac',
-                 '--with-opengl',
-                 '--enable-geometry',
-                 '--disable-precomp',
+                 [buildenv['sh'], '../configure', '--with-gtk',
+                 '--disable-std_iostreams',
+                 '--enable-gtk2',
+                 '--with-libpng=builtin',
                  '--prefix='+buildenv['root']+os.sep+'release'],
-                 "Configuring wxWindows release")
+                 "Configuring wxWindows")
 
             hardhatlib.executeCommand(buildenv, info['name'],
              [buildenv['make']],
-             "Making wxWindows release")
+             "Making wxWindows")
 
             hardhatlib.executeCommand(buildenv, info['name'],
              [buildenv['make'], 'install'],
-             "Install wxWindows release")
+             "Installing wxWindows")
+
 
         if buildenv['version'] == 'debug':
 
@@ -183,28 +184,24 @@
                  info['name'], "Already configured")
             else:
                 hardhatlib.executeCommand(buildenv, info['name'],
-                 [buildenv['sh'], 
-                 '../configure', 
-                 '--with-mac',
-                 '--with-opengl',
-                 '--enable-geometry',
-                 '--enable-debug',
-                 '--disable-precomp',
+                 [buildenv['sh'], '../configure', '--with-gtk', 
+                 '--enable-debug', '--enable-mem_tracing',
+                 '--disable-std_iostreams',
+                 '--enable-gtk2',
+                 '--with-libpng=builtin',
                  '--prefix='+buildenv['root']+os.sep+'debug'],
-                 "Configuring wxWindows debug")
+                 "Configuring wxWindows")
 
             hardhatlib.executeCommand(buildenv, info['name'],
              [buildenv['make']],
-             "Making wxWindows debug")
+             "Making wxWindows")
 
             hardhatlib.executeCommand(buildenv, info['name'],
              [buildenv['make'], 'install'],
-             "Install wxWindows debug")
-
-
+             "Installing wxWindows")
 
 
-    if buildenv['os'] == 'win':
+    elif buildenv['os'] == 'win':
 
         os.putenv('WXWIN', buildenv['root_dos'] + '\\wxpython')