modeling: remove support for Dia and JSON

Author: mcraveiro

CMakeLists.txt

@@ -393,40 +393,7 @@ if (DOGEN_CLI_EXECUTABLE)
     set(DOGEN_GENERATION_OPTIONS --output-directory ${projects_dir}/)
 endif()
 
-if (WITH_JSON_VALIDATION)
-    add_custom_target(iaj)
-    add_custom_target(vaj)
-
-    add_dependencies(iaj indent_all_json)
-    add_dependencies(vaj indent_all_json)
-endif()
-
-#
-# benchmarks
-#
-if(NOT UNIX)
-    set(WITH_BENCHMARKS "off")
-endif()
-
-if(WITH_BENCHMARKS)
-    set(benchmark_repeats "20")
-    set(benchmark_command "${CMAKE_SOURCE_DIR}/build/scripts/benchmark.linux.sh")
-    set(benchmark_directory "${stage_test_data_dir}/benchmarks/actual")
-    set(benchmark_prefix "")
-    if(NOT EXISTS "${benchmark_directory}")
-        make_directory("${benchmark_directory}")
-    endif()
-
-    add_custom_target(benchmark_stats)
-    add_custom_target(benchmark_all)
-    add_custom_target(ba)
-    add_dependencies(ba benchmark_all)
-
-    add_custom_target(benchmark_dia)
-    add_custom_target(benchmark_json)
-    add_custom_target(benchmark_org)
-    add_dependencies(benchmark_all benchmark_dia)
-endif()
+set(WITH_BENCHMARKS "off")
 
 #
 # include all sub directories

README.md

@@ -43,7 +43,7 @@ or its abbreviation ```rat```.
 ## Regenerating Models
 
 If you'd like to run Dogen to regenerate all models, you can do so by using the
-target ```generate_all_dia``` or its abbreviation ```gad```. This is useful, for
+target ```generate_all_org``` or its abbreviation ```gao```. This is useful, for
 example, to update the Reference Implementation to the latest version of Dogen,
 or just to see how Dogen works. However, note that Dogen must be on the path for
 the target to become available. If you installed Dogen via a package, it's
@@ -58,9 +58,6 @@ After regeneration, you can then use ```git diff``` to inspect the differences
 produced by regeneration, if any. The build directory contains all of the logs,
 under the directory ```log```.
 
-If you'd like to regenerate ODB code, you can use the target ```odb_all``` or
-the abbreviated target ```oa```. Note that
-
 # Test Models
 
 The Reference Implementation is composed of a number of test models. These can

projects/cpp_ref_impl.models/CMakeLists.txt

@@ -17,79 +17,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA 02110-1301, USA.
 #
-set(input_dir "json")
-set(output_dir "${CMAKE_CURRENT_SOURCE_DIR}/json")
-set(folder "${CMAKE_CURRENT_SOURCE_DIR}/json")
-if (WITH_JSON_VALIDATION)
-    set(files "")
 
-    file(GLOB_RECURSE files RELATIVE
-        "${CMAKE_CURRENT_SOURCE_DIR}/${input_dir}"
-        "${CMAKE_CURRENT_SOURCE_DIR}/${input_dir}/*.json")
-
-    set(target "models.json")
-    add_custom_target(validate_${target})
-    add_dependencies(validate_all_json validate_${target})
-
-    add_custom_target(indent_${target})
-    add_dependencies(indent_all_json indent_${target})
-
-    foreach(file ${files})
-        add_custom_target(validate_${file}
-            COMMENT "Validating JSON for ${target}/${file}."
-            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-            COMMAND ${JQ_COMMAND} . ${folder}/${file} > /dev/null)
-        add_dependencies(validate_${target} validate_${file})
-
-        add_custom_target(indent_${file}
-            COMMENT "Indenting JSON for ${target}/${file}."
-            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-            COMMAND ${JQ_COMMAND} . ${folder}/${file} > ${folder}/${file}_tmp
-            COMMAND mv ${folder}/${file}_tmp ${folder}/${file})
-        add_dependencies(indent_${target} indent_${file})
-
-    endforeach()
-endif()
-
-#
-# Conversion targets
-#
 if (DOGEN_CLI_EXECUTABLE)
-    #
-    # Model conversion
-    #
-    file(GLOB models "dia/*.dia")
-    foreach(model ${models})
-        set(model_name "")
-        get_filename_component(model_name ${model} NAME)
-
-        set(output_dir "${CMAKE_CURRENT_SOURCE_DIR}/json")
-        set(destination_name ${output_dir}/${model_name})
-        string(REGEX REPLACE ".dia$" ".json" destination_name
-            ${destination_name})
-
-        add_custom_target(convert_${model_name}_json
-            COMMENT "Converting ${model_name} to JSON."
-            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-            COMMAND ${DOGEN_CLI_EXECUTABLE} convert
-            --source ${model} --destination ${destination_name}
-            ${DOGEN_COMMON_OPTIONS})
-        add_dependencies(convert_all_json convert_${model_name}_json)
-
-        set(output_dir "${CMAKE_CURRENT_SOURCE_DIR}/org")
-        set(destination_name ${output_dir}/${model_name})
-        string(REGEX REPLACE ".dia$" ".org" destination_name
-            ${destination_name})
-
-        add_custom_target(convert_${model_name}_org
-            COMMENT "Converting ${model_name} to org-mode."
-            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-            COMMAND ${DOGEN_CLI_EXECUTABLE} convert
-            --source ${model} --destination ${destination_name}
-            ${DOGEN_COMMON_OPTIONS})
-        add_dependencies(convert_all_org convert_${model_name}_org)
-    endforeach()
-
     # input models
     set(models cpp_ref_impl.directory_settings)
     set(models ${models} cpp_ref_impl.northwind)
@@ -122,6 +51,4 @@ if (DOGEN_CLI_EXECUTABLE)
     # set(models ${models} cpp_ref_impl.out_of_sync)
 endif()
 
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/dia)
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/json)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/org)