refactor(common): move keymanversion_build.in to /common/include

common/include/.gitignore

@@ -0,0 +1,2 @@
+keymanversion_build.h
+.keymanversion_build.configured

common/include/build.sh

@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+#
+# Creates keymanversion_build.h
+#
+
+# Exit on command failure and when using unset variables:
+set -eu
+
+## START STANDARD BUILD SCRIPT INCLUDE
+# adjust relative paths as necessary
+THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
+. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+## END STANDARD BUILD SCRIPT INCLUDE
+
+cd "$THIS_SCRIPT_PATH"
+
+builder_describe "Build keymanversion_build.h" configure build clean
+
+builder_describe_outputs \
+  configure     /common/include/.keymanversion_build.configured \
+  build         /common/include/keymanversion_build.h
+
+builder_parse "$@"
+
+#-------------------------------------------------------------------------------------------------------------------
+
+if builder_start_action clean; then
+  rm -f keymanversion_build.h .keymanversion_build.configured
+  builder_finish_action success clean
+fi
+
+if builder_start_action configure; then
+  # no-op, keeping 'configure' for deps
+  touch .keymanversion_build.configured
+  builder_finish_action success configure
+fi
+
+if builder_start_action build; then
+  replaceVersionStrings_Mkver keymanversion_build.in keymanversion_build.h
+  builder_finish_action success build
+fi

common/windows/cpp/include/.gitignore

@@ -1 +0,0 @@
-keymanversion_build.h

common/windows/cpp/include/keymanversion.h

@@ -1,7 +1,7 @@
 #ifndef _KEYMANVERSION_H
 #define _KEYMANVERSION_H
 
-#include "keymanversion_build.h"
+#include "../../../include/keymanversion_build.h"
 
 // We should not need to add to these hard-coded version numbers for future versions, unless
 // we have a back-compat need to refer to a specific version.

common/windows/delphi/Makefile

@@ -1,10 +1,9 @@
 !include Defines.mak
 
 global-versions:
-# Build our root version.txt
+# Build our root version.txt; TODO: replace with build.sh deps
     cd $(KEYMAN_ROOT)\common\windows
-
-    $(MKVER_U) $(KEYMAN_ROOT)\common\windows\cpp\include\keymanversion_build.in $(KEYMAN_ROOT)\common\windows\cpp\include\keymanversion_build.h
     $(MKVER_U) $(KEYMAN_ROOT)\common\windows\delphi\general\keymanversion_build.in $(KEYMAN_ROOT)\common\windows\delphi\general\keymanversion_build.inc
+    $(GIT_BASH_FOR_KEYMAN) $(KEYMAN_ROOT)/common/include/build.sh clean configure build
 
 !include Target.mak

developer/src/Makefile

@@ -257,7 +257,7 @@ build-tools:
 
 global-versions:
     cd $(COMMON_ROOT)
-    @if not exist $(KEYMAN_ROOT)\common\windows\cpp\include\keymanversion_build.h $(MAKE) global-versions
+    @if not exist $(KEYMAN_ROOT)\include\keymanversion_build.h $(MAKE) global-versions
     cd $(DEVELOPER_ROOT)\src
 
 build-tools-internal:

developer/src/kmc/build.sh

@@ -17,6 +17,7 @@ cd "$THIS_SCRIPT_PATH"
 . "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
 
 builder_describe "Build Keyman Keyboard Compiler kmc" \
+  "@/common/include" \
   "@/common/web/keyman-version" \
   "@/common/web/types" \
   "@/developer/src/kmc-keyboard" \

windows/src/Makefile

@@ -276,7 +276,7 @@ build-tools:
 
 global-versions:
     cd $(COMMON_ROOT)
-    @if not exist $(KEYMAN_ROOT)\common\windows\cpp\include\keymanversion_build.h $(MAKE) global-versions
+    @if not exist $(KEYMAN_ROOT)\include\keymanversion_build.h $(MAKE) global-versions
     cd $(ROOT)\src
 
 message-constants: build-tools

windows/src/Target.mak

@@ -17,7 +17,7 @@ versionhistory-app2:
 
 devtools-app: dirs
     cd $(COMMON_ROOT)
-    @if not exist $(KEYMAN_ROOT)\common\windows\cpp\include\keymanversion_build.h $(MAKE) global-versions
+    @if not exist $(KEYMAN_ROOT)\include\keymanversion_build.h $(MAKE) global-versions
     cd $(COMMON_ROOT)\tools\devtools
     $(MAKE)
     cd $(ROOT)\src

windows/src/global/Makefile

@@ -20,7 +20,7 @@ build-release:
 
 clean:
   -del $(ROOT)\src\global\delphi\general\keymanversion_build.inc
-  -del $(KEYMAN_ROOT)\common\windows\cpp\include\keymanversion_build.h
+  $(GIT_BASH_FOR_KEYMAN) $(KEYMAN_ROOT)/common/include/build.sh clean
 
   cd $(ROOT)\src\global\delphi
   $(MAKE) clean