Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Newdigate <andrew@gitlab.com>2017-09-25 12:21:32 +0300
committerJacob Vosmaer (GitLab) <jacob@gitlab.com>2017-09-25 12:21:32 +0300
commit6972f75c4abe9d5447373f0e853fb58b3ab3bd1a (patch)
tree63e3e5ccc523ae0a8f1a90f104dc9133a0d0d13d /Makefile
parent70235af2a4cbb1f251d428932c778c3a3562802c (diff)
Add a specific target to install for assemble all the Gitaly runtime components
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile11
1 files changed, 11 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 1db1300b3..760b8bc46 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,7 @@ export TEST_REPO_STORAGE_PATH := $(BUILD_DIR)/internal/testhelper/testdata/data
TEST_REPO := $(TEST_REPO_STORAGE_PATH)/gitlab-test.git
INSTALL_DEST_DIR := $(DESTDIR)$(PREFIX)/bin/
COVERAGE_DIR := $(TARGET_DIR)/cover
+ASSEMBLY_ROOT := $(TARGET_DIR)/assembly
export GITALY_TEST_RUBY_DIR := $(BUILD_DIR)/ruby
BUILDTIME = $(shell date -u +%Y%m%d.%H%M%S)
@@ -58,11 +59,21 @@ build: .ruby-bundle $(TARGET_SETUP)
cd ruby && bundle install
touch $@
+# TODO: confirm what references this target? Omnibus? Source installs?
.PHONY: install
install: build
mkdir -p $(INSTALL_DEST_DIR)
cd $(BIN_BUILD_DIR) && install $(COMMANDS) $(INSTALL_DEST_DIR)
+# Assembles all runtime components into a directory
+# Used by the GDK: run `make assemble ASSEMBLY_ROOT=.../gitaly`
+.PHONY: assemble
+assemble: build
+ rm -rf $(ASSEMBLY_ROOT)/bin $(ASSEMBLY_ROOT)/ruby
+ mkdir -p $(ASSEMBLY_ROOT)/bin
+ cp -r ruby $(ASSEMBLY_ROOT)/ruby
+ install $(foreach cmd,$(COMMANDS),$(BIN_BUILD_DIR)/$(cmd)) $(ASSEMBLY_ROOT)/bin
+
.PHONY: verify
verify: lint check-formatting megacheck govendor-status notice-up-to-date