Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-15 21:18:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/topic/timw/make-dist-deleting-build-files'

Browse source 
* origin/topic/timw/make-dist-deleting-build-files:
  Keep make dist from deleting all paths containing 'build' [skip ci]

(cherry picked from commit 31fa43b3df)
This commit is contained in:
Tim Wojtulewicz 2022-06-07 10:02:39 -07:00
parent c383fb6db2
commit dd7d13d244
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGES
View file

@ -1,5 +1,7 @@
5.0.0-rc1 | 2022-06-03 12:09:34 -0700 5.0.0-rc1 | 2022-06-03 12:09:34 -0700
* Keep make dist from deleting all paths containing 'build' [skip ci] (Tim Wojtulewicz)
* Remove duplicate entry about websockets from 5.0 NEWS (Tim Wojtulewicz, Corelight) * Remove duplicate entry about websockets from 5.0 NEWS (Tim Wojtulewicz, Corelight)
* NEWS updates for 5.0 (Vern Paxson, Corelight) * NEWS updates for 5.0 (Vern Paxson, Corelight)

2
Makefile
View file

@ -43,7 +43,7 @@ dist:
@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 @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
@(cd ../$(VERSION_FULL) && find . -name \.git\* | xargs rm -rf) @(cd ../$(VERSION_FULL) && find . -name \.git\* | xargs rm -rf)
@(cd ../$(VERSION_FULL) && find . -name \.idea -type d | xargs rm -rf) @(cd ../$(VERSION_FULL) && find . -name \.idea -type d | xargs rm -rf)
@(cd ../$(VERSION_FULL) && find . -name build\* -type d | xargs rm -rf) @(cd ../$(VERSION_FULL) && find . -maxdepth 1 -name build\* | xargs rm -rf)
@mv ../$(VERSION_FULL) . @mv ../$(VERSION_FULL) .
@COPYFILE_DISABLE=true tar -czf $(VERSION_FULL).tar.gz $(VERSION_FULL) @COPYFILE_DISABLE=true tar -czf $(VERSION_FULL).tar.gz $(VERSION_FULL)
@echo Package: $(VERSION_FULL).tar.gz @echo Package: $(VERSION_FULL).tar.gz