[Commits] (markie) Use proper method to get path to init.sh (still need to make sure this works on cygwin)

[commits at osafoundation.org]

Commit by: markie
Modified files:
osaf/hardhat/buildscripts/new-chandler.py 1.12 1.13

Log message:
Use proper method to get path to init.sh (still need to make sure this works on cygwin) 


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

Index: osaf/hardhat/buildscripts/new-chandler.py
diff -u osaf/hardhat/buildscripts/new-chandler.py:1.12 osaf/hardhat/buildscripts/new-chandler.py:1.13
--- osaf/hardhat/buildscripts/new-chandler.py:1.12	Mon Apr 26 11:54:56 2004
+++ osaf/hardhat/buildscripts/new-chandler.py	Mon Apr 26 12:08:15 2004
@@ -25,8 +25,8 @@
     global ret
 
     # find path to buildscripts
-#    thisScriptDir = os.path.join("/home/markie/hardhat", "buildscripts")
-#    print "Build scripts dir is " + thisScriptDir + "\n"
+    thisScriptDir = buildenv['hardhatroot'] + os.sep + "buildscripts"
+    print "Build scripts dir is " + thisScriptDir + "\n"
 
     # initialize return value
     ret = "no_changes" 
@@ -84,19 +84,19 @@
             log.write("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -\n")
             log.write("Expanding external sources\n")
             try: 
+#               outputList = hardhatutil.executeCommandReturnOutput(
+#                [buildenv['make'], "expand" ])
+#               hardhatutil.dumpOutputList(outputList, log)
+#               outputList = hardhatutil.executeCommandReturnOutput(
+#                [buildenv['make'], dbgStr ])
+#               hardhatutil.dumpOutputList(outputList, log)
+#               log.write("Making external (debug) binaries\n")
+#               outputList = hardhatutil.executeCommandReturnOutput(
+#                [buildenv['make'], dbgStr, "binaries" ])
+                initFile = os.path.join(thisScriptDir, 'init.sh')
+                log.write("Running init script from " + initFile + "\n")
                 outputList = hardhatutil.executeCommandReturnOutput(
-                 [buildenv['make'], "expand" ])
-                hardhatutil.dumpOutputList(outputList, log)
-                outputList = hardhatutil.executeCommandReturnOutput(
-                 [buildenv['make'], dbgStr ])
-                hardhatutil.dumpOutputList(outputList, log)
-                log.write("Making external (debug) binaries\n")
-                outputList = hardhatutil.executeCommandReturnOutput(
-                 [buildenv['make'], dbgStr, "binaries" ])
-#                initFile = os.path.join(thisScriptDir, 'init.sh')
-#                log.write("Running init script from " + initFile + "\n")
-#                outputList = hardhatutil.executeCommandReturnOutput(
-#                 [initFile] )
+                 [initFile] )
                 hardhatutil.dumpOutputList(outputList, log)
 
             except Exception, e: