[llvm-commits] [hlvm] r38182 - in /hlvm/trunk: hlvm/Reader/SConscript hlvm/Writer/SConscript hlvm/Writer/XML/ hlvm/Writer/XMLWriter.cpp hlvm/Writer/XMLWriter.h tools/hlvm-compiler/SConscript tools/hlvm-compiler/hlvm-compiler.cpp tools/hlvm-xml2xml/SConscript tools/hlvm-xml2xml/hlvm-xml2xml.cpp

[Reid Spencer]

Author: reid
Date: Sat Jul  7 19:00:52 2007
New Revision: 38182

URL: http://llvm.org/viewvc/llvm-project?rev=38182&view=rev
Log:
Move the XMLWriter into the hlvm/Writer directory from hlvm/XML/Writer. There's
no point having the directory structure go this deep.

Added:
    hlvm/trunk/hlvm/Writer/XMLWriter.cpp
      - copied, changed from r38180, hlvm/trunk/hlvm/Writer/XML/XMLWriter.cpp
    hlvm/trunk/hlvm/Writer/XMLWriter.h
      - copied unchanged from r38180, hlvm/trunk/hlvm/Writer/XML/XMLWriter.h
Removed:
    hlvm/trunk/hlvm/Writer/XML/
Modified:
    hlvm/trunk/hlvm/Reader/SConscript
    hlvm/trunk/hlvm/Writer/SConscript
    hlvm/trunk/tools/hlvm-compiler/SConscript
    hlvm/trunk/tools/hlvm-compiler/hlvm-compiler.cpp
    hlvm/trunk/tools/hlvm-xml2xml/SConscript
    hlvm/trunk/tools/hlvm-xml2xml/hlvm-xml2xml.cpp

Modified: hlvm/trunk/hlvm/Reader/SConscript
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/hlvm/Reader/SConscript?rev=38182&r1=38181&r2=38182&view=diff

==============================================================================
--- hlvm/trunk/hlvm/Reader/SConscript (original)
+++ hlvm/trunk/hlvm/Reader/SConscript Sat Jul  7 19:00:52 2007
@@ -26,6 +26,6 @@
 hlvm.GetRNGTokenizer(env)
 env.RNGQuoteSource('HLVM.rng.inc','HLVM.rng')
 env.RNGTokenizer('HLVMTokenizer.cpp','HLVM.rng')
-lib = env.Library('HLVMXMLReader',['XMLReader.cpp','HLVMTokenizer.cpp'])
+lib = env.Library('HLVMReader',['XMLReader.cpp','HLVMTokenizer.cpp'])
 hlvm.InstallLibrary(env,lib)
 hlvm.InstallHeader(env,['XMLReader.h'])

Modified: hlvm/trunk/hlvm/Writer/SConscript
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/hlvm/Writer/SConscript?rev=38182&r1=38181&r2=38182&view=diff

==============================================================================
--- hlvm/trunk/hlvm/Writer/SConscript (original)
+++ hlvm/trunk/hlvm/Writer/SConscript Sat Jul  7 19:00:52 2007
@@ -22,5 +22,6 @@
 #===----------------------------------------------------------------------===#
 from build import hlvm
 Import('env')
-hlvm.Dirs(env,['XML'])
-hlvm.InstallHeader(env,['Writer.h'])
+lib = env.Library('HLVMWriter',hlvm.GetAllCXXFiles(env))
+hlvm.InstallLibrary(env,lib)
+hlvm.InstallHeader(env,['XMLWriter.h'])

Copied: hlvm/trunk/hlvm/Writer/XMLWriter.cpp (from r38180, hlvm/trunk/hlvm/Writer/XML/XMLWriter.cpp)
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/hlvm/Writer/XMLWriter.cpp?p2=hlvm/trunk/hlvm/Writer/XMLWriter.cpp&p1=hlvm/trunk/hlvm/Writer/XML/XMLWriter.cpp&r1=38180&r2=38182&rev=38182&view=diff

==============================================================================
--- hlvm/trunk/hlvm/Writer/XML/XMLWriter.cpp (original)
+++ hlvm/trunk/hlvm/Writer/XMLWriter.cpp Sat Jul  7 19:00:52 2007
@@ -27,7 +27,7 @@
 /// @brief Provides the interface to hlvm::XMLWriter
 //===----------------------------------------------------------------------===//
 
-#include <hlvm/Writer/XML/XMLWriter.h>
+#include <hlvm/Writer/XMLWriter.h>
 #include <hlvm/AST/AST.h>
 #include <hlvm/AST/Bundle.h>
 #include <hlvm/AST/Import.h>

Modified: hlvm/trunk/tools/hlvm-compiler/SConscript
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/tools/hlvm-compiler/SConscript?rev=38182&r1=38181&r2=38182&view=diff

==============================================================================
--- hlvm/trunk/tools/hlvm-compiler/SConscript (original)
+++ hlvm/trunk/tools/hlvm-compiler/SConscript Sat Jul  7 19:00:52 2007
@@ -26,8 +26,8 @@
 prog = env.Program('hlvm-compiler', hlvm.GetAllCXXFiles(env),
  LIBS=[
    'HLVMCodeGen',
-   'HLVMXMLReader',
-   'HLVMXMLWriter',
+   'HLVMReader',
+   'HLVMWriter',
    'HLVMPass',
    'HLVMAST',
    'HLVMBase',

Modified: hlvm/trunk/tools/hlvm-compiler/hlvm-compiler.cpp
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/tools/hlvm-compiler/hlvm-compiler.cpp?rev=38182&r1=38181&r2=38182&view=diff

==============================================================================
--- hlvm/trunk/tools/hlvm-compiler/hlvm-compiler.cpp (original)
+++ hlvm/trunk/tools/hlvm-compiler/hlvm-compiler.cpp Sat Jul  7 19:00:52 2007
@@ -29,7 +29,7 @@
 
 #include <hlvm/Base/Memory.h>
 #include <hlvm/Reader/XMLReader.h>
-#include <hlvm/Writer/XML/XMLWriter.h>
+#include <hlvm/Writer/XMLWriter.h>
 #include <hlvm/Pass/Pass.h>
 #include <hlvm/CodeGen/LLVMGenerator.h>
 #include <llvm/Support/CommandLine.h>

Modified: hlvm/trunk/tools/hlvm-xml2xml/SConscript
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/tools/hlvm-xml2xml/SConscript?rev=38182&r1=38181&r2=38182&view=diff

==============================================================================
--- hlvm/trunk/tools/hlvm-xml2xml/SConscript (original)
+++ hlvm/trunk/tools/hlvm-xml2xml/SConscript Sat Jul  7 19:00:52 2007
@@ -24,8 +24,8 @@
 Import('env')
 prog = env.Program('hlvm-xml2xml', hlvm.GetAllCXXFiles(env),
  LIBS=[
-   'HLVMXMLReader',
-   'HLVMXMLWriter',
+   'HLVMReader',
+   'HLVMWriter',
    'HLVMPass',
    'HLVMAST',
    'HLVMBase',

Modified: hlvm/trunk/tools/hlvm-xml2xml/hlvm-xml2xml.cpp
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/tools/hlvm-xml2xml/hlvm-xml2xml.cpp?rev=38182&r1=38181&r2=38182&view=diff

==============================================================================
--- hlvm/trunk/tools/hlvm-xml2xml/hlvm-xml2xml.cpp (original)
+++ hlvm/trunk/tools/hlvm-xml2xml/hlvm-xml2xml.cpp Sat Jul  7 19:00:52 2007
@@ -29,7 +29,7 @@
 
 #include <hlvm/Base/Memory.h>
 #include <hlvm/Reader/XMLReader.h>
-#include <hlvm/Writer/XML/XMLWriter.h>
+#include <hlvm/Writer/XMLWriter.h>
 #include <hlvm/Pass/Pass.h>
 #include <llvm/Support/CommandLine.h>
 #include <llvm/System/Signals.h>