[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  451a5bdf0386d7acf091c3e3b39107e5ed8be25d (commit)
       via  475fc3d8729190fd12b4ff23d6ec488439fb78f9 (commit)
       via  4a544810f08539f1549eea9be36bd878c67c8e26 (commit)
      from  5fa30720e481e62d14c113f502db1a76cf5dd221 (commit)


- Log -----------------------------------------------------------------
commit 451a5bdf0386d7acf091c3e3b39107e5ed8be25d
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Dec 7 15:56:27 2015 +0100

    Do not add symlinks in the source release
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 475fc3d8729190fd12b4ff23d6ec488439fb78f9
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Dec 7 15:47:43 2015 +0100

    In travis, build from a "source release" rather than from the build tree
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 4a544810f08539f1549eea9be36bd878c67c8e26
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Dec 7 15:45:50 2015 +0100

    Small changes to creating dists
    
    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 at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 .travis.yml  |  6 ++++++
 Makefile.org | 36 ++++++++++++++++--------------------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f431989..61f7c4a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -68,6 +68,9 @@ matrix:
           env: CONFIG_OPTS="--debug --strict-warnings"
 
 before_script:
+    - make -f Makefile.org TARFILE=_srcdist.tar NAME=_srcdist dist
+    - tar -xvzf _srcdist.tar.gz
+    - cd _srcdist
     - if [ "$CC" == i686-w64-mingw32-gcc ]; then
           export CROSS_COMPILE=${CC%%gcc}; unset CC;
           ./Configure mingw $CONFIG_OPTS -Wno-pedantic-ms-format;
@@ -77,13 +80,16 @@ before_script:
       else
           ./config $CONFIG_OPTS;
       fi
+    - cd ..
 
 script:
+    - cd _srcdist
     - make
     - if [ -n "$CROSS_COMPILE" ]; then
           export EXE_SHELL="wine" WINEPREFIX=`pwd`;
       fi
     - make test
+    - cd ..
 
 notifications:
     email:
diff --git a/Makefile.org b/Makefile.org
index 4ad6bf6..0ecb897 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -172,8 +172,7 @@ SHARED_LDFLAGS=
 GENERAL=        Makefile
 BASENAME=       openssl
 NAME=           $(BASENAME)-$(VERSION)
-TARFILE=        $(NAME).tar
-WTARFILE=       $(NAME)-win.tar
+TARFILE=        ../$(NAME).tar
 HEADER=         e_os.h
 
 # Directories created on install if they don't exist.
@@ -493,38 +492,35 @@ TABLE: Configure Configurations/*.conf
 # 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
 # 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 \
-			       --transform 's|^|openssl-$(VERSION)/|' \
+			       --transform 's|^|$(NAME)/|' \
 			       -cvf -
 
-../$(TARFILE).list:
+$(TARFILE).list:
 	find * \! -name STATUS \! -name TABLE \! -name '*.o' \! -name '*.a' \
 	       \! -name '*.so' \! -name '*.so.*'  \! -name 'openssl' \
-	       \! -name '*test' \! -name '.#*' \! -name '*~' \
-	    | sort > ../$(TARFILE).list
+	       \! -name '*test' \! -name '.#*' \! -name '*~' \!	-xtype l \
+	    | sort > $(TARFILE).list
 
-tar: ../$(TARFILE).list
+tar: $(TARFILE).list
 	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
-	$(TAR_COMMAND) | gzip --best >../$(TARFILE).gz
-	rm -f ../$(TARFILE).list
-	ls -l ../$(TARFILE).gz
+	$(TAR_COMMAND) | gzip --best > $(TARFILE).gz
+	rm -f $(TARFILE).list
+	ls -l $(TARFILE).gz
 
-tar-snap: ../$(TARFILE).list
-	$(TAR_COMMAND) > ../$(TARFILE)
-	rm -f ../$(TARFILE).list
-	ls -l ../$(TARFILE)
+tar-snap: $(TARFILE).list
+	$(TAR_COMMAND) > $(TARFILE)
+	rm -f $(TARFILE).list
+	ls -l $(TARFILE)
 
 dist:   
 	$(PERL) Configure dist
-	@$(MAKE) dist_pem_h
 	@$(MAKE) SDIRS='$(SDIRS)' clean
-	@$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' tar
-
-dist_pem_h:
-	(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
+	@$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' \
+	         TARFILE='$(TARFILE)' NAME='$(NAME)' tar
 
 install: all install_docs install_sw