Collapse more clang version numbers down into fewer places.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@81983 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3e225eb85afdc7537921a0398730d06ea3e4c808..6ed32d9578b17472151a164258deaae8ed7b52d0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,5 @@
 # Clang version information
+# FIXME: get from a file called ./VER
 set(CLANG_VERSION 1.1)
 
 macro(add_clang_library name)

diff --git a/VER b/VER
new file mode 100644 (file)
index 0000000..9459d4b
--- /dev/null
+++ b/VER
@@ -0,0 +1 @@
+1.1

diff --git a/docs/tools/Makefile b/docs/tools/Makefile
index a1bbbcc92016d0ff763fce65efbf045b99b0f67b..12696ef0b659b44cb0ca9b1d1c47fad2b985b952 100644 (file)
--- a/docs/tools/Makefile
+++ b/docs/tools/Makefile
@@ -21,6 +21,7 @@ SRC_DOC_DIR=
 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 @@ else
 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 @@ $(DST_HTML_DIR)%.html: %.pod $(DST_HTML_DIR)/.dir
          --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 $< > $@

diff --git a/lib/Headers/Makefile b/lib/Headers/Makefile
index 3abe149879f8b21fecac196bdaac20d1935eb41f..cb36e84319a14ec24dfe18ae40ff1a3a29611567 100644 (file)
--- a/lib/Headers/Makefile
+++ b/lib/Headers/Makefile
@@ -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 @@ $(OBJHEADERS): $(HeaderDir)/%.h: $(PROJ_SRC_DIR)/%.h $(HeaderDir)/.dir
 # 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 @@ $(INSTHEADERS): $(PROJ_headers)/%.h: $(HeaderDir)/%.h | $(PROJ_headers)
        $(Echo) Installing compiler include file: $(notdir $<)
 
 install-local:: $(INSTHEADERS)
-