Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move application-related data into the repository. #3804

Merged
merged 63 commits into from
Mar 27, 2020
Merged

Move application-related data into the repository. #3804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
ce5cd2f
Adds initial directory structure for appdata in source and update fro…
krlberry Mar 3, 2020
ce480e8
Update CMakeLists process translation files in the ISIS source code. …
krlberry Mar 4, 2020
de8cd58
Change ISIS3DATA to ISISDATA (#3728)
krlberry Mar 4, 2020
7b6ac6b
Migrates subset of base data to appdata area in source. Fixes CI erro…
krlberry Mar 5, 2020
250ef2b
Updates cmake to copy apollo templates (#3732)
paarongiroux Mar 5, 2020
a4c79d8
Moving apollo15 data into source (#3733)
krlberry Mar 5, 2020
8e1ee70
Moving apollo16 data into source (#3734)
krlberry Mar 5, 2020
cc5881d
Moving apollo17 data into source (#3735)
krlberry Mar 5, 2020
1ddeaf4
Moved Juno data files into source code (#3736)
krlberry Mar 5, 2020
05037b9
Moved Mex data files into source code (#3738)
scsides Mar 5, 2020
621ac1f
Moved Dawn data files into source code (#3739)
krlberry Mar 5, 2020
bdfd507
Migrates application data from base into source (#3740)
krlberry Mar 6, 2020
080e199
Update LRO appdata (#3742)
scsides Mar 10, 2020
24797a8
Moved Messenger data into source (#3745)
paarongiroux Mar 10, 2020
43210f2
Fix missed ProcessImportPds base references and update CMakelists to …
krlberry Mar 10, 2020
24ac448
moved Kaguya data into source (#3747)
paarongiroux Mar 10, 2020
4a7b2a0
Move template files into revision control (#3748)
krlberry Mar 12, 2020
93377af
Moved Cassini data into source (#3744)
kaitlyndlee Mar 12, 2020
8c742c5
Newhorizons data (#3749)
paarongiroux Mar 12, 2020
e34a698
moved hayabusa2 data into source (#3752)
paarongiroux Mar 12, 2020
c040fb3
moved hayabusa data into source (#3751)
paarongiroux Mar 12, 2020
b77e8dd
Fix unit test failures associated with base data area update. (#3753)
krlberry Mar 12, 2020
31f4fda
Moved Near Data into Source (#3755)
kaitlyndlee Mar 12, 2020
f9f45dc
Appdata for viking 1 and 2 (#3743)
scsides Mar 13, 2020
d15d748
Updating Application data for LRO (#3758)
scsides Mar 13, 2020
75203aa
Moved MGS data into source (#3754)
kaitlyndlee Mar 13, 2020
a33946f
Moved Odyssey Data into Source (#3750)
kaitlyndlee Mar 13, 2020
f071f9e
Move application data from ISIS3DATA to git repo for Voyager 1 and 2 …
scsides Mar 14, 2020
e83f120
Moves tgo application data into source control and also fixes other a…
krlberry Mar 16, 2020
420cb51
Update paths to map files in applications that use map templates (#3760)
krlberry Mar 16, 2020
9044801
Moves lo-associated appdata into the repository (#3761)
krlberry Mar 17, 2020
9cf578e
Moves Clementine-related appdata into repository (#3762)
krlberry Mar 17, 2020
c877e12
Moves Mariner10 related appdata into the repo (#3763)
krlberry Mar 17, 2020
c3b88c8
Moves MER-related appdata into the repo (#3764)
krlberry Mar 17, 2020
66a935d
Moves Rosetta-related application data into this repo (#3765)
krlberry Mar 17, 2020
4e37bb3
Move application-related data for mro into repo (#3766)
krlberry Mar 17, 2020
f9ed5c2
Chandrayaan1 changes for #3727 (#3768)
scsides Mar 18, 2020
4ef3dbe
Add missing lo translation file (#3769)
krlberry Mar 18, 2020
3c16d05
Move Galileo application data into the repo (#3770)
scsides Mar 18, 2020
b7f026e
Removed ISIS3DATA from base apps (#3771)
scsides Mar 18, 2020
097d37f
Fix unit test failures in appdata branch (#3772)
krlberry Mar 18, 2020
89ccace
Update $base paths for files moved into the repo, add noproj template…
krlberry Mar 18, 2020
0686780
Removed references to Standard Pref file (#3774)
scsides Mar 18, 2020
cc63e53
Adds rolo translation files to repo, fixes additional paths to point …
krlberry Mar 18, 2020
8e6dfe7
Fix failing lrowac2pds and mrf2pds tests on appdata branch (#3776)
krlberry Mar 19, 2020
60e3b91
Fix scripts to use isis_testData and fix app tests (#3777)
scsides Mar 19, 2020
62e5413
App test fixes (#3779)
scsides Mar 19, 2020
41384e0
Fixes mro test failures in appdata branch (#3778)
krlberry Mar 20, 2020
264aee0
Fixes failing hirdrgen tests in appdata branch (#3782)
krlberry Mar 20, 2020
7d0fe13
Remove reference to ISIS3DATA (#3783)
scsides Mar 20, 2020
d73fc02
Remove unnecessary TestPreferences file from ISIS (#3780)
krlberry Mar 20, 2020
12d58b9
Fixes individual ISIS applications missing icons in appdata branch (#…
krlberry Mar 21, 2020
42fb1fb
Replace ISIS3TESTDATA with ISISTESTDATA and update Jenkinsscript to u…
krlberry Mar 21, 2020
7d00324
Move Europa Clipper data files into repo (#3787)
scsides Mar 23, 2020
febc0db
Add osirisrex translation files to repo (#3789)
krlberry Mar 23, 2020
6d2e680
move lopdsgen out of templates into translations, add hidtmgen templa…
krlberry Mar 23, 2020
6eb8363
Moves maps and labels under templates in appdata (#3794)
krlberry Mar 24, 2020
88187d7
Fixes mdiscal and osirisrex test failures in appdata branch (#3799)
krlberry Mar 25, 2020
b938882
Cmake update for appdata branch (#3803)
krlberry Mar 25, 2020
35cb70d
Merge branch 'dev' into appdata
krlberry Mar 25, 2020
34252e5
Merge branch 'dev' into appdata
krlberry Mar 25, 2020
7803650
Update path in spiceserver from merge failure (#3808)
krlberry Mar 27, 2020
e12fe21
Update viking serial number translation files for backwards compatabi…
krlberry Mar 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ pipeline {
def build_ok = true
def condaPath = ""
def isisEnv = [
"ISIS3DATA=/isisData/data",
"ISIS3TESTDATA=/isisData/testData",
"ISISDATA=/isisData/isis_data",
"ISISTESTDATA=/isisData/isis_testData",
"ISIS3MGRSCRIPTS=/isisData/data/isis3mgr_scripts",
"MALLOC_CHECK_=1"
]
Expand Down
149 changes: 126 additions & 23 deletions isis/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ cmake_minimum_required(VERSION 3.10)
# Point cmake to our other CMake files.
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")

# set(CMAKE_FIND_FRAMEWORK LAST)
set(CMAKE_FRAMEWORK_PATH /System/Library/Frameworks/)

set(CMAKE_FIND_FRAMEWORK LAST)

include(AddIsisModule)
Expand Down Expand Up @@ -65,8 +63,8 @@ set(BUILD_SHARED_LIBS ON)
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)

# Specify user options that can be passed in with the initial CMake command.
option(isis3Data "Directory containing Isis3Data" OFF )
option(isis3TestData "Directory containing Isis3TestData" OFF )
option(isisData "Directory containing IsisData" OFF )
option(isisTestData "Directory containing IsisTestData" OFF )
option(testOutputDir "Directory to store app test output folders" OFF )
option(buildCore "Build the core ISIS modules" ON )
option(buildMissions "Build the mission specific modules" ON )
Expand All @@ -82,25 +80,25 @@ if(DEFINED ENV{CONDA_PREFIX} AND CMAKE_INSTALL_PREFIX STREQUAL "/usr/local")
endif()

# Prioritize passed in variables over env vars, probably a better way to do this
if(DEFINED ENV{ISIS3DATA} AND NOT isis3Data)
set(isis3Data $ENV{ISIS3DATA})
if(DEFINED ENV{ISISDATA} AND NOT isisData)
set(isisData $ENV{ISISDATA})
endif()
if(DEFINED ENV{ISIS3TESTDATA} AND NOT isis3TestData)
set(isis3TestData $ENV{ISIS3TESTDATA})
if(DEFINED ENV{ISISTESTDATA} AND NOT isisTestData)
set(isisTestData $ENV{ISISTESTDATA})
endif()

if(EXISTS ${isis3Data})
set(ENV{ISIS3DATA} "${isis3Data}")
if(EXISTS ${isisData})
set(ENV{ISISDATA} "${isisData}")
else()
message(WARNING "Isis3Data directory ${isis3Data} not found, unit tests will fail.")
set(isis3Data OFF)
message(WARNING "Isis Data directory ${isisData} not found, unit tests will fail.")
set(isisData OFF)
endif()

if(EXISTS ${isis3TestData})
set(ENV{ISIS3TESTDATA} "${isis3TestData}")
if(EXISTS ${isisTestData})
set(ENV{ISISTESTDATA} "${isisTestData}")
else()
message(WARNING "Isis3TestData directory ${isis3TestData} not found, application and module tests will fail.")
set(isis3TestData OFF)
message(WARNING "IsisTestData directory ${isisTestData} not found, application and module tests will fail.")
set(isisTestData OFF)
endif()

if(${testOutputDir} STREQUAL "OFF")
Expand All @@ -124,8 +122,8 @@ message("\tBUILD CORE: ${buildCore}")
message("\tBUILD MISSIONS: ${buildMissions}")
message("\tJP2K SUPPORT: ${JP2KFLAG}")
message("\tPYTHON BINDINGS: ${pybindings}")
message("\tISIS3DATA: ${isis3Data}")
message("\tISISTESTDATA: ${isis3TestData}")
message("\tISISDATA: ${isisData}")
message("\tISISTESTDATA: ${isisTestData}")
message("\tTEST OUTPUT DIR: ${testOutputDir}")
message("\tINSTALL PREFIX: ${CMAKE_INSTALL_PREFIX}")

Expand Down Expand Up @@ -427,7 +425,6 @@ install(CODE "EXECUTE_PROCESS(COMMAND rm -f ${CMAKE_INSTALL_PREFIX}/lib/libisis3
install(CODE "EXECUTE_PROCESS(COMMAND rm -f ${CMAKE_INSTALL_PREFIX}/lib/libisis3.6${SO})")
install(CODE "EXECUTE_PROCESS(COMMAND rm -f ${CMAKE_INSTALL_PREFIX}/lib/libisis3.${SO})")
EXECUTE_PROCESS(COMMAND cp -f ${CMAKE_SOURCE_DIR}/TestPreferences ${CMAKE_BINARY_DIR}/)
install(CODE "EXECUTE_PROCESS(COMMAND cp -f ${CMAKE_SOURCE_DIR}/src/base/objs/Preference/TestPreferences ${CMAKE_INSTALL_PREFIX}/)")
install(CODE "EXECUTE_PROCESS(COMMAND cp -f ${CMAKE_SOURCE_DIR}/IsisPreferences ${CMAKE_INSTALL_PREFIX}/)")

# Install the header files
Expand All @@ -446,7 +443,7 @@ endif()
file(WRITE "${CMAKE_BINARY_DIR}/qt.conf" "[Paths]\nPlugins=../3rdParty/plugins/\n")
install(FILES "${CMAKE_BINARY_DIR}/qt.conf" DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/xml)

#Create the inc directory
# Create the inc directory
execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/inc)

# Create an xml folder in the source directory that we will need later
Expand All @@ -456,12 +453,34 @@ execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/bin/xml)
# Create the version file
configure_file(${CMAKE_SOURCE_DIR}/cmake/version.in ${CMAKE_BINARY_DIR}/version)

# Set up install of the templates folder.
install(DIRECTORY ${CMAKE_SOURCE_DIR}/templates DESTINATION .)

# Set up install of the make folder.
install(DIRECTORY ${CMAKE_SOURCE_DIR}/make DESTINATION ${CMAKE_INSTALL_PREFIX})

# Set up install of appdata folder
install(DIRECTORY ${CMAKE_BINARY_DIR}/appdata DESTINATION ${CMAKE_INSTALL_PREFIX})

# Create the appdata directory with translations directory, images directory, templates directories
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/appdata/translations
${CMAKE_BINARY_DIR}/appdata/templates/apollo
${CMAKE_BINARY_DIR}/appdata/templates/autoseed
${CMAKE_BINARY_DIR}/appdata/templates/autoreg
${CMAKE_BINARY_DIR}/appdata/templates/noproj
${CMAKE_BINARY_DIR}/appdata/templates/cnetref
${CMAKE_BINARY_DIR}/appdata/templates/cnetstats
${CMAKE_BINARY_DIR}/appdata/templates/cnet_validmeasure
${CMAKE_BINARY_DIR}/appdata/templates/controlnetworks
${CMAKE_BINARY_DIR}/appdata/templates/hidtmgen
${CMAKE_BINARY_DIR}/appdata/templates/findfeatures
${CMAKE_BINARY_DIR}/appdata/templates/fullcnetdiff
${CMAKE_BINARY_DIR}/appdata/templates/jigsaw
${CMAKE_BINARY_DIR}/appdata/templates/kernels
${CMAKE_BINARY_DIR}/appdata/templates/labels
${CMAKE_BINARY_DIR}/appdata/templates/maps
${CMAKE_BINARY_DIR}/appdata/templates/photometry
${CMAKE_BINARY_DIR}/appdata/images/icons
${CMAKE_BINARY_DIR}/appdata/images/targets)


# Have CMake process all of the source code and tests.
add_subdirectory(src objects)

Expand Down Expand Up @@ -490,6 +509,90 @@ add_custom_target(incs ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_SOURCE_DIR}/src/*/apps/*/*.h ${CMAKE_BINARY_DIR}/inc)
add_dependencies(isis3 incs)

# Add custom build target to copy modified translation files to the build/appdata/translations
## directory.
add_custom_target(appdata ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_SOURCE_DIR}/appdata/serialnumbers/*.trn ${CMAKE_SOURCE_DIR}/appdata/translations/*.trn
${CMAKE_SOURCE_DIR}/appdata/translations/*.typ ${CMAKE_SOURCE_DIR}/src/*/apps/*/*.typ
${CMAKE_SOURCE_DIR}/src/*/apps/*/*.trn ${CMAKE_SOURCE_DIR}/src/*/apps/*/*.pft
${CMAKE_SOURCE_DIR}/src/*/apps/*/*.def ${CMAKE_SOURCE_DIR}/appdata/translations/*.def
${CMAKE_SOURCE_DIR}/appdata/translations/*.pvl
${CMAKE_BINARY_DIR}/appdata/translations)
add_dependencies(isis3 appdata)

# Add custom build targets to copy modified template files to build/appdata/templates
add_custom_target(apollotemplate ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_SOURCE_DIR}/src/*/templates/*.def ${CMAKE_BINARY_DIR}/appdata/templates/apollo/)
add_dependencies(isis3 apollotemplate)

add_custom_target(autoreg ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_SOURCE_DIR}/appdata/templates/autoreg/* ${CMAKE_BINARY_DIR}/appdata/templates/autoreg/)
add_dependencies(isis3 autoreg)

add_custom_target(autoseed ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_SOURCE_DIR}/appdata/templates/autoseed/* ${CMAKE_BINARY_DIR}/appdata/templates/autoseed/)

add_custom_target(noproj ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_SOURCE_DIR}/appdata/templates/noproj/* ${CMAKE_BINARY_DIR}/appdata/templates/noproj/)
add_dependencies(isis3 noproj)

add_custom_target(cnetref ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_SOURCE_DIR}/appdata/templates/cnetref/* ${CMAKE_BINARY_DIR}/appdata/templates/cnetref/)
add_dependencies(isis3 cnetref)

add_custom_target(cnetstats ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_SOURCE_DIR}/appdata/templates/cnetstats/* ${CMAKE_BINARY_DIR}/appdata/templates/cnetstats/)
add_dependencies(isis3 cnetstats)

add_custom_target(cnetvalid ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_SOURCE_DIR}/appdata/templates/cnet_validmeasure/* ${CMAKE_BINARY_DIR}/appdata/templates/cnet_validmeasure/)
add_dependencies(isis3 cnetvalid)

add_custom_target(controlnetworks ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_SOURCE_DIR}/appdata/templates/controlnetworks/* ${CMAKE_BINARY_DIR}/appdata/templates/controlnetworks/)
add_dependencies(isis3 controlnetworks)

add_custom_target(findfeatures ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_SOURCE_DIR}/appdata/templates/findfeatures/* ${CMAKE_BINARY_DIR}/appdata/templates/findfeatures/)
add_dependencies(isis3 findfeatures)

add_custom_target(fullcnetdiff ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_SOURCE_DIR}/appdata/templates/fullcnetdiff/* ${CMAKE_BINARY_DIR}/appdata/templates/fullcnetdiff/)
add_dependencies(isis3 fullcnetdiff)

add_custom_target(jigsaw ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_SOURCE_DIR}/appdata/templates/jigsaw/* ${CMAKE_BINARY_DIR}/appdata/templates/jigsaw/)
add_dependencies(isis3 jigsaw)

add_custom_target(kernels ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_SOURCE_DIR}/appdata/templates/kernels/* ${CMAKE_BINARY_DIR}/appdata/templates/kernels/)
add_dependencies(isis3 kernels)

add_custom_target(photometry ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_SOURCE_DIR}/appdata/templates/photometry/* ${CMAKE_BINARY_DIR}/appdata/templates/photometry/)
add_dependencies(isis3 photometry)

add_custom_target(icons ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_SOURCE_DIR}/appdata/images/icons/* ${CMAKE_SOURCE_DIR}/appdata/images/icons/licenses/*
${CMAKE_BINARY_DIR}/appdata/images/icons)
add_dependencies(isis3 icons)

add_custom_target(targets ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_SOURCE_DIR}/appdata/images/targets/* ${CMAKE_BINARY_DIR}/appdata/images/targets)
add_dependencies(isis3 targets)

add_custom_target(maps ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_SOURCE_DIR}/appdata/templates/maps/* ${CMAKE_BINARY_DIR}/appdata/templates/maps)
add_dependencies(isis3 maps)

add_custom_target(labels ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_SOURCE_DIR}/appdata/templates/labels/* ${CMAKE_BINARY_DIR}/appdata/templates/labels)
add_dependencies(isis3 labels)

add_custom_target(hidtmgen ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_SOURCE_DIR}/appdata/templates/hidtmgen/* ${CMAKE_BINARY_DIR}/appdata/templates/hidtmgen/)
add_dependencies(isis3 hidtmgen)

acpaquette marked this conversation as resolved.
Show resolved Hide resolved
# Add a custom build target to clean out everything that gets added to the source
# directory during the build process.
# - Only a few things are added in order to make the tests work properly so
Expand Down
72 changes: 36 additions & 36 deletions isis/IsisPreferences
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,42 +175,42 @@ EndGroup
########################################################

Group = DataDirectory
Apollo15 = $ISIS3DATA/apollo15
Apollo16 = $ISIS3DATA/apollo16
Apollo17 = $ISIS3DATA/apollo17
Base = $ISIS3DATA/base
Cassini = $ISIS3DATA/cassini
Chan1 = $ISIS3DATA/chan1
Chandrayaan1 = $ISIS3DATA/chandrayaan1
Clementine1 = $ISIS3DATA/clementine1
Clipper = $ISIS3DATA/../datalocal/clipper
Control = $ISIS3DATA/control
Dawn = $ISIS3DATA/dawn
Galileo = $ISIS3DATA/galileo
Hayabusa = $ISIS3DATA/hayabusa
Hayabusa2 = $ISIS3DATA/hayabusa2
Juno = $ISIS3DATA/juno
Kaguya = $ISIS3DATA/kaguya
Lo = $ISIS3DATA/lo
Lro = $ISIS3DATA/lro
Mariner10 = $ISIS3DATA/mariner10
Mer = $ISIS3DATA/mer
Mex = $ISIS3DATA/mex
Messenger = $ISIS3DATA/messenger
Mgs = $ISIS3DATA/mgs
Mro = $ISIS3DATA/mro
Near = $ISIS3DATA/near
NewHorizons = $ISIS3DATA/newhorizons
Odyssey = $ISIS3DATA/odyssey
OsirisRex = $ISIS3DATA/../datalocal/osirisrex
Rolo = $ISIS3DATA/rolo
Rosetta = $ISIS3DATA/rosetta
Smart1 = $ISIS3DATA/smart1
Tgo = $ISIS3DATA/tgo
Viking1 = $ISIS3DATA/viking1
Viking2 = $ISIS3DATA/viking2
Voyager1 = $ISIS3DATA/voyager1
Voyager2 = $ISIS3DATA/voyager2
Apollo15 = $ISISDATA/apollo15
Apollo16 = $ISISDATA/apollo16
Apollo17 = $ISISDATA/apollo17
Base = $ISISDATA/base
Cassini = $ISISDATA/cassini
Chan1 = $ISISDATA/chan1
Chandrayaan1 = $ISISDATA/chandrayaan1
Clementine1 = $ISISDATA/clementine1
Clipper = $ISISDATA/../datalocal/clipper
Control = $ISISDATA/control
Dawn = $ISISDATA/dawn
Galileo = $ISISDATA/galileo
Hayabusa = $ISISDATA/hayabusa
Hayabusa2 = $ISISDATA/hayabusa2
Juno = $ISISDATA/juno
Kaguya = $ISISDATA/kaguya
Lo = $ISISDATA/lo
Lro = $ISISDATA/lro
Mariner10 = $ISISDATA/mariner10
Mer = $ISISDATA/mer
Mex = $ISISDATA/mex
Messenger = $ISISDATA/messenger
Mgs = $ISISDATA/mgs
Mro = $ISISDATA/mro
Near = $ISISDATA/near
NewHorizons = $ISISDATA/newhorizons
Odyssey = $ISISDATA/odyssey
OsirisRex = $ISISDATA/../datalocal/osirisrex
Rolo = $ISISDATA/rolo
Rosetta = $ISISDATA/rosetta
Smart1 = $ISISDATA/smart1
Tgo = $ISISDATA/tgo
Viking1 = $ISISDATA/viking1
Viking2 = $ISISDATA/viking2
Voyager1 = $ISISDATA/voyager1
Voyager2 = $ISISDATA/voyager2
Temporary = .
EndGroup

Expand Down
72 changes: 36 additions & 36 deletions isis/TestPreferences
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,42 +175,42 @@ EndGroup
########################################################

Group = DataDirectory
Apollo15 = $ISIS3DATA/apollo15
Apollo16 = $ISIS3DATA/apollo16
Apollo17 = $ISIS3DATA/apollo17
Base = $ISIS3DATA/base
Cassini = $ISIS3DATA/cassini
Chan1 = $ISIS3DATA/chan1
Chandrayaan1 = $ISIS3DATA/chandrayaan1
Clementine1 = $ISIS3DATA/clementine1
Clipper = $ISIS3DATA/../datalocal/clipper
Control = $ISIS3DATA/control
Dawn = $ISIS3DATA/dawn
Galileo = $ISIS3DATA/galileo
Hayabusa = $ISIS3DATA/hayabusa
Hayabusa2 = $ISIS3DATA/hayabusa2
Juno = $ISIS3DATA/juno
Kaguya = $ISIS3DATA/kaguya
Lo = $ISIS3DATA/lo
Lro = $ISIS3DATA/lro
Mariner10 = $ISIS3DATA/mariner10
Mer = $ISIS3DATA/mer
Mex = $ISIS3DATA/mex
Messenger = $ISIS3DATA/messenger
Mgs = $ISIS3DATA/mgs
Mro = $ISIS3DATA/mro
Near = $ISIS3DATA/near
NewHorizons = $ISIS3DATA/newhorizons
Odyssey = $ISIS3DATA/odyssey
OsirisRex = $ISIS3DATA/../datalocal/osirisrex
Rolo = $ISIS3DATA/rolo
Rosetta = $ISIS3DATA/rosetta
Smart1 = $ISIS3DATA/smart1
Tgo = $ISIS3DATA/tgo
Viking1 = $ISIS3DATA/viking1
Viking2 = $ISIS3DATA/viking2
Voyager1 = $ISIS3DATA/voyager1
Voyager2 = $ISIS3DATA/voyager2
Apollo15 = $ISISDATA/apollo15
Apollo16 = $ISISDATA/apollo16
Apollo17 = $ISISDATA/apollo17
Base = $ISISDATA/base
Cassini = $ISISDATA/cassini
Chan1 = $ISISDATA/chan1
Chandrayaan1 = $ISISDATA/chandrayaan1
Clementine1 = $ISISDATA/clementine1
Clipper = $ISISDATA/../datalocal/clipper
Control = $ISISDATA/control
Dawn = $ISISDATA/dawn
Galileo = $ISISDATA/galileo
Hayabusa = $ISISDATA/hayabusa
Hayabusa2 = $ISISDATA/hayabusa2
Juno = $ISISDATA/juno
Kaguya = $ISISDATA/kaguya
Lo = $ISISDATA/lo
Lro = $ISISDATA/lro
Mariner10 = $ISISDATA/mariner10
Mer = $ISISDATA/mer
Mex = $ISISDATA/mex
Messenger = $ISISDATA/messenger
Mgs = $ISISDATA/mgs
Mro = $ISISDATA/mro
Near = $ISISDATA/near
NewHorizons = $ISISDATA/newhorizons
Odyssey = $ISISDATA/odyssey
OsirisRex = $ISISDATA/../datalocal/osirisrex
Rolo = $ISISDATA/rolo
Rosetta = $ISISDATA/rosetta
Smart1 = $ISISDATA/smart1
Tgo = $ISISDATA/tgo
Viking1 = $ISISDATA/viking1
Viking2 = $ISISDATA/viking2
Voyager1 = $ISISDATA/voyager1
Voyager2 = $ISISDATA/voyager2
Temporary = .
EndGroup

Expand Down
Loading