aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2015-06-30 14:50:31 +0100
committerVsevolod Stakhov <vsevolod@highsecure.ru>2015-06-30 14:50:55 +0100
commitf826e627cf53496b3ec79be2cc72a5445c89db19 (patch)
treebc2f68d3f701df1da47266d644d2930b18c2ca08
parent15b0796571b8a00408ffddc766191f5d7455d96d (diff)
downloadrspamd-f826e627cf53496b3ec79be2cc72a5445c89db19.tar.gz
rspamd-f826e627cf53496b3ec79be2cc72a5445c89db19.zip
Support dist on FreeBSD and Darwin.
-rw-r--r--CMakeLists.txt6
-rwxr-xr-xdist.sh8
2 files changed, 9 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 050f02559..ec9c69f44 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -421,6 +421,7 @@ IF(NOT BUILD_CPU_MODE)
ENDIF(NOT BUILD_CPU_MODE)
SET(POE_LOOP "Loop::IO_Poll")
+SET(TAR "tar")
# Platform specific configuration
IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
@@ -452,6 +453,7 @@ IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
ENDIF(_LIBUTIL_H)
ENDIF(LIBUTIL_LIBRARY)
SET(POE_LOOP "Loop::Kqueue")
+ SET(TAR "gtar")
ENDIF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
IF(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
@@ -461,7 +463,7 @@ IF(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pagezero_size 10000 -image_base 100000000")
ENDIF(ENABLE_LUAJIT MATCHES "ON")
MESSAGE(STATUS "Configuring for Darwin")
-
+ SET(TAR "gnutar")
ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
@@ -1186,7 +1188,7 @@ IF(INSTALL_WEBUI MATCHES "ON")
ENDIF(INSTALL_WEBUI MATCHES "ON")
ADD_CUSTOM_TARGET(dist ${CMAKE_SOURCE_DIR}/dist.sh
- "${CMAKE_BINARY_DIR}/rspamd-${RSPAMD_VERSION}.tar.xz"
+ "${CMAKE_BINARY_DIR}/rspamd-${RSPAMD_VERSION}.tar.xz" "${TAR}"
COMMENT "Create source distribution"
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
diff --git a/dist.sh b/dist.sh
index af4e14e9e..e2ecd8e19 100755
--- a/dist.sh
+++ b/dist.sh
@@ -1,7 +1,9 @@
#!/bin/sh
-if [ $# -ne 1 ] ; then
- echo "Usage: dist.sh <filename>"
+TAR=${2:-"tar"}
+
+if [ $# -lt 1 ] ; then
+ echo "Usage: dist.sh <filename> [tar_command]"
exit 1
fi
@@ -21,5 +23,5 @@ for sub in $SUBMODULES ; do
(cd $sub && git ls-files | sed -e "s|^|$sub/|" >> $OUT)
done
-tar -c --exclude='.[^/]*' --exclude='*.xz' --exclude='*.gz' --no-recursion --transform "s|^|$PREFIX/|" -a -T $OUT -v -f $FNAME
+${TAR} -c --exclude='.[^/]*' --exclude='*.xz' --exclude='*.gz' --no-recursion --transform "s|^|$PREFIX/|" -a -T $OUT -v -f $FNAME
rm -f $OUT