[llvm-commits] [hlvm] r38084 - in /hlvm/trunk: SConstruct build/ build/check.py build/environment.py build/filterbuilders.py build/hlvm.py hlvm/AST/SConscript hlvm/Base/SConscript hlvm/Reader/SConscript hlvm/Reader/XML/SConscript hlvm/SConscript hlvm/Writer/SConscript hlvm/Writer/XML/SConscript scons/ test/SConscript tools/SConscript tools/hlvm-xml2xml/SConscript tools/hlvm/SConscript
Reid Spencer
reid at x10sys.com
Sat Jul 7 16:59:41 PDT 2007
Author: reid
Date: Sat Jul 7 18:59:41 2007
New Revision: 38084
URL: http://llvm.org/viewvc/llvm-project?rev=38084&view=rev
Log:
Rename the "scons" directory as "build" so that things don't get confusing
with Python import statements
Added:
hlvm/trunk/build/
- copied from r38082, hlvm/trunk/scons/
hlvm/trunk/build/check.py
- copied unchanged from r38083, hlvm/trunk/scons/check.py
hlvm/trunk/build/environment.py
- copied unchanged from r38083, hlvm/trunk/scons/environment.py
hlvm/trunk/build/filterbuilders.py
- copied unchanged from r38083, hlvm/trunk/scons/filterbuilders.py
hlvm/trunk/build/hlvm.py
- copied, changed from r38083, hlvm/trunk/scons/hlvm.py
Removed:
hlvm/trunk/scons/
Modified:
hlvm/trunk/SConstruct
hlvm/trunk/hlvm/AST/SConscript
hlvm/trunk/hlvm/Base/SConscript
hlvm/trunk/hlvm/Reader/SConscript
hlvm/trunk/hlvm/Reader/XML/SConscript
hlvm/trunk/hlvm/SConscript
hlvm/trunk/hlvm/Writer/SConscript
hlvm/trunk/hlvm/Writer/XML/SConscript
hlvm/trunk/test/SConscript
hlvm/trunk/tools/SConscript
hlvm/trunk/tools/hlvm-xml2xml/SConscript
hlvm/trunk/tools/hlvm/SConscript
Modified: hlvm/trunk/SConstruct
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/SConstruct?rev=38084&r1=38083&r2=38084&view=diff
==============================================================================
--- hlvm/trunk/SConstruct (original)
+++ hlvm/trunk/SConstruct Sat Jul 7 18:59:41 2007
@@ -20,7 +20,7 @@
# MA 02110-1301 USA
#
#===----------------------------------------------------------------------===#
-from scons import hlvm
+from build import hlvm
env = hlvm.GetBuildEnvironment(COMMAND_LINE_TARGETS,ARGUMENTS)
Export('env')
hlvm.Dirs(env,['hlvm','tools','test'])
Copied: hlvm/trunk/build/hlvm.py (from r38083, hlvm/trunk/scons/hlvm.py)
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/build/hlvm.py?p2=hlvm/trunk/build/hlvm.py&p1=hlvm/trunk/scons/hlvm.py&r1=38083&r2=38084&rev=38084&view=diff
==============================================================================
--- hlvm/trunk/scons/hlvm.py (original)
+++ hlvm/trunk/build/hlvm.py Sat Jul 7 18:59:41 2007
@@ -18,11 +18,11 @@
return env.Flatten([p1,p2,p3])
def GetRNGQuoteSource(env):
- from scons import filterbuilders
+ from build import filterbuilders
return filterbuilders.RNGQuoteSource(env)
def GetRNGTokenizer(env):
- from scons import filterbuilders
+ from build import filterbuilders
return filterbuilders.RNGTokenizer(env)
def Dirs(env,dirlist=[]):
@@ -172,7 +172,7 @@
print "HLVM BUILD MODE:", VariantName
env = ConfigureHLVM(env)
if 'check' in targets:
- from scons import check
+ from build import check
check.Check(env)
return env
Modified: hlvm/trunk/hlvm/AST/SConscript
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/hlvm/AST/SConscript?rev=38084&r1=38083&r2=38084&view=diff
==============================================================================
--- hlvm/trunk/hlvm/AST/SConscript (original)
+++ hlvm/trunk/hlvm/AST/SConscript Sat Jul 7 18:59:41 2007
@@ -20,8 +20,7 @@
# MA 02110-1301 USA
#
#===----------------------------------------------------------------------===#
-#
-from scons import hlvm
+from build import hlvm
Import('env')
lib = env.Library('HLVMAST',hlvm.GetAllCXXFiles(env))
hlvm.InstallLibrary(env,lib)
Modified: hlvm/trunk/hlvm/Base/SConscript
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/hlvm/Base/SConscript?rev=38084&r1=38083&r2=38084&view=diff
==============================================================================
--- hlvm/trunk/hlvm/Base/SConscript (original)
+++ hlvm/trunk/hlvm/Base/SConscript Sat Jul 7 18:59:41 2007
@@ -20,8 +20,7 @@
# MA 02110-1301 USA
#
#===----------------------------------------------------------------------===#
-#
+from build import hlvm
Import('env')
-from scons import hlvm
lib = env.Library('HLVMBase',hlvm.GetAllCXXFiles(env))
hlvm.InstallLibrary(env,lib)
Modified: hlvm/trunk/hlvm/Reader/SConscript
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/hlvm/Reader/SConscript?rev=38084&r1=38083&r2=38084&view=diff
==============================================================================
--- hlvm/trunk/hlvm/Reader/SConscript (original)
+++ hlvm/trunk/hlvm/Reader/SConscript Sat Jul 7 18:59:41 2007
@@ -20,6 +20,6 @@
# MA 02110-1301 USA
#
#===----------------------------------------------------------------------===#
-from scons import hlvm
+from build import hlvm
Import('env')
hlvm.Dirs(env,['XML'])
Modified: hlvm/trunk/hlvm/Reader/XML/SConscript
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/hlvm/Reader/XML/SConscript?rev=38084&r1=38083&r2=38084&view=diff
==============================================================================
--- hlvm/trunk/hlvm/Reader/XML/SConscript (original)
+++ hlvm/trunk/hlvm/Reader/XML/SConscript Sat Jul 7 18:59:41 2007
@@ -20,9 +20,8 @@
# MA 02110-1301 USA
#
#===----------------------------------------------------------------------===#
-#
+from build import hlvm
Import('env')
-from scons import hlvm
hlvm.GetRNGQuoteSource(env)
hlvm.GetRNGTokenizer(env)
env.RNGQuoteSource('HLVM.rng.inc','HLVM.rng')
Modified: hlvm/trunk/hlvm/SConscript
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/hlvm/SConscript?rev=38084&r1=38083&r2=38084&view=diff
==============================================================================
--- hlvm/trunk/hlvm/SConscript (original)
+++ hlvm/trunk/hlvm/SConscript Sat Jul 7 18:59:41 2007
@@ -20,7 +20,6 @@
# MA 02110-1301 USA
#
#===----------------------------------------------------------------------===#
-#
-from scons import hlvm
+from build import hlvm
Import('env')
hlvm.Dirs(env,['Base','AST','Reader','Writer'])
Modified: hlvm/trunk/hlvm/Writer/SConscript
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/hlvm/Writer/SConscript?rev=38084&r1=38083&r2=38084&view=diff
==============================================================================
--- hlvm/trunk/hlvm/Writer/SConscript (original)
+++ hlvm/trunk/hlvm/Writer/SConscript Sat Jul 7 18:59:41 2007
@@ -20,6 +20,6 @@
# MA 02110-1301 USA
#
#===----------------------------------------------------------------------===#
-from scons import hlvm
+from build import hlvm
Import('env')
hlvm.Dirs(env,['XML'])
Modified: hlvm/trunk/hlvm/Writer/XML/SConscript
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/hlvm/Writer/XML/SConscript?rev=38084&r1=38083&r2=38084&view=diff
==============================================================================
--- hlvm/trunk/hlvm/Writer/XML/SConscript (original)
+++ hlvm/trunk/hlvm/Writer/XML/SConscript Sat Jul 7 18:59:41 2007
@@ -20,7 +20,7 @@
# MA 02110-1301 USA
#
#===----------------------------------------------------------------------===#
-from scons import hlvm
+from build import hlvm
Import('env')
lib = env.Library('HLVMXMLWriter',hlvm.GetAllCXXFiles(env))
hlvm.InstallLibrary(env,lib)
Modified: hlvm/trunk/test/SConscript
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/test/SConscript?rev=38084&r1=38083&r2=38084&view=diff
==============================================================================
--- hlvm/trunk/test/SConscript (original)
+++ hlvm/trunk/test/SConscript Sat Jul 7 18:59:41 2007
@@ -20,5 +20,5 @@
# MA 02110-1301 USA
#
#===----------------------------------------------------------------------===#
-from scons import hlvm
+from build import hlvm
Import('env')
Modified: hlvm/trunk/tools/SConscript
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/tools/SConscript?rev=38084&r1=38083&r2=38084&view=diff
==============================================================================
--- hlvm/trunk/tools/SConscript (original)
+++ hlvm/trunk/tools/SConscript Sat Jul 7 18:59:41 2007
@@ -20,7 +20,6 @@
# MA 02110-1301 USA
#
#===----------------------------------------------------------------------===#
-#
-from scons import hlvm
+from build import hlvm
Import('env')
hlvm.Dirs(env,['hlvm-xml2xml','hlvm'])
Modified: hlvm/trunk/tools/hlvm-xml2xml/SConscript
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/tools/hlvm-xml2xml/SConscript?rev=38084&r1=38083&r2=38084&view=diff
==============================================================================
--- hlvm/trunk/tools/hlvm-xml2xml/SConscript (original)
+++ hlvm/trunk/tools/hlvm-xml2xml/SConscript Sat Jul 7 18:59:41 2007
@@ -20,8 +20,7 @@
# MA 02110-1301 USA
#
#===----------------------------------------------------------------------===#
-#
-from scons import hlvm
+from build import hlvm
Import('env')
prog = env.Program('hlvm-xml2xml', hlvm.GetAllCXXFiles(env),
LIBS=[
Modified: hlvm/trunk/tools/hlvm/SConscript
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/tools/hlvm/SConscript?rev=38084&r1=38083&r2=38084&view=diff
==============================================================================
--- hlvm/trunk/tools/hlvm/SConscript (original)
+++ hlvm/trunk/tools/hlvm/SConscript Sat Jul 7 18:59:41 2007
@@ -20,8 +20,7 @@
# MA 02110-1301 USA
#
#===----------------------------------------------------------------------===#
-#
-from scons import hlvm
+from build import hlvm
Import('env')
env.Program('hlvm', hlvm.GetAllCXXFiles(env),
LIBS=[
More information about the llvm-commits
mailing list