[Cmake-commits] CMake branch, next, updated. v3.6.0-rc3-630-g4e7bb44
Brad King
brad.king at kitware.com
Wed Jun 29 10:15:35 EDT 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 4e7bb44e4d6ba33cd5495913f73985f5b6d80825 (commit)
via 60212979ea6cf92be7557358ef89484317ae0340 (commit)
via e4d3914639d1e7b41337c9626b91458c4fe6ae95 (commit)
via d4f524040e8b9573bd568e4bb6b6ddb70d6ab366 (commit)
via bf969198067649a55752db21d03ae8a0fb443c6e (commit)
via ca4276e435e251e1b2011a7a523aecdbf85c18ec (commit)
via d38a37ea1539eafec6cec6ef59cc9419531cad91 (commit)
via ec8f744a11dfcab9560387168cab76260aa0b777 (commit)
from f723860ff359eedfff8a0371eba7691027676e29 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4e7bb44e4d6ba33cd5495913f73985f5b6d80825
commit 4e7bb44e4d6ba33cd5495913f73985f5b6d80825
Merge: f723860 6021297
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 29 10:15:32 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 29 10:15:32 2016 -0400
Merge topic 'update-liblzma' into next
60212979 Merge branch 'upstream-liblzma' into update-liblzma
e4d39146 liblzma 2014-12-21 (265e5ffb)
d4f52404 liblzma: Revise update script to get version 5.0.8
bf969198 Merge branch 'upstream-liblzma' into update-liblzma
ca4276e4 liblzma: Remove CMake-specific README
d38a37ea liblzma 2013-06-30 (b69900ed)
ec8f744a Add script to update liblzma from upstream
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=60212979ea6cf92be7557358ef89484317ae0340
commit 60212979ea6cf92be7557358ef89484317ae0340
Merge: d4f5240 e4d3914
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 29 10:14:03 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 29 10:14:03 2016 -0400
Merge branch 'upstream-liblzma' into update-liblzma
* upstream-liblzma:
liblzma 2014-12-21 (265e5ffb)
diff --cc Utilities/cmliblzma/liblzma/check/crc32_fast.c
index 13f65b4,0000000..c2c3cb7
mode 100644,000000..100644
--- a/Utilities/cmliblzma/liblzma/check/crc32_fast.c
+++ b/Utilities/cmliblzma/liblzma/check/crc32_fast.c
@@@ -1,86 -1,0 +1,86 @@@
+///////////////////////////////////////////////////////////////////////////////
+//
+/// \file crc32.c
+/// \brief CRC32 calculation
+///
+/// Calculate the CRC32 using the slice-by-eight algorithm.
+/// It is explained in this document:
+/// http://www.intel.com/technology/comms/perfnet/download/CRC_generators.pdf
+/// The code in this file is not the same as in Intel's paper, but
+/// the basic principle is identical.
+//
+// Author: Lasse Collin
+//
+// This file has been put into the public domain.
+// You can do whatever you want with this file.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "check.h"
+#include "crc_macros.h"
+
+
- // If you make any changes, do some bench marking! Seemingly unrelated
++// If you make any changes, do some benchmarking! Seemingly unrelated
+// changes can very easily ruin the performance (and very probably is
+// very compiler dependent).
+extern LZMA_API(uint32_t)
+lzma_crc32(const uint8_t *buf, size_t size, uint32_t crc)
+{
+ crc = ~crc;
+
+#ifdef WORDS_BIGENDIAN
+ crc = bswap32(crc);
+#endif
+
+ if (size > 8) {
+ const uint8_t * limit;
+
+ // Fix the alignment, if needed. The if statement above
+ // ensures that this won't read past the end of buf[].
+ while ((uintptr_t)(buf) & 7) {
+ crc = lzma_crc32_table[0][*buf++ ^ A(crc)] ^ S8(crc);
+ --size;
+ }
+
+ // Calculate the position where to stop.
+ limit = buf + (size & ~(size_t)(7));
+
+ // Calculate how many bytes must be calculated separately
+ // before returning the result.
+ size &= (size_t)(7);
+
+ // Calculate the CRC32 using the slice-by-eight algorithm.
+ while (buf < limit) {
+ uint32_t tmp;
+
+ crc ^= *(const uint32_t *)(buf);
+ buf += 4;
+
+ crc = lzma_crc32_table[7][A(crc)]
+ ^ lzma_crc32_table[6][B(crc)]
+ ^ lzma_crc32_table[5][C(crc)]
+ ^ lzma_crc32_table[4][D(crc)];
+
+ tmp = *(const uint32_t *)(buf);
+ buf += 4;
+
+ // At least with some compilers, it is critical for
+ // performance, that the crc variable is XORed
+ // between the two table-lookup pairs.
+ crc = lzma_crc32_table[3][A(tmp)]
+ ^ lzma_crc32_table[2][B(tmp)]
+ ^ crc
+ ^ lzma_crc32_table[1][C(tmp)]
+ ^ lzma_crc32_table[0][D(tmp)];
+ }
+ }
+
+ while (size-- != 0)
+ crc = lzma_crc32_table[0][*buf++ ^ A(crc)] ^ S8(crc);
+
+#ifdef WORDS_BIGENDIAN
+ crc = bswap32(crc);
+#endif
+
+ return ~crc;
+}
diff --cc Utilities/cmliblzma/liblzma/check/sha256.c
index c2c85eb,0000000..3af6aa6
mode 100644,000000..100644
--- a/Utilities/cmliblzma/liblzma/check/sha256.c
+++ b/Utilities/cmliblzma/liblzma/check/sha256.c
@@@ -1,204 -1,0 +1,204 @@@
+///////////////////////////////////////////////////////////////////////////////
+//
+/// \file sha256.c
+/// \brief SHA-256
+///
+/// \todo Crypto++ has x86 ASM optimizations. They use SSE so if they
+/// are imported to liblzma, SSE instructions need to be used
+/// conditionally to keep the code working on older boxes.
+//
+// This code is based on the code found from 7-Zip, which has a modified
+// version of the SHA-256 found from Crypto++ <http://www.cryptopp.com/>.
+// The code was modified a little to fit into liblzma.
+//
+// Authors: Kevin Springle
+// Wei Dai
+// Igor Pavlov
+// Lasse Collin
+//
+// This file has been put into the public domain.
+// You can do whatever you want with this file.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+// Avoid bogus warnings in transform().
+#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 2) || __GNUC__ > 4
+# pragma GCC diagnostic ignored "-Wuninitialized"
+#endif
+
+#include "check.h"
+
+// At least on x86, GCC is able to optimize this to a rotate instruction.
+#define rotr_32(num, amount) ((num) >> (amount) | (num) << (32 - (amount)))
+
+#define blk0(i) (W[i] = data[i])
+#define blk2(i) (W[i & 15] += s1(W[(i - 2) & 15]) + W[(i - 7) & 15] \
+ + s0(W[(i - 15) & 15]))
+
+#define Ch(x, y, z) (z ^ (x & (y ^ z)))
+#define Maj(x, y, z) ((x & y) | (z & (x | y)))
+
+#define a(i) T[(0 - i) & 7]
+#define b(i) T[(1 - i) & 7]
+#define c(i) T[(2 - i) & 7]
+#define d(i) T[(3 - i) & 7]
+#define e(i) T[(4 - i) & 7]
+#define f(i) T[(5 - i) & 7]
+#define g(i) T[(6 - i) & 7]
+#define h(i) T[(7 - i) & 7]
+
+#define R(i) \
+ h(i) += S1(e(i)) + Ch(e(i), f(i), g(i)) + SHA256_K[i + j] \
+ + (j ? blk2(i) : blk0(i)); \
+ d(i) += h(i); \
+ h(i) += S0(a(i)) + Maj(a(i), b(i), c(i))
+
+#define S0(x) (rotr_32(x, 2) ^ rotr_32(x, 13) ^ rotr_32(x, 22))
+#define S1(x) (rotr_32(x, 6) ^ rotr_32(x, 11) ^ rotr_32(x, 25))
+#define s0(x) (rotr_32(x, 7) ^ rotr_32(x, 18) ^ (x >> 3))
+#define s1(x) (rotr_32(x, 17) ^ rotr_32(x, 19) ^ (x >> 10))
+
+
+static const uint32_t SHA256_K[64] = {
+ 0x428A2F98, 0x71374491, 0xB5C0FBCF, 0xE9B5DBA5,
+ 0x3956C25B, 0x59F111F1, 0x923F82A4, 0xAB1C5ED5,
+ 0xD807AA98, 0x12835B01, 0x243185BE, 0x550C7DC3,
+ 0x72BE5D74, 0x80DEB1FE, 0x9BDC06A7, 0xC19BF174,
+ 0xE49B69C1, 0xEFBE4786, 0x0FC19DC6, 0x240CA1CC,
+ 0x2DE92C6F, 0x4A7484AA, 0x5CB0A9DC, 0x76F988DA,
+ 0x983E5152, 0xA831C66D, 0xB00327C8, 0xBF597FC7,
+ 0xC6E00BF3, 0xD5A79147, 0x06CA6351, 0x14292967,
+ 0x27B70A85, 0x2E1B2138, 0x4D2C6DFC, 0x53380D13,
+ 0x650A7354, 0x766A0ABB, 0x81C2C92E, 0x92722C85,
+ 0xA2BFE8A1, 0xA81A664B, 0xC24B8B70, 0xC76C51A3,
+ 0xD192E819, 0xD6990624, 0xF40E3585, 0x106AA070,
+ 0x19A4C116, 0x1E376C08, 0x2748774C, 0x34B0BCB5,
+ 0x391C0CB3, 0x4ED8AA4A, 0x5B9CCA4F, 0x682E6FF3,
+ 0x748F82EE, 0x78A5636F, 0x84C87814, 0x8CC70208,
+ 0x90BEFFFA, 0xA4506CEB, 0xBEF9A3F7, 0xC67178F2,
+};
+
+
+static void
- transform(uint32_t state[], const uint32_t data[])
++transform(uint32_t state[8], const uint32_t data[16])
+{
+ uint32_t W[16];
+ uint32_t T[8];
+ unsigned int j;
+
+ // Copy state[] to working vars.
+ memcpy(T, state, sizeof(T));
+
+ // 64 operations, partially loop unrolled
+ for (j = 0; j < 64; j += 16) {
+ R( 0); R( 1); R( 2); R( 3);
+ R( 4); R( 5); R( 6); R( 7);
+ R( 8); R( 9); R(10); R(11);
+ R(12); R(13); R(14); R(15);
+ }
+
+ // Add the working vars back into state[].
+ state[0] += a(0);
+ state[1] += b(0);
+ state[2] += c(0);
+ state[3] += d(0);
+ state[4] += e(0);
+ state[5] += f(0);
+ state[6] += g(0);
+ state[7] += h(0);
+}
+
+
+static void
+process(lzma_check_state *check)
+{
+#ifdef WORDS_BIGENDIAN
+ transform(check->state.sha256.state, check->buffer.u32);
+
+#else
+ uint32_t data[16];
+ size_t i;
+
+ for (i = 0; i < 16; ++i)
+ data[i] = bswap32(check->buffer.u32[i]);
+
+ transform(check->state.sha256.state, data);
+#endif
+
+ return;
+}
+
+
+extern void
+lzma_sha256_init(lzma_check_state *check)
+{
+ static const uint32_t s[8] = {
+ 0x6A09E667, 0xBB67AE85, 0x3C6EF372, 0xA54FF53A,
+ 0x510E527F, 0x9B05688C, 0x1F83D9AB, 0x5BE0CD19,
+ };
+
+ memcpy(check->state.sha256.state, s, sizeof(s));
+ check->state.sha256.size = 0;
+
+ return;
+}
+
+
+extern void
+lzma_sha256_update(const uint8_t *buf, size_t size, lzma_check_state *check)
+{
+ // Copy the input data into a properly aligned temporary buffer.
+ // This way we can be called with arbitrarily sized buffers
+ // (no need to be multiple of 64 bytes), and the code works also
+ // on architectures that don't allow unaligned memory access.
+ while (size > 0) {
+ const size_t copy_start = check->state.sha256.size & 0x3F;
+ size_t copy_size = 64 - copy_start;
+ if (copy_size > size)
+ copy_size = size;
+
+ memcpy(check->buffer.u8 + copy_start, buf, copy_size);
+
+ buf += copy_size;
+ size -= copy_size;
+ check->state.sha256.size += copy_size;
+
+ if ((check->state.sha256.size & 0x3F) == 0)
+ process(check);
+ }
+
+ return;
+}
+
+
+extern void
+lzma_sha256_finish(lzma_check_state *check)
+{
+ size_t i;
+
+ // Add padding as described in RFC 3174 (it describes SHA-1 but
+ // the same padding style is used for SHA-256 too).
+ size_t pos = check->state.sha256.size & 0x3F;
+ check->buffer.u8[pos++] = 0x80;
+
+ while (pos != 64 - 8) {
+ if (pos == 64) {
+ process(check);
+ pos = 0;
+ }
+
+ check->buffer.u8[pos++] = 0x00;
+ }
+
+ // Convert the message size from bytes to bits.
+ check->state.sha256.size *= 8;
+
+ check->buffer.u64[(64 - 8) / 8] = conv64be(check->state.sha256.size);
+
+ process(check);
+
+ for (i = 0; i < 8; ++i)
+ check->buffer.u32[i] = conv32be(check->state.sha256.state[i]);
+
+ return;
+}
diff --cc Utilities/cmliblzma/liblzma/lzma/lzma_encoder_presets.c
index 8af9b9f,0000000..9332abf
mode 100644,000000..100644
--- a/Utilities/cmliblzma/liblzma/lzma/lzma_encoder_presets.c
+++ b/Utilities/cmliblzma/liblzma/lzma/lzma_encoder_presets.c
@@@ -1,63 -1,0 +1,64 @@@
+///////////////////////////////////////////////////////////////////////////////
+//
+/// \file lzma_encoder_presets.c
+/// \brief Encoder presets
+//
+// Author: Lasse Collin
+//
+// This file has been put into the public domain.
+// You can do whatever you want with this file.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "common.h"
+
+
+extern LZMA_API(lzma_bool)
+lzma_lzma_preset(lzma_options_lzma *options, uint32_t preset)
+{
- static const uint8_t dict_size_values[] = { 18, 20, 21, 22, 22, 23, 23, 24, 25, 26 };
- static const uint8_t depth_values[] = { 4, 8, 24, 48 };
++ static const uint8_t dict_pow2[]
++ = { 18, 20, 21, 22, 22, 23, 23, 24, 25, 26 };
++ static const uint8_t depths[] = { 4, 8, 24, 48 };
+
+ const uint32_t level = preset & LZMA_PRESET_LEVEL_MASK;
+ const uint32_t flags = preset & ~LZMA_PRESET_LEVEL_MASK;
+ const uint32_t supported_flags = LZMA_PRESET_EXTREME;
+
+ if (level > 9 || (flags & ~supported_flags))
+ return true;
+
+ options->preset_dict = NULL;
+ options->preset_dict_size = 0;
+
+ options->lc = LZMA_LC_DEFAULT;
+ options->lp = LZMA_LP_DEFAULT;
+ options->pb = LZMA_PB_DEFAULT;
+
- options->dict_size = UINT32_C(1) << dict_size_values[level];
++ options->dict_size = UINT32_C(1) << dict_pow2[level];
+
+ if (level <= 3) {
+ options->mode = LZMA_MODE_FAST;
+ options->mf = level == 0 ? LZMA_MF_HC3 : LZMA_MF_HC4;
+ options->nice_len = level <= 1 ? 128 : 273;
- options->depth = depth_values[level];
++ options->depth = depths[level];
+ } else {
+ options->mode = LZMA_MODE_NORMAL;
+ options->mf = LZMA_MF_BT4;
+ options->nice_len = level == 4 ? 16 : level == 5 ? 32 : 64;
+ options->depth = 0;
+ }
+
+ if (flags & LZMA_PRESET_EXTREME) {
+ options->mode = LZMA_MODE_NORMAL;
+ options->mf = LZMA_MF_BT4;
+ if (level == 3 || level == 5) {
+ options->nice_len = 192;
+ options->depth = 0;
+ } else {
+ options->nice_len = 273;
+ options->depth = 512;
+ }
+ }
+
+ return false;
+}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e4d3914639d1e7b41337c9626b91458c4fe6ae95
commit e4d3914639d1e7b41337c9626b91458c4fe6ae95
Author: liblzma upstream <xz-devel at tukaani.org>
AuthorDate: Sun Dec 21 17:06:21 2014 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 29 10:08:26 2016 -0400
liblzma 2014-12-21 (265e5ffb)
Code extracted from:
http://git.tukaani.org/xz.git
at commit 265e5ffb70d9c175b424621576294d28807efd9b (v5.0.8).
diff --git a/liblzma/Makefile.am b/liblzma/Makefile.am
index 0529ff8..c81990a 100644
--- a/liblzma/Makefile.am
+++ b/liblzma/Makefile.am
@@ -24,7 +24,7 @@ liblzma_la_CPPFLAGS = \
-I$(top_srcdir)/src/liblzma/simple \
-I$(top_srcdir)/src/common \
-DTUKLIB_SYMBOL_PREFIX=lzma_
-liblzma_la_LDFLAGS = -no-undefined -version-info 5:5:0
+liblzma_la_LDFLAGS = -no-undefined -version-info 5:8:0
include $(srcdir)/common/Makefile.inc
include $(srcdir)/check/Makefile.inc
@@ -88,3 +88,23 @@ endif
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = liblzma.pc
EXTRA_DIST += liblzma.pc.in
+
+pc_verbose = $(pc_verbose_ at AM_V@)
+pc_verbose_ = $(pc_verbose_ at AM_DEFAULT_V@)
+pc_verbose_0 = @echo " PC " $@;
+
+liblzma.pc: $(srcdir)/liblzma.pc.in
+ $(AM_V_at)rm -f $@
+ $(pc_verbose)sed \
+ -e 's, at prefix[@],$(prefix),g' \
+ -e 's, at exec_prefix[@],$(exec_prefix),g' \
+ -e 's, at libdir[@],$(libdir),g' \
+ -e 's, at includedir[@],$(includedir),g' \
+ -e 's, at PACKAGE_URL[@],$(PACKAGE_URL),g' \
+ -e 's, at PACKAGE_VERSION[@],$(PACKAGE_VERSION),g' \
+ -e 's, at PTHREAD_CFLAGS[@],$(PTHREAD_CFLAGS),g' \
+ -e 's, at PTHREAD_LIBS[@],$(PTHREAD_LIBS),g' \
+ < $(srcdir)/liblzma.pc.in > $@ || { rm -f $@; exit 1; }
+
+clean-local:
+ rm -f liblzma.pc
diff --git a/liblzma/api/lzma/block.h b/liblzma/api/lzma/block.h
index 8a4bf23..e6710a7 100644
--- a/liblzma/api/lzma/block.h
+++ b/liblzma/api/lzma/block.h
@@ -318,6 +318,9 @@ extern LZMA_API(lzma_ret) lzma_block_header_encode(
* The size of the Block Header must have already been decoded with
* lzma_block_header_size_decode() macro and stored to block->header_size.
*
+ * The integrity check type from Stream Header must have been stored
+ * to block->check.
+ *
* block->filters must have been allocated, but they don't need to be
* initialized (possible existing filter options are not freed).
*
diff --git a/liblzma/api/lzma/version.h b/liblzma/api/lzma/version.h
index 66e9396..09866b9 100644
--- a/liblzma/api/lzma/version.h
+++ b/liblzma/api/lzma/version.h
@@ -22,7 +22,7 @@
*/
#define LZMA_VERSION_MAJOR 5
#define LZMA_VERSION_MINOR 0
-#define LZMA_VERSION_PATCH 5
+#define LZMA_VERSION_PATCH 8
#define LZMA_VERSION_STABILITY LZMA_VERSION_STABILITY_STABLE
#ifndef LZMA_VERSION_COMMIT
diff --git a/liblzma/check/crc32_fast.c b/liblzma/check/crc32_fast.c
index 94da855..3de0263 100644
--- a/liblzma/check/crc32_fast.c
+++ b/liblzma/check/crc32_fast.c
@@ -20,7 +20,7 @@
#include "crc_macros.h"
-// If you make any changes, do some bench marking! Seemingly unrelated
+// If you make any changes, do some benchmarking! Seemingly unrelated
// changes can very easily ruin the performance (and very probably is
// very compiler dependent).
extern LZMA_API(uint32_t)
diff --git a/liblzma/check/sha256.c b/liblzma/check/sha256.c
index 23bda92..f2cc0d7 100644
--- a/liblzma/check/sha256.c
+++ b/liblzma/check/sha256.c
@@ -80,7 +80,7 @@ static const uint32_t SHA256_K[64] = {
static void
-transform(uint32_t state[static 8], const uint32_t data[static 16])
+transform(uint32_t state[8], const uint32_t data[16])
{
uint32_t W[16];
uint32_t T[8];
diff --git a/liblzma/lzma/lzma_encoder_presets.c b/liblzma/lzma/lzma_encoder_presets.c
index 21e427a..8484b77 100644
--- a/liblzma/lzma/lzma_encoder_presets.c
+++ b/liblzma/lzma/lzma_encoder_presets.c
@@ -30,14 +30,16 @@ lzma_lzma_preset(lzma_options_lzma *options, uint32_t preset)
options->lp = LZMA_LP_DEFAULT;
options->pb = LZMA_PB_DEFAULT;
- options->dict_size = UINT32_C(1) << (uint8_t []){
- 18, 20, 21, 22, 22, 23, 23, 24, 25, 26 }[level];
+ static const uint8_t dict_pow2[]
+ = { 18, 20, 21, 22, 22, 23, 23, 24, 25, 26 };
+ options->dict_size = UINT32_C(1) << dict_pow2[level];
if (level <= 3) {
options->mode = LZMA_MODE_FAST;
options->mf = level == 0 ? LZMA_MF_HC3 : LZMA_MF_HC4;
options->nice_len = level <= 1 ? 128 : 273;
- options->depth = (uint8_t []){ 4, 8, 24, 48 }[level];
+ static const uint8_t depths[] = { 4, 8, 24, 48 };
+ options->depth = depths[level];
} else {
options->mode = LZMA_MODE_NORMAL;
options->mf = LZMA_MF_BT4;
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4f524040e8b9573bd568e4bb6b6ddb70d6ab366
commit d4f524040e8b9573bd568e4bb6b6ddb70d6ab366
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 29 10:07:48 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 29 10:07:48 2016 -0400
liblzma: Revise update script to get version 5.0.8
diff --git a/Utilities/Scripts/update-liblzma.bash b/Utilities/Scripts/update-liblzma.bash
index 31de671..088eb91 100755
--- a/Utilities/Scripts/update-liblzma.bash
+++ b/Utilities/Scripts/update-liblzma.bash
@@ -8,7 +8,7 @@ readonly name="liblzma"
readonly ownership="liblzma upstream <xz-devel at tukaani.org>"
readonly subtree="Utilities/cmliblzma"
readonly repo="http://git.tukaani.org/xz.git"
-readonly tag="v5.0.5"
+readonly tag="v5.0.8"
readonly shortlog=false
readonly paths="
COPYING
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf969198067649a55752db21d03ae8a0fb443c6e
commit bf969198067649a55752db21d03ae8a0fb443c6e
Merge: ca4276e d38a37e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 29 10:06:53 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 29 10:06:53 2016 -0400
Merge branch 'upstream-liblzma' into update-liblzma
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ca4276e435e251e1b2011a7a523aecdbf85c18ec
commit ca4276e435e251e1b2011a7a523aecdbf85c18ec
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 29 10:06:16 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 29 10:06:16 2016 -0400
liblzma: Remove CMake-specific README
We will now manage the liblzma source tree updates using
the `Utilities/Scripts/update-liblzma.bash` script. Drop
the README that covered the old method.
diff --git a/Utilities/cmliblzma/README-CMake.txt b/Utilities/cmliblzma/README-CMake.txt
deleted file mode 100644
index b512997..0000000
--- a/Utilities/cmliblzma/README-CMake.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-The Utilities/cmliblzma directory contains a reduced distribution
-of the liblzma source tree with only the library source code and
-CMake build system. It is not a submodule; the actual content is part
-of our source tree and changes can be made and committed directly.
-
-We update from upstream using Git's "subtree" merge strategy. A
-special branch contains commits of upstream liblzma snapshots and
-nothing else. No Git ref points explicitly to the head of this
-branch, but it is merged into our history.
-
-Update liblzma from upstream as follows. Create a local branch to
-explicitly reference the upstream snapshot branch head:
-
- git branch liblzma-upstream c289e634
-
-Use a temporary directory to checkout the branch:
-
- mkdir liblzma-tmp
- cd liblzma-tmp
- git init
- git pull .. liblzma-upstream
- rm -rf *
-
-Now place the (reduced) liblzma content in this directory. See
-instructions shown by
-
- git log c289e634
-
-for help extracting the content from the upstream svn repo. Then run
-the following commands to commit the new version. Substitute the
-appropriate date and version number:
-
- git add --all
-
- GIT_AUTHOR_NAME='liblzma upstream' \
- GIT_AUTHOR_EMAIL='xz-devel at tukaani.org' \
- GIT_AUTHOR_DATE='Sun Jun 30 19:55:49 2013 +0300' \
- git commit -m 'liblzma 5.0.5-gb69900ed (reduced)' &&
- git commit --amend
-
-Edit the commit message to describe the procedure used to obtain the
-content. Then push the changes back up to the main local repository:
-
- git push .. HEAD:liblzma-upstream
- cd ..
- rm -rf liblzma-tmp
-
-Create a topic in the main repository on which to perform the update:
-
- git checkout -b update-liblzma master
-
-Merge the liblzma-upstream branch as a subtree:
-
- git merge -s recursive -X subtree=Utilities/cmliblzma \
- liblzma-upstream
-
-If there are conflicts, resolve them and commit. Build and test the
-tree. Commit any additional changes needed to succeed.
-
-Finally, run
-
- git rev-parse --short=8 liblzma-upstream
-
-to get the commit from which the liblzma-upstream branch must be started
-on the next update. Edit the "git branch liblzma-upstream" line above to
-record it, and commit this file.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d38a37ea1539eafec6cec6ef59cc9419531cad91
commit d38a37ea1539eafec6cec6ef59cc9419531cad91
Author: liblzma upstream <xz-devel at tukaani.org>
AuthorDate: Sun Jun 30 18:03:54 2013 +0300
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 29 10:02:54 2016 -0400
liblzma 2013-06-30 (b69900ed)
Code extracted from:
http://git.tukaani.org/xz.git
at commit b69900ed0b2f914fc6c0a180dcb522dbe5b80ea7 (v5.0.5).
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ec8f744a11dfcab9560387168cab76260aa0b777
commit ec8f744a11dfcab9560387168cab76260aa0b777
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Tue Jun 28 23:10:11 2016 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 29 10:01:33 2016 -0400
Add script to update liblzma from upstream
diff --git a/Utilities/Scripts/update-liblzma.bash b/Utilities/Scripts/update-liblzma.bash
new file mode 100755
index 0000000..31de671
--- /dev/null
+++ b/Utilities/Scripts/update-liblzma.bash
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+set -e
+set -x
+shopt -s dotglob
+
+readonly name="liblzma"
+readonly ownership="liblzma upstream <xz-devel at tukaani.org>"
+readonly subtree="Utilities/cmliblzma"
+readonly repo="http://git.tukaani.org/xz.git"
+readonly tag="v5.0.5"
+readonly shortlog=false
+readonly paths="
+ COPYING
+ src/common/common_w32res.rc
+ src/common/sysdefs.h
+ src/common/tuklib_integer.h
+ src/liblzma/
+"
+
+extract_source () {
+ git_archive
+ pushd "${extractdir}/${name}-reduced"
+ mv src/common .
+ mv src/liblzma .
+ rmdir src
+ popd
+}
+
+. "${BASH_SOURCE%/*}/update-third-party.bash"
-----------------------------------------------------------------------
Summary of changes:
Utilities/Scripts/update-liblzma.bash | 30 +++++++++
Utilities/cmliblzma/README-CMake.txt | 66 --------------------
Utilities/cmliblzma/liblzma/api/lzma/block.h | 3 +
Utilities/cmliblzma/liblzma/api/lzma/version.h | 2 +-
Utilities/cmliblzma/liblzma/check/crc32_fast.c | 2 +-
Utilities/cmliblzma/liblzma/check/sha256.c | 2 +-
.../cmliblzma/liblzma/lzma/lzma_encoder_presets.c | 9 +--
7 files changed, 41 insertions(+), 73 deletions(-)
create mode 100755 Utilities/Scripts/update-liblzma.bash
delete mode 100644 Utilities/cmliblzma/README-CMake.txt
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list