Skip to content

Commit 2ff3eaf

Browse files
committed
Added a mandatory 'WISK_VERSION' field to makefile
1 parent 8cde9c9 commit 2ff3eaf

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

Makefile

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ test:
1616

1717
integrate: build
1818
@./.output/wisk -a ./samples/helloworld_ruby/
19-
./.output/wisk helloworld_ruby ./.populatedSample
19+
./.output/wisk helloworld_ruby ./.populatedSample
2020

2121
clean:
2222
@rm -rf ./.output/
@@ -47,19 +47,26 @@ ifeq ($(shell which fpm), )
4747
@exit 1
4848
endif
4949

50+
ifeq ($(WISK_VERSION), )
51+
52+
@echo "No 'WISK_VERSION' was specified."
53+
@echo "Export a 'WISK_VERSION' environment variable to perform a package"
54+
@exit 1
55+
endif
56+
5057
fpm \
5158
--log error \
5259
-s dir \
5360
-t deb \
54-
-v 1.0 \
61+
-v $(WISK_VERSION) \
5562
-n wisk \
5663
./.output/wisk64=/usr/local/bin/wisk
5764

5865
fpm \
5966
--log error \
6067
-s dir \
6168
-t deb \
62-
-v 1.0 \
69+
-v $(WISK_VERSION) \
6370
-n wisk \
6471
-a i686 \
6572
./.output/wisk32=/usr/local/bin/wisk
@@ -70,14 +77,14 @@ endif
7077
--log error \
7178
-s dir \
7279
-t rpm \
73-
-v 1.0 \
80+
-v $(WISK_VERSION) \
7481
-n wisk \
7582
./.output/wisk64=/usr/local/bin/wisk
7683
fpm \
7784
--log error \
7885
-s dir \
7986
-t rpm \
80-
-v 1.0 \
87+
-v $(WISK_VERSION) \
8188
-n wisk \
8289
-a i686 \
8390
./.output/wisk32=/usr/local/bin/wisk

0 commit comments

Comments
 (0)