Skip to content

Commit 8d9535e

Browse files
committed
Remove all 'make dist' artifacts
Reviewed-by: Matt Caswell <[email protected]> (Merged from openssl#7692)
1 parent 8c209ee commit 8d9535e

File tree

3 files changed

+2
-51
lines changed

3 files changed

+2
-51
lines changed

.travis-create-release.sh

+1-9
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
11
#! /bin/sh
22

3-
# $1 is expected to be $TRAVIS_OS_NAME
4-
5-
./Configure dist
6-
if [ "$1" == osx ]; then
7-
make NAME='_srcdist' TARFILE='_srcdist.tar' \
8-
TAR_COMMAND='$(TAR) $(TARFLAGS) -cf -' tar
9-
else
10-
make TARFILE='_srcdist.tar' NAME='_srcdist' dist
11-
fi
3+
./util/mktar.sh --name=_srcdist

Configurations/dist.conf

-12
This file was deleted.

Configurations/unix-Makefile.tmpl

+1-30
Original file line numberDiff line numberDiff line change
@@ -872,37 +872,8 @@ tags TAGS: FORCE
872872

873873
# Release targets (note: only available on Unix) #####################
874874

875-
# If your tar command doesn't support --owner and --group, make sure to
876-
# use one that does, for example GNU tar
877-
TAR_COMMAND=$(TAR) $(TARFLAGS) --owner 0 --group 0 -cf -
878-
PREPARE_CMD=:
879875
tar:
880-
set -e; \
881-
TMPDIR=/var/tmp/openssl-copy.$$$$; \
882-
DISTDIR=$(NAME); \
883-
mkdir -p $$TMPDIR/$$DISTDIR; \
884-
(cd $(SRCDIR); \
885-
excl_re=`git submodule status | sed -e 's/^.//' | cut -d' ' -f2`; \
886-
excl_re="^(fuzz/corpora|Configurations/.*\.norelease\.conf|`echo $$excl_re | sed -e 's/ /$$|/g'`\$$)"; \
887-
echo "$$excl_re"; \
888-
git ls-tree -r --name-only --full-tree HEAD \
889-
| egrep -v "$$excl_re" \
890-
| while read F; do \
891-
mkdir -p $$TMPDIR/$$DISTDIR/`dirname $$F`; \
892-
cp $$F $$TMPDIR/$$DISTDIR/$$F; \
893-
done); \
894-
(cd $$TMPDIR/$$DISTDIR; \
895-
$(PREPARE_CMD); \
896-
find . -type d -print | xargs chmod 755; \
897-
find . -type f -print | xargs chmod a+r; \
898-
find . -type f -perm -0100 -print | xargs chmod a+x); \
899-
(cd $$TMPDIR; $(TAR_COMMAND) $$DISTDIR) \
900-
| (cd $(SRCDIR); gzip --best > $(TARFILE).gz); \
901-
rm -rf $$TMPDIR
902-
cd $(SRCDIR); ls -l $(TARFILE).gz
903-
904-
dist:
905-
@$(MAKE) PREPARE_CMD='$(PERL) ./Configure dist' TARFILE="$(TARFILE)" NAME="$(NAME)" tar
876+
$(SRCDIR)/util/mktar.sh --name='$(NAME)' --tarfile='$(TARFILE)'
906877

907878
# Helper targets #####################################################
908879

0 commit comments

Comments
 (0)