[llvm-commits] [hlvm] r38085 - in /hlvm/trunk: SConstruct build/configure.py build/hlvm.py

[Reid Spencer]

Author: reid
Date: Sat Jul  7 18:59:42 2007
New Revision: 38085

URL: http://llvm.org/viewvc/llvm-project?rev=38085&view=rev
Log:
Attempt to get the object files in the build directory.

Modified:
    hlvm/trunk/SConstruct
    hlvm/trunk/build/configure.py
    hlvm/trunk/build/hlvm.py

Modified: hlvm/trunk/SConstruct
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/SConstruct?rev=38085&r1=38084&r2=38085&view=diff

==============================================================================
--- hlvm/trunk/SConstruct (original)
+++ hlvm/trunk/SConstruct Sat Jul  7 18:59:42 2007
@@ -21,6 +21,7 @@
 #
 #===----------------------------------------------------------------------===#
 from build import hlvm
+from os.path import join as pjoin
 env = hlvm.GetBuildEnvironment(COMMAND_LINE_TARGETS,ARGUMENTS)
 Export('env')
 hlvm.Dirs(env,['hlvm','tools','test'])

Modified: hlvm/trunk/build/configure.py
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/build/configure.py?rev=38085&r1=38084&r2=38085&view=diff

==============================================================================
--- hlvm/trunk/build/configure.py (original)
+++ hlvm/trunk/build/configure.py Sat Jul  7 18:59:42 2007
@@ -117,7 +117,7 @@
   return response
 
 def FindLLVM(conf,env):
-  code = 'llvm::Module* M = new llvm::Module("Name");'
+  code = 'new llvm::Module("Name");'
   return conf.FindPackage('LLVM','llvm/Module.h',['LLVMSupport','LLVMSystem'],
       code,['/proj/install/llvm'],['LLVMCore','LLVMbzip2'])
 
@@ -176,4 +176,4 @@
   FindAPR(conf,env)
   FindAPRU(conf,env)
   FindLLVM(conf,env)
-  return conf.Finish()
+  conf.Finish()

Modified: hlvm/trunk/build/hlvm.py
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/build/hlvm.py?rev=38085&r1=38084&r2=38085&view=diff

==============================================================================
--- hlvm/trunk/build/hlvm.py (original)
+++ hlvm/trunk/build/hlvm.py Sat Jul  7 18:59:42 2007
@@ -27,16 +27,16 @@
 
 def Dirs(env,dirlist=[]):
   dir = env.Dir('.').path
-  top = env.Dir('#').path
-  if top == dir:
-    path = pjoin('#',env['BuildDir'])
+  print "dir=",dir
+  if (dir == env.Dir('#').path):
+    dir = '#' + env['BuildDir']
   else:
-    path = ''
-  print "Entering Directory",dir
-  result = []
+    dir = '#' + dir
+  print "dir=",dir
   for d in dirlist:
-    result.append(pjoin(path,d,'SConscript'))
-  env.SConscript(result)
+    sconsfile = pjoin(dir,d,'SConscript')
+    print "sconsfile=",sconsfile
+    env.SConscript(sconsfile)
 
 def InstallProgram(env,prog):
   dir = pjoin(env['prefix'],'bin')
@@ -56,9 +56,6 @@
   env.Alias('install',dir)
   return 1
 
-def join(one,two):
-  return pjoin([one,two])
-
 def GetBuildEnvironment(targets,arguments):
   env = Environment();
   env.EnsurePythonVersion(2,3)
@@ -145,11 +142,11 @@
     pjoin('#',BuildDir,'hlvm/Reader/XML'),
     pjoin('#',BuildDir,'hlvm/Writer/XML')
   ];
+  env.Prepend(CPPPATH=[pjoin('#',BuildDir)])
+  env.Prepend(CPPPATH=['#'])
   env.BuildDir(pjoin(BuildDir,'hlvm'),'hlvm',duplicate=0)
   env.BuildDir(pjoin(BuildDir,'tools'),'tools',duplicate=0)
   env.BuildDir(pjoin(BuildDir,'test'),'test',duplicate=0)
-  env.Prepend(CPPPATH=[pjoin('#',BuildDir)])
-  env.Prepend(CPPPATH=['#'])
   env.SConsignFile(pjoin(BuildDir,'sconsign'))
   env.Help("""
 HLVM Build Environment
@@ -170,7 +167,7 @@
   prefix=<path>     - specify where HLVM should be installed (/usr/local)
 """)
   print "HLVM BUILD MODE:", VariantName
-  env = ConfigureHLVM(env)
+  ConfigureHLVM(env)
   if 'check' in targets:
     from build import check
     check.Check(env)