[Commits] (markie) Try to use external script for init

[commits at osafoundation.org]

Commit by: markie
Modified files:
osaf/hardhat/buildscripts/chandler-newbuild.py 1.46 1.47

Log message:
Try to use external script for init


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

Index: osaf/hardhat/buildscripts/chandler-newbuild.py
diff -u osaf/hardhat/buildscripts/chandler-newbuild.py:1.46 osaf/hardhat/buildscripts/chandler-newbuild.py:1.47
--- osaf/hardhat/buildscripts/chandler-newbuild.py:1.46	Sun Apr 25 00:28:51 2004
+++ osaf/hardhat/buildscripts/chandler-newbuild.py	Sun Apr 25 10:49:35 2004
@@ -23,6 +23,10 @@
 
 def Start(hardhatScript, workingDir, cvsVintage, buildVersion, clobber, log):
 
+    # find path to buildscripts
+    hardhatDir = os.dirname(hardhatScript)
+    log.write( "Directory of build script is " + hardhatDir + "\n" )
+
     # make sure workingDir is absolute, remove it, and create it
     workingDir = os.path.abspath(workingDir)
     if not os.path.exists(workingDir):
@@ -102,6 +106,48 @@
         # Find out if the initialization was ever done
         try:
             intModuleDir = os.path.join(releaseModeDir, "internal")
+            version = getVersion(os.path.join(extModuleDir, "Makefile"))
+            sourceTarball = os.path.join(extModuleDir, "sources-" + version + ".tar")
+            log.write("Checking for source tarball " + sourceTarball + "\n")
+            if not os.path.exists(sourceTarball) :
+                # Now need to do the setup for external - "expand" and "make"
+                os.chdir(extModuleDir)
+                log.write("Environment variables: \n")
+                log.write("GCJ_HOME = " + os.environ['GCJ_HOME'] + "\n")
+                os.environ["BUILD_ROOT"] = extModuleDir
+                log.write("BUILD_ROOT = " + os.environ['BUILD_ROOT'] + "\n")
+                os.environ["DEBUG"] = dbgStr
+                log.write("DEBUG = " + os.environ['DEBUG'] + "\n")
+
+                print "Building " + releaseMode
+                log.write("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -\n")
+                log.write("Expanding external sources\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(hardhatDir, 'init.sh')
+                log.write("Running init script from " + initFile + "\n")
+                outputList = hardhatutil.executeCommandReturnOutput(
+                 [initFile] )
+                hardhatutil.dumpOutputList(outputList, log)
+
+                os.chdir(intModuleDir)
+                log.write("Making internal (debug) programs\n")
+                outputList = hardhatutil.executeCommandReturnOutput(
+                 [buildenv['make'], dbgStr ])
+                hardhatutil.dumpOutputList(outputList, log)
+                log.write("Making internal (debug) binaries\n")
+                outputList = hardhatutil.executeCommandReturnOutput(
+                 [buildenv['make'], dbgStr, "binaries" ])
+                hardhatutil.dumpOutputList(outputList, log)
+                ret = "no_changes" 
+
             os.chdir(intModuleDir)
             log.write("Making internal (debug) programs\n")
             outputList = hardhatutil.executeCommandReturnOutput(