diff --git a/CMakeLists.txt b/CMakeLists.txt index 8688da4bf5..63d6c3edca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -185,28 +185,9 @@ endif() foreach(share_dir workflows gui forward-models) install(DIRECTORY "share/ert/${share_dir}" DESTINATION ${SHARE_DIR}) endforeach() - install_example("share/ert/site-config" ${SHARE_DIR}) install(PROGRAMS bin/job_dispatch.py DESTINATION bin ) -# Install (symlinks) compatibility version of jobs (only on case sensitive OSs) -# Case-sensitivity is checked by looking for an existing file. It is arguably -# hacky but I could not find any better way to do it -if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMAKELISTS.TXT") - foreach (job eclipse100 eclipse300 flow) - string(TOUPPER ${job} uc_job) - set(ln_target ${CMAKE_INSTALL_PREFIX}/${SHARE_DIR}/forward-models/res/${job}_compatibility) - set(ln_name ${CMAKE_INSTALL_PREFIX}/${SHARE_DIR}/forward-models/res/${uc_job}) - INSTALL(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${ln_target} ${ln_name})") - endforeach() - foreach (script careful_copy_file copy_directory copy_file delete_directory delete_file make_directory move_file symlink make_symlink) - string(TOUPPER ${script} uc_scrip) - set(ln_target ${CMAKE_INSTALL_PREFIX}/${SHARE_DIR}/forward-models/shell/${script}_compatibility) - set(ln_name ${CMAKE_INSTALL_PREFIX}/${SHARE_DIR}/forward-models/shell/${uc_scrip}) - INSTALL(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${ln_target} ${ln_name})") - endforeach() -endif() - foreach (script ecl100 ecl300 flow rms) install(PROGRAMS "share/ert/forward-models/res/script/${script}" DESTINATION "${SHARE_DIR}/forward-models/res/script") endforeach() diff --git a/python/tests/res/enkf/test_site_config.py b/python/tests/res/enkf/test_site_config.py index f81c696def..cc2426ef6e 100755 --- a/python/tests/res/enkf/test_site_config.py +++ b/python/tests/res/enkf/test_site_config.py @@ -65,7 +65,8 @@ def test_constructors(self): [ ERT_SHARE_PATH + '/forward-models/res', ERT_SHARE_PATH + '/forward-models/shell', - ERT_SHARE_PATH + '/forward-models/templating' + ERT_SHARE_PATH + '/forward-models/templating', + ERT_SHARE_PATH + '/forward-models/old_style' ], "SETENV": diff --git a/share/ert/forward-models/shell/careful_copy_file_compatibility b/share/ert/forward-models/old_style/CAREFUL_COPY_FILE similarity index 77% rename from share/ert/forward-models/shell/careful_copy_file_compatibility rename to share/ert/forward-models/old_style/CAREFUL_COPY_FILE index 79beb48c7b..72637994b6 100644 --- a/share/ert/forward-models/shell/careful_copy_file_compatibility +++ b/share/ert/forward-models/old_style/CAREFUL_COPY_FILE @@ -1,6 +1,6 @@ STDOUT careful_copy_file.stdout STDERR careful_copy_file.stderr -EXECUTABLE script/careful_copy_file +EXECUTABLE ../shell/script/careful_copy_file ARGLIST MIN_ARG 2 diff --git a/share/ert/forward-models/shell/copy_directory_compatibility b/share/ert/forward-models/old_style/COPY_DIRECTORY similarity index 78% rename from share/ert/forward-models/shell/copy_directory_compatibility rename to share/ert/forward-models/old_style/COPY_DIRECTORY index b47483026e..d47351eccd 100644 --- a/share/ert/forward-models/shell/copy_directory_compatibility +++ b/share/ert/forward-models/old_style/COPY_DIRECTORY @@ -1,6 +1,6 @@ STDERR copy_directory.stderr STDOUT copy_directory.stdout -EXECUTABLE script/copy_directory +EXECUTABLE ../shell/script/copy_directory ARGLIST MIN_ARG 2 diff --git a/share/ert/forward-models/shell/copy_file_compatibility b/share/ert/forward-models/old_style/COPY_FILE similarity index 79% rename from share/ert/forward-models/shell/copy_file_compatibility rename to share/ert/forward-models/old_style/COPY_FILE index c164882f15..360cfea06b 100644 --- a/share/ert/forward-models/shell/copy_file_compatibility +++ b/share/ert/forward-models/old_style/COPY_FILE @@ -1,6 +1,6 @@ STDOUT copy_file.stdout STDERR copy_file.stderr -EXECUTABLE script/copy_file +EXECUTABLE ../shell/script/copy_file ARGLIST MIN_ARG 2 diff --git a/share/ert/forward-models/shell/delete_directory_compatibility b/share/ert/forward-models/old_style/DELETE_DIRECTORY similarity index 73% rename from share/ert/forward-models/shell/delete_directory_compatibility rename to share/ert/forward-models/old_style/DELETE_DIRECTORY index 133125e01b..347ffc97dd 100644 --- a/share/ert/forward-models/shell/delete_directory_compatibility +++ b/share/ert/forward-models/old_style/DELETE_DIRECTORY @@ -1,7 +1,7 @@ STDERR delete_dir.stderr STDOUT delete_dir.stdout -EXECUTABLE script/delete_directory +EXECUTABLE ../shell/script/delete_directory ARGLIST MIN_ARG 1 diff --git a/share/ert/forward-models/shell/delete_file_compatibility b/share/ert/forward-models/old_style/DELETE_FILE similarity index 75% rename from share/ert/forward-models/shell/delete_file_compatibility rename to share/ert/forward-models/old_style/DELETE_FILE index 6fbc958c47..d16d7987ac 100644 --- a/share/ert/forward-models/shell/delete_file_compatibility +++ b/share/ert/forward-models/old_style/DELETE_FILE @@ -1,7 +1,7 @@ STDERR delete_file.stderr STDOUT delete_file.stdout -EXECUTABLE script/delete_file +EXECUTABLE ../shell/script/delete_file ARGLIST MIN_ARG 1 diff --git a/share/ert/forward-models/res/eclipse100_compatibility b/share/ert/forward-models/old_style/ECLIPSE100 similarity index 80% rename from share/ert/forward-models/res/eclipse100_compatibility rename to share/ert/forward-models/old_style/ECLIPSE100 index 9cd57e33f4..ac9cccbd84 100644 --- a/share/ert/forward-models/res/eclipse100_compatibility +++ b/share/ert/forward-models/old_style/ECLIPSE100 @@ -1,4 +1,4 @@ -EXECUTABLE script/ecl100 +EXECUTABLE ../res/script/ecl100 DEFAULT version DEFAULT 1 DEFAULT "" diff --git a/share/ert/forward-models/res/eclipse300_compatibility b/share/ert/forward-models/old_style/ECLIPSE300 similarity index 80% rename from share/ert/forward-models/res/eclipse300_compatibility rename to share/ert/forward-models/old_style/ECLIPSE300 index 48531d7717..86a4e0aefe 100644 --- a/share/ert/forward-models/res/eclipse300_compatibility +++ b/share/ert/forward-models/old_style/ECLIPSE300 @@ -1,4 +1,4 @@ -EXECUTABLE script/ecl300 +EXECUTABLE ../res/script/ecl300 DEFAULT version DEFAULT 1 DEFAULT "" diff --git a/share/ert/forward-models/res/flow_compatibility b/share/ert/forward-models/old_style/FLOW similarity index 81% rename from share/ert/forward-models/res/flow_compatibility rename to share/ert/forward-models/old_style/FLOW index fda12a6699..f65fce46de 100644 --- a/share/ert/forward-models/res/flow_compatibility +++ b/share/ert/forward-models/old_style/FLOW @@ -1,4 +1,4 @@ -EXECUTABLE script/flow +EXECUTABLE ../res/script/flow DEFAULT default DEFAULT 1 DEFAULT "" diff --git a/share/ert/forward-models/shell/make_directory_compatibility b/share/ert/forward-models/old_style/MAKE_DIRECTORY similarity index 74% rename from share/ert/forward-models/shell/make_directory_compatibility rename to share/ert/forward-models/old_style/MAKE_DIRECTORY index cb89dc7a12..e628b42e0e 100644 --- a/share/ert/forward-models/shell/make_directory_compatibility +++ b/share/ert/forward-models/old_style/MAKE_DIRECTORY @@ -2,7 +2,7 @@ STDERR make_directory.stderr STDOUT make_directory.stdout ARGLIST -EXECUTABLE script/make_directory +EXECUTABLE ../shell/script/make_directory MIN_ARG 1 MAX_ARG 1 diff --git a/share/ert/forward-models/shell/make_symlink_compatibility b/share/ert/forward-models/old_style/MAKE_SYMLINK similarity index 87% rename from share/ert/forward-models/shell/make_symlink_compatibility rename to share/ert/forward-models/old_style/MAKE_SYMLINK index 9b0849e878..007440b045 100644 --- a/share/ert/forward-models/shell/make_symlink_compatibility +++ b/share/ert/forward-models/old_style/MAKE_SYMLINK @@ -3,7 +3,7 @@ STDERR make_symlink.stderr STDOUT make_symlink.stdout -EXECUTABLE script/symlink +EXECUTABLE ../shell/script/symlink ARGLIST MIN_ARG 2 diff --git a/share/ert/forward-models/shell/move_file_compatibility b/share/ert/forward-models/old_style/MOVE_FILE similarity index 78% rename from share/ert/forward-models/shell/move_file_compatibility rename to share/ert/forward-models/old_style/MOVE_FILE index bdbb89b4ec..4c274a12f8 100644 --- a/share/ert/forward-models/shell/move_file_compatibility +++ b/share/ert/forward-models/old_style/MOVE_FILE @@ -1,7 +1,7 @@ STDERR move_file.stderr STDOUT move_file.stdout -EXECUTABLE script/move_file +EXECUTABLE ../shell/script/move_file ARGLIST MIN_ARG 2 diff --git a/share/ert/forward-models/res/RMS b/share/ert/forward-models/old_style/RMS similarity index 91% rename from share/ert/forward-models/res/RMS rename to share/ert/forward-models/old_style/RMS index ac9d532c35..a470b91c87 100644 --- a/share/ert/forward-models/res/RMS +++ b/share/ert/forward-models/old_style/RMS @@ -1,4 +1,4 @@ -EXECUTABLE script/rms +EXECUTABLE ../res/script/rms DEFAULT ./ DEFAULT ./ diff --git a/share/ert/forward-models/shell/symlink_compatibility b/share/ert/forward-models/old_style/SYMLINK similarity index 87% rename from share/ert/forward-models/shell/symlink_compatibility rename to share/ert/forward-models/old_style/SYMLINK index 9b0849e878..007440b045 100644 --- a/share/ert/forward-models/shell/symlink_compatibility +++ b/share/ert/forward-models/old_style/SYMLINK @@ -3,7 +3,7 @@ STDERR make_symlink.stderr STDOUT make_symlink.stdout -EXECUTABLE script/symlink +EXECUTABLE ../shell/script/symlink ARGLIST MIN_ARG 2 diff --git a/share/ert/forward-models/old_style/TEMPLATE_RENDER b/share/ert/forward-models/old_style/TEMPLATE_RENDER new file mode 100644 index 0000000000..a13b9e9ffa --- /dev/null +++ b/share/ert/forward-models/old_style/TEMPLATE_RENDER @@ -0,0 +1 @@ +EXECUTABLE ../templating/script/template_render diff --git a/share/ert/forward-models/res/rms b/share/ert/forward-models/res/rms new file mode 100644 index 0000000000..2da059aafd --- /dev/null +++ b/share/ert/forward-models/res/rms @@ -0,0 +1 @@ +EXECUTABLE script/rms diff --git a/share/ert/forward-models/templating/TEMPLATE_RENDER b/share/ert/forward-models/templating/template_render similarity index 100% rename from share/ert/forward-models/templating/TEMPLATE_RENDER rename to share/ert/forward-models/templating/template_render diff --git a/share/ert/site-config b/share/ert/site-config index 49b4538e2a..1f2c7b49db 100644 --- a/share/ert/site-config +++ b/share/ert/site-config @@ -7,6 +7,7 @@ JOB_SCRIPT ../../bin/job_dispatch.py INSTALL_JOB_DIRECTORY forward-models/res INSTALL_JOB_DIRECTORY forward-models/shell INSTALL_JOB_DIRECTORY forward-models/templating +INSTALL_JOB_DIRECTORY forward-models/old_style QUEUE_OPTION LOCAL MAX_RUNNING 1