From 6e71c97bfe09d3b3c19cc0b137ecc784da4f7eeb Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Mon, 23 Sep 2013 14:44:50 -0500 Subject: [PATCH] Update 'make dist' target. --- Makefile | 13 +++++++------ aux/binpac | 2 +- aux/bro-aux | 2 +- aux/broccoli | 2 +- aux/broctl | 2 +- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index d915050b6b..cbc44c6780 100644 --- a/Makefile +++ b/Makefile @@ -44,13 +44,14 @@ broxygenclean: configured dist: @rm -rf $(VERSION_FULL) $(VERSION_FULL).tgz @rm -rf $(VERSION_MIN) $(VERSION_MIN).tgz - @mkdir $(VERSION_FULL) - @tar --exclude=$(VERSION_FULL)* --exclude=$(VERSION_MIN)* --exclude=.git -cf - . | ( cd $(VERSION_FULL) && tar -xpf - ) - @( cd $(VERSION_FULL) && cp -R ../.git . && git reset -q --hard HEAD && git clean -xdfq && rm -rf .git ) + @git clone --recursive . $(VERSION_FULL) >/dev/null 2>&1 + @find $(VERSION_FULL) -name .git\* | xargs rm -rf @tar -czf $(VERSION_FULL).tgz $(VERSION_FULL) && echo Package: $(VERSION_FULL).tgz && rm -rf $(VERSION_FULL) - @$(HAVE_MODULES) && mkdir $(VERSION_MIN) || exit 0 - @$(HAVE_MODULES) && tar --exclude=$(VERSION_FULL)* --exclude=$(VERSION_MIN)* --exclude=.git `git submodule | awk '{print "--exclude="$$2}' | grep -v cmake | tr '\n' ' '` -cf - . | ( cd $(VERSION_MIN) && tar -xpf - ) || exit 0 - @$(HAVE_MODULES) && ( cd $(VERSION_MIN) && cp -R ../.git . && git reset -q --hard HEAD && git clean -xdfq && rm -rf .git ) || exit 0 + @$(HAVE_MODULES) && git clone . $(VERSION_MIN) >/dev/null 2>&1 || exit 0 + @$(HAVE_MODULES) && (cd $(VERSION_MIN) && git submodule update --init cmake >/dev/null 2>&1) || exit 0 + @$(HAVE_MODULES) && (cd $(VERSION_MIN) && git submodule update --init src/3rdparty >/dev/null 2>&1) || exit 0 + @$(HAVE_MODULES) && (cd $(VERSION_MIN) && git submodule update --init magic >/dev/null 2>&1) || exit 0 + @$(HAVE_MODULES) && find $(VERSION_MIN) -name .git\* | xargs rm -rf || exit 0 @$(HAVE_MODULES) && tar -czf $(VERSION_MIN).tgz $(VERSION_MIN) && echo Package: $(VERSION_MIN).tgz && rm -rf $(VERSION_MIN) || exit 0 bindist: diff --git a/aux/binpac b/aux/binpac index 5f9d4afe82..3c29b917e5 160000 --- a/aux/binpac +++ b/aux/binpac @@ -1 +1 @@ -Subproject commit 5f9d4afe8274b1c1125757ca0e971f66d6d35384 +Subproject commit 3c29b917e59e8d8200f669d3d9729d36c34b9245 diff --git a/aux/bro-aux b/aux/bro-aux index 387e26609a..ee2d64928e 160000 --- a/aux/bro-aux +++ b/aux/bro-aux @@ -1 +1 @@ -Subproject commit 387e26609a923f5abd10be593ae127690f7a6b72 +Subproject commit ee2d64928edc38b10e508bd577a22f52b024c992 diff --git a/aux/broccoli b/aux/broccoli index 2a886a31f2..c0d5345bf2 160000 --- a/aux/broccoli +++ b/aux/broccoli @@ -1 +1 @@ -Subproject commit 2a886a31f23ebecd17274af1af581f9e40f1810d +Subproject commit c0d5345bf25d25f6965f3201048344687bacc860 diff --git a/aux/broctl b/aux/broctl index f80ddc95cd..3582f494de 160000 --- a/aux/broctl +++ b/aux/broctl @@ -1 +1 @@ -Subproject commit f80ddc95cdfae6c6a4f20169de60767271b240e1 +Subproject commit 3582f494de247784fc7634b319ddf99aef44b6e1