Move the tarball distribution code into dist/tarball ##ci

Makefile

@@ -353,46 +353,13 @@ purge: purge-doc purge-dev uninstall user-uninstall
 system-purge: purge
 	sys/purge.sh
 
-R2V=radare2-${VERSION}
-
-v ver version:
-	@echo CURRENT=${VERSION}
-	@echo PREVIOUS=${PREVIOUS_RELEASE}
-
 dist:
-	rm -rf $(R2V)
-	git clone . $(R2V)
-	-cd $(R2V) && [ ! -f config-user.mk -o configure -nt config-user.mk ] && ./configure "--prefix=${PREFIX}"
-	cd $(R2V) ; git log $$(git show-ref | grep ${PREVIOUS_RELEASE} | awk '{print $$1}')..HEAD > ChangeLog
-	$(MAKE) -C $(R2V)/shlr capstone-sync
-	FILES=`cd $(R2V); git ls-files | sed -e "s,^,$(R2V)/,"` ; \
-	CS_FILES=`cd $(R2V)/shlr/capstone ; git ls-files | grep -v pdf | grep -v xcode | grep -v msvc | grep -v suite | grep -v bindings | grep -v tests | sed -e "s,^,$(R2V)/shlr/capstone/,"` ; \
-	${TAR} "radare2-${VERSION}.tar" $${FILES} $${CS_FILES} "$(R2V)/ChangeLog" ; \
-	${CZ} "radare2-${VERSION}.tar"
-
-olddist:
-	-[ configure -nt config-user.mk ] && ./configure "--prefix=${PREFIX}"
-	#git log $$(git show-ref `git tag |tail -n1`)..HEAD > ChangeLog
-	git log $$(git show-ref | grep ${PREVIOUS_RELEASE} | awk '{print $$1}')..HEAD > ChangeLog
-	cd shlr && ${MAKE} capstone-sync
-	$(MAKE) -R capstone.ps
-	DIR=`basename "$$PWD"` ; \
-	FILES=`git ls-files | sed -e "s,^,radare2-${VERSION}/,"` ; \
-	CS_FILES=`cd shlr/capstone ; git ls-files | grep -v pdf | grep -v xcode | grep -v msvc | grep -v suite | grep -v bindings | grep -v tests | sed -e "s,^,radare2-${VERSION}/shlr/capstone/,"` ; \
-	cd .. && mv "$${DIR}" "radare2-${VERSION}" && \
-	${TAR} "radare2-${VERSION}.tar" $${FILES} $${CS_FILES} "radare2-${VERSION}/ChangeLog" ; \
-	${CZ} "radare2-${VERSION}.tar" ; \
-	mv "radare2-${VERSION}" "$${DIR}"
+	$(MAKE) -C dist/tarball
+	cp -f dist/tarball/*.$(TAREXT) .
+	cp -f dist/tarball/*.zip .
 
 shot:
-	DATE=`date '+%Y%m%d'` ; \
-	FILES=`git ls-files | sed -e "s,^,radare2-${DATE}/,"` ; \
-	cd .. && mv radare2 "radare2-$${DATE}" && \
-	${TAR} "radare2-$${DATE}.tar" $${FILES} ;\
-	${CZ} "radare2-$${DATE}.tar" ;\
-	mv "radare2-$${DATE}" radare2 && \
-	scp "radare2-$${DATE}.${TAREXT}" \
-		radare.org:/srv/http/radareorg/get/shot
+	$(MAKE) -C dist/tarball VERSION=`date '+%Y%m%d'`
 
 tests test:
 	$(MAKE) -j -C test

dist/tarball/Makefile

@@ -0,0 +1,48 @@
+VERSION=$(shell ../../configure -qV)
+R2V=radare2-${VERSION}
+
+ifneq ($(shell xz --help 2>/dev/null | grep improve),)
+TAR=tar -cvf
+TAREXT=tar.xz
+CZ=xz -f
+else
+TAR=bsdtar cvf
+TAREXT=tar.gz
+CZ=gzip -f
+endif
+
+all:
+	rm -rf $(R2V)
+	git clone ../.. $(R2V)
+	-cd $(R2V) \
+		&& ./preconfigure \
+		&& ./configure \
+		&& git log --decorate=short > ChangeLog
+	rm -f $(R2V)/.test.c $(R2V)/config-user.mk \
+		$(R2V)/config-user.mk $(R2V)/pkgcfg/*.pc $(R2V)/libr/include/r_userconf.h
+	R2_FILES=`cd $(R2V) && git ls-files | sed -e "s,^,$(R2V)/,"` ; \
+	V64_FILS=`cd $(R2V)/libr/arch/p/arm/v35/arch-arm64 ; \
+		git ls-files \
+		| grep -v '^\.' \
+		| grep -v gitig \
+		| sed -e "s,^,$(R2V)/libr/arch/p/arm/v35/arch-arm64/,"` ; \
+	V32_FILS=`cd $(R2V)/libr/arch/p/arm/v35/arch-armv7 ; \
+		git ls-files \
+		| grep -v '^\.' \
+		| grep -v gitig \
+		| sed -e "s,^,$(R2V)/libr/arch/p/arm/v35/arch-armv7/,"` ; \
+	CS_FILES=`cd $(R2V)/shlr/capstone ; \
+		git ls-files \
+	       	| grep -v pdf \
+		| grep -v xcode \
+		| grep -v '^\.' \
+		| grep -v msvc \
+		| grep -v gitig \
+		| grep -v suite \
+		| grep -v bindings \
+		| grep -v tests \
+		| sed -e "s,^,$(R2V)/shlr/capstone/,"` ; \
+	rm -rf $(R2V)/shlr/capstone/.[a-z]* ; \
+	${TAR} "radare2-${VERSION}.tar" $${V64_FILS} $${V32_FILS} $${R2_FILES} $${CS_FILES} "$(R2V)/ChangeLog" ; \
+	${CZ} "radare2-${VERSION}.tar"
+	zip -r radare2-$(VERSION).zip radare2-$(VERSION)

dist/wapm/r2/wapm.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pancake/r2"
-version = "5.8.2"
+version = "5.8.4"
 description = "Unix-Like Reverse Engineering Framework"
 readme = "README.md"
 license = "LGPL3"

shlr/Makefile

@@ -6,6 +6,13 @@ _INCLUDE_MK_GCC_=
 include ../mk/${COMPILER}.mk
 include ../mk/darwin.mk
 
+
+ifeq ($(shell test -f ../ChangeLog -a -d capstone -a ! -d capstone/.git && echo 1),1)
+WITHOUT_PULL=1
+CS_RELEASE=0
+else
+WITHOUT_PULL=0
+
 # Build against last capstone release or next
 ifeq ($(shell test -d ../.git && echo 1),1)
 CS_RELEASE=0
@@ -16,6 +23,7 @@ else
 CS_RELEASE=1
 endif
 endif
+endif
 
 # CAPSTONE_CFLAGS?=-g
 CAPSTONE_CFLAGS=
@@ -255,6 +263,7 @@ else
 
 capstone: capstone-sync
 
+
 capstone-sync:
 ifeq ($(WITHOUT_PULL),1)
 	@echo "Nothing to sync because of --without-pull"

sys/tarball.sh

@@ -1,27 +1,4 @@
 #!/bin/sh
-if [ ! -d .git ]; then
-	echo "Run this script from the root of a git copy"
-	exit 1
-fi
-if [ ! -x sys/tarball.sh ]; then
-	echo "Run this script from the radare2 root directory"
-	exit 1
-fi
-V=`./configure -qV`
-git clone . radare2-${V}
-cd radare2-${V}
-./preconfigure
-git status .
-rm -rf .git
-find * | grep /.git$ | xargs rm -rf
-rm -f .test.c
-rm -f config-user.mk
-rm -f pkgcfg/*.pc
-rm -f libr/include/r_userconf.h
-mkdir shlr/capstone/.git
-cd ..
-rm -f radare2-${V}.tar.xz
-tar cJvf radare2-${V}.tar.xz radare2-${V}
-rm -f radare2-${V}.zip
-zip -r radare2-${V}.zip radare2-${V}
-rm -rf radare2-${V}
+make -C dist/tarball
+cp -f dist/tarball/*.zip .
+cp -f dist/tarball/*.xz .