From 33a0465a51a1b6d90f1989601cf4ef407dc3446f Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Fri, 2 Sep 2016 22:11:49 -0700 Subject: [PATCH] fixed a few links --- NEWS | 2 +- lib/libzstd.pc.in | 2 +- programs/zstd.1 | 2 +- projects/README.md | 2 +- projects/cmake/CMakeLists.txt | 32 ++++---------------------------- tests/test-zstd-speed.py | 2 +- tests/test-zstd-versions.py | 2 +- zstd.rb | 18 ------------------ 8 files changed, 10 insertions(+), 52 deletions(-) delete mode 100644 zstd.rb diff --git a/NEWS b/NEWS index dcfabbf3..fce31cb2 100644 --- a/NEWS +++ b/NEWS @@ -189,6 +189,6 @@ frame concatenation support v0.1.1 fix compression bug detects write-flush errors -git@github.com:Cyan4973/zstd.git + v0.1.0 first release diff --git a/lib/libzstd.pc.in b/lib/libzstd.pc.in index 28afc3ad..9399363d 100644 --- a/lib/libzstd.pc.in +++ b/lib/libzstd.pc.in @@ -8,7 +8,7 @@ includedir=@INCLUDEDIR@ Name: zstd Description: lossless compression algorithm library -URL: https://github.com/Cyan4973/zstd +URL: https://github.com/facebook/zstd Version: @VERSION@ Libs: -L@LIBDIR@ -lzstd Cflags: -I@INCLUDEDIR@ diff --git a/programs/zstd.1 b/programs/zstd.1 index 0a0ad629..a2361652 100644 --- a/programs/zstd.1 +++ b/programs/zstd.1 @@ -135,7 +135,7 @@ Typical gains range from ~10% (at 64KB) to x5 better (at <1KB). .SH BUGS -Report bugs at:- https://github.com/Cyan4973/zstd/issues +Report bugs at:- https://github.com/facebook/zstd/issues .SH AUTHOR Yann Collet diff --git a/projects/README.md b/projects/README.md index 39742fb1..dd60b56e 100644 --- a/projects/README.md +++ b/projects/README.md @@ -14,7 +14,7 @@ The following projects are included with the zstd distribution: #### How to compile zstd with Visual Studio 1. Install Visual Studio e.g. VS 2015 Community Edition (it's free). -2. Download the latest version of zstd from https://github.com/Cyan4973/zstd/releases +2. Download the latest version of zstd from https://github.com/facebook/zstd/releases 3. Decompress ZIP archive. 4. Go to decompressed directory then to `projects` then `VS2010` and open `zstd.sln` 5. Visual Studio will ask about converting VS2010 project to VS2015 and you should agree. diff --git a/projects/cmake/CMakeLists.txt b/projects/cmake/CMakeLists.txt index 86178bf9..b8f5d18e 100644 --- a/projects/cmake/CMakeLists.txt +++ b/projects/cmake/CMakeLists.txt @@ -1,34 +1,10 @@ # ################################################################ -# zstd - Makefile -# Copyright (C) Yann Collet 2014-2016 +# Copyright (c) 2016-present, Yann Collet, Facebook, Inc. # All rights reserved. -# -# BSD license # -# Redistribution and use in source and binary forms, with or without modification, -# are permitted provided that the following conditions are met: -# -# * Redistributions of source code must retain the above copyright notice, this -# list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above copyright notice, this -# list of conditions and the following disclaimer in the documentation and/or -# other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# You can contact the author at : -# - zstd source repository : https://github.com/Cyan4973/zstd -# - Public forum : https://groups.google.com/forum/#!forum/lz4c +# This source code is licensed under the BSD-style license found in the +# LICENSE file in the root directory of this source tree. An additional grant +# of patent rights can be found in the PATENTS file in the same directory. # ################################################################ PROJECT(zstd) diff --git a/tests/test-zstd-speed.py b/tests/test-zstd-speed.py index 45cfe865..8d4d172b 100755 --- a/tests/test-zstd-speed.py +++ b/tests/test-zstd-speed.py @@ -18,7 +18,7 @@ import traceback import hashlib script_version = 'v0.8.0 (2016-08-03)' -default_repo_url = 'https://github.com/Cyan4973/zstd.git' +default_repo_url = 'https://github.com/facebook/zstd.git' working_dir_name = 'speedTest' working_path = os.getcwd() + '/' + working_dir_name # /path/to/zstd/tests/speedTest clone_path = working_path + '/' + 'zstd' # /path/to/zstd/tests/speedTest/zstd diff --git a/tests/test-zstd-versions.py b/tests/test-zstd-versions.py index 5a24bc4d..a5a71300 100755 --- a/tests/test-zstd-versions.py +++ b/tests/test-zstd-versions.py @@ -19,7 +19,7 @@ import sys import subprocess from subprocess import Popen, PIPE -repo_url = 'https://github.com/Cyan4973/zstd.git' +repo_url = 'https://github.com/facebook/zstd.git' tmp_dir_name = 'tests/versionsTest' make_cmd = 'make' git_cmd = 'git' diff --git a/zstd.rb b/zstd.rb deleted file mode 100644 index 0aa72a21..00000000 --- a/zstd.rb +++ /dev/null @@ -1,18 +0,0 @@ -class Zstd < Formula - desc "Zstandard - Fast real-time compression algorithm" - homepage "http://www.zstd.net/" - url "https://github.com/Cyan4973/zstd/archive/v1.0.0.tar.gz" - sha256 "197e6ef74da878cbf72844f38461bb18129d144fd5221b3598e973ecda6f5963" - - def install - system "make", "install", "PREFIX=#{prefix}" - end - - test do - (testpath/"input.txt").write("Hello, world." * 10) - system "#{bin}/zstd", "input.txt", "-o", "compressed.zst" - system "#{bin}/zstd", "--test", "compressed.zst" - system "#{bin}/zstd", "-d", "compressed.zst", "-o", "decompressed.txt" - system "cmp", "input.txt", "decompressed.txt" - end -end