From: Yann Collet <cyan@fb.com>
Date: Sat, 24 Mar 2018 16:55:13 +0000 (-0700)
Subject: Merge branch 'dev' into srcPackage
X-Git-Tag: v1.3.4~1^2~3^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1072%2Fhead;p=thirdparty%2Fzstd.git

Merge branch 'dev' into srcPackage
---

4d753b0ca894117df46649818845755a28242eda
diff --cc appveyor.yml
index b098fd452,7d6ca99bb..742f61206
--- a/appveyor.yml
+++ b/appveyor.yml
@@@ -79,22 -80,12 +79,22 @@@
        SET "LDFLAGS=../../zlib/libz.a" &&
        sh -c "%SCRIPT%" &&
        ( if [%COMPILER%]==[gcc] if [%ARTIFACT%]==[true]
 +          ECHO Creating artifacts &&
 +          ECHO %cd% &&
            lib\dll\example\build_package.bat &&
-           cd programs\ && make DEBUGFLAGS= clean zstd &&
-           7z a -tzip -mx9 zstd-win-binary-%PLATFORM%.zip zstd.exe &&
+           make -C programs DEBUGFLAGS= clean zstd &&
+           cd programs\ && 7z a -tzip -mx9 zstd-win-binary-%PLATFORM%.zip zstd.exe &&
            appveyor PushArtifact zstd-win-binary-%PLATFORM%.zip &&
            cp zstd.exe ..\bin\zstd.exe &&
 -          cd ..\bin\ && 7z a -tzip -mx9 zstd-win-release-%PLATFORM%.zip * &&
 +          git clone --depth 1 --branch master https://github.com/facebook/zstd &&
 +          cd zstd &&
 +          git archive --format=tar master -o zstd-src.tar &&
 +          ..\zstd -19 zstd-src.tar &&
 +          appveyor PushArtifact zstd-src.tar.zst &&
-           certUtil -hashfile zstd-src.tar.zst SHA256 > zstd-src.sig.sha256 &&
-           appveyor PushArtifact zstd-src.sig.sha256 &&
++          certUtil -hashfile zstd-src.tar.zst SHA256 > zstd-src.tar.zst.sha256.sig &&
++          appveyor PushArtifact zstd-src.tar.zst.sha256.sig &&
 +          cd ..\..\bin\ &&
 +          7z a -tzip -mx9 zstd-win-release-%PLATFORM%.zip * &&
            appveyor PushArtifact zstd-win-release-%PLATFORM%.zip
        )
      )