[cfe-commits] r81983 - in /cfe/trunk: CMakeLists.txt VER docs/tools/Makefile lib/Headers/Makefile

[Mike Stump]

Author: mrs
Date: Tue Sep 15 20:26:05 2009
New Revision: 81983

URL: http://llvm.org/viewvc/llvm-project?rev=81983&view=rev
Log:
Collapse more clang version numbers down into fewer places.

Added:
    cfe/trunk/VER
Modified:
    cfe/trunk/CMakeLists.txt
    cfe/trunk/docs/tools/Makefile
    cfe/trunk/lib/Headers/Makefile

Modified: cfe/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/CMakeLists.txt?rev=81983&r1=81982&r2=81983&view=diff

==============================================================================
--- cfe/trunk/CMakeLists.txt (original)
+++ cfe/trunk/CMakeLists.txt Tue Sep 15 20:26:05 2009
@@ -1,4 +1,5 @@
 # Clang version information
+# FIXME: get from a file called ./VER
 set(CLANG_VERSION 1.1)
 
 macro(add_clang_library name)

Added: cfe/trunk/VER
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/VER?rev=81983&view=auto

==============================================================================
--- cfe/trunk/VER (added)
+++ cfe/trunk/VER Tue Sep 15 20:26:05 2009
@@ -0,0 +1 @@
+1.1

Modified: cfe/trunk/docs/tools/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/docs/tools/Makefile?rev=81983&r1=81982&r2=81983&view=diff

==============================================================================
--- cfe/trunk/docs/tools/Makefile (original)
+++ cfe/trunk/docs/tools/Makefile Tue Sep 15 20:26:05 2009
@@ -21,6 +21,7 @@
 DST_HTML_DIR=html/
 DST_MAN_DIR=man/man1/
 DST_PS_DIR=ps/
+CLANG_VERSION := trunk
 
 # If we are in BUILD_FOR_WEBSITE mode, default to the all target.
 all:: html man ps
@@ -39,6 +40,8 @@
 LEVEL := ../../../..
 include $(LEVEL)/Makefile.common
 
+CLANG_VERSION := $(shell cat $(PROJ_SRC_DIR)/../../VER)
+
 SRC_DOC_DIR=$(PROJ_SRC_DIR)/
 DST_HTML_DIR=$(PROJ_OBJ_DIR)/
 DST_MAN_DIR=$(PROJ_OBJ_DIR)/
@@ -66,7 +69,7 @@
 	  --podpath=. --infile=$< --outfile=$@ --title=$*
 
 $(DST_MAN_DIR)%.1: %.pod $(DST_MAN_DIR)/.dir
-	pod2man --release "clang 1.1" --center="Clang Tools Documentation" $< $@
+	pod2man --release "clang $(CLANG_VERSION)" --center="Clang Tools Documentation" $< $@
 
 $(DST_PS_DIR)%.ps: $(DST_MAN_DIR)%.1 $(DST_PS_DIR)/.dir
 	groff -Tps -man $< > $@

Modified: cfe/trunk/lib/Headers/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/Makefile?rev=81983&r1=81982&r2=81983&view=diff

==============================================================================
--- cfe/trunk/lib/Headers/Makefile (original)
+++ cfe/trunk/lib/Headers/Makefile Tue Sep 15 20:26:05 2009
@@ -10,8 +10,9 @@
 LEVEL = ../../../..
 include $(LEVEL)/Makefile.common
 
-# FIXME: Get version from a common place.
-HeaderDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/1.1/include
+CLANG_VERSION := $(shell cat $(PROJ_SRC_DIR)/../../VER)
+
+HeaderDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)/include
 
 HEADERS := $(notdir $(wildcard $(PROJ_SRC_DIR)/*.h))
 
@@ -25,7 +26,7 @@
 # Hook into the standard Makefile rules.
 all-local:: $(OBJHEADERS)
 
-PROJ_headers := $(DESTDIR)$(PROJ_prefix)/lib/clang/1.1/include
+PROJ_headers := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)/include
 
 INSTHEADERS := $(addprefix $(PROJ_headers)/, $(HEADERS))
 
@@ -37,4 +38,3 @@
 	$(Echo) Installing compiler include file: $(notdir $<)
 
 install-local:: $(INSTHEADERS)
-