diff --git a/NEWS b/NEWS index 5392dc7b5..d27810849 100644 --- a/NEWS +++ b/NEWS @@ -156,6 +156,7 @@ RPC distortion files with this tool if optimization is desired. - Misc + * Comiled against USGS ISIS version 3.6.0. * Expanded the documentation explaining how to align cameras to a DEM manually (or initialize such cameras) by selecting matching points between the images and the DEM. diff --git a/README b/README index 004d5a38d..1f16e95ad 100644 --- a/README +++ b/README @@ -12,9 +12,9 @@ imagery, 3D models, and bundle-adjusted networks of cameras. ASP's data products are suitable for science analysis, mission planning, and public outreach. -Please install USGS ISIS version 3.5.2 if you would like to process -NASA non-terrestrial imagery. Users wishing to process Earth images, -such as Digital Globe, satellites with RPC cameras, or various +Please install USGS ISIS version 3.6.0 or later if you would like to +process NASA non-terrestrial imagery. Users wishing to process Earth +images, such as Digital Globe, satellites with RPC cameras, or various frame/pinhole cameras do not need to download anything else. ************************************************************************ diff --git a/RELEASEGUIDE b/RELEASEGUIDE index 3ced30109..45f6adfed 100644 --- a/RELEASEGUIDE +++ b/RELEASEGUIDE @@ -5,9 +5,9 @@ Pipeline (ASP) release. 1.) Modify the build system: -Inside ASP's configure.ac, remove "_post" and increment version number -on the AC_INIT line. Do not do this for VisionWorkbench, as that -library has its own versioning. +Inside ASP's configure.ac and in src/CMakeLists.txt set the new +version. Do not do this for VisionWorkbench, as that library has its +own versioning. 2.) Look up the latest ISIS version and update it in StereoPipeline/README (see the "version" file in the packaged ASP @@ -51,19 +51,19 @@ The resulting release tarballs will go to BinaryBuilder/asp_tarballs. 10.) Commit and tag the release in the ASP repo. Example: - git tag v2.6.1 + git tag v2.6.2 Push the tags to the remote server with: - git push origin v2.6.1 # commit to your branch - git push god v2.6.1 # commit to main branch + git push origin v2.6.2 # commit to your branch + git push god v2.6.2 # commit to main branch If more commits were made and it is desired to apply this tag to a different commit, first remove the exiting tag with: - git tag -d v2.6.1 - git push origin :refs/tags/v2.6.1 - git push god :refs/tags/v2.6.1 + git tag -d v2.6.2 + git push origin :refs/tags/v2.6.2 + git push god :refs/tags/v2.6.2 11.) Upload the builds and the pdf documentation to GitHub, in the release area. @@ -91,8 +91,8 @@ specified in NEWS. 14.) Modify the build system: -Inside ASP's configure.ac, append "_post" to version number in AC_INIT -line. +Inside ASP's configure.ac and in src/CMakeLists.txt, append "_post" to +the version number. 15.) Reflect any changes in release policy by modifying this document. diff --git a/configure.ac b/configure.ac index 0d1f14b58..2e415117c 100644 --- a/configure.ac +++ b/configure.ac @@ -37,8 +37,8 @@ m4_pattern_allow([^PKG_ARBITRARY_QT_NEEDED_HEADERS$]) AC_PREREQ([2.59]) dnl TODO BEFORE RELEASE: update package version -AC_INIT([NASA Ames Stereo Pipeline], [2.6.1], [asp@nx.arc.nasa.gov], [StereoPipeline]) -#AC_INIT([NASA Ames Stereo Pipeline], [2.6.0_post], [asp@nx.arc.nasa.gov], [StereoPipeline]) +AC_INIT([NASA Ames Stereo Pipeline], [2.6.2], [asp@nx.arc.nasa.gov], [StereoPipeline]) +#AC_INIT([NASA Ames Stereo Pipeline], [2.6.2_post], [asp@nx.arc.nasa.gov], [StereoPipeline]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_HOST diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 614d451f2..3593793f3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -21,7 +21,7 @@ endif() project (StereoPipeline) -set(PACKAGE_VERSION "2.6.1") +set(PACKAGE_VERSION "2.6.2") set(PACKAGE_NAME "NASA Ames Stereo Pipeline") set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set(PACKAGE_BUGREPORT "scott.t.mcmichael@nasa.gov")