public/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix configurations such as 'dist' and tar building

Browse source 
For config targets such as 'dist', which doesn't have a BASE template,
we still need to have a default build scheme.

Additionally, the unified Makefile template's target 'tar' wasn't
quite as flexible as the unixmake one.

Finally, .travis-create-release.sh can be somewhat simplified now that
it builds with the unified build scheme.

Reviewed-by: Matt Caswell <matt@openssl.org>
This commit is contained in:
Richard Levitte 2016-03-08 11:49:26 +01:00
parent 69633bb4c9
commit 54bb8f74bd
3 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.travis-create-release.sh
View file

@ -5,8 +5,7 @@
./Configure dist ./Configure dist
if [ "$1" == osx ]; then if [ "$1" == osx ]; then
make NAME='_srcdist' TARFLAGS='-n' TARFILE='_srcdist.tar' \ make NAME='_srcdist' TARFLAGS='-n' TARFILE='_srcdist.tar' \
TAR_COMMAND='$(TAR) $(TARFLAGS) -s "|^|$(NAME)/|" -T $(TARFILE).list -cvf -' \ TAR_COMMAND='$(TAR) $(TARFLAGS) -cvf -' tar
SHELL='sh -vx' tar
else else
make TARFILE='_srcdist.tar' NAME='_srcdist' SHELL='sh -v' dist make TARFILE='_srcdist.tar' NAME='_srcdist' dist
fi fi

3
Configurations/00-base-templates.conf
View file

@ -35,6 +35,9 @@
shared_ldflag => "", shared_ldflag => "",
shared_rcflag => "", shared_rcflag => "",
shared_extension => "", shared_extension => "",
build_scheme => [ "unified", "unix" ],
build_file => "Makefile",
}, },
BASE_common => { BASE_common => {

8
Configurations/unix-Makefile.tmpl
View file

@ -660,9 +660,11 @@ tags TAGS: FORCE
# Release targets (note: only available on Unix) ##################### # Release targets (note: only available on Unix) #####################
TAR_COMMAND=$(TAR) $(TARFLAGS) --owner 0 --group 0 -cvf -
PREPARE_CMD=:
tar: tar:
TMPDIR=/var/tmp/openssl-copy.$$$$; \ TMPDIR=/var/tmp/openssl-copy.$$$$; \
DISTDIR=openssl-$(VERSION); \ DISTDIR=$(NAME); \
mkdir -p $$TMPDIR/$$DISTDIR; \ mkdir -p $$TMPDIR/$$DISTDIR; \
(cd $(SRCDIR); \ (cd $(SRCDIR); \
git ls-tree -r --name-only --full-tree HEAD \ git ls-tree -r --name-only --full-tree HEAD \
@ -671,11 +673,11 @@ tar:
cp $$F $$TMPDIR/$$DISTDIR/$$F; \ cp $$F $$TMPDIR/$$DISTDIR/$$F; \
done); \ done); \
(cd $$TMPDIR; \ (cd $$TMPDIR; \
[ -n "$(PREPARE_CMD)" ] && $(PREPARE_CMD); \ $(PREPARE_CMD); \
find $$TMPDIR/$$DISTDIR -type d -print | xargs chmod 755; \ find $$TMPDIR/$$DISTDIR -type d -print | xargs chmod 755; \
find $$TMPDIR/$$DISTDIR -type f -print | xargs chmod a+r; \ find $$TMPDIR/$$DISTDIR -type f -print | xargs chmod a+r; \
find $$TMPDIR/$$DISTDIR -type f -perm -0100 -print | xargs chmod a+x; \ find $$TMPDIR/$$DISTDIR -type f -perm -0100 -print | xargs chmod a+x; \
$(TAR) $(TARFLAGS) --owner 0 --group 0 -cvf - $$DISTDIR) \ $(TAR_COMMAND) $$DISTDIR) \
| (cd $(SRCDIR); gzip --best > $(TARFILE).gz); \ | (cd $(SRCDIR); gzip --best > $(TARFILE).gz); \
rm -rf $$TMPDIR rm -rf $$TMPDIR
cd $(SRCDIR); ls -l $(TARFILE).gz cd $(SRCDIR); ls -l $(TARFILE).gz