Commit 415c4a46 authored by Richard Levitte's avatar Richard Levitte
Browse files

Remove all 'make dist' artifacts 



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7692)

(cherry picked from commit 8d9535ec3e317641b8e551973c8cfe2ee1c89296)
parent 48c813ef

.travis-create-release.sh

+1 −9
Original line number Diff line number Diff line 
#! /bin/sh



# $1 is expected to be $TRAVIS_OS_NAME



./Configure dist

if [ "$1" == osx ]; then

    make NAME='_srcdist' TARFILE='_srcdist.tar' \

         TAR_COMMAND='$(TAR) $(TARFLAGS) -cf -' tar

else

    make TARFILE='_srcdist.tar' NAME='_srcdist' dist

fi
 
./util/mktar.sh --name=_srcdist

Configurations/dist.conf

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
## -*- mode: perl; -*-

## Build configuration targets for openssl-team members



# This is to support 'make dist'

my %targets = (

    "dist" => {

        inherit_from     => [ 'BASE_unix' ],

        CC               => "cc",

        CFLAGS           => "-O",

        thread_scheme    => "(unknown)",

    },

);

Configurations/unix-Makefile.tmpl

+1 −30
Original line number Diff line number Diff line
@@ -830,37 +830,8 @@ tags TAGS: FORCE 


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



# If your tar command doesn't support --owner and --group, make sure to

# use one that does, for example GNU tar

TAR_COMMAND=$(TAR) $(TARFLAGS) --owner 0 --group 0 -cf -

PREPARE_CMD=:

tar:

	set -e; \

	TMPDIR=/var/tmp/openssl-copy.$$$$; \

	DISTDIR=$(NAME); \

	mkdir -p $$TMPDIR/$$DISTDIR; \

	(cd $(SRCDIR); \

	 excl_re=`git submodule status | sed -e 's/^.//' | cut -d' ' -f2`; \

	 excl_re="^(fuzz/corpora|Configurations/.*\.norelease\.conf|`echo $$excl_re | sed -e 's/ /$$|/g'`\$$)"; \

	 echo "$$excl_re"; \

	 git ls-tree -r --name-only --full-tree HEAD \

	 | egrep -v "$$excl_re" \

	 | while read F; do \

	       mkdir -p $$TMPDIR/$$DISTDIR/`dirname $$F`; \

	       cp $$F $$TMPDIR/$$DISTDIR/$$F; \

	   done); \

	(cd $$TMPDIR/$$DISTDIR; \

	 $(PREPARE_CMD); \

	 find . -type d -print | xargs chmod 755; \

	 find . -type f -print | xargs chmod a+r; \

	 find . -type f -perm -0100 -print | xargs chmod a+x); \

	(cd $$TMPDIR; $(TAR_COMMAND) $$DISTDIR) \

	| (cd $(SRCDIR); gzip --best > $(TARFILE).gz); \

	rm -rf $$TMPDIR

	cd $(SRCDIR); ls -l $(TARFILE).gz



dist:

	@$(MAKE) PREPARE_CMD='$(PERL) ./Configure dist' TARFILE="$(TARFILE)" NAME="$(NAME)" tar

	$(SRCDIR)/util/mktar.sh --name='$(NAME)' --tarfile='$(TARFILE)'



# Helper targets #####################################################