add unpack_dist command
@@ -341,6 +341,8 @@ install: install_soter_headers install_themis_headers install_static_libs instal
get_themis_version:
@echo $(THEMIS_VERSION)
+THEMIS_DIST_FILENAME = $(THEMIS_VERSION).tar.gz
+
dist:
mkdir -p $(THEMIS_VERSION)
rsync -avz src $(THEMIS_VERSION)
@@ -356,7 +358,7 @@ dist:
rsync -avz build.gradle $(THEMIS_VERSION)
rsync -avz gradlew $(THEMIS_VERSION)
rsync -avz themis.podspec $(THEMIS_VERSION)
- tar -zcvf $(THEMIS_VERSION).tar.gz $(THEMIS_VERSION)
+ tar -zcvf $(THEMIS_DIST_FILENAME) $(THEMIS_VERSION)
rm -rf $(THEMIS_VERSION)
for-audit: $(SOTER_AUD) $(THEMIS_AUD)
@@ -432,9 +434,10 @@ themispp_uninstall:
@echo -n "themispp uninstall "
@$(BUILD_CMD_)
+
COSSACKLABS_URL = https://www.cossacklabs.com
# tag version from VCS
-THEMIS_VERSION = `git describe --tags HEAD | cut -b 1-`
+THEMIS_VERSION := $(shell git describe --tags HEAD | cut -b 1-)
THEMIS_LICENSE_NAME = "Apache License Version 2.0"
MAINTAINER = "CossackLabs LTD <dev@cossacklabs.com>"
DEBIAN_THEMIS_DEPENDENCIES = libssl-dev
@@ -456,7 +459,10 @@ themis_collect_headers:
collect_headers: themis_collect_headers soter_collect_headers
-deb: themis_static themis_shared soter_static soter_shared collect_headers
+unpack_dist:
+ @tar -xf $(THEMIS_DIST_FILENAME)
+
+deb: test themis_static themis_shared soter_static soter_shared collect_headers
@find . -name \*.so -exec strip -o {} {} \;
@mkdir -p $(BIN_PATH)/deb
@@ -494,8 +500,10 @@ deb: themis_static themis_shared soter_static soter_shared collect_headers
$(BIN_PATH)/libsoter.a=$(PREFIX)/lib/libsoter.a \
$(BIN_PATH)/libsoter.so=$(PREFIX)/lib/libsoter.so 1>/dev/null
+ # it's just for printing .deb files
@find $(BIN_PATH) -name \*.deb
+
rpm: themis_static themis_shared soter_static soter_shared collect_headers
@find . -name \*.so -exec strip -o {} {} \;
@mkdir -p $(BIN_PATH)/rpm
