From 5730b9dad8e4f7b9df2c1c4bba319d20393616a9 Mon Sep 17 00:00:00 2001 From: StarGate-One Date: Thu, 5 Nov 2020 17:54:58 -0500 Subject: [PATCH 1/3] Update port geotrans to version 3.8 1. Added new files to CMakeLists.txt required by version 3.8 2. Remove old style CONTROL file used by vcpkg 3. Updated portfile.cmake for version 3.8 4. Add new style vcpkg.json file used by vcpkg --- ports/geotrans/CMakeLists.txt | 110 ++++++++++++++++++---------------- ports/geotrans/CONTROL | 4 -- ports/geotrans/portfile.cmake | 10 ++-- ports/geotrans/vcpkg.json | 7 +++ 4 files changed, 70 insertions(+), 61 deletions(-) delete mode 100644 ports/geotrans/CONTROL create mode 100644 ports/geotrans/vcpkg.json diff --git a/ports/geotrans/CMakeLists.txt b/ports/geotrans/CMakeLists.txt index f733f8c8a00091..f2deeda14050df 100644 --- a/ports/geotrans/CMakeLists.txt +++ b/ports/geotrans/CMakeLists.txt @@ -3,96 +3,102 @@ project(geotrans CXX) file(GLOB_RECURSE DTCC_CPP CCS/src/dtcc/*.cpp) include_directories( +CCS/src/CoordinateConversion CCS/src/dtcc -CCS/src/dtcc/Enumerations -CCS/src/dtcc/Exception CCS/src/dtcc/CoordinateSystemParameters CCS/src/dtcc/CoordinateSystems CCS/src/dtcc/CoordinateSystems/albers -CCS/src/dtcc/CoordinateSystems/bonne -CCS/src/dtcc/CoordinateSystems/datum -CCS/src/dtcc/CoordinateSystems/ellipse -CCS/src/dtcc/CoordinateSystems/geocent -CCS/src/dtcc/CoordinateSystems/grinten -CCS/src/dtcc/CoordinateSystems/mercator -CCS/src/dtcc/CoordinateSystems/misc -CCS/src/dtcc/CoordinateSystems/nzmg -CCS/src/dtcc/CoordinateSystems/polarst -CCS/src/dtcc/CoordinateSystems/stereogr -CCS/src/dtcc/CoordinateSystems/trcyleqa -CCS/src/dtcc/CoordinateSystems/utm CCS/src/dtcc/CoordinateSystems/azeq -CCS/src/dtcc/CoordinateSystems/cassini -CCS/src/dtcc/CoordinateSystems/eckert4 -CCS/src/dtcc/CoordinateSystems/eqdcyl -CCS/src/dtcc/CoordinateSystems/georef -CCS/src/dtcc/CoordinateSystems/lambert -CCS/src/dtcc/CoordinateSystems/mgrs -CCS/src/dtcc/CoordinateSystems/mollweid -CCS/src/dtcc/CoordinateSystems/omerc -CCS/src/dtcc/CoordinateSystems/polycon -CCS/src/dtcc/CoordinateSystems/threads -CCS/src/dtcc/CoordinateSystems/ups -CCS/src/dtcc/CoordinateSystems/webmerc CCS/src/dtcc/CoordinateSystems/bng +CCS/src/dtcc/CoordinateSystems/bonne +CCS/src/dtcc/CoordinateSystems/cassini CCS/src/dtcc/CoordinateSystems/cyleqa +CCS/src/dtcc/CoordinateSystems/datum +CCS/src/dtcc/CoordinateSystems/eckert4 CCS/src/dtcc/CoordinateSystems/eckert6 +CCS/src/dtcc/CoordinateSystems/ellipse +CCS/src/dtcc/CoordinateSystems/eqdcyl CCS/src/dtcc/CoordinateSystems/gars +CCS/src/dtcc/CoordinateSystems/geocent +CCS/src/dtcc/CoordinateSystems/georef CCS/src/dtcc/CoordinateSystems/gnomonic +CCS/src/dtcc/CoordinateSystems/grinten +CCS/src/dtcc/CoordinateSystems/lambert CCS/src/dtcc/CoordinateSystems/loccart +CCS/src/dtcc/CoordinateSystems/locspher +CCS/src/dtcc/CoordinateSystems/mercator +CCS/src/dtcc/CoordinateSystems/mgrs CCS/src/dtcc/CoordinateSystems/miller +CCS/src/dtcc/CoordinateSystems/misc +CCS/src/dtcc/CoordinateSystems/mollweid CCS/src/dtcc/CoordinateSystems/neys +CCS/src/dtcc/CoordinateSystems/nzmg +CCS/src/dtcc/CoordinateSystems/omerc CCS/src/dtcc/CoordinateSystems/orthogr +CCS/src/dtcc/CoordinateSystems/polarst +CCS/src/dtcc/CoordinateSystems/polycon CCS/src/dtcc/CoordinateSystems/sinusoid +CCS/src/dtcc/CoordinateSystems/spherical +CCS/src/dtcc/CoordinateSystems/stereogr +CCS/src/dtcc/CoordinateSystems/threads CCS/src/dtcc/CoordinateSystems/tranmerc +CCS/src/dtcc/CoordinateSystems/trcyleqa +CCS/src/dtcc/CoordinateSystems/ups CCS/src/dtcc/CoordinateSystems/usng +CCS/src/dtcc/CoordinateSystems/utm +CCS/src/dtcc/CoordinateSystems/webmerc CCS/src/dtcc/CoordinateTuples +CCS/src/dtcc/Enumerations +CCS/src/dtcc/Exception ) set(DTCC_INCLUDES +include/CoordinateConversion include/dtcc/ -include/dtcc/Enumerations -include/dtcc/Exception include/dtcc/CoordinateSystemParameters include/dtcc/CoordinateSystems include/dtcc/CoordinateSystems/albers -include/dtcc/CoordinateSystems/bonne -include/dtcc/CoordinateSystems/datum -include/dtcc/CoordinateSystems/ellipse -include/dtcc/CoordinateSystems/geocent -include/dtcc/CoordinateSystems/grinten -include/dtcc/CoordinateSystems/mercator -include/dtcc/CoordinateSystems/misc -include/dtcc/CoordinateSystems/nzmg -include/dtcc/CoordinateSystems/polarst -include/dtcc/CoordinateSystems/stereogr -include/dtcc/CoordinateSystems/trcyleqa -include/dtcc/CoordinateSystems/utm include/dtcc/CoordinateSystems/azeq -include/dtcc/CoordinateSystems/cassini -include/dtcc/CoordinateSystems/eckert4 -include/dtcc/CoordinateSystems/eqdcyl -include/dtcc/CoordinateSystems/georef -include/dtcc/CoordinateSystems/lambert -include/dtcc/CoordinateSystems/mgrs -include/dtcc/CoordinateSystems/mollweid -include/dtcc/CoordinateSystems/omerc -include/dtcc/CoordinateSystems/polycon -include/dtcc/CoordinateSystems/threads -include/dtcc/CoordinateSystems/ups -include/dtcc/CoordinateSystems/webmerc include/dtcc/CoordinateSystems/bng +include/dtcc/CoordinateSystems/bonne +include/dtcc/CoordinateSystems/cassini include/dtcc/CoordinateSystems/cyleqa +include/dtcc/CoordinateSystems/datum +include/dtcc/CoordinateSystems/eckert4 include/dtcc/CoordinateSystems/eckert6 +include/dtcc/CoordinateSystems/ellipse +include/dtcc/CoordinateSystems/eqdcyl include/dtcc/CoordinateSystems/gars +include/dtcc/CoordinateSystems/geocent +include/dtcc/CoordinateSystems/georef include/dtcc/CoordinateSystems/gnomonic +include/dtcc/CoordinateSystems/grinten +include/dtcc/CoordinateSystems/lambert include/dtcc/CoordinateSystems/loccart +include/dtcc/CoordinateSystems/locspher +include/dtcc/CoordinateSystems/mercator +include/dtcc/CoordinateSystems/mgrs include/dtcc/CoordinateSystems/miller +include/dtcc/CoordinateSystems/misc +include/dtcc/CoordinateSystems/mollweid include/dtcc/CoordinateSystems/neys +include/dtcc/CoordinateSystems/nzmg +include/dtcc/CoordinateSystems/omerc include/dtcc/CoordinateSystems/orthogr +include/dtcc/CoordinateSystems/polarst +include/dtcc/CoordinateSystems/polycon include/dtcc/CoordinateSystems/sinusoid +include/dtcc/CoordinateSystems/spherical +include/dtcc/CoordinateSystems/stereogr +include/dtcc/CoordinateSystems/threads include/dtcc/CoordinateSystems/tranmerc +include/dtcc/CoordinateSystems/trcyleqa +include/dtcc/CoordinateSystems/ups include/dtcc/CoordinateSystems/usng +include/dtcc/CoordinateSystems/utm +include/dtcc/CoordinateSystems/webmerc include/dtcc/CoordinateTuples +include/dtcc/Enumerations +include/dtcc/Exception ) if(WIN32) diff --git a/ports/geotrans/CONTROL b/ports/geotrans/CONTROL deleted file mode 100644 index 72885e4fb7ce84..00000000000000 --- a/ports/geotrans/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: geotrans -Version: 3.7 -Homepage: https://earth-info.nga.mil/GandG/update/index.php?action=home -Description: GEOTRANS is an application that allows you to convert geographic coordinates among a wide variety of coordinate systems, map projections, grids, and datums. GEOTRANS runs in Microsoft Windows and LINUX environments. diff --git a/ports/geotrans/portfile.cmake b/ports/geotrans/portfile.cmake index 39844c315253b4..b289c38b55920e 100644 --- a/ports/geotrans/portfile.cmake +++ b/ports/geotrans/portfile.cmake @@ -1,11 +1,13 @@ set(VCPKG_LIBRARY_LINKAGE "dynamic") +message(WARNING "Download ${PORT} may take a few minutes, It depends on your network speed and connection.") + # We specify the Linux URL, but the only difference between the Windows/Linux packages are the included libraries # which we re-build anyway. There is no source only package provided or it would be preferred (and smaller). vcpkg_download_distfile(ARCHIVE - URLS "http://earth-info.nga.mil/GandG/geotrans/geotrans3.7/linux_dev.tgz" - FILENAME "geotrans-3.7.tgz" - SHA512 20bdc870026e95154f1d7f9560cbfa2c0b2dc39042aa544f093b502a0609121cb47df5729248e0d79ccf8f9908bf01bbcea8e777ae4f45e25472b7ce2bcb9742 + URLS "ftp://ftp.nga.mil/pub2/gandg/website/wgs84/apps/geotrans/current-version/sw/master_version/master.tgz" + FILENAME "geotrans-3.8-master.tgz" + SHA512 359704ee9700762111006d126872feab9f644af0cebd433a657473347ea48f4eb172681f5f564fbca171bbf58fe0e8fb0829597403958770b7d22ad380afeac3 ) vcpkg_extract_source_archive_ex( @@ -15,7 +17,6 @@ vcpkg_extract_source_archive_ex( file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -31,7 +32,6 @@ configure_file( configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT} @ONLY) - # Handle copyright file(INSTALL ${SOURCE_PATH}/GEOTRANS3/docs/MSP_Geotrans_Terms_Of_Use.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/geotrans/vcpkg.json b/ports/geotrans/vcpkg.json new file mode 100644 index 00000000000000..788e2307309403 --- /dev/null +++ b/ports/geotrans/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "geotrans", + "version-string": "3.8", + "description": "GEOTRANS is an application that allows you to convert geographic coordinates among a wide variety of coordinate systems, map projections, grids, and datums. GEOTRANS runs in Microsoft Windows and LINUX environments.", + "homepage": "https://earth-info.nga.mil/GandG/update/index.php?action=home", + "supports": "(((x86 | x64) & windows & !static) | ((x86 | x64) & linux)) & !uwp & !arm & !arm64 & !osx & !android" +} From cfabb385663977b90f6926d659a13587f4ea32ee Mon Sep 17 00:00:00 2001 From: StarGate-One Date: Thu, 24 Dec 2020 13:56:07 -0500 Subject: [PATCH 2/3] Add skip to CI baseline. Add slow warning messages to portfile --- ports/geotrans/portfile.cmake | 3 ++- scripts/ci.baseline.txt | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/geotrans/portfile.cmake b/ports/geotrans/portfile.cmake index b289c38b55920e..8f9948f2ba5c4e 100644 --- a/ports/geotrans/portfile.cmake +++ b/ports/geotrans/portfile.cmake @@ -1,6 +1,7 @@ set(VCPKG_LIBRARY_LINKAGE "dynamic") -message(WARNING "Download ${PORT} may take a few minutes, It depends on your network speed and connection.") +message(WARNING "Download ${PORT} may take a several hours to download!!!") +message(WARNING "Port ${PORT} source resides NGA US Government military ftp server with an extremely slow connection.") # We specify the Linux URL, but the only difference between the Windows/Linux packages are the included libraries # which we re-build anyway. There is no source only package provided or it would be preferred (and smaller). diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index e2c7b7730678e8..9e5c9240957171 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -446,6 +446,12 @@ gdcm:arm64-windows=fail gdcm:x64-linux = skip geos:arm-uwp=fail geos:x64-uwp=fail + +# Port geotrans source ftp://ftp.nga.mil server +# extremely slow may take several hours to download +geotrans:x64-linux = skip +geotrans:x64-windows = skip +geotrans:x86-windows = skip getopt:arm-uwp=fail getopt:x64-uwp=fail getopt-win32:arm64-windows=fail From dac699e0e670090a9b4d8bf8d9f93fad6a10d303 Mon Sep 17 00:00:00 2001 From: StarGate-One Date: Thu, 24 Dec 2020 14:10:19 -0500 Subject: [PATCH 3/3] Refine warning message about long download times --- ports/geotrans/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/geotrans/portfile.cmake b/ports/geotrans/portfile.cmake index 8f9948f2ba5c4e..930452baa4f2a7 100644 --- a/ports/geotrans/portfile.cmake +++ b/ports/geotrans/portfile.cmake @@ -1,6 +1,6 @@ set(VCPKG_LIBRARY_LINKAGE "dynamic") -message(WARNING "Download ${PORT} may take a several hours to download!!!") +message(WARNING "Download ${PORT} may take a several hours to complete!") message(WARNING "Port ${PORT} source resides NGA US Government military ftp server with an extremely slow connection.") # We specify the Linux URL, but the only difference between the Windows/Linux packages are the included libraries