Unverified Commit 4b0e3206 authored by Ian Humphrey's avatar Ian Humphrey Committed by GitHub
Browse files

Merge pull request #543 from USGS-Astrogeology/release 

Pulling release into dev
parents 02a66024 357d4881

isis/CMakeLists.txt

+3 −4
Original line number Diff line number Diff line
@@ -28,16 +28,15 @@ set(PACKAGE "ISIS") 
set(PACKAGE_NAME       "USGS ISIS")



# Version number

set(VERSION            "3.5.00.0")

set(VERSION            "3.6.0.1")

set(PACKAGE_VERSION    ${VERSION})



# Full name and version number

set(PACKAGE_STRING     "${PACKAGE_NAME} ${VERSION}")



# Other release information

set(VERSION_DATE              "2017-04-24")

set(THIRD_PARTY_LIBS_VERSION  "v007")

set(RELEASE_STAGE             "alpha") # (alpha, beta, stable)

set(VERSION_DATE              "2018-10-26")

set(RELEASE_STAGE             "beta") # (alpha, beta, stable)



# Define to the address where bug reports for this package should be sent.

set(PACKAGE_BUGREPORT  "https://isis.astrogeology.usgs.gov/fixit")

isis/cmake/CMakeLists.txt

+3 −3
Original line number Diff line number Diff line
@@ -4,9 +4,9 @@ 
message("Setting up post-install behavior...")



# Set up format version numbers for the main shared library on install

install(CODE "EXECUTE_PROCESS(COMMAND cp -f ${CMAKE_BINARY_DIR}/lib/libisis3${SO} ${CMAKE_INSTALL_PREFIX}/lib/libisis3.5.0${SO})")

install(CODE "EXECUTE_PROCESS(COMMAND ln -sf libisis3.5.0${SO} ${CMAKE_INSTALL_PREFIX}/lib/libisis3.5${SO})")

install(CODE "EXECUTE_PROCESS(COMMAND ln -sf libisis3.5${SO} ${CMAKE_INSTALL_PREFIX}/lib/libisis3${SO})")

install(CODE "EXECUTE_PROCESS(COMMAND cp -f ${CMAKE_BINARY_DIR}/lib/libisis3${SO} ${CMAKE_INSTALL_PREFIX}/lib/libisis3.6.0${SO})")

install(CODE "EXECUTE_PROCESS(COMMAND ln -sf libisis3.6.0${SO} ${CMAKE_INSTALL_PREFIX}/lib/libisis3.6${SO})")

install(CODE "EXECUTE_PROCESS(COMMAND ln -sf libisis3.6${SO} ${CMAKE_INSTALL_PREFIX}/lib/libisis3${SO})")

install(CODE "EXECUTE_PROCESS(COMMAND ln -sf libisis3${SO} ${CMAKE_INSTALL_PREFIX}/lib/libisis${SO})")



# On OSX, need to correct all the paths encoded in each of the distributed library files so

isis/scripts/isis3VarInit.py

+17 −9
Original line number Diff line number Diff line 
#!/usr/bin/env python



import argparse

import os

import sys



##########################################################################################################

#   Author:  Tyler Wilson

#   Date  :  2018-10-05

#   Description:  This script sets ISISROOT/ISIS3DATA/ISIS3TESTDATA for the user and is executed
@@ -9,6 +12,13 @@ import sys 
#   The data directory and test directory are optional command line arguments.  If the user chooses

#   not to set them, they will both be placed created on the same level as the $ISISROOT directory

#   within the conda environment.

#   History:

#       Author:  Tyler Wilson

#       Date:    2018-11-01

#       Description:  Removed a pair of lines which were causing output errors on Mac OS X and were not

#                     required anyway.

#

##########################################################################################################



parser = argparse.ArgumentParser(description='Usage:  ./isis3VarInit --data_dir <data dir path> --test_dir <test dir path')
@@ -35,8 +45,6 @@ else: 
os.popen('mkdir -p '+isisroot+'/etc/conda/activate.d')

os.popen('mkdir -p '+isisroot+'/etc/conda/deactivate.d')



os.system("echo -n '' >"+isisroot+"/etc/conda/activate.d/env_vars.sh")

os.popen("echo -n '' >"+isisroot+"/etc/conda/deactivate.d/env_vars.sh")

os.popen('touch '+isisroot+'/etc/conda/activate.d/env_vars.sh')

os.popen('touch '+isisroot+'/etc/conda/activate.d/env_vars.sh')

isis/src/docsys/documents/InstallGuide/InstallGuide.xml

+52 −20
Original line number Diff line number Diff line
@@ -34,43 +34,74 @@ you must <em>not</em> upgrade the ISIS Data Files!!! 
    <ol>

      <li>Download either the Anaconda or Miniconda installation script for your OS platform.  Anaconda is a much larger distribtion of packages supporting scientific python, while Miniconda is a minimal installation and not as large: 

      <a href="https://www.anaconda.com/download">Anaconda installer</a>, <a href="https://conda.io/miniconda.html">Miniconda installer</a></li>

      <li>Open a terminal window in the directory where you downloaded the script, and run the following commands.  In this example, we chose to do a full install of Anaconda, and our OS is Linux-based.  Your file name may be different depending on your environment.</li>

      <li>If you are running on some variant of Linux, open a terminal window in the directory where you downloaded the script, and run the following commands.  In this example, we chose to do a full install of Anaconda, and our OS is Linux-based.  Your file name may be different depending on your environment.</li>

        <pre>

          chmod +x Anaconda3-5.2.0-Linux-x86_64.sh

          ./Anaconda3-5.2.0-Linux-x86_64.sh          

          <strong>chmod +x Anaconda3-5.2.0-Linux-x86_64.sh</strong>

          <strong>./Anaconda3-5.2.0-Linux-x86_64.sh</strong>          

        </pre>

       

        This will start the Anaconda installer which will guide you through the installation process.

      <li>After the installation has finished, open up a bash prompt in your terminal window.</li>

      <li>Create a new environment for your ISIS3 installation:

       <li>If you are running Mac OS X, a pkg file (which looks similar to Anaconda3-5.3.0-MacOSX-x86_64.pkg) will be downloaded.  Double-click on the file to start the installation process.</li>

      <li>Again from within a terminal window, create a new environment for your ISIS3 installation:

        <pre>

          #Add the following channels to the Anaconda installation

          conda config --add channels conda-forge, usgs-astrogeology

          <em>#Add the following channels to the Anaconda installation</em>

          <strong>conda config --add channels conda-forge</strong>

          <strong>conda config --add channels usgs-astrogeology</strong>



          #Verify you have the correct channels:

          <strong>conda config --show channels</strong>



          <em>#You should see:</em>



          <strong>channels:</strong>

           <strong>   - usgs-astrogeology</strong>

           <strong>   - conda-forge</strong>

           <strong>   - defaults</strong>



           <em>#The order is important.  If conda-forge is before usgs-astrogeology, you will need to run:</em>



          #Create a new conda environment to install ISIS3 in

          conda create -n isis3

           <strong>conda config --add channels usgs-astrogeology</strong>



          #Activate the environment

          source activate isis3



          #Download the ISIS3 version

          conda install -c usgs-astrogeology isis3

          <em>#Create a new conda environment to install ISIS3 in.</em>

          <strong>conda create -n isis3</strong>



          #Execute the ISIS3 variable initialization script with default arguments.

          #This script prepares default values for:  $ISISROOT/$ISIS3DATA/$ISIS3TESTDATA

          <em>#Activate the environment</em>

          <strong>source activate isis3</strong>



          python $CONDA_PREFIX/scripts/isis3VarInit.py

          <em>#Download the ISIS3 version</em>

          <strong>conda install -c usgs-astrogeology isis3</strong>

          

          <em>#Execute the ISIS3 variable initialization script with default arguments.</em>

          <em>#This script prepares default values for:  $ISISROOT/$ISIS3DATA/$ISIS3TESTDATA</em>



          <strong>python $CONDA_PREFIX/scripts/isis3VarInit.py</strong>



         Executing this script with no arguments will result in $ISIS3DATA=$CONDA_PREFIX/data, 

         and $ISIS3TESTDATA=$CONDA_PREFIX/testdata.  The user can specify different directories

         for both of these optional values:



         ./$CONDA_PREFIX/scripts/isis3VarInit --data-dir=[path to data directory]  --test-dir=[path to test data directory]

         <strong>./$CONDA_PREFIX/scripts/isis3VarInit --data-dir=[path to data directory]  --test-dir=[path to test data directory]</strong>



         

         Directions for running rsync to download ISIS3 data can be found <a href="#ISIS3DataDownload">here.</a>





          <em>#Run the source activate command a second time to process the changes:</em>



          <strong>source activate isis3</strong>



          To avoid having to do this every time you open a new terminal window, we suggest adding the following lines to the end of your .bashrc file 

          (if running a variant of Linux) to ensure that conda is in your PATH variable.  If you are running Mac OS X, these lines would be appended

          to the end of your .bash_profile file:



          

          <strong>source activate isis3</strong>

          <strong>python $CONDA_PREFIX/scripts/isis3VarInit.py</strong>

          <strong>source activate isis3</strong>



          #Run the source activate command a second time to process the changes:



          source activate isis3



        </pre>

      </li>
@@ -173,7 +204,7 @@ is a popular choice and may be downloaded below. 
  </ul>

</p>





<A NAME="ISIS3DataDownload"></A>

<h3>Full ISIS3 Data Download</h3>



<p>
@@ -494,6 +525,7 @@ is a popular choice and may be downloaded below. 
  <history>

    <change name="Kristin Berry" date="2018-08-28">Original Version</change>

    <change name ="Tyler Wilson along with the ASC Development Team" date="2018-09-26">Updated version to incorporate installation through Conda</change>

    <change name="Tyler Wilson" date="2018-10-01">Updated version after feedback was received from outside users.</change>

  </history>