Skip to content

Commit

Permalink
[FAB-5545] Allow building images from diff project
Browse files Browse the repository at this point in the history
This change will allow fabric images and executables
to be built from a separate repository when fabric is
included as a git submodule.

By default, the build will assume that the repository is
hyperledger/fabric. When using fabric as a submodule, the
parent repository will need to set the PROJECT_NAME
environment variable.

Change-Id: Ia7a49052e1ebb2503631e047bb3b0957ea6ab704
Signed-off-by: Latitia M Haskins <[email protected]>
  • Loading branch information
lhaskins committed Nov 2, 2017
1 parent 6cf9558 commit 67ade82
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,16 @@
# - dist-clean - clean release packages for all target platforms
# - unit-test-clean - cleans unit test state (particularly from docker)

PROJECT_NAME = hyperledger/fabric
BASE_VERSION = 1.1.0-alpha
PREV_VERSION = 1.0.0-preview
# Allow to build as a submodule setting the main project to
# the PROJECT_NAME env variable, for example,
# export PROJECT_NAME=hyperledger/fabric-test
ifeq ($(PROJECT_NAME),true)
PROJECT_NAME = $(PROJECT_NAME)/fabric
else
PROJECT_NAME = hyperledger/fabric
endif
IS_RELEASE = false
EXPERIMENTAL ?= true

Expand Down

0 comments on commit 67ade82

Please sign in to comment.