maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Collapse more clang version numbers down into fewer places. 

llvm-svn: 81983
This commit is contained in:
Mike Stump 2009-09-16 01:26:05 +00:00
parent e739ac8900
commit b4bed3a497
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clang/CMakeLists.txt
View File

@ -1,4 +1,5 @@
# Clang version information # Clang version information
# FIXME: get from a file called ./VER
set(CLANG_VERSION 1.1) set(CLANG_VERSION 1.1)
macro(add_clang_library name) macro(add_clang_library name)

1
clang/VER Normal file
View File

@ -0,0 +1 @@
1.1

5
clang/docs/tools/Makefile
View File

@ -21,6 +21,7 @@ SRC_DOC_DIR=
DST_HTML_DIR=html/ DST_HTML_DIR=html/
DST_MAN_DIR=man/man1/ DST_MAN_DIR=man/man1/
DST_PS_DIR=ps/ DST_PS_DIR=ps/
CLANG_VERSION := trunk
# If we are in BUILD_FOR_WEBSITE mode, default to the all target. # If we are in BUILD_FOR_WEBSITE mode, default to the all target.
all:: html man ps all:: html man ps
@ -39,6 +40,8 @@ else
LEVEL := ../../../.. LEVEL := ../../../..
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common
CLANG_VERSION := $(shell cat $(PROJ_SRC_DIR)/../../VER)
SRC_DOC_DIR=$(PROJ_SRC_DIR)/ SRC_DOC_DIR=$(PROJ_SRC_DIR)/
DST_HTML_DIR=$(PROJ_OBJ_DIR)/ DST_HTML_DIR=$(PROJ_OBJ_DIR)/
DST_MAN_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=$* --podpath=. --infile=$< --outfile=$@ --title=$*
$(DST_MAN_DIR)%.1: %.pod $(DST_MAN_DIR)/.dir $(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 $(DST_PS_DIR)%.ps: $(DST_MAN_DIR)%.1 $(DST_PS_DIR)/.dir
groff -Tps -man $< > $@ groff -Tps -man $< > $@

8
clang/lib/Headers/Makefile
View File

@ -10,8 +10,9 @@
LEVEL = ../../../.. LEVEL = ../../../..
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common
# FIXME: Get version from a common place. CLANG_VERSION := $(shell cat $(PROJ_SRC_DIR)/../../VER)
HeaderDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/1.1/include
HeaderDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)/include
HEADERS := $(notdir $(wildcard $(PROJ_SRC_DIR)/*.h)) 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. # Hook into the standard Makefile rules.
all-local:: $(OBJHEADERS) 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)) INSTHEADERS := $(addprefix $(PROJ_headers)/, $(HEADERS))
@ -37,4 +38,3 @@ $(INSTHEADERS): $(PROJ_headers)/%.h: $(HeaderDir)/%.h | $(PROJ_headers)
$(Echo) Installing compiler include file: $(notdir $<) $(Echo) Installing compiler include file: $(notdir $<)
install-local:: $(INSTHEADERS) install-local:: $(INSTHEADERS)