Move hosts and resources from svn_bin to top-level resources directory.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@18001 18c085ea-50e0-402c-830e-de6fd14e8384

CMakeLists.txt

@@ -621,6 +621,8 @@ IF(WIN32)
         CACHE PATH "VisIt plugins install directory" FORCE)
     SET(VISIT_INSTALLED_VERSION_ARCHIVES ${CMAKE_INSTALL_PREFIX}/lib 
         CACHE PATH "3rd party I/O archives install directory" FORCE)
+    SET(VISIT_INSTALLED_VERSION_RESOURCES ${CMAKE_INSTALL_PREFIX}/resources
+        CACHE PATH "VisIt resources install directory" FORCE)
 ELSE(WIN32)
     INCLUDE(${VISIT_SOURCE_DIR}/CMake/DetermineVisItArchitecture.cmake)
     DETERMINE_VISIT_ARCHITECTURE(VISIT_INSTALL_PLATFORM)
@@ -638,6 +640,8 @@ ELSE(WIN32)
         CACHE PATH "VisIt plugins install directory" FORCE)
     SET(VISIT_INSTALLED_VERSION_ARCHIVES ${VISIT_INSTALLED_VERSION}/archives 
         CACHE PATH "3rd party I/O archives install directory" FORCE)
+    SET(VISIT_INSTALLED_VERSION_RESOURCES ${VISIT_INSTALLED_VERSION}/resources
+        CACHE PATH "VisIt resources install directory" FORCE)
 
     IF(VISIT_RPATH_RELATIVE_TO_EXECUTABLE_PATH)
         SET(CMAKE_INSTALL_RPATH "$ORIGIN/../lib")
@@ -1958,7 +1962,7 @@ ADD_SUBDIRECTORY(bin)
 ADD_SUBDIRECTORY(lib)
 ADD_SUBDIRECTORY(include)
 ADD_SUBDIRECTORY(help)
-ADD_SUBDIRECTORY(svn_bin)
+ADD_SUBDIRECTORY(resources)
 
 #-----------------------------------------------------------------------------
 # Add the "data" directory if it exists

common/misc/InstallationFunctions.C

@@ -439,16 +439,19 @@ GetSystemVisItHostsDirectory()
 // Creation:   Fri Apr 27 17:31:12 PDT 2012
 //
 // Modifications:
-//   
+//   Brad Whitlock, Mon Apr 30 11:27:32 PDT 2012
+//   Base the directory name off of the architecture directory so it can be
+//   peer to bin and lib.
+//
 // ****************************************************************************
 
 std::string
 GetSystemVisItResourcesDirectory()
 {
-    const char *d = GetDefaultConfigFile("resources", "VISITHOME");
-    std::string retVal(d);
-    delete [] d;
-    return retVal;
+    std::string retval(GetVisItArchitectureDirectory());
+    retval += VISIT_SLASH_STRING;
+    retval += "resources";
+    return retval;
 }
 
 // ****************************************************************************
@@ -476,7 +479,7 @@ GetSystemVisItColorTableDirectory()
 {
     std::string retval(GetSystemVisItResourcesDirectory());
     retval += VISIT_SLASH_STRING;
-    retval += "ct";
+    retval += "colortables";
     return retval;
 }
 

resources/CMakeLists.txt

+#*****************************************************************************
+#
+# Copyright (c) 2000 - 2012, Lawrence Livermore National Security, LLC
+# Produced at the Lawrence Livermore National Laboratory
+# LLNL-CODE-442911
+# All rights reserved.
+#
+# This file is  part of VisIt. For  details, see https://visit.llnl.gov/.  The
+# full copyright notice is contained in the file COPYRIGHT located at the root
+# of the VisIt distribution or at http://www.llnl.gov/visit/copyright.html.
+#
+# Redistribution  and  use  in  source  and  binary  forms,  with  or  without
+# modification, are permitted provided that the following conditions are met:
+#
+#  - Redistributions of  source code must  retain the above  copyright notice,
+#    this list of conditions and the disclaimer below.
+#  - Redistributions in binary form must reproduce the above copyright notice,
+#    this  list of  conditions  and  the  disclaimer (as noted below)  in  the
+#    documentation and/or other materials provided with the distribution.
+#  - Neither the name of  the LLNS/LLNL nor the names of  its contributors may
+#    be used to endorse or promote products derived from this software without
+#    specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT  HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR  IMPLIED WARRANTIES, INCLUDING,  BUT NOT  LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND  FITNESS FOR A PARTICULAR  PURPOSE
+# ARE  DISCLAIMED. IN  NO EVENT  SHALL LAWRENCE  LIVERMORE NATIONAL  SECURITY,
+# LLC, THE  U.S.  DEPARTMENT OF  ENERGY  OR  CONTRIBUTORS BE  LIABLE  FOR  ANY
+# DIRECT,  INDIRECT,   INCIDENTAL,   SPECIAL,   EXEMPLARY,  OR   CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT  LIMITED TO, PROCUREMENT OF  SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF  USE, DATA, OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER
+# CAUSED  AND  ON  ANY  THEORY  OF  LIABILITY,  WHETHER  IN  CONTRACT,  STRICT
+# LIABILITY, OR TORT  (INCLUDING NEGLIGENCE OR OTHERWISE)  ARISING IN ANY  WAY
+# OUT OF THE  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+# DAMAGE.
+#
+# Notes:
+#   This directory may later contain additional subdirectories that provide
+#   useful content. For example, we could have a "logos" directory that contains
+#   VisIt project logos or commonly used Lab logos. We could have some VTK
+#   datasets such as globes, etc. 
+#
+# Modifications:
+#
+#*****************************************************************************
+
+ADD_SUBDIRECTORY(colortables)
+ADD_SUBDIRECTORY(hosts)

resources/colortables/CMakeLists.txt

+#*****************************************************************************
+#
+# Copyright (c) 2000 - 2012, Lawrence Livermore National Security, LLC
+# Produced at the Lawrence Livermore National Laboratory
+# LLNL-CODE-442911
+# All rights reserved.
+#
+# This file is  part of VisIt. For  details, see https://visit.llnl.gov/.  The
+# full copyright notice is contained in the file COPYRIGHT located at the root
+# of the VisIt distribution or at http://www.llnl.gov/visit/copyright.html.
+#
+# Redistribution  and  use  in  source  and  binary  forms,  with  or  without
+# modification, are permitted provided that the following conditions are met:
+#
+#  - Redistributions of  source code must  retain the above  copyright notice,
+#    this list of conditions and the disclaimer below.
+#  - Redistributions in binary form must reproduce the above copyright notice,
+#    this  list of  conditions  and  the  disclaimer (as noted below)  in  the
+#    documentation and/or other materials provided with the distribution.
+#  - Neither the name of  the LLNS/LLNL nor the names of  its contributors may
+#    be used to endorse or promote products derived from this software without
+#    specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT  HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR  IMPLIED WARRANTIES, INCLUDING,  BUT NOT  LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND  FITNESS FOR A PARTICULAR  PURPOSE
+# ARE  DISCLAIMED. IN  NO EVENT  SHALL LAWRENCE  LIVERMORE NATIONAL  SECURITY,
+# LLC, THE  U.S.  DEPARTMENT OF  ENERGY  OR  CONTRIBUTORS BE  LIABLE  FOR  ANY
+# DIRECT,  INDIRECT,   INCIDENTAL,   SPECIAL,   EXEMPLARY,  OR   CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT  LIMITED TO, PROCUREMENT OF  SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF  USE, DATA, OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER
+# CAUSED  AND  ON  ANY  THEORY  OF  LIABILITY,  WHETHER  IN  CONTRACT,  STRICT
+# LIABILITY, OR TORT  (INCLUDING NEGLIGENCE OR OTHERWISE)  ARISING IN ANY  WAY
+# OUT OF THE  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+# DAMAGE.
+#
+#
+#
+# Modifications:
+#
+#*****************************************************************************
+
+## find all color table files to install using a glob
+FILE(GLOB CT_FILES1  "${CMAKE_CURRENT_SOURCE_DIR}/*.ct")
+SET(CT_FILES ${CT_FILES1} "${CMAKE_CURRENT_SOURCE_DIR}/License_BrewerColortables.txt")
+
+# Install the color table files
+INSTALL(FILES ${CT_FILES}
+        DESTINATION ${VISIT_INSTALLED_VERSION_RESOURCES}/colortables
+        PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ GROUP_WRITE WORLD_READ
+)
+

svn_bin/CMakeLists.txt → resources/hosts/CMakeLists.txt

@@ -37,37 +37,17 @@
 #
 #
 # Modifications:
-#  Cyrus Harrison, Mon Dec 20 09:26:12 PST 2010
-#  Use glob to find all host profiles & ini files we want to install
-#  from svn_bin.
-#
-#  Gunther H. Weber, Tue Sep 20 13:11:08 PDT 2011
-#  Support installation of global host profiles on "make install". Set
-#  VISIT_INSTALL_PROFILES_TO_HOSTS to "nersc", "ornl" etc. to create
-#  a global "hosts" directory in the VisIt install and copy over the
-#  corresponding host profiles.
-#
-#  Brad Whitlock, Wed Oct 12 09:24:00 PDT 2011
-#  Move host-related files to hosts subdirectory.
-#
-#  Brad Whitlock, Fri Apr 27 17:44:07 PDT 2012
-#  Install a resources directory too.
 #
 #*****************************************************************************
 
 ## find all host profiles to install using a glob
-FILE(GLOB HPROF_FILES "${CMAKE_CURRENT_SOURCE_DIR}/hosts/host_*.xml")
+FILE(GLOB HPROF_FILES "${CMAKE_CURRENT_SOURCE_DIR}/host_*.xml")
 ## find all ini files to install using a glob
-FILE(GLOB INI_FILES   "${CMAKE_CURRENT_SOURCE_DIR}/hosts/visit-*.ini")
-
-## find all resource files to install using a glob
-FILE(GLOB CT_FILES1   "${CMAKE_CURRENT_SOURCE_DIR}/resources/ct/*.ct")
-FILE(GLOB CT_FILES2  "${CMAKE_CURRENT_SOURCE_DIR}/resources/ct/*.txt")
-SET(CT_FILES ${CT_FILES1} ${CT_FILES2})
+FILE(GLOB INI_FILES   "${CMAKE_CURRENT_SOURCE_DIR}/visit-*.ini")
 
 IF(APPLE)
-    LIST(APPEND INI_FILES ${CMAKE_CURRENT_SOURCE_DIR}/hosts/default_configs.dat)
-    LIST(APPEND INI_FILES ${CMAKE_CURRENT_SOURCE_DIR}/hosts/networks.dat)
+    LIST(APPEND INI_FILES ${CMAKE_CURRENT_SOURCE_DIR}/default_configs.dat)
+    LIST(APPEND INI_FILES ${CMAKE_CURRENT_SOURCE_DIR}/networks.dat)
 ENDIF (APPLE)
 
 ## provide proper install structure windows vs other:
@@ -75,12 +55,10 @@ IF(WIN32)
     SET(INI_DEST   ${VISIT_INSTALLED_VERSION_BIN})
     SET(HPROF_DEST ${VISIT_INSTALLED_VERSION_BIN}/allhosts)
     SET(LPROF_DEST ${VISIT_INSTALLED_VERSION_BIN}/hosts)
-    SET(CT_DEST    ${VISIT_INSTALLED_VERSION_BIN}/resources/ct)
 ELSE(WIN32)
     SET(INI_DEST   ${VISIT_VERSION}/.visit)
     SET(HPROF_DEST ${VISIT_VERSION}/.visit/allhosts)
     SET(LPROF_DEST ${VISIT_VERSION}/.visit/hosts)
-    SET(CT_DEST    ${VISIT_VERSION}/.visit/resources/ct)
 ENDIF(WIN32)
 
 # Install the visit config files
@@ -95,16 +73,10 @@ INSTALL(FILES ${HPROF_FILES}
         PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ GROUP_WRITE WORLD_READ
 )
 
-# Install the color table files
-INSTALL(FILES ${CT_FILES}
-        DESTINATION ${CT_DEST}
-        PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ GROUP_WRITE WORLD_READ
-)
-
 # Install local host profiles if specified
 IF (VISIT_INSTALL_PROFILES_TO_HOSTS)
     FILE(GLOB LPROF_FILES
-         "${CMAKE_CURRENT_SOURCE_DIR}/hosts/host_${VISIT_INSTALL_PROFILES_TO_HOSTS}_*.xml")
+         "${CMAKE_CURRENT_SOURCE_DIR}/host_${VISIT_INSTALL_PROFILES_TO_HOSTS}_*.xml")
     INSTALL(FILES ${LPROF_FILES}
             DESTINATION ${LPROF_DEST}
             PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ GROUP_WRITE WORLD_READ