Skip to content

Commit cd8da63

Browse files
committed
---
yaml --- r: 109343 b: refs/heads/dist-snap c: 169f08d h: refs/heads/master i: 109341: 4319bc4 109339: e7991b7 109335: 0935673 109327: d4e18c1 109311: c0dbbea v: v3
1 parent 6685d29 commit cd8da63

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: f64fdf524a434f0e5cd0bc91d09c144723f3c90d
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/dist-snap: c2e5e62135ea97b7e4926038f52116fd591e6215
9+
refs/heads/dist-snap: 169f08dd59f287a65da5188ff453f38f4215250c
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1212
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/mk/dist.mk

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,17 @@
2424

2525
PKG_NAME := $(CFG_PACKAGE_NAME)
2626

27+
# License suitable for displaying in a popup
28+
LICENSE.txt: $(S)COPYRIGHT $(S)LICENSE-APACHE $(S)LICENSE-MIT
29+
cat $^ > $@
30+
31+
32+
######################################################################
33+
# Source tarball
34+
######################################################################
35+
36+
PKG_TAR = dist/$(PKG_NAME).tar.gz
37+
2738
PKG_GITMODULES := $(S)src/libuv $(S)src/llvm $(S)src/gyp $(S)src/compiler-rt
2839
PKG_FILES := \
2940
$(S)COPYRIGHT \
@@ -52,16 +63,6 @@ PKG_FILES := \
5263

5364
UNROOTED_PKG_FILES := $(patsubst $(S)%,./%,$(PKG_FILES))
5465

55-
LICENSE.txt: $(S)COPYRIGHT $(S)LICENSE-APACHE $(S)LICENSE-MIT
56-
cat $^ > $@
57-
58-
59-
######################################################################
60-
# Source tarball
61-
######################################################################
62-
63-
PKG_TAR = dist/$(PKG_NAME).tar.gz
64-
6566
$(PKG_TAR): $(PKG_FILES)
6667
@$(call E, making dist dir)
6768
$(Q)rm -Rf tmp/dist/$(PKG_NAME)

0 commit comments

Comments
 (0)