Re: [cmake-developers] Script to update liblzma from upstream.

2016-06-29 Thread Brad King
On 06/28/2016 05:24 PM, Daniel Pfeifer wrote:
> I have attached a patch that adds a script to update liblzma from
> upstream (closely modeled after the other update scripts).  I am not
> sure how these kinds of scripts need to be run.
> 
> We currently have a copy of liblzma version 5.0.5. The latest version
> on the 5.0 branch is 5.0.8. Once the script is introduced, we may
> consider switching to the 5.2 branch.

I've merged an `update-libarchive` topic to `next`:

 Merge topic 'update-liblzma' into next
 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4e7bb44e

that uses your update script with minor tweaks.  First I re-imported
the existing version with it to transition the infrastructure.  I
manually edited the parent of the new import root commit to connect
to the old import branch.  Then I ran the update to 5.0.8 and
resolved the conflicts.

Once that is in `master` please look at following the pattern to
update to 5.2.2.  Just resolve conflicts on the first merge and
then follow up with changes to port back to C90 in separate commits.
See the log of the Utilities/cmliblzma directory for how this was
done before.

Thanks,
-Brad

-- 

Powered by www.kitware.com

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake-developers


Re: [cmake-developers] Script to update liblzma from upstream.

2016-06-29 Thread Ben Boeckel
On Wed, Jun 29, 2016 at 09:06:25 -0400, Brad King wrote:
> If there is a developer mailing list I typically use that.
> Otherwise I use kwrobot.

Ah, makes sense.

--Ben
-- 

Powered by www.kitware.com

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake-developers


Re: [cmake-developers] Script to update liblzma from upstream.

2016-06-29 Thread Brad King
On 06/29/2016 09:02 AM, Ben Boeckel wrote:
>> +readonly ownership="liblzma upstream "
> 
> This should probably use kwro...@kitware.com as the email. The oddball I
> see in the repo now is libarchive. Brad, why is that not kwrobot?

If there is a developer mailing list I typically use that.
Otherwise I use kwrobot.

-Brad

-- 

Powered by www.kitware.com

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake-developers


Re: [cmake-developers] Script to update liblzma from upstream.

2016-06-29 Thread Ben Boeckel
On Tue, Jun 28, 2016 at 23:24:22 +0200, Daniel Pfeifer wrote:
> I have attached a patch that adds a script to update liblzma from
> upstream (closely modeled after the other update scripts).  I am not
> sure how these kinds of scripts need to be run.

Thanks! Looks like Brad hadn't imported the docs for it. Here's VTK's
copy:

https://gitlab.kitware.com/vtk/vtk/blob/master/ThirdParty/UPDATING.md

> +readonly ownership="liblzma upstream "

This should probably use kwro...@kitware.com as the email. The oddball I
see in the repo now is libarchive. Brad, why is that not kwrobot?

> +readonly paths="
> +  src/common/sysdefs.h
> +  src/common/tuklib_integer.h
> +  src/liblzma

I'd recommend adding a trailing slash to this to indicate that it is a
directory (at least this is the style I'd have used for VTK imports had
I needed to import any directories in those I ported to use this setup).

--Ben
-- 

Powered by www.kitware.com

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake-developers


[cmake-developers] Script to update liblzma from upstream.

2016-06-28 Thread Daniel Pfeifer
Hi Brad,

I have attached a patch that adds a script to update liblzma from
upstream (closely modeled after the other update scripts).  I am not
sure how these kinds of scripts need to be run.

We currently have a copy of liblzma version 5.0.5. The latest version
on the 5.0 branch is 5.0.8. Once the script is introduced, we may
consider switching to the 5.2 branch.

Cheers, Daniel
From c0401e6f56fe5c9c77e9a80a2c2ab063930f70ed Mon Sep 17 00:00:00 2001
From: Daniel Pfeifer 
Date: Tue, 28 Jun 2016 23:10:11 +0200
Subject: [PATCH] Add script to update liblzma from upstream

---
 Utilities/Scripts/update-liblzma.bash | 29 +
 1 file changed, 29 insertions(+)
 create mode 100755 Utilities/Scripts/update-liblzma.bash

diff --git a/Utilities/Scripts/update-liblzma.bash b/Utilities/Scripts/update-liblzma.bash
new file mode 100755
index 000..4933017
--- /dev/null
+++ b/Utilities/Scripts/update-liblzma.bash
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+set -e
+set -x
+shopt -s dotglob
+
+readonly name="liblzma"
+readonly ownership="liblzma upstream "
+readonly subtree="Utilities/cmliblzma"
+readonly repo="http://git.tukaani.org/xz.git";
+readonly tag="v5.0"
+readonly shortlog=false
+readonly paths="
+  src/common/sysdefs.h
+  src/common/tuklib_integer.h
+  src/liblzma
+  COPYING
+"
+
+extract_source () {
+git_archive
+pushd "${extractdir}/${name}-reduced"
+mv src/common .
+mv src/liblzma .
+rmdir src
+popd
+}
+
+. "${BASH_SOURCE%/*}/update-third-party.bash"
-- 
2.9.0

-- 

Powered by www.kitware.com

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake-developers