[cfe-commits] r62517 - in /cfe/trunk: Makefile tools/ccc/Makefile tools/ccc/ccc tools/ccc/xcc

[Daniel Dunbar]

Author: ddunbar
Date: Mon Jan 19 12:50:49 2009
New Revision: 62517

URL: http://llvm.org/viewvc/llvm-project?rev=62517&view=rev
Log:
ccc: Add installation of ccc; based on patch from Mike Stump.
 - This doesn't follow normal installation procedure of python
   code, but no sense trying too hard since ccc will be moved to
   C++.

 - Entry point is now tools/ccc.

Added:
    cfe/trunk/tools/ccc/Makefile
    cfe/trunk/tools/ccc/ccc   (props changed)
      - copied unchanged from r62472, cfe/trunk/tools/ccc/xcc
Removed:
    cfe/trunk/tools/ccc/xcc
Modified:
    cfe/trunk/Makefile

Modified: cfe/trunk/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Makefile?rev=62517&r1=62516&r2=62517&view=diff

==============================================================================
--- cfe/trunk/Makefile (original)
+++ cfe/trunk/Makefile Mon Jan 19 12:50:49 2009
@@ -1,5 +1,5 @@
 LEVEL = ../..
-DIRS := lib Driver docs
+DIRS := lib Driver docs tools
 
 include $(LEVEL)/Makefile.common
 

Added: cfe/trunk/tools/ccc/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/ccc/Makefile?rev=62517&view=auto

==============================================================================
--- cfe/trunk/tools/ccc/Makefile (added)
+++ cfe/trunk/tools/ccc/Makefile Mon Jan 19 12:50:49 2009
@@ -0,0 +1,28 @@
+##===- tools/ccc/Makefile ----------------------------------*- Makefile -*-===##
+#
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+#
+##===----------------------------------------------------------------------===##
+
+LEVEL = ../../../..
+
+include $(LEVEL)/Makefile.common
+
+install-local:: $(PROJ_bindir)/ccc $(PROJ_bindir)/ccclib
+
+Extra := $(wildcard ccclib/*.py)
+
+$(PROJ_bindir)/ccclib : $(Extra)
+	$(Echo) Installing ccclib.
+	$(Verb) mkdir -p $(PROJ_bindir)/ccclib
+	$(Verb) cp $? $(PROJ_bindir)/ccclib
+	$(Verb) python -m compileall $(PROJ_bindir)/ccclib 
+	$(Verb) touch $(PROJ_bindir)/ccclib
+
+$(PROJ_bindir)/ccc : ccc
+	$(Echo) Installing $< shell script.
+	$(Verb) cat $< > $@
+	$(Verb) chmod 0755 $@

Propchange: cfe/trunk/tools/ccc/ccc

------------------------------------------------------------------------------
    svn:executable = *

Propchange: cfe/trunk/tools/ccc/ccc

------------------------------------------------------------------------------
    svn:mergeinfo = 

Removed: cfe/trunk/tools/ccc/xcc
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/ccc/xcc?rev=62516&view=auto

==============================================================================
--- cfe/trunk/tools/ccc/xcc (original)
+++ cfe/trunk/tools/ccc/xcc (removed)
@@ -1,25 +0,0 @@
-#!/usr/bin/python
-
-import os
-import sys
-from ccclib import Arguments
-from ccclib import Driver
-        
-def main():
-    progDir = os.path.dirname(sys.argv[0])
-    progName = os.path.basename(sys.argv[0])
-
-    d = Driver.Driver(progName, progDir)
-    try:
-        d.run(sys.argv[1:])
-    except Arguments.InvalidArgumentsError,e:
-        print >>sys.stderr, "%s: %s" % (progName, e.args[0])
-        sys.exit(1)
-    except Arguments.MissingArgumentError,e:
-        print >>sys.stderr, "%s: argument to '%s' missing" % (progName, e.args[0].name)
-        sys.exit(1)
-    except NotImplementedError,e:
-        print >>sys.stderr, "%s: not implemented: %s" % (progName, e.args[0])
-
-if __name__=='__main__':
-    main()