Skip to content

Commit e00dcd6

Browse files
rouaultrouault
authored
Merge pull request #120 from rouault/fix_119
 Add LIBGEOTIFF_MAJOR_VERSION, LIBGEOTIFF_MINOR_VERSION, LIBGEOTIFF_PATCH_VERSION, LIBGEOTIFF_REV_VERSION, and LIBGEOTIFF_STRING_VERSION variables in geotiff.h, and autogenerate it
2 parents cee338f + f2c6038 commit e00dcd6

File tree

6 files changed

+58
-30
lines changed

6 files changed

+58
-30
lines changed

‎.github/workflows/test.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ jobs:
4747
run: |
4848
4949
if [ "$RUNNER_OS" == "Windows" ]; then
50-
export CC=cl.exe
51-
export CXX=cl.exe
50+
export CC=cl.exe
51+
export CXX=cl.exe
5252
fi
5353
5454
cmake -G "Ninja" \
@@ -71,6 +71,7 @@ jobs:
7171
shell: bash -l {0}
7272
run: |
7373
ninja
74+
DESTDIR=tmp-install ninja install
7475
working-directory: ./libgeotiff/build
7576

7677
- name: Generate source distribution

‎libgeotiff/CMakeLists.txt

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,10 @@ SET(GEOTIFF_LIBRARY_TARGET geotiff_library)
1919
SET(CMAKE_COLOR_MAKEFILE ON)
2020

2121
# Version information
22-
set(PROJECT_VERSION_MAJOR 1)
23-
set(PROJECT_VERSION_MINOR 7)
24-
set(PROJECT_VERSION_PATCH 3)
25-
set(PROJECT_VERSION
26-
"${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
27-
set(GeoTIFF_VERSION ${PROJECT_VERSION})
22+
set(LIBGEOTIFF_MAJOR_VERSION 1)
23+
set(LIBGEOTIFF_MINOR_VERSION 7)
24+
set(LIBGEOTIFF_PATCH_VERSION 4)
25+
set(LIBGEOTIFF_REV_VERSION 0)
2826

2927
# Set library version to match that of autoconf:
3028
# libgeotiff.so -> libgeotiff.so.5
@@ -33,9 +31,20 @@ set(GeoTIFF_VERSION ${PROJECT_VERSION})
3331
set(LINK_SOVERSION "5")
3432
set(LINK_VERSION "5.3.2")
3533

34+
set(PROJECT_VERSION_MAJOR ${LIBGEOTIFF_MAJOR_VERSION})
35+
set(PROJECT_VERSION_MINOR ${LIBGEOTIFF_MINOR_VERSION})
36+
set(PROJECT_VERSION_PATCH ${LIBGEOTIFF_PATCH_VERSION})
37+
set(PROJECT_VERSION
38+
"${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
39+
40+
set(LIBGEOTIFF_STRING_VERSION "${PROJECT_VERSION}")
41+
set(LIBGEOTIFF_VERSION "${LIBGEOTIFF_MAJOR_VERSION}${LIBGEOTIFF_MINOR_VERSION}${LIBGEOTIFF_PATCH_VERSION}${LIBGEOTIFF_REV_VERSION}")
42+
3643
string (TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
3744
string (TOUPPER ${PROJECT_NAME} PROJECT_NAME_UPPER)
3845

46+
configure_file(geotiff.h.in ${CMAKE_CURRENT_BINARY_DIR}/geotiff.h @ONLY)
47+
3948
# Allow advanced users to generate Makefiles printing detailed commands
4049
MARK_AS_ADVANCED(CMAKE_VERBOSE_MAKEFILE)
4150

@@ -131,7 +140,7 @@ MESSAGE(STATUS "Generating geo_config.h header - done")
131140
# Installation settings
132141

133142
SET(GEOTIFF_LIB_HEADERS
134-
geotiff.h
143+
${CMAKE_CURRENT_BINARY_DIR}/geotiff.h
135144
geotiffio.h
136145
geovalues.h
137146
geonames.h
@@ -160,8 +169,6 @@ SET(GEOTIFF_MAN_PAGES
160169
man/man1/geotifcp.1
161170
man/man1/listgeo.1)
162171

163-
# ${PROJECT_BINARY_DIR}/geotiff_version.h
164-
165172
# Install doc files
166173
if(BUILD_DOC)
167174
INSTALL(FILES

‎libgeotiff/HOWTO-RELEASE

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
11
Preparing a libgeotiff Release
22
==============================
33

4-
1) Update the VERSION_MAJOR/MINOR/POINT information in configure.ac, and
5-
run autogen.sh
4+
1)
5+
a) Update the LIBGEOTIFF_MAJOR_VERSION/LIBGEOTIFF_MINOR_VERSION/
6+
LIBGEOTIFF_PATCH_VERSION/LIBGEOTIFF_REV_VERSION variables in configure.ac
67

7-
2) Update the LIBGEOTIFF_VERSION macro in geotiff.h.
8+
b) Update the second value of AC_INIT() in configure.ac
9+
10+
2) run autogen.sh
811

912
3) Update -version-info CURRENT/REVISION/AGE values in Makefile.am
1013
- For a release with no interface changes just bump REVISION.
1114
- Adding interfaces, bump CURRENT/AGE, set REVISION to 0.
1215
- Deleting interfaces / compatibility issues - bump CURRENT, others to zero.
1316

14-
4) Update GeoTIFF_VERSION and SO_VERSION in CMakeLists.txt
17+
4)
18+
a) Update the LIBGEOTIFF_MAJOR_VERSION/LIBGEOTIFF_MINOR_VERSION/
19+
LIBGEOTIFF_PATCH_VERSION/LIBGEOTIFF_REV_VERSION variables in CMakeLists
20+
21+
b) Update SO_VERSION in CMakeLists.txt
1522

1623
5) Update NEWS
1724

‎libgeotiff/Makefile.am

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ endif
1313

1414
AM_CFLAGS = -I$(srcdir)/libxtiff $(PROJ_CFLAGS) $(TIFF_CFLAGS)
1515

16-
include_HEADERS = geotiff.h \
17-
geotiffio.h \
16+
include_HEADERS = geotiffio.h \
1817
geovalues.h \
1918
geonames.h \
2019
geokeys.h \
@@ -35,7 +34,8 @@ include_HEADERS = geotiff.h \
3534
geokeys.inc \
3635
geokeys_v1_1.inc
3736

38-
nodist_include_HEADERS = geo_config.h
37+
nodist_include_HEADERS = geotiff.h \
38+
geo_config.h
3939

4040
libgeotiff_la_SOURCES = cpl_serv.c \
4141
geo_extra.c \

‎libgeotiff/configure.ac

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,29 @@
11

2-
3-
m4_define([VERSION_MAJOR], [1])
4-
m4_define([VERSION_MINOR], [7])
5-
m4_define([VERSION_POINT], [3])
6-
m4_define([GEOTIFF_VERSION],
7-
[VERSION_MAJOR.VERSION_MINOR.VERSION_POINT])
8-
92
m4_include([m4/ax_prog_doxygen.m4])
103

114
AC_PREREQ([2.59])
12-
AC_INIT([libgeotiff], [GEOTIFF_VERSION], [warmerdam@pobox.com])
5+
AC_INIT([libgeotiff], [1.7.4], [warmerdam@pobox.com])
136
AC_CANONICAL_BUILD
147

158
AC_CONFIG_MACRO_DIR([m4])
169

17-
RELEASE_VERSION=GEOTIFF_VERSION
18-
AC_SUBST([RELEASE_VERSION])
19-
AC_CONFIG_HEADER(geo_config.h)
10+
LIBGEOTIFF_MAJOR_VERSION=1
11+
LIBGEOTIFF_MINOR_VERSION=7
12+
LIBGEOTIFF_PATCH_VERSION=4
13+
LIBGEOTIFF_REV_VERSION=0
14+
15+
LIBGEOTIFF_STRING_VERSION=${LIBGEOTIFF_MAJOR_VERSION}.${LIBGEOTIFF_MINOR_VERSION}.${LIBGEOTIFF_PATCH_VERSION}
16+
LIBGEOTIFF_VERSION="${LIBGEOTIFF_MAJOR_VERSION}${LIBGEOTIFF_MINOR_VERSION}${LIBGEOTIFF_PATCH_VERSION}${LIBGEOTIFF_REV_VERSION}"
17+
18+
AC_SUBST(LIBGEOTIFF_MAJOR_VERSION)
19+
AC_SUBST(LIBGEOTIFF_MINOR_VERSION)
20+
AC_SUBST(LIBGEOTIFF_PATCH_VERSION)
21+
AC_SUBST(LIBGEOTIFF_REV_VERSION)
22+
AC_SUBST(LIBGEOTIFF_STRING_VERSION)
23+
AC_SUBST(LIBGEOTIFF_VERSION)
24+
25+
AC_CONFIG_HEADERS([geo_config.h])
26+
AC_CONFIG_FILES([geotiff.h])
2027

2128
dnl #########################################################################
2229
dnl Checks for programs.

‎libgeotiff/geotiff.h renamed to ‎libgeotiff/geotiff.h.in

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,13 @@
4747
#define GEOTIFF_SPEC_1_1_MINOR_REVISION 1
4848

4949
/* Library version */
50-
#define LIBGEOTIFF_VERSION 1740
50+
/* LIBGEOTIFF_MAJOR_VERSION, LIBGEOTIFF_MINOR_VERSION, LIBGEOTIFF_PATCH_VERSION, LIBGEOTIFF_REV_VERSION and LIBGEOTIFF_STRING_VERSION are new since libgeotiff 1.7.4. Only LIBGEOTIFF_VERSION pre-existed */
51+
#define LIBGEOTIFF_MAJOR_VERSION @LIBGEOTIFF_MAJOR_VERSION@
52+
#define LIBGEOTIFF_MINOR_VERSION @LIBGEOTIFF_MINOR_VERSION@
53+
#define LIBGEOTIFF_PATCH_VERSION @LIBGEOTIFF_PATCH_VERSION@
54+
#define LIBGEOTIFF_REV_VERSION @LIBGEOTIFF_REV_VERSION@
55+
#define LIBGEOTIFF_VERSION @LIBGEOTIFF_VERSION@
56+
#define LIBGEOTIFF_STRING_VERSION "@LIBGEOTIFF_STRING_VERSION@"
5157

5258
#include "geo_config.h"
5359
#include "geokeys.h"

0 commit comments

Comments
 (0)