cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Additional CMake-related files were missing from the distribution tarball.

Browse Source
This commit is contained in:
Bob Friesenhahn 2015-08-31 00:01:18 +00:00
parent adc4f64c30
commit e9b10efff9
8 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -43,12 +43,12 @@ if (POLICY CMP0054)
endif(POLICY CMP0054)
# Project version
project(tiff VERSION 4.0.4 LANGUAGES C)
project(tiff VERSION 4.0.5 LANGUAGES C)
# the other tiff_VERSION_* variables are set automatically
set(tiff_VERSION_ALPHA beta)
# Library version (unlike libtool's baroque scheme, WYSIWYG here)
set(SO_COMPATVERSION 5)
set(SO_VERSION 5.2.1)
set(SO_VERSION 5.2.2)
# For autotools header compatibility
set(PACKAGE_NAME "LibTIFF Software")

33
HOWTO-RELEASE
View File

@ -53,11 +53,24 @@ Notes on releasing.
have been added, removed, or interface structures have changed,
then more care is required.
7. Add an entry to Changelog similar to:
7. Increment the release version in CMakeLists.txt. Change the
'project' property similar to
# Project version
project(tiff VERSION 4.0.5 LANGUAGES C)
8. Update library ELF versioning in CMakeLists.txt. This is a raw ELF
SO version specification similar to:
# Library version (unlike libtool's baroque scheme, WYSIWYG here)
set(SO_COMPATVERSION 5)
set(SO_VERSION 5.2.2)
9. Add an entry to Changelog similar to:
* libtiff 4.0.0 released.
8. In the source tree do
10. In the source tree do
./autogen.sh
@ -65,7 +78,7 @@ Notes on releasing.
maintainer build with current autoconf, automake, and libtool
packages. It is only needed when updating tool versions.
9. It is recommended (but not required) to build outside of the source
11. It is recommended (but not required) to build outside of the source
tree so that the source tree is kept in a pristine state. This
also allows sharing the source directory on several networked
systems. For example:
@ -78,17 +91,17 @@ Notes on releasing.
./configure --enable-maintainer-mode
10. In the build tree do
12. In the build tree do
make release
This will update "RELEASE-DATE", "VERSION", and libtiff/tiffvers.h
in the source tree.
11. In the source tree, verify that the version info in RELEASE-DATE,
13. In the source tree, verify that the version info in RELEASE-DATE,
VERSION and libtiff/tiffvers.h is right.
12. In the build tree do
14. In the build tree do
make
make distcheck
@ -99,21 +112,21 @@ Notes on releasing.
Two files with names tiff-version.tar.gz and tiff-version.zip will
be created in the top level build directory.
13. In the source tree do
15. In the source tree do
'cvs commit'.
14. In the source tree do
16. In the source tree do
cvs tag Release-v4-0-0
(or the appropriate name for the release)
15. Copy release packages from the build tree to the
17. Copy release packages from the build tree to the
ftp.remotesensing.org ftp site.
scp tiff-*.tar.gz tiff-*.zip \
warmerdam@upload.osgeo.org:/osgeo/download/libtiff
16. Announce to list, tiff@lists.maptools.org
18. Announce to list, tiff@lists.maptools.org

3
html/man/Makefile.am
View File

@ -125,4 +125,5 @@ htmldoc:
done
EXTRA_DIST = \
CMakeLists.txt
CMakeLists.txt \
HtmlDoc.cmake

3
html/man/Makefile.in
View File

@ -408,7 +408,8 @@ INDEXSTART = '<HTML><HEAD><TITLE>Libtiff HTML manpage index</TITLE></HEAD><BODY
INDEXEND = '</ul></BODY></HTML>'
manpages = $(docfiles:.html=)
EXTRA_DIST = \
CMakeLists.txt
CMakeLists.txt \
HtmlDoc.cmake
all: all-am

2
libtiff/Makefile.am
View File

@ -35,8 +35,10 @@ EXTRA_DIST = \
libtiff.map \
libtiffxx.map \
tif_config.h-vms \
tif_config.h.cmake.in \
tif_config.vc.h \
tif_config.wince.h \
tiffconf.h.cmake.in \
tiffconf.vc.h \
tiffconf.wince.h

5
libtiff/Makefile.in
View File

@ -451,8 +451,9 @@ LIBPORT = $(top_builddir)/port/libport.la
LIBTIFF = $(top_builddir)/libtiff/libtiff.la
libtiffincludedir = $(includedir)
EXTRA_DIST = CMakeLists.txt Makefile.vc SConstruct libtiff.def \
libtiff.map libtiffxx.map tif_config.h-vms tif_config.vc.h \
tif_config.wince.h tiffconf.vc.h tiffconf.wince.h \
libtiff.map libtiffxx.map tif_config.h-vms \
tif_config.h.cmake.in tif_config.vc.h tif_config.wince.h \
tiffconf.h.cmake.in tiffconf.vc.h tiffconf.wince.h \
$(am__append_2) $(am__append_4)
libtiffinclude_HEADERS = tiff.h tiffio.h tiffvers.h $(am__append_1)
noinst_HEADERS = \

4
test/Makefile.am
View File

@ -37,7 +37,9 @@ EXTRA_DIST = \
$(TESTSCRIPTS) \
$(IMAGES_EXTRA_DIST) \
CMakeLists.txt \
common.sh
common.sh \
TiffSplitTest.cmake \
TiffTestCommon.cmake
# All of the tests to execute via 'make check'
TESTS = $(check_PROGRAMS) $(TESTSCRIPTS)

4
test/Makefile.in
View File

@ -641,7 +641,9 @@ EXTRA_DIST = \
$(TESTSCRIPTS) \
$(IMAGES_EXTRA_DIST) \
CMakeLists.txt \
common.sh
common.sh \
TiffSplitTest.cmake \
TiffTestCommon.cmake
# Extra files which should be cleaned by 'make clean'