Skip to content

Commit 48d639c

Browse files
committed
* Major overhaul of Makefile build system to use autoconf/automake.
* Warning fixes in contrib/
1 parent ad14e98 commit 48d639c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+1487
-460
lines changed

.cvsignore

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,16 @@ shptest
1313
*.la
1414
*.lo
1515
.libs
16+
configure
17+
config.sub
18+
config.guess
19+
Makefile.in
20+
aclocal.m4
21+
ar-lib
22+
compile
23+
depcomp
24+
install-sh
25+
ltmain.sh
26+
missing
27+
test-driver
28+
autom4te.cache

AUTHORS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Frank Warmerdam <warmerdam@pobox.com> et al.
2+

CMakeLists.txt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -203,35 +203,35 @@ if(BUILD_TEST)
203203
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/script.sh "${SED_EXECUTABLE} -f script.sed < $1 >| $2")
204204
execute_process(
205205
COMMAND
206-
${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/script.sh ${CMAKE_CURRENT_SOURCE_DIR}/stream1.sh ${CMAKE_CURRENT_BINARY_DIR}/sed_scripted_stream1.sh
206+
${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/script.sh ${CMAKE_CURRENT_SOURCE_DIR}/tests/test1.sh ${CMAKE_CURRENT_BINARY_DIR}/sed_scripted_test1.sh
207207
)
208208

209209
execute_process(
210210
COMMAND
211-
${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/script.sh ${CMAKE_CURRENT_SOURCE_DIR}/stream2.sh ${CMAKE_CURRENT_BINARY_DIR}/sed_scripted_stream2.sh
211+
${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/script.sh ${CMAKE_CURRENT_SOURCE_DIR}/tests/test2.sh ${CMAKE_CURRENT_BINARY_DIR}/sed_scripted_test2.sh
212212
)
213213

214214
execute_process(
215215
COMMAND
216-
${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/script.sh ${CMAKE_CURRENT_SOURCE_DIR}/makeshape.sh ${CMAKE_CURRENT_BINARY_DIR}/sed_scripted_makeshape.sh
216+
${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/script.sh ${CMAKE_CURRENT_SOURCE_DIR}/tests/test3.sh ${CMAKE_CURRENT_BINARY_DIR}/sed_scripted_test3.sh
217217
)
218218

219219
if(EG_DATA)
220-
# These tests correspond to everything in stream1.sh
220+
# These tests correspond to everything in test1.sh
221221
add_test(
222-
NAME stream1
223-
COMMAND ${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/sed_scripted_stream1.sh
222+
NAME test1
223+
COMMAND ${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/sed_scripted_test1.sh
224224
)
225225
endif(EG_DATA)
226-
# These tests correspond to everything in stream1.sh
226+
# These tests correspond to everything in test2.sh
227227
add_test(
228-
NAME stream2
229-
COMMAND ${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/sed_scripted_stream2.sh
228+
NAME test2
229+
COMMAND ${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/sed_scripted_test2.sh
230230
)
231231

232-
# These tests correspond to everything in makeshape.sh
232+
# These tests correspond to everything in test3.sh
233233
add_test(
234-
NAME makeshape
235-
COMMAND ${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/sed_scripted_makeshape.sh
234+
NAME test3
235+
COMMAND ${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/sed_scripted_test3.sh
236236
)
237237
endif(BUILD_TEST)

COPYING

Lines changed: 483 additions & 0 deletions
Large diffs are not rendered by default.

ChangeLog

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
2016-12-05 Even Rouault <even.rouault at spatialys.com>
2+
3+
* Major overhaul of Makefile build system to use autoconf/automake.
4+
Contributed by Sandro Mani: https://github.com/manisandro/shapelib/tree/autotools
5+
6+
* Warning fixes in contrib/
7+
18
2016-12-04 Even Rouault <even.rouault at spatialys.com>
29

310
* shpopen.c, dbfopen.c, shptree.c, shapefil.h: resync with

HOWTO-RELEASE

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55

66
2) Build the release files.
77

8-
./mkrelease.sh 1.3.0
8+
./autogen.sh
9+
make distcheck
910

1011
3) Upload:
1112

0 commit comments

Comments
 (0)