Skip to content

Commit

Permalink
Rename "build-dist" target to "source-bundle"
Browse files Browse the repository at this point in the history
This incorporates PR feedback from @michaelklishin

Signed-off-by: Kartik Ganesh <gkart@amazon.com>
(cherry picked from commit 741e04b)
  • Loading branch information
kartg authored and mergify[bot] committed Feb 22, 2025
1 parent ec45d93 commit 3415fa8
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ endef
# --------------------------------------------------------------------

.PHONY: source-dist clean-source-dist
.PHONY: build-dist clean-build-dist
.PHONY: source-bundle clean-source-bundle

SOURCE_DIST_BASE ?= rabbitmq-server
SOURCE_DIST_SUFFIXES ?= tar.xz
Expand All @@ -151,8 +151,8 @@ SOURCE_DIST_FILES = $(addprefix $(SOURCE_DIST).,$(SOURCE_DIST_SUFFIXES))
.PHONY: $(SOURCE_DIST_FILES)

# Override rsync flags as a pre-requisite
build-dist: RSYNC_FLAGS = $(BUILD_DIST_RSYNC_FLAGS)
build-dist: $(SOURCE_DIST_FILES)
source-bundle: RSYNC_FLAGS = $(SOURCE_BUNDLE_RSYNC_FLAGS)
source-bundle: $(SOURCE_DIST_FILES)
@:

# Override rsync flags as a pre-requisite
Expand Down Expand Up @@ -222,10 +222,10 @@ SOURCE_DIST_RSYNC_FLAGS += $(BASE_RSYNC_FLAGS) \
--exclude 'packaging' \
--exclude 'test'

# For build-dist, explicitly include folders that are needed
# For source-bundle, explicitly include folders that are needed
# for tests to execute. These are added before excludes from
# the base flags so rsync honors the first match.
BUILD_DIST_RSYNC_FLAGS += \
SOURCE_BUNDLE_RSYNC_FLAGS += \
--include 'rabbit_shovel_test/ebin' \
--include 'rabbit_shovel_test/ebin/*' \
--include 'rabbitmq_ct_helpers/tools' \
Expand Down Expand Up @@ -395,7 +395,7 @@ $(SOURCE_DIST).zip: $(SOURCE_DIST).manifest

clean:: clean-source-dist

clean-build-dist:: clean-source-dist
clean-source-bundle:: clean-source-dist

clean-source-dist:
$(gen_verbose) rm -rf -- $(SOURCE_DIST_BASE)-*
Expand Down

0 comments on commit 3415fa8

Please sign in to comment.