Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Improve make dist

Browse source
This commit is contained in:
Jon Siwek 2018-08-31 15:33:31 -05:00
parent 33a8e7a7c7
commit d1e4dbe5e3
9 changed files with 28 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,4 +1,8 @@
2.5-951 | 2018-08-31 15:33:31 -0500
* Improve `make dist` (Jon Siwek, Corelight)
2.5-950 | 2018-08-31 08:54:36 -0700 2.5-950 | 2018-08-31 08:54:36 -0700
* Add @deprecated directive and deprecate policy/protocols/smb/__load__.bro * Add @deprecated directive and deprecate policy/protocols/smb/__load__.bro

32
Makefile
View file

@ -6,10 +6,10 @@
# #
BUILD=build BUILD=build
REPO=`basename \`git config --get remote.origin.url | sed 's/^[^:]*://g'\`` REPO=$$(cd $(CURDIR) && basename $$(git config --get remote.origin.url | sed 's/^[^:]*://g'))
VERSION_FULL=$(REPO)-`cat VERSION` VERSION_FULL=$(REPO)-$$(cd $(CURDIR) && cat VERSION)
VERSION_MIN=$(REPO)-`cat VERSION`-minimal VERSION_MIN=$(REPO)-$$(cd $(CURDIR) && cat VERSION)-minimal
HAVE_MODULES=git submodule | grep -v cmake >/dev/null GITDIR=$$(test -f .git && echo $$(cut -d" " -f2 .git) || echo .git)
all: configured all: configured
$(MAKE) -C $(BUILD) $@ $(MAKE) -C $(BUILD) $@
@ -30,17 +30,19 @@ docclean: configured
$(MAKE) -C $(BUILD) $@ $(MAKE) -C $(BUILD) $@
dist: dist:
@rm -rf $(VERSION_FULL) $(VERSION_FULL).tgz @test -e ../$(VERSION_FULL) && rm -ri ../$(VERSION_FULL) || true
@rm -rf $(VERSION_MIN) $(VERSION_MIN).tgz @cp -R . ../$(VERSION_FULL)
@git clone --recursive . $(VERSION_FULL) >/dev/null 2>&1 @for i in . $$(git submodule foreach -q --recursive realpath --relative-to=$$(pwd) .); do ((cd ../$(VERSION_FULL)/$$i && test -f .git && cp -R $(GITDIR) .gitnew && rm -f .git && mv .gitnew .git && sed -i.bak -e 's#[[:space:]]*worktree[[:space:]]*=[[:space:]]*.*##g' .git/config) || true); done
@find $(VERSION_FULL) -name .git\* | xargs rm -rf @for i in . $$(git submodule foreach -q --recursive realpath --relative-to=$$(pwd) .); do (cd ../$(VERSION_FULL)/$$i && git reset -q --hard && git clean -ffdxq); done
@tar -czf $(VERSION_FULL).tgz $(VERSION_FULL) && echo Package: $(VERSION_FULL).tgz && rm -rf $(VERSION_FULL) @(cd ../$(VERSION_FULL) && find . -name \.git\* | xargs rm -rf)
@$(HAVE_MODULES) && git clone . $(VERSION_MIN) >/dev/null 2>&1 || exit 0 @mv ../$(VERSION_FULL) .
@$(HAVE_MODULES) && (cd $(VERSION_MIN) && git submodule update --init cmake >/dev/null 2>&1) || exit 0 @tar -czf $(VERSION_FULL).tar.gz $(VERSION_FULL)
@$(HAVE_MODULES) && (cd $(VERSION_MIN) && git submodule update --init src/3rdparty >/dev/null 2>&1) || exit 0 @echo Package: $(VERSION_FULL).tar.gz
@$(HAVE_MODULES) && (cd $(VERSION_MIN) && git submodule update --init magic >/dev/null 2>&1) || exit 0 @mv $(VERSION_FULL) $(VERSION_MIN)
@$(HAVE_MODULES) && find $(VERSION_MIN) -name .git\* | xargs rm -rf || exit 0 @(cd $(VERSION_MIN) && for i in aux/*; do rm -rf $$i/*; done)
@$(HAVE_MODULES) && tar -czf $(VERSION_MIN).tgz $(VERSION_MIN) && echo Package: $(VERSION_MIN).tgz && rm -rf $(VERSION_MIN) || exit 0 @tar -czf $(VERSION_MIN).tar.gz $(VERSION_MIN)
@echo Package: $(VERSION_MIN).tar.gz
@rm -rf $(VERSION_MIN)
distclean: distclean:
rm -rf $(BUILD) rm -rf $(BUILD)

2
VERSION
View file

@ -1 +1 @@
2.5-950 2.5-951

2
aux/bifcl

@ -1 +1 @@
Subproject commit b0ba021208c0c5fe8d7c92412b919d6667f63961 Subproject commit 2c106da5c56f0c864f9894dff21bd6557ef219eb

2
aux/binpac

@ -1 +1 @@
Subproject commit 3ebf910b6befde6352e3af0b25589cfc2545cb5a Subproject commit 090d2614a6dfd2a354cb36f890f9d52557300c74

2
aux/bro-aux

@ -1 +1 @@
Subproject commit 9866d31e45f5e1467c0f1fd4a1cd9948b067ce43 Subproject commit 2c37ea379bc25dd4b4fd38ee2bb40068e5418a2b

2
aux/broccoli

@ -1 +1 @@
Subproject commit 1898e81bba7c595108bc20c5148df7f0f6a2258f Subproject commit 9e6290ee3f398141d90995bb766163218e9076a8

2
aux/broctl

@ -1 +1 @@
Subproject commit a88cb3434e05dbb117687f6152acc8892ed969ca Subproject commit 9455886e959b5d9ddeccc86ae5428706e2424237

2
aux/broker

@ -1 +1 @@
Subproject commit a3e188680cd2889edbb9cf09c01fb1f031a90975 Subproject commit 6f8cfce62cbfd80743cae02e89b72bd97e8e9114