[llvm-commits] [hlvm] r38079 - in /hlvm/trunk: ./ hlvm/AST/SConscript hlvm/Base/SConscript hlvm/Reader/XML/SConscript scons/configure.py scons/environment.py scons/filterbuilders.py tools/hlvm-xml2xml/SConscript
Reid Spencer
reid at x10sys.com
Sat Jul 7 16:59:38 PDT 2007
Author: reid
Date: Sat Jul 7 18:59:38 2007
New Revision: 38079
URL: http://llvm.org/viewvc/llvm-project?rev=38079&view=rev
Log:
Get the last few scons nigglies out of the way. Everything builds now.
Modified:
hlvm/trunk/ (props changed)
hlvm/trunk/hlvm/AST/SConscript
hlvm/trunk/hlvm/Base/SConscript
hlvm/trunk/hlvm/Reader/XML/SConscript
hlvm/trunk/scons/configure.py
hlvm/trunk/scons/environment.py
hlvm/trunk/scons/filterbuilders.py
hlvm/trunk/tools/hlvm-xml2xml/SConscript
Propchange: hlvm/trunk/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Jul 7 18:59:38 2007
@@ -0,0 +1,3 @@
+build.*
+.sconsign.dblite
+options.cache
Modified: hlvm/trunk/hlvm/AST/SConscript
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/hlvm/AST/SConscript?rev=38079&r1=38078&r2=38079&view=diff
==============================================================================
--- hlvm/trunk/hlvm/AST/SConscript (original)
+++ hlvm/trunk/hlvm/AST/SConscript Sat Jul 7 18:59:38 2007
@@ -1,3 +1,3 @@
from scons import main
Import('env')
-env.Library('HLVMast',main.GetAllCXXFiles(env))
+env.Library('HLVMAST',main.GetAllCXXFiles(env))
Modified: hlvm/trunk/hlvm/Base/SConscript
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/hlvm/Base/SConscript?rev=38079&r1=38078&r2=38079&view=diff
==============================================================================
--- hlvm/trunk/hlvm/Base/SConscript (original)
+++ hlvm/trunk/hlvm/Base/SConscript Sat Jul 7 18:59:38 2007
@@ -1,3 +1,3 @@
Import('env')
from scons import main
-env.Library('HLVMbase',main.GetAllCXXFiles(env))
+env.Library('HLVMBase',main.GetAllCXXFiles(env))
Modified: hlvm/trunk/hlvm/Reader/XML/SConscript
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/hlvm/Reader/XML/SConscript?rev=38079&r1=38078&r2=38079&view=diff
==============================================================================
--- hlvm/trunk/hlvm/Reader/XML/SConscript (original)
+++ hlvm/trunk/hlvm/Reader/XML/SConscript Sat Jul 7 18:59:38 2007
@@ -4,4 +4,4 @@
main.GetRNGTokenizer(env)
env.RNGQuoteSource('HLVM.rng.inc','HLVM.rng')
env.RNGTokenizer('HLVMTokenizer.cpp','HLVM.rng')
-env.Library('HLVMXMLReader',main.GetAllCXXFiles(env))
+env.Library('HLVMXMLReader',main.GetAllCXXFiles(env)+['HLVMTokenizer.cpp'])
Modified: hlvm/trunk/scons/configure.py
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/scons/configure.py?rev=38079&r1=38078&r2=38079&view=diff
==============================================================================
--- hlvm/trunk/scons/configure.py (original)
+++ hlvm/trunk/scons/configure.py Sat Jul 7 18:59:38 2007
@@ -72,7 +72,7 @@
library += alib + context.env['LIBSUFFIX']
if not exists(library):
continue
- objects = " "
+ objects = []
count = 0
for o in objs:
obj = pjoin(libdir,context.env['OBJPREFIX'])
@@ -81,7 +81,8 @@
continue;
else:
count += 1
- objects += obj + " "
+ objects.append(obj)
+ print "objects(",len(objects),"=",objects
if count != len(objs):
continue
for incdir in ['include', 'inc', 'incl']:
@@ -105,6 +106,8 @@
context.env.Replace(LIBS=lastLIBS, LIBPATH=lastLIBPATH,
CPPPATH=lastCPPPATH, LINKFLAGS=lastLINKFLAGS)
continue
+ else:
+ context.env.Replace(LIBS=lastLIBS, LINKFLAGS=lastLINKFLAGS)
context.env[pkgname + '_lib'] = libdir
context.env[pkgname + '_inc'] = hdrdir
context.Result('Found: (' + hdrdir + ',' + libdir + ')')
Modified: hlvm/trunk/scons/environment.py
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/scons/environment.py?rev=38079&r1=38078&r2=38079&view=diff
==============================================================================
--- hlvm/trunk/scons/environment.py (original)
+++ hlvm/trunk/scons/environment.py Sat Jul 7 18:59:38 2007
@@ -80,15 +80,17 @@
env['Variant'] = VariantName
env['BuildDir'] = BuildDir
env['LIBPATH'] = [
- pjoin(BuildDir,'hlvm/Base'),
- pjoin(BuildDir,'hlvm/AST'),
- pjoin(BuildDir,'hlvm/Reader/XML'),
- pjoin(BuildDir,'hlvm/Writer/XML')
+ pjoin('#',BuildDir,'hlvm/Base'),
+ pjoin('#',BuildDir,'hlvm/AST'),
+ pjoin('#',BuildDir,'hlvm/Reader/XML'),
+ pjoin('#',BuildDir,'hlvm/Writer/XML')
];
+ print 'LIBPATH=',env['LIBPATH']
env.BuildDir(pjoin(BuildDir,'hlvm'),'hlvm',duplicate=0)
env.BuildDir(pjoin(BuildDir,'tools'),'tools',duplicate=0)
env.Prepend(CPPPATH=[pjoin('#',BuildDir)])
env.Prepend(CPPPATH=['#'])
+ env.SConsignFile(pjoin(BuildDir,'sconsign'))
opts.Save('options.cache', env)
env.Help(opts.GenerateHelpText(env,sort=cmp))
Modified: hlvm/trunk/scons/filterbuilders.py
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/scons/filterbuilders.py?rev=38079&r1=38078&r2=38079&view=diff
==============================================================================
--- hlvm/trunk/scons/filterbuilders.py (original)
+++ hlvm/trunk/scons/filterbuilders.py Sat Jul 7 18:59:38 2007
@@ -77,17 +77,17 @@
tknFilename = pjoin(tgtDir,Schema) + "Tokens.tmp"
tknFile = open(tknFilename,"w")
tknFile.write('struct TokenMap {\n')
- tknFile.write('const char *name; hlvm::'+Schema+'Tokens token;\n')
+ tknFile.write('const char *name; HLVM_'+Module+'::'+Schema+'Tokens token;\n')
tknFile.write('};\n%%\n')
for tkn in tokens:
- tknFile.write('"' + tkn + '", hlvm::TKN_' + tkn + ',\n')
+ tknFile.write('"' + tkn + '", HLVM_'+Module+'::TKN_' + tkn + ',\n')
tknFile.write('%%\n')
tknFile.close()
gperfAction = env.Action(
"$GPERF -tcDCIoGl --fast 0 -L C++ -Z " + TokenHashClass +
" -s 2 -S 1 -k '*' " + tknFilename + " >" + TokenHashFile)
env.Execute(gperfAction)
- tokenList = "TKN_"
+ tokenList = ""
for tkn in tokens:
tokenList += "TKN_" + tkn + ",\n "
from datetime import date
Modified: hlvm/trunk/tools/hlvm-xml2xml/SConscript
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/tools/hlvm-xml2xml/SConscript?rev=38079&r1=38078&r2=38079&view=diff
==============================================================================
--- hlvm/trunk/tools/hlvm-xml2xml/SConscript (original)
+++ hlvm/trunk/tools/hlvm-xml2xml/SConscript Sat Jul 7 18:59:38 2007
@@ -1,4 +1,15 @@
from scons import main
Import('env')
env.Program('hlvm-xml2xml', main.GetAllCXXFiles(env),
- LIBS=['HLVMAST','HLVMXMLReader','HLVMXMLWriter','HLVMBase','xml2','LLVMSupport'])
+ LIBS=[
+ 'HLVMXMLReader',
+ 'HLVMXMLWriter',
+ 'HLVMAST',
+ 'HLVMBase',
+ 'xml2',
+ 'LLVMSupport',
+ 'LLVMSystem',
+ 'apr-1',
+ 'stdc++'
+ ]
+)
More information about the llvm-commits
mailing list