generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Small changes to creating dists

Browse Source 
Make TARFILE include ../ instead of having that hard coded all over the place.
When transforming file names in TAR_COMMAND, use $(NAME) instead of openssl-$(VERSION)

Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit 4a544810f0)
This commit is contained in:
Richard Levitte 2015-12-07 15:45:50 +01:00
parent d82626caec
commit 3b92a6fe4f
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Makefile.org
View File

@ -180,7 +180,6 @@ GENERAL= Makefile
BASENAME= openssl BASENAME= openssl
NAME= $(BASENAME)-$(VERSION) NAME= $(BASENAME)-$(VERSION)
TARFILE= $(NAME).tar TARFILE= $(NAME).tar
WTARFILE= $(NAME)-win.tar
EXHEADER= e_os2.h EXHEADER= e_os2.h
HEADER= e_os.h HEADER= e_os.h
@ -499,38 +498,35 @@ TABLE: Configure
# would occur. Therefore the list of files is temporarily stored into a file # would occur. Therefore the list of files is temporarily stored into a file
# and read directly, requiring GNU-Tar. Call "make TAR=gtar dist" if the normal # and read directly, requiring GNU-Tar. Call "make TAR=gtar dist" if the normal
# tar does not support the --files-from option. # tar does not support the --files-from option.
TAR_COMMAND=$(TAR) $(TARFLAGS) --files-from ../$(TARFILE).list \ TAR_COMMAND=$(TAR) $(TARFLAGS) --files-from $(TARFILE).list \
--owner openssl:0 --group openssl:0 \ --owner openssl:0 --group openssl:0 \
--transform 's|^|openssl-$(VERSION)/|' \ --transform 's|^|$(NAME)/|' \
-cvf - -cvf -
../$(TARFILE).list: $(TARFILE).list:
find * \! -name STATUS \! -name TABLE \! -name '*.o' \! -name '*.a' \ find * \! -name STATUS \! -name TABLE \! -name '*.o' \! -name '*.a' \
\! -name '*.so' \! -name '*.so.*' \! -name 'openssl' \ \! -name '*.so' \! -name '*.so.*' \! -name 'openssl' \
\! -name '*test' \! -name '.#*' \! -name '*~' \ \! -name '*test' \! -name '.#*' \! -name '*~' \
| sort > ../$(TARFILE).list | sort > $(TARFILE).list
tar: ../$(TARFILE).list tar: $(TARFILE).list
find . -type d -print | xargs chmod 755 find . -type d -print | xargs chmod 755
find . -type f -print | xargs chmod a+r find . -type f -print | xargs chmod a+r
find . -type f -perm -0100 -print | xargs chmod a+x find . -type f -perm -0100 -print | xargs chmod a+x
$(TAR_COMMAND) | gzip --best >../$(TARFILE).gz $(TAR_COMMAND) | gzip --best > $(TARFILE).gz
rm -f ../$(TARFILE).list rm -f $(TARFILE).list
ls -l ../$(TARFILE).gz ls -l $(TARFILE).gz
tar-snap: ../$(TARFILE).list tar-snap: $(TARFILE).list
$(TAR_COMMAND) > ../$(TARFILE) $(TAR_COMMAND) > $(TARFILE)
rm -f ../$(TARFILE).list rm -f $(TARFILE).list
ls -l ../$(TARFILE) ls -l $(TARFILE)
dist: dist:
$(PERL) Configure dist $(PERL) Configure dist
@$(MAKE) dist_pem_h
@$(MAKE) SDIRS='$(SDIRS)' clean @$(MAKE) SDIRS='$(SDIRS)' clean
@$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' tar @$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' \
TARFILE='$(TARFILE)' NAME='$(NAME)' tar
dist_pem_h:
(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
install: all install_docs install_sw install: all install_docs install_sw