[llvm-branch-commits] [cfe-branch] r81955 - in /cfe/branches/Apple/Dib: docs/tools/Makefile include/clang/Basic/Version.h lib/CodeGen/CGDebugInfo.cpp lib/Headers/Makefile tools/clang-cc/clang-cc.cpp

[Mike Stump]

Author: mrs
Date: Tue Sep 15 18:40:49 2009
New Revision: 81955

URL: http://llvm.org/viewvc/llvm-project?rev=81955&view=rev
Log:
Update version number.

Modified:
    cfe/branches/Apple/Dib/docs/tools/Makefile
    cfe/branches/Apple/Dib/include/clang/Basic/Version.h
    cfe/branches/Apple/Dib/lib/CodeGen/CGDebugInfo.cpp
    cfe/branches/Apple/Dib/lib/Headers/Makefile
    cfe/branches/Apple/Dib/tools/clang-cc/clang-cc.cpp

Modified: cfe/branches/Apple/Dib/docs/tools/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/docs/tools/Makefile?rev=81955&r1=81954&r2=81955&view=diff

==============================================================================
--- cfe/branches/Apple/Dib/docs/tools/Makefile (original)
+++ cfe/branches/Apple/Dib/docs/tools/Makefile Tue Sep 15 18:40:49 2009
@@ -66,7 +66,7 @@
 	  --podpath=. --infile=$< --outfile=$@ --title=$*
 
 $(DST_MAN_DIR)%.1: %.pod $(DST_MAN_DIR)/.dir
-	pod2man --release "clang 1.0" --center="Clang Tools Documentation" $< $@
+	pod2man --release "clang 1.0.2" --center="Clang Tools Documentation" $< $@
 
 $(DST_PS_DIR)%.ps: $(DST_MAN_DIR)%.1 $(DST_PS_DIR)/.dir
 	groff -Tps -man $< > $@

Modified: cfe/branches/Apple/Dib/include/clang/Basic/Version.h
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/include/clang/Basic/Version.h?rev=81955&r1=81954&r2=81955&view=diff

==============================================================================
--- cfe/branches/Apple/Dib/include/clang/Basic/Version.h (original)
+++ cfe/branches/Apple/Dib/include/clang/Basic/Version.h Tue Sep 15 18:40:49 2009
@@ -20,9 +20,21 @@
 /// \brief Clang minor version
 #define CLANG_VERSION_MINOR 0
 
+/// \brief Clang patchlevel version
+#define CLANG_VERSION_PATCHLEVEL 2
+
 /// \brief Helper macro for CLANG_VERSION_STRING.
 #define CLANG_MAKE_VERSION_STRING2(X) #X
 
+#ifdef CLANG_VERSION_PATCHLEVEL
+/// \brief Helper macro for CLANG_VERSION_STRING.
+#define CLANG_MAKE_VERSION_STRING(X,Y,Z) CLANG_MAKE_VERSION_STRING2(X.Y.Z)
+
+/// \brief A string that describes the Clang version number, e.g.,
+/// "1.0".
+#define CLANG_VERSION_STRING \
+  CLANG_MAKE_VERSION_STRING(CLANG_VERSION_MAJOR,CLANG_VERSION_MINOR,CLANG_VERSION_PATCHLEVEL)
+#else
 /// \brief Helper macro for CLANG_VERSION_STRING.
 #define CLANG_MAKE_VERSION_STRING(X,Y) CLANG_MAKE_VERSION_STRING2(X.Y)
 
@@ -30,6 +42,6 @@
 /// "1.0".
 #define CLANG_VERSION_STRING \
   CLANG_MAKE_VERSION_STRING(CLANG_VERSION_MAJOR,CLANG_VERSION_MINOR)
-
+#endif
 
 #endif // LLVM_CLANG_BASIC_VERSION_H

Modified: cfe/branches/Apple/Dib/lib/CodeGen/CGDebugInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/lib/CodeGen/CGDebugInfo.cpp?rev=81955&r1=81954&r2=81955&view=diff

==============================================================================
--- cfe/branches/Apple/Dib/lib/CodeGen/CGDebugInfo.cpp (original)
+++ cfe/branches/Apple/Dib/lib/CodeGen/CGDebugInfo.cpp Tue Sep 15 18:40:49 2009
@@ -19,6 +19,7 @@
 #include "clang/AST/RecordLayout.h"
 #include "clang/Basic/SourceManager.h"
 #include "clang/Basic/FileManager.h"
+#include "clang/Basic/Version.h"
 #include "clang/Frontend/CompileOptions.h"
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"
@@ -103,7 +104,7 @@
     LangTag = llvm::dwarf::DW_LANG_C89;
   }
 
-  std::string Producer = "clang 1.0";// FIXME: clang version.
+  std::string Producer = "clang " CLANG_VERSION_STRING;
   bool isOptimized = LO.Optimize;
   const char *Flags = "";   // FIXME: Encode command line options.
 

Modified: cfe/branches/Apple/Dib/lib/Headers/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/lib/Headers/Makefile?rev=81955&r1=81954&r2=81955&view=diff

==============================================================================
--- cfe/branches/Apple/Dib/lib/Headers/Makefile (original)
+++ cfe/branches/Apple/Dib/lib/Headers/Makefile Tue Sep 15 18:40:49 2009
@@ -11,7 +11,7 @@
 include $(LEVEL)/Makefile.common
 
 # FIXME: Get version from a common place.
-HeaderDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/1.0/include
+HeaderDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/1.0.2/include
 
 HEADERS := $(notdir $(wildcard $(PROJ_SRC_DIR)/*.h))
 
@@ -25,7 +25,7 @@
 # Hook into the standard Makefile rules.
 all-local:: $(OBJHEADERS)
 
-PROJ_headers := $(DESTDIR)$(PROJ_prefix)/lib/clang/1.0/include
+PROJ_headers := $(DESTDIR)$(PROJ_prefix)/lib/clang/1.0.2/include
 
 INSTHEADERS := $(addprefix $(PROJ_headers)/, $(HEADERS))
 

Modified: cfe/branches/Apple/Dib/tools/clang-cc/clang-cc.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/tools/clang-cc/clang-cc.cpp?rev=81955&r1=81954&r2=81955&view=diff

==============================================================================
--- cfe/branches/Apple/Dib/tools/clang-cc/clang-cc.cpp (original)
+++ cfe/branches/Apple/Dib/tools/clang-cc/clang-cc.cpp Tue Sep 15 18:40:49 2009
@@ -2075,7 +2075,7 @@
   }
 
   if (Verbose)
-    fprintf(stderr, "clang version 1.0 based upon " PACKAGE_STRING
+    fprintf(stderr, "clang version " CLANG_VERSION_STRING " based upon " PACKAGE_STRING
             " hosted on " LLVM_HOSTTRIPLE "\n");
 
   if (!NoCaretDiagnostics)