force git repo root when computing version info

Summary:
public
closes #230

Reviewed By: jberdine

Differential Revision: D2807153

fb-gh-sync-id: 7487db0
master
Jules Villard 9 years ago committed by facebook-github-bot-1
parent b3bf8b1ecc
commit 9ecf2d9f5e

@ -265,8 +265,8 @@ endif
version: $(BACKEND_SOURCES)/version.ml.in Makefile version: $(BACKEND_SOURCES)/version.ml.in Makefile
TMPFILE=$$(mktemp $(BACKEND_SOURCES)/version.ml.tmp.XXXX); \ TMPFILE=$$(mktemp $(BACKEND_SOURCES)/version.ml.tmp.XXXX); \
INFER_GIT_COMMIT=$$(git rev-parse --short HEAD || printf "unknown"); \ INFER_GIT_COMMIT=$$(git --work-tree=$(ROOT_DIR) --git-dir=$(ROOT_DIR)/.git rev-parse --short HEAD || printf "unknown"); \
INFER_GIT_BRANCH=$$(git rev-parse --abbrev-ref HEAD || printf "unknown"); \ INFER_GIT_BRANCH=$$(git --work-tree=$(ROOT_DIR) --git-dir=$(ROOT_DIR)/.git rev-parse --abbrev-ref HEAD || printf "unknown"); \
sed \ sed \
-e 's|@INFER_MAJOR[@]|$(INFER_MAJOR)|g' \ -e 's|@INFER_MAJOR[@]|$(INFER_MAJOR)|g' \
-e 's|@INFER_MINOR[@]|$(INFER_MINOR)|g' \ -e 's|@INFER_MINOR[@]|$(INFER_MINOR)|g' \
@ -275,8 +275,8 @@ version: $(BACKEND_SOURCES)/version.ml.in Makefile
-e "s|@INFER_GIT_COMMIT[@]|$$INFER_GIT_COMMIT|g" \ -e "s|@INFER_GIT_COMMIT[@]|$$INFER_GIT_COMMIT|g" \
-e "s|@INFER_GIT_BRANCH[@]|$$INFER_GIT_BRANCH|g" \ -e "s|@INFER_GIT_BRANCH[@]|$$INFER_GIT_BRANCH|g" \
$< > "$$TMPFILE"; \ $< > "$$TMPFILE"; \
@INSTALL@ -m 644 -C $$TMPFILE $(BACKEND_SOURCES)/version.ml; \ @INSTALL@ -m 644 -C "$$TMPFILE" $(BACKEND_SOURCES)/version.ml; \
rm -f $$TMPFILE rm -f "$$TMPFILE"
$(BUILD_DIR): $(BUILD_DIR):
$(MKDIR) $(BUILD_DIR) $(MKDIR) $(BUILD_DIR)

Loading…
Cancel
Save