From 49feeea57b4309e90b5582e125793473dd5a6f6b Mon Sep 17 00:00:00 2001 From: MarkS Date: Fri, 8 Apr 2022 10:36:34 -0600 Subject: [PATCH] dev: set EC dirs in run-fw Change-Id: Id5a019fa373d1ef4080e09473d8f3e38e9ef72f9 --- Build/run-fw | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Build/run-fw b/Build/run-fw index 0dcf53de1c..f2f2e7166e 100755 --- a/Build/run-fw +++ b/Build/run-fw @@ -14,6 +14,8 @@ fw_registry_utils_dir="${repo_root}/Bin" dist_files_dir="${repo_root}/DistFiles" CONFIGURATION="${CONFIGURATION-Debug}" output_configuration_dir="${repo_root}/Output/${CONFIGURATION}" +ec_plugin_dir="/usr/lib/fieldworks/EC/Plugins" +ec_root_dir="/usr/lib/fieldworks" cd "${repo_root}/" FLEXBRIDGE_CONFIGURATION="${FLEXBRIDGE_CONFIGURATION-Debug}" @@ -34,10 +36,20 @@ ReadKey() { for registry in LM CU; do WriteKey ${registry} "Software/SIL/FieldWorks/9" "RootCodeDir" "${dist_files_dir}" + WriteKey ${registry} "Software/SIL/SilEncConverters40" "PluginDir" "${ec_plugin_dir}" + WriteKey ${registry} "Software/SIL/SilEncConverters40" "RootDir" "${ec_root_dir}" # It's not clear if "Primary Interop Assemblies" is being used by anything # other than NMock. WriteKey ${registry} "Software/Microsoft/.NETFramework/AssemblyFolders" \ "Primary Interop Assemblies" "${output_configuration_dir}" + devPluginDir="$(ReadKey ${registry} "Software/SIL/SilEncConverters40" "DeveloperPluginDir" 2>/dev/null || true)" + if [[ ${devPluginDir} != "" ]]; then + newValue="${ec_plugin_dir}" + echo "Warning: Registry setting ${registry} SilEncConverters40" \ + "DeveloperPluginDir is set. Its value is \'${devPluginDir}\'." \ + "Changing it to \'${newValue}\'." + WriteKey ${registry} "Software/SIL/SilEncConverters40" "DeveloperPluginDir" "${newValue}" + fi done FW_EXE="${output_configuration_dir}/FieldWorks.exe"