e9bc469b2a
Merge branch 'upstream-LibArchive' into update-libarchive
...
Resolve conflicts in C code by taking their side. Resolve conflicts in
CMake code by integrating the changes.
2016-05-02 10:48:48 -04:00
102071f80c
Merge branch 'libarchive-upstream' into update-libarchive
...
Conflicts:
Utilities/cmlibarchive/CMakeLists.txt
Utilities/cmlibarchive/libarchive/archive.h
Utilities/cmlibarchive/libarchive/archive_entry.h
Utilities/cmlibarchive/libarchive/archive_read_disk_posix.c
Utilities/cmlibarchive/libarchive/archive_read_support_format_iso9660.c
Utilities/cmlibarchive/libarchive/archive_windows.h
Utilities/cmlibarchive/libarchive/archive_write_set_format_iso9660.c
2013-07-31 08:19:13 -04:00
156cb3bbf2
Merge branch 'libarchive-upstream' into update-libarchive
...
Conflicts:
Utilities/cmlibarchive/CMakeLists.txt
Utilities/cmlibarchive/libarchive/archive_windows.c
2012-01-05 09:02:58 -05:00
3e5a80f063
Merge branch 'libarchive-upstream' into update-libarchive
...
Add Utilities/cmlibarchive using upstream libarchive 3.0.0-r3950
snapshot.
2011-12-20 11:54:25 -05:00
f6ac86d70e
libarchive: Remove our copy to make room for new import
2011-12-20 11:47:27 -05:00
fb51d98562
Switch to using libarchive from libtar for cpack and cmake -E tar
...
This allows for a built in bzip and zip capability, so external tools
will not be needed for these packagers. The cmake -E tar xf should be
able to handle all compression types now as well.
2009-10-30 13:10:56 -04:00
Brad King
Bill Hoffman