From d6aaddc5e0cb2bd9080a8fc4b77de947172c81d8 Mon Sep 17 00:00:00 2001 From: Kristian Evers Date: Mon, 4 Feb 2019 14:48:52 +0100 Subject: Remove all traces of nad2bin and nad2nad The source material for the default grids used by PROJ has been moved to the proj-datumgrid repository. For that reason it is no longer necessary to include the nad2bin program in the PROJ repository and source distribution. From now on the nad2bin application will be kept in the proj-datumgrid repo. Previously the null grid was generated by running nad2bin on the null.lla file. Since nad2bin is no longer available null.lla has been replaced by its binary counterpart null. This file will be distributed and installed alongside PROJ. Build scripts and documenation has been adjusted so that nad2bin is not mentioned anywhere. Additionally all references to nad2nad has been removed as well. nad2nad has not been part of the PROJ distribution for quite some time so this has been long overdue. --- data/CMakeLists.txt | 11 ----------- data/Makefile.am | 32 +++++--------------------------- data/README | 7 +++---- data/install.in | 26 -------------------------- data/null | Bin 0 -> 232 bytes data/null.lla | 5 ----- 6 files changed, 8 insertions(+), 73 deletions(-) create mode 100644 data/null delete mode 100644 data/null.lla (limited to 'data') diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 859f9a60..8d3a06b2 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -22,17 +22,6 @@ file(GLOB GTX_FILES *.gtx) set(GRIDSHIFT_FILES ${GSB_FILES} ${GTX_FILES}) set(GRIDSHIFT_FILES ${GRIDSHIFT_FILES} ) -option(CONVERT_DATA "convert some ascii file to binary file for use in proj4" OFF) -if(CONVERT_DATA) - if (BUILD_NAD2BIN) - set(LLA_GRID_DIR ${CMAKE_CURRENT_SOURCE_DIR}) - proj_convert_grid_lla2gsb(LLA_GRID_DIR) - file(GLOB LLA_FILES *.lla) - proj_append_lla_output_file(LLA_FILES GRIDSHIFT_FILES) - else() - message(ERROR " you need to compile nad2bin exe in order to convert data file" ) - endif(BUILD_NAD2BIN) -endif(CONVERT_DATA) set(ALL_SQL_IN "${CMAKE_CURRENT_SOURCE_DIR}/all.sql.in") set(PROJ_DB "${CMAKE_CURRENT_SOURCE_DIR}/proj.db") diff --git a/data/Makefile.am b/data/Makefile.am index 3e98e59f..8234c034 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,7 +1,7 @@ DATAPATH = $(top_srcdir)/data pkgdata_DATA = GL27 nad.lst nad27 nad83 world other.extra \ - CH \ + CH null \ ITRF2000 ITRF2008 ITRF2014 proj.db SQL_ORDERED_LIST = sql/begin.sql \ @@ -40,34 +40,12 @@ EXTRA_DIST = GL27 nad.lst nad27 nad83 \ world other.extra \ CH \ ITRF2000 ITRF2008 ITRF2014 \ - CMakeLists.txt tests/test_nodata.gtx null.lla \ + CMakeLists.txt tests/test_nodata.gtx null \ generate_all_sql_in.cmake sql_filelist.cmake \ $(SQL_ORDERED_LIST) -process-nad2bin: - @if [ -f $(DATAPATH)/null.lla -a ! -f null ] || [ -f $(DATAPATH)/conus.lla -a ! -f conus ] ; then \ - for x in $(DATAPATH)/*.lla ; do \ - DEST=`basename $$x .lla`; \ - echo "../src/nad2bin$(EXEEXT) $$DEST < $$x"; \ - ../src/nad2bin$(EXEEXT) $$DEST < $$x ; \ - done; \ - fi - -install-data-local: process-nad2bin +install-data-local: $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) - @if [ -f $(DATAPATH)/null.lla -a ! -f $(DATAPATH)/null ] || [ -f $(DATAPATH)/conus.lla -a ! -f $(DATAPATH)/conus ] ; then \ - for x in $(DATAPATH)/*.lla ; do \ - DEST=$(DESTDIR)$(pkgdatadir)/`basename $$x .lla`; \ - echo "../src/nad2bin$(EXEEXT) $$DEST < $$x"; \ - ../src/nad2bin$(EXEEXT) $$DEST < $$x ; \ - if [ $$? -ne 0 ] ; then \ - echo "nad2bin$(EXEEXT) failed to install $$DEST"; \ - exit 1; \ - fi; \ - done; \ - else \ - echo "nad2nad NADCON source files not present"; \ - fi @for gridfile in $(DATAPATH)/*.gsb $(DATAPATH)/*.gtx $(DATAPATH)/ntv1_can.dat dummy \ $(DATAPATH)/alaska $(DATAPATH)/conus $(DATAPATH)/hawaii $(DATAPATH)/null \ $(DATAPATH)/prvi $(DATAPATH)/stgeorge $(DATAPATH)/stlrnc $(DATAPATH)/stpaul \ @@ -97,9 +75,9 @@ proj.db: $(DATAPATH)/sql/*.sql exit 1; \ fi - + # For out-of-tree builds, link all file of the source data dir to the generated data -check-local: process-nad2bin +check-local: @if [ ! -f GL27 ]; then \ for x in $(DATAPATH)/*; do \ ln -sf $$x .; \ diff --git a/data/README b/data/README index 1b18dd2f..ae690729 100644 --- a/data/README +++ b/data/README @@ -1,5 +1,4 @@ -The files in this directory are support data for PROJ programs -as well as test scripts for testing proj installation. +The files in this directory are support data for PROJ programs. File Contents: @@ -28,7 +27,7 @@ nad.lst --- Reference list of SPCS States and NGS datum identifiers IGNF --- Translation of French Mapping Agency codes into PROJ via init= mechanism. -install --- Unix shell (sh) script to install nad2nad file and proj - init files. Read beginning for usage instructions. +install --- Unix shell (sh) script to install proj init files. + Read beginning for usage instructions. Additional data files are available in https://github.com/OSGeo/proj-datumgrid/ diff --git a/data/install.in b/data/install.in index d60dc725..98b2c846 100755 --- a/data/install.in +++ b/data/install.in @@ -23,31 +23,5 @@ do echo "file $x installed" fi done -# just test for conus and assume others are there -if [ -f conus.lla ] ; then -# install nad2nad NADCON files - echo "installing ${lib}/nad2783" - lib=${lib}/nad2783 - if [ ! -d $lib ] ; then - mkdir $lib - if [ $? -ne 0 ] ; then - echo "failed to make dir $lib" - echo "nad2nad lib install stopped" - exit 1 - fi - fi -# Process ascii grid into nad2nad compatible files. - for x in *.lla ; do - dest=`expr $x : '\(.*\)\.lla'` - cat < $x | ../src/nad2bin ${lib}/${dest} - if [ $? -ne 0 ] ; then - echo "nad2nad file install failed on file ${lib}/${dest}" - exit 1 - fi - echo "${lib}/${dest} installed" - done -else - echo "nad2nad NADCON files not present" -fi echo "normal completion" exit 0 diff --git a/data/null b/data/null new file mode 100644 index 00000000..8418408b Binary files /dev/null and b/data/null differ diff --git a/data/null.lla b/data/null.lla deleted file mode 100644 index eb25285a..00000000 --- a/data/null.lla +++ /dev/null @@ -1,5 +0,0 @@ -Null transform for whole world - 3 3 1 -180.00000 180.00000 -90.00000 90.00000 -0: 0 0 0 0 0 0 -1: 0 0 0 0 0 0 -2: 0 0 0 0 0 0 -- cgit v1.2.3 From ed3cf22d7ee4f3cf88919502f4ab753679523869 Mon Sep 17 00:00:00 2001 From: Kristian Evers Date: Fri, 8 Feb 2019 14:22:25 +0100 Subject: Do not install non-existing proj_def.dat data file --- data/install.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/install.in b/data/install.in index 98b2c846..6c26b44a 100755 --- a/data/install.in +++ b/data/install.in @@ -14,7 +14,7 @@ prefix=/usr/local # lib=${prefix}/lib/proj.4 # Copy in "init" files -for x in proj_def.dat nad27 nad83 world GL27 +for x in nad27 nad83 world GL27 do cp $x ${lib}/$x if [ $? -ne 0 ] ; then -- cgit v1.2.3 From d8f09e00702c0f77a611d7aa5f002d2ede861f5c Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Fri, 8 Feb 2019 17:32:47 -0500 Subject: Remove data/install.in. The files referenced in it (and more) are already installed by listing them in `pkgdata_DATA` (for autotools) and in the `install` command (for CMake). --- data/install.in | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100755 data/install.in (limited to 'data') diff --git a/data/install.in b/data/install.in deleted file mode 100755 index 6c26b44a..00000000 --- a/data/install.in +++ /dev/null @@ -1,27 +0,0 @@ -: -# SCCSID @(#)install.in 4.8 95/09/24 GIE REL -# -# Installation script all PROJ.4 system reference files. -# -# This script must be executed after compilation of proj library. -# -# Execute as: -# -# install -# -# ------------------------------------------------------------ -prefix=/usr/local -# -lib=${prefix}/lib/proj.4 -# Copy in "init" files -for x in nad27 nad83 world GL27 -do - cp $x ${lib}/$x - if [ $? -ne 0 ] ; then - echo "init copying failed for file $x" - else - echo "file $x installed" - fi -done -echo "normal completion" -exit 0 -- cgit v1.2.3