[Commits] (markie) Need hardhatlib for buildenv

[commits at osafoundation.org]

Commit by: markie
Modified files:
osaf/hardhat/buildscripts/chandler-newbuild.py 1.18 1.19

Log message:
Need hardhatlib for buildenv


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/osaf/hardhat/buildscripts/chandler-newbuild.py.diff?r1=text&tr1=1.18&r2=text&tr2=1.19

Index: osaf/hardhat/buildscripts/chandler-newbuild.py
diff -u osaf/hardhat/buildscripts/chandler-newbuild.py:1.18 osaf/hardhat/buildscripts/chandler-newbuild.py:1.19
--- osaf/hardhat/buildscripts/chandler-newbuild.py:1.18	Sat Apr 24 14:16:34 2004
+++ osaf/hardhat/buildscripts/chandler-newbuild.py	Sat Apr 24 14:34:45 2004
@@ -12,7 +12,7 @@
 False = 0
 
 
-import os, hardhatutil, sys, re
+import os, hardhatutil, hardhatlib, sys, re
 
 
 treeName = "Chandler"
@@ -60,12 +60,12 @@
 
             # Now need to do the setup for external - "expand" and "make"
             os.chdir("external")
-            os.environ.put("BUILD_ROOT", os.path.join(outputDir, "debug", "external") )
+            os.putenv("BUILD_ROOT", os.path.join(outputDir, "debug", "external") )
             print "Building debug"
             log.write("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -\n")
             log.write("Building debug..." + "\n")
             outputList = hardhatutil.executeCommandReturnOutput(
-             [buildenv['make'], "expand" ],
+             ['make', "expand" ],
              "Expanding external sources")
             outputList = hardhatutil.executeCommandReturnOutput(
              [buildenv['make'], "DEBUG=1" ],
@@ -260,12 +260,10 @@
              [buildenv['make'] ],
              "Making external programs")
             outputList = hardhatutil.executeCommandReturnOutput(
-             buildenv, info['name'],
              [buildenv['make'], "binaries" ],
              "Making external binaries")
             os.chdir(intModuleDir)
             outputList = hardhatutil.executeCommandReturnOutput(
-             buildenv, info['name'],
              [buildenv['make'] ],
              "Making internal programs")
             outputList = hardhatutil.executeCommandReturnOutput(
@@ -302,16 +300,13 @@
              [buildenv['make'] ],
              "Making external programs")
             outputList = hardhatutil.executeCommandReturnOutput(
-             buildenv, info['name'],
              [buildenv['make'], "binaries" ],
              "Making external binaries")
             os.chdir(intModuleDir)
             outputList = hardhatutil.executeCommandReturnOutput(
-             buildenv, info['name'],
              [buildenv['make'] ],
              "Making internal programs")
             outputList = hardhatutil.executeCommandReturnOutput(
-             buildenv, info['name'],
              [buildenv['make'], "binaries" ],
              "Making internal binaries")