Packaging tweaks and rewrite of 'dist' target.

- Move binary packaging scripts out of source root into pkg/ subdir
- A consistent CMake version (2.8.4) is now enforced for binary packaging
- Added a 'bindist' target to top Makefile as a convenience
- The 'dist' target has been rewritten to depend on standard system
  command/utils rather than CMake and the full dependency chain of Bro,
  addressing #398 (but the CMake 'package_source' target is still available
  in the generated build/Makefile and can be used if desired)

Makefile

@@ -5,15 +5,12 @@
 # to offer. For more, execute that one directly. 
 #
 
-BUILD=build
+SOURCE=$(PWD)
-BROCCOLI=aux/broccoli
+BUILD=$(SOURCE)/build
-BROCTL=aux/broctl
+TMP=/tmp/bro-dist.$(UID)
-
+BRO_V=`cat $(SOURCE)/VERSION`
-# CMake/CPack versions before 2.8.2 have bugs that can create bad packages
+BROCCOLI_V=`cat $(SOURCE)/aux/broccoli/VERSION`
-CMAKE_PACK_REQ=2.8.2
+BROCTL_V=`cat $(SOURCE)/aux/broctl/VERSION`
-CMAKE_VER=`cmake -version`
-
-OSX_VER_CMD=sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2
 
 all: configured
 	( cd $(BUILD) && make )
@@ -31,39 +28,25 @@ doc: configured
 docclean: configured
 	( cd $(BUILD) && make docclean && make restclean )
 
-dist: cmake_version
+dist:
-	# Minimum Bro source package
+	@( mkdir -p $(BUILD) && rm -rf $(TMP) && mkdir $(TMP) )
-	( \
+	@cp -R $(SOURCE) $(TMP)/Bro-$(BRO_V)
-	./configure --ignore-dirs='aux/broctl;aux/broccoli' --pkg-name-prefix=Bro && \
+	@( cd $(TMP) && find . -name .git\* | xargs rm -rf )
-	cd $(BUILD) && \
+	@( cd $(TMP) && find . -name \*.swp | xargs rm -rf )
-	make package_source \
+	@( cd $(TMP) && find . -type d -name build | xargs rm -rf )
-	)
+	@( cd $(TMP) && tar -czf $(BUILD)/Bro-all-$(BRO_V).tar.gz Bro-$(BRO_V) )
-	# Full Bro source package
+	@( cd $(TMP)/Bro-$(BRO_V)/aux && mv broccoli Broccoli-$(BROCCOLI_V) && \
-	( \
+	    tar -czf $(BUILD)/Broccoli-$(BROCCOLI_V).tar.gz Broccoli-$(BROCCOLI_V) )
-	./configure --pkg-name-prefix=Bro-all && \
+	@( cd $(TMP)/Bro-$(BRO_V)/aux && mv broctl Broctl-$(BROCTL_V) && \
-	cd $(BUILD) && \
+	    tar -czf $(BUILD)/Broctl-$(BROCTL_V).tar.gz Broctl-$(BROCTL_V) )
-	make package_source \
+	@( cd $(TMP)/Bro-$(BRO_V)/aux && rm -rf Broctl* Broccoli* )
-	)
+	@( cd $(TMP) && tar -czf $(BUILD)/Bro-$(BRO_V).tar.gz Bro-$(BRO_V) )
-	# Broccoli source package
+	@rm -rf $(TMP)
-	( \
+	@echo "Distribution source tarballs have been compiled in $(BUILD)"
-	cd $(BROCCOLI) && \
+
-	./configure && \
+bindist:
-	cd $(BUILD) && \
+	@( cd pkg && ( ./make-deb-packages || ./make-mac-packages || \
-	make package_source && \
+	               ./make-rpm-packages ) )
-	mv Broccoli*.tar.gz ../../../$(BUILD)/ && \
-	cd .. && \
-	rm -r $(BUILD) \
-	)
-	# Broctl source package
-	( \
-	cd $(BROCTL) && \
-	./configure && \
-	cd $(BUILD) && \
-	make package_source && \
-	mv Broctl*.tar.gz ../../../$(BUILD)/ && \
-	cd .. && \
-	rm -r $(BUILD) \
-	)
 
 distclean:
 	rm -rf $(BUILD)
@@ -72,7 +55,4 @@ configured:
 	@test -d $(BUILD) || ( echo "Error: No build/ directory found. Did you run configure?" && exit 1 )
 	@test -e $(BUILD)/Makefile || ( echo "Error: No build/Makefile found. Did you run configure?" && exit 1 )
 
-cmake_version:
+.PHONY : all install clean doc docclean dist bindist distclean configured
-	@test "$(CMAKE_VER)" \> "cmake version $(CMAKE_PACK_REQ)" || ( echo "Error: please use a CMake version greater than $(CMAKE_PACK_REQ)" && exit 1 )
-
-.PHONY : all install clean distclean configured cmake_version

pkg/check-cmake

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# CMake/CPack versions before 2.8.3 have bugs that can create bad packages
+# Since packages will be built on several different systems, a single
+# version of CMake is required to obtain consistency, but can be increased
+# as new versions of CMake come out that also produce working packages.
+
+CMAKE_PACK_REQ="cmake version 2.8.4"
+CMAKE_VER=`cmake -version`
+
+if [ "${CMAKE_VER}" != "${CMAKE_PACK_REQ}" ]; then
+    echo "Package creation requires ${CMAKE_PACK_REQ}" >&2
+    exit 1
+fi

pkg/make-deb-packages

@@ -1,35 +1,30 @@
 #!/bin/sh
 
 # This script generates binary DEB packages.
-# They can be found in build/ after running.
+# They can be found in ../build/ after running.
 
-prefix=/opt/bro
+./check-cmake || { exit 1; }
-
-# CMake/CPack versions before 2.8.2 have bugs that can create bad packages
-CMAKE_PACK_REQ=2.8.2
-CMAKE_VER=`cmake -version`
-
-if [ "${CMAKE_VER}" \< "${CMAKE_PACK_REQ}" ]; then
-    echo "Package creation requires CMake > 2.8.2" >&2
-    exit 1
-fi
 
 # The DEB CPack generator depends on `dpkg-shlibdeps` to automatically
 # determine what dependencies to set for the packages
 type dpkg-shlibdeps > /dev/null 2>&1 || {
     echo "\
-Creating DEB packages requires the `dpkg-shlibs` command, usually provided by
+Creating DEB packages requires the "dpkg-shlibs" command, usually provided by
 the 'dpkg-dev' package, please install it first.
 " >&2;
     exit 1;
 }
 
+prefix=/opt/bro
+
 # During the packaging process, `dpkg-shlibs` will fail if used on a library
 # that links to other internal/project libraries unless an RPATH is used or
 # we set LD_LIBRARY_PATH such that it can find the internal/project library
 # in the temporary packaging tree.
 export LD_LIBRARY_PATH=./${prefix}/lib
 
+cd ..
+
 # Minimum Bro
 ./configure --prefix=${prefix} --disable-broccoli --disable-broctl \
             --pkg-name-prefix=Bro --binary-package

pkg/make-mac-packages

@@ -1,18 +1,9 @@
 #!/bin/sh
 
 # This script creates binary packages for Mac OS X.
-# They can be found in build/ after running.
+# They can be found in ../build/ after running.
 
-prefix=/opt/bro
+./check-cmake || { exit 1; }
-
-# CMake/CPack versions before 2.8.2 have bugs that can create bad packages
-CMAKE_PACK_REQ=2.8.3
-CMAKE_VER=`cmake -version`
-
-if [ "${CMAKE_VER}" \< "${CMAKE_PACK_REQ}" ]; then
-    echo "Package creation requires CMake > 2.8.2" >&2
-    exit 1
-fi
 
 type sw_vers > /dev/null 2>&1 || {
     echo "Unable to get Mac OS X version" >&2;
@@ -38,6 +29,10 @@ else
     arch=x86_64
 fi
 
+prefix=/opt/bro
+
+cd ..
+
 # Minimum Bro
 CMAKE_OSX_ARCHITECTURES=${arch} ./configure --prefix=${prefix} \
     --disable-broccoli --disable-broctl --pkg-name-prefix=Bro \

pkg/make-rpm-packages

@@ -1,18 +1,22 @@
 #!/bin/sh
 
 # This script generates binary RPM packages.
-# They can be found in build/ after running.
+# They can be found in ../build/ after running.
+
+./check-cmake || { exit 1; }
+
+# The RPM CPack generator depends on `rpmbuild` to create packages
+type rpmbuild > /dev/null 2>&1 || {
+    echo "\
+Creating RPM packages requires the "rpmbuild" command, usually provided by
+the 'rpm-build' package, please install it first.
+" >&2;
+    exit 1;
+}
 
 prefix=/opt/bro
 
-# CMake/CPack versions before 2.8.2 have bugs that can create bad packages
+cd ..
-CMAKE_PACK_REQ=2.8.2
-CMAKE_VER=`cmake -version`
-
-if [ "${CMAKE_VER}" \< "${CMAKE_PACK_REQ}" ]; then
-    echo "Package creation requires CMake > 2.8.2" >&2
-    exit 1
-fi
 
 # Minimum Bro
 ./configure --prefix=${prefix} --disable-broccoli --disable-broctl \