[Commits] (markie) Get the right path

[commits at osafoundation.org]

Commit by: markie
Modified files:
osaf/hardhat/buildscripts/chandler-newbuild.py 1.49 1.50

Log message:
Get the right path


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

Index: osaf/hardhat/buildscripts/chandler-newbuild.py
diff -u osaf/hardhat/buildscripts/chandler-newbuild.py:1.49 osaf/hardhat/buildscripts/chandler-newbuild.py:1.50
--- osaf/hardhat/buildscripts/chandler-newbuild.py:1.49	Sun Apr 25 11:27:39 2004
+++ osaf/hardhat/buildscripts/chandler-newbuild.py	Sun Apr 25 11:31:27 2004
@@ -24,7 +24,9 @@
 
     # find path to buildscripts
     hardhatDir = hardhatutil.findInPath(path,hardhatScript)
-    print "Directory of build script is " + hardhatDir + "\n"
+    print "Build script is " + hardhatDir + "\n"
+    thisScriptDir = os.join(os.dirname(hardhatDir), "buildscripts")
+    print "Build scripts dir is " + thisScriptDir + "\n"
 
     # make sure workingDir is absolute, remove it, and create it
     workingDir = os.path.abspath(workingDir)
@@ -87,7 +89,7 @@
                   #  log.write("Making external (debug) binaries\n")
                   #  outputList = hardhatutil.executeCommandReturnOutput(
                   #   [buildenv['make'], dbgStr, "binaries" ])
-                    initFile = os.path.join(hardhatDir, 'init.sh')
+                    initFile = os.path.join(thisScriptDir, 'init.sh')
                     log.write("Running init script from " + initFile + "\n")
                     outputList = hardhatutil.executeCommandReturnOutput(
                      [initFile] )