diff --git a/common/windows/data/build.sh b/common/windows/data/build.sh index 950a1356e0..e3e3263a92 100755 --- a/common/windows/data/build.sh +++ b/common/windows/data/build.sh @@ -2,7 +2,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh" +. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe \ diff --git a/common/windows/delphi/build.sh b/common/windows/delphi/build.sh index d248f67197..d56cd71775 100755 --- a/common/windows/delphi/build.sh +++ b/common/windows/delphi/build.sh @@ -2,7 +2,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh" +. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe \ diff --git a/common/windows/delphi/components/build.sh b/common/windows/delphi/components/build.sh index 0b8fa1e83c..c4b06fa967 100755 --- a/common/windows/delphi/components/build.sh +++ b/common/windows/delphi/components/build.sh @@ -2,7 +2,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../../resources/build/build-utils.sh" +. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe "Build Keyman common Delphi components" clean configure build test diff --git a/common/windows/delphi/ext/build.sh b/common/windows/delphi/ext/build.sh index bada986871..2b4dd95916 100755 --- a/common/windows/delphi/ext/build.sh +++ b/common/windows/delphi/ext/build.sh @@ -2,7 +2,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../../resources/build/build-utils.sh" +. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe \ diff --git a/common/windows/delphi/ext/cef4delphi/build.sh b/common/windows/delphi/ext/cef4delphi/build.sh index 28c7327236..2df1afd62c 100755 --- a/common/windows/delphi/ext/cef4delphi/build.sh +++ b/common/windows/delphi/ext/cef4delphi/build.sh @@ -2,7 +2,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../../../resources/build/build-utils.sh" +. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe "Build cef4delphi component" clean configure build test diff --git a/common/windows/delphi/ext/dcpcrypt/build.sh b/common/windows/delphi/ext/dcpcrypt/build.sh index f9f74f302d..e21215446e 100755 --- a/common/windows/delphi/ext/dcpcrypt/build.sh +++ b/common/windows/delphi/ext/dcpcrypt/build.sh @@ -2,7 +2,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../../../resources/build/build-utils.sh" +. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe "Build dcpcrypt component" clean configure build test diff --git a/common/windows/delphi/ext/jwa/build.sh b/common/windows/delphi/ext/jwa/build.sh index 857c548977..bc716b26b5 100755 --- a/common/windows/delphi/ext/jwa/build.sh +++ b/common/windows/delphi/ext/jwa/build.sh @@ -2,7 +2,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../../../resources/build/build-utils.sh" +. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe "Build jwa component" clean configure build test diff --git a/common/windows/delphi/ext/sentry/build.sh b/common/windows/delphi/ext/sentry/build.sh index 994504ad5e..baf52c034f 100755 --- a/common/windows/delphi/ext/sentry/build.sh +++ b/common/windows/delphi/ext/sentry/build.sh @@ -2,7 +2,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../../../resources/build/build-utils.sh" +. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe "Build sentry component" clean configure build test diff --git a/common/windows/delphi/ext/tds2dbg/build.sh b/common/windows/delphi/ext/tds2dbg/build.sh index 5e21d003b5..b57d2cc32b 100755 --- a/common/windows/delphi/ext/tds2dbg/build.sh +++ b/common/windows/delphi/ext/tds2dbg/build.sh @@ -2,7 +2,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../../../resources/build/build-utils.sh" +. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe "Build tds2dbg component" clean configure build test diff --git a/common/windows/delphi/tools/build.sh b/common/windows/delphi/tools/build.sh index 7d0e2a0626..4f92daf167 100755 --- a/common/windows/delphi/tools/build.sh +++ b/common/windows/delphi/tools/build.sh @@ -2,7 +2,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../../resources/build/build-utils.sh" +. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe \ diff --git a/common/windows/delphi/tools/build_standards_data/build.sh b/common/windows/delphi/tools/build_standards_data/build.sh index e4831b85c9..4ac5dca9cb 100755 --- a/common/windows/delphi/tools/build_standards_data/build.sh +++ b/common/windows/delphi/tools/build_standards_data/build.sh @@ -2,7 +2,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../../../resources/build/build-utils.sh" +. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe "Build build_standards_data tool" clean configure build test diff --git a/common/windows/delphi/tools/buildunidata/build.sh b/common/windows/delphi/tools/buildunidata/build.sh index fa96a82192..656fc55163 100755 --- a/common/windows/delphi/tools/buildunidata/build.sh +++ b/common/windows/delphi/tools/buildunidata/build.sh @@ -2,7 +2,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../../../resources/build/build-utils.sh" +. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe "Build buildunidata tool" clean configure build test diff --git a/common/windows/delphi/tools/certificates/build.sh b/common/windows/delphi/tools/certificates/build.sh index 2cd3871cbd..378723a125 100755 --- a/common/windows/delphi/tools/certificates/build.sh +++ b/common/windows/delphi/tools/certificates/build.sh @@ -2,7 +2,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../../../resources/build/build-utils.sh" +. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe "Build and install test certificates" clean configure build test \ diff --git a/common/windows/delphi/tools/devtools/build.sh b/common/windows/delphi/tools/devtools/build.sh index fd4ced99b9..8edae2812f 100755 --- a/common/windows/delphi/tools/devtools/build.sh +++ b/common/windows/delphi/tools/devtools/build.sh @@ -2,7 +2,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../../../resources/build/build-utils.sh" +. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe "Build devtools tool" clean configure build test diff --git a/common/windows/delphi/tools/sentrytool/build.sh b/common/windows/delphi/tools/sentrytool/build.sh index c3c5af9407..620f5a4fde 100755 --- a/common/windows/delphi/tools/sentrytool/build.sh +++ b/common/windows/delphi/tools/sentrytool/build.sh @@ -2,7 +2,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../../../resources/build/build-utils.sh" +. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe "Build sentrytool tool" clean configure build test diff --git a/common/windows/delphi/tools/test-klog/build.sh b/common/windows/delphi/tools/test-klog/build.sh index 7c9f801a15..6290bba39a 100755 --- a/common/windows/delphi/tools/test-klog/build.sh +++ b/common/windows/delphi/tools/test-klog/build.sh @@ -2,7 +2,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../../../resources/build/build-utils.sh" +. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe "Build test-klog tool" clean configure build test verify diff --git a/common/windows/delphi/tools/verify_signatures/build.sh b/common/windows/delphi/tools/verify_signatures/build.sh index 05aa948df7..438bb4fdde 100755 --- a/common/windows/delphi/tools/verify_signatures/build.sh +++ b/common/windows/delphi/tools/verify_signatures/build.sh @@ -2,7 +2,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../../../resources/build/build-utils.sh" +. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe "Build verify_signatures tool" clean configure build test verify diff --git a/developer/build.sh b/developer/build.sh index 9c0b75e1ee..b75967a4ce 100755 --- a/developer/build.sh +++ b/developer/build.sh @@ -1,8 +1,9 @@ #!/usr/bin/env bash -## START STANDARD BUILD SCRIPT INCLUDE +## START STANDARD UTILITY SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../resources/build/builder.inc.sh" -## END STANDARD BUILD SCRIPT INCLUDE +. "${THIS_SCRIPT%/*}/../resources/build/build-utils.sh" +## END STANDARD UTILITY SCRIPT INCLUDE -./src/build.sh "$@" +# This is not a builder script but calls a builder script +"$THIS_SCRIPT_PATH/src/build.sh" "$@" diff --git a/developer/src/common/delphi/build.sh b/developer/src/common/delphi/build.sh index 777ae18113..e6e13988a0 100755 --- a/developer/src/common/delphi/build.sh +++ b/developer/src/common/delphi/build.sh @@ -2,7 +2,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../../resources/build/build-utils.sh" +. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe "Build Keyman Developer Delphi components" clean configure build test diff --git a/developer/src/common/web/build.sh b/developer/src/common/web/build.sh index d9a0aaf4fc..7ca90bd986 100755 --- a/developer/src/common/web/build.sh +++ b/developer/src/common/web/build.sh @@ -2,7 +2,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../../resources/build/build-utils.sh" +. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe \ diff --git a/developer/src/ext/browse4folder/Makefile b/developer/src/ext/browse4folder/Makefile deleted file mode 100644 index 7e01558963..0000000000 --- a/developer/src/ext/browse4folder/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# -# Keyman root Makefile -# - -!include ..\..\Defines.mak - -# ---------------------------------------------------------------------- - -build: dirs compile install - -compile: - @-mkdir obj\Win32\$(TARGET_PATH) - $(DCC32DPK) browse4folder.dpk - -install: - $(DEVTOOLS) -ip $(OUTLIB)\browse4folder.bpl - -# ---------------------------------------------------------------------- -# clean target -# ---------------------------------------------------------------------- - -clean: def-clean - $(CLEAN) *.bpl - -# ---------------------------------------------------------------------- - -!include ..\..\Target.mak - -# ---------------------------------------------------------------------- -# EOF -# ---------------------------------------------------------------------- diff --git a/developer/src/ext/browse4folder/build.sh b/developer/src/ext/browse4folder/build.sh index d7b40d5b16..8da285b5d3 100755 --- a/developer/src/ext/browse4folder/build.sh +++ b/developer/src/ext/browse4folder/build.sh @@ -2,7 +2,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../../resources/build/build-utils.sh" +. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe "Build browser4folder component" clean configure build test diff --git a/developer/src/ext/mbcolor/Makefile b/developer/src/ext/mbcolor/Makefile deleted file mode 100644 index b499c20995..0000000000 --- a/developer/src/ext/mbcolor/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# -# mbcolor Makefile (Tavultesoft) -# - -!include ..\..\Defines.mak - -build: dirs - @-mkdir obj\Win32\$(TARGET_PATH) - $(DCC32DPK) mbColorLibD10.dpk - $(MAKE) install - -install: - $(DEVTOOLS) -ip $(OUTLIB)\mbColorLibD10.bpl - $(DEVTOOLS) -ai $(DEVELOPER_ROOT)\src\ext\mbcolor - -clean: def-clean - -!include ..\..\Target.mak diff --git a/developer/src/ext/mbcolor/build.sh b/developer/src/ext/mbcolor/build.sh index b9120b00d3..fca6d2868a 100755 --- a/developer/src/ext/mbcolor/build.sh +++ b/developer/src/ext/mbcolor/build.sh @@ -2,7 +2,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../../resources/build/build-utils.sh" +. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe "Build mbcolor component" clean configure build test diff --git a/developer/src/ext/scfontcombobox/Makefile b/developer/src/ext/scfontcombobox/Makefile deleted file mode 100644 index 002a14408d..0000000000 --- a/developer/src/ext/scfontcombobox/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# -# scFontCombo Makefile -# - -!include ..\..\Defines.mak - -build: dirs - @-mkdir obj\Win32\$(TARGET_PATH) - $(DCC32DPK) scFontCombo.dpk - $(MAKE) install - -install: - $(DEVTOOLS) -ip $(OUTLIB)\scFontCombo.bpl - $(DEVTOOLS) -ai $(DEVELOPER_ROOT)\src\ext\scfontcombobox - -clean: def-clean - -!include ..\..\Target.mak diff --git a/developer/src/ext/scfontcombobox/build.sh b/developer/src/ext/scfontcombobox/build.sh index 1b6e44f9f9..01901f7bf7 100755 --- a/developer/src/ext/scfontcombobox/build.sh +++ b/developer/src/ext/scfontcombobox/build.sh @@ -2,7 +2,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../../resources/build/build-utils.sh" +. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe "Build scfontcombobox component" clean configure build test diff --git a/developer/src/kmanalyze/Makefile b/developer/src/kmanalyze/Makefile deleted file mode 100644 index 8d4c769811..0000000000 --- a/developer/src/kmanalyze/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# -# KMAnalyze Makefile -# - -!include ..\Defines.mak - -build: version.res dirs - $(MSBUILD) kmanalyze.vcxproj $(MSBUILD_BUILD) - $(COPY) $(WIN32_TARGET_PATH)\kmanalyze.exe $(DEVELOPER_PROGRAM) - $(COPY) $(WIN32_TARGET_PATH)\kmanalyze.pdb $(DEVELOPER_DEBUGPATH) - -clean: def-clean - $(MSBUILD) kmanalyze.sln $(MSBUILD_CLEAN) - -signcode: - $(SIGNCODE) /d "Keyman Developer Keyboard Analyzer" $(DEVELOPER_PROGRAM)\kmanalyze.exe - -wrap-symbols: - $(SYMSTORE) $(DEVELOPER_PROGRAM)\kmanalyze.exe /t keyman-developer - $(SYMSTORE) $(DEVELOPER_DEBUGPATH)\kmanalyze.pdb /t keyman-developer - -test-manifest: - @rem - -install: - $(COPY) $(DEVELOPER_PROGRAM)\kmanalyze.exe "$(INSTALLPATH_KEYMANDEVELOPER)\kmanalyze.exe" - -!include ..\Target.mak diff --git a/developer/src/kmc-analyze/Makefile b/developer/src/kmc-analyze/Makefile deleted file mode 100644 index e0f5ed559b..0000000000 --- a/developer/src/kmc-analyze/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# -# Keyman Developer - kmc analyze Compiler Makefile -# - -!include ..\Defines.mak - -# We don't depend on configure here because kmc does that already -build: .virtual - $(GIT_BASH_FOR_KEYMAN) build.sh build - -configure: .virtual - $(GIT_BASH_FOR_KEYMAN) build.sh configure - -clean: .virtual - $(GIT_BASH_FOR_KEYMAN) build.sh clean - -test: .virtual - $(GIT_BASH_FOR_KEYMAN) build.sh test - -# build.sh bundle must be run from shell as it requires a temp folder to be -# passed in. See inst/download.in.mak for instantiation. - -publish: .virtual - $(GIT_BASH_FOR_KEYMAN) build.sh publish - -signcode: - @rem nothing to do - -wrap-symbols: - @rem nothing to do - -test-manifest: - @rem nothing to do - -install: - @rem nothing to do - -!include ..\Target.mak diff --git a/developer/src/kmc-keyboard-info/Makefile b/developer/src/kmc-keyboard-info/Makefile deleted file mode 100644 index 72ee6d4ac3..0000000000 --- a/developer/src/kmc-keyboard-info/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# -# Keyman Developer - kmc keyboard-info Compiler Makefile -# - -!include ..\Defines.mak - -# We don't depend on configure here because kmc does that already -build: .virtual - $(GIT_BASH_FOR_KEYMAN) build.sh build - -configure: .virtual - $(GIT_BASH_FOR_KEYMAN) build.sh configure - -clean: .virtual - $(GIT_BASH_FOR_KEYMAN) build.sh clean - -test: .virtual - $(GIT_BASH_FOR_KEYMAN) build.sh test - -# build.sh bundle must be run from shell as it requires a temp folder to be -# passed in. See inst/download.in.mak for instantiation. - -publish: .virtual - $(GIT_BASH_FOR_KEYMAN) build.sh publish - -signcode: - @rem nothing to do - -wrap-symbols: - @rem nothing to do - -test-manifest: - @rem nothing to do - -install: - @rem nothing to do - -!include ..\Target.mak diff --git a/developer/src/kmc-kmn/Makefile b/developer/src/kmc-kmn/Makefile deleted file mode 100644 index 31ce8fcb9c..0000000000 --- a/developer/src/kmc-kmn/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -# -# Keyman Developer - kmc kmn Compiler Makefile -# - -!include ..\Defines.mak - -build: .virtual - $(GIT_BASH_FOR_KEYMAN) build.sh build - -configure: .virtual - $(GIT_BASH_FOR_KEYMAN) build.sh configure - -clean: .virtual - $(GIT_BASH_FOR_KEYMAN) build.sh clean - -test: .virtual - $(GIT_BASH_FOR_KEYMAN) build.sh test - -# build.sh bundle must be run from shell as it requires a temp folder to be -# passed in. See inst/download.in.mak for instantiation. - -publish: .virtual - $(GIT_BASH_FOR_KEYMAN) build.sh publish - -signcode: - @rem nothing to do - -wrap-symbols: - @rem nothing to do - -test-manifest: - @rem nothing to do - -install: - @rem nothing to do - -!include ..\Target.mak diff --git a/developer/src/kmc-ldml/Makefile b/developer/src/kmc-ldml/Makefile deleted file mode 100644 index 3cf3ac055a..0000000000 --- a/developer/src/kmc-ldml/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# Keyman Developer - kmc Keyboard Compiler Makefile -# - -!include ..\Defines.mak - -# We do configure here because parent Makefile calls this first; other -# kmc and kmc-* makefiles don't do it -build: configure .virtual - $(GIT_BASH_FOR_KEYMAN) build.sh build - -configure: .virtual - $(GIT_BASH_FOR_KEYMAN) build.sh configure - -clean: .virtual - $(GIT_BASH_FOR_KEYMAN) build.sh clean - -test: .virtual - $(GIT_BASH_FOR_KEYMAN) build.sh test - -# build.sh bundle must be run from shell as it requires a temp folder to be -# passed in. See inst/download.in.mak for instantiation. - -publish: .virtual - $(GIT_BASH_FOR_KEYMAN) build.sh publish - -signcode: - @rem nothing to do - -wrap-symbols: - @rem nothing to do - -test-manifest: - @rem nothing to do - -install: - @rem nothing to do - -!include ..\Target.mak diff --git a/developer/src/kmc-model/Makefile b/developer/src/kmc-model/Makefile deleted file mode 100644 index b41bbe8184..0000000000 --- a/developer/src/kmc-model/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# -# Keyman Developer - kmc Model Compiler Makefile -# - -!include ..\Defines.mak - -# We don't depend on configure here because kmc-ldml does that already -build: .virtual - $(GIT_BASH_FOR_KEYMAN) build.sh build - -configure: .virtual - $(GIT_BASH_FOR_KEYMAN) build.sh configure - -clean: .virtual - $(GIT_BASH_FOR_KEYMAN) build.sh clean - -test: .virtual - $(GIT_BASH_FOR_KEYMAN) build.sh test - -# build.sh bundle must be run from shell as it requires a temp folder to be -# passed in. See inst/download.in.mak for instantiation. - -publish: .virtual - $(GIT_BASH_FOR_KEYMAN) build.sh publish - -signcode: - @rem nothing to do - -wrap-symbols: - @rem nothing to do - -test-manifest: - @rem nothing to do - -install: - @rem nothing to do - -!include ..\Target.mak diff --git a/developer/src/kmc-package/Makefile b/developer/src/kmc-package/Makefile deleted file mode 100644 index 0a5ba6a1c1..0000000000 --- a/developer/src/kmc-package/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# -# Keyman Developer - kmc Package Compiler Makefile -# - -!include ..\Defines.mak - -# We don't depend on configure here because kmc-ldml does that already -build: .virtual - $(GIT_BASH_FOR_KEYMAN) build.sh build - -configure: .virtual - $(GIT_BASH_FOR_KEYMAN) build.sh configure - -clean: .virtual - $(GIT_BASH_FOR_KEYMAN) build.sh clean - -test: .virtual - $(GIT_BASH_FOR_KEYMAN) build.sh test - -# build.sh bundle must be run from shell as it requires a temp folder to be -# passed in. See inst/download.in.mak for instantiation. - -publish: .virtual - $(GIT_BASH_FOR_KEYMAN) build.sh publish - -signcode: - @rem nothing to do - -wrap-symbols: - @rem nothing to do - -test-manifest: - @rem nothing to do - -install: - @rem nothing to do - -!include ..\Target.mak diff --git a/developer/src/kmc/Makefile b/developer/src/kmc/Makefile deleted file mode 100644 index 1078ab1a67..0000000000 --- a/developer/src/kmc/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# Keyman Developer - next generation compiler Makefile -# - -!include ..\Defines.mak - -# We don't depend on configure here because kmc-ldml does that already, -# called from parent folder Makefile -build: .virtual - $(GIT_BASH_FOR_KEYMAN) build.sh build - -configure: .virtual - $(GIT_BASH_FOR_KEYMAN) build.sh configure - -clean: .virtual - $(GIT_BASH_FOR_KEYMAN) build.sh clean - -test: .virtual - $(GIT_BASH_FOR_KEYMAN) build.sh test - -# build.sh bundle must be run from shell as it requires a temp folder to be -# passed in. See inst/download.in.mak for instantiation. - -publish: .virtual - $(GIT_BASH_FOR_KEYMAN) build.sh publish - -signcode: - @rem nothing to do - -wrap-symbols: - @rem nothing to do - -test-manifest: - @rem nothing to do - -install: - @rem nothing to do - -!include ..\Target.mak diff --git a/developer/src/kmconvert/Makefile b/developer/src/kmconvert/Makefile deleted file mode 100644 index 2b31c63bda..0000000000 --- a/developer/src/kmconvert/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# -# Kmconvert Makefile -# - -!include ..\Defines.mak - -build: version.res manifest.res dirs icons - $(DELPHI_MSBUILD) kmconvert.dproj "/p:Platform=Win32" - - $(SENTRYTOOL_DELPHIPREP) $(WIN32_TARGET_PATH)\kmconvert.exe -dpr kmconvert.dpr - $(TDS2DBG) $(WIN32_TARGET_PATH)\kmconvert.exe - $(COPY) $(WIN32_TARGET_PATH)\kmconvert.exe $(DEVELOPER_PROGRAM) - if exist $(WIN32_TARGET_PATH)\kmconvert.dbg $(COPY) $(WIN32_TARGET_PATH)\kmconvert.dbg $(DEVELOPER_DEBUGPATH) - -# Copy template files to project - -rd /s/q $(DEVELOPER_PROGRAM)\projects\templates - -mkdir $(DEVELOPER_PROGRAM)\projects\templates - xcopy /s /y data\* $(DEVELOPER_PROGRAM)\projects\templates - -icons: - rc icons.rc - -clean: def-clean - if exist icons.res del icons.res - -signcode: - $(SIGNCODE) /d "Keyman Developer Conversion Utility" $(DEVELOPER_PROGRAM)\kmconvert.exe - -wrap-symbols: - $(SYMSTORE) $(DEVELOPER_PROGRAM)\kmconvert.exe /t keyman-developer - $(SYMSTORE) $(DEVELOPER_DEBUGPATH)\kmconvert.dbg /t keyman-developer - -test-manifest: -# test that (a) linked manifest exists and correct - $(MT) -nologo -inputresource:$(DEVELOPER_PROGRAM)\kmconvert.exe -validate_manifest - -install: - $(COPY) $(DEVELOPER_PROGRAM)\kmconvert.exe "$(INSTALLPATH_KEYMANDEVELOPER)\kmconvert.exe" - -!include ..\Target.mak diff --git a/developer/src/kmdecomp/Makefile b/developer/src/kmdecomp/Makefile deleted file mode 100644 index d80531ecc9..0000000000 --- a/developer/src/kmdecomp/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# -# kmdecomp Makefile -# - -!include ..\Defines.mak - - -build: version.res dirs - $(MSBUILD) kmdecomp.sln $(MSBUILD_BUILD) "/p:Platform=Win32" - $(COPY) $(WIN32_TARGET_PATH)\kmdecomp.exe $(DEVELOPER_PROGRAM) - $(COPY) $(WIN32_TARGET_PATH)\kmdecomp.pdb $(DEVELOPER_DEBUGPATH) - -clean: def-clean - $(MSBUILD) kmdecomp.sln $(MSBUILD_CLEAN) - -signcode: - $(SIGNCODE) /d "Keyman Developer Decompiler" $(DEVELOPER_PROGRAM)\kmdecomp.exe - -wrap-symbols: - $(SYMSTORE) $(DEVELOPER_PROGRAM)\kmdecomp.exe /t keyman-developer - $(SYMSTORE) $(DEVELOPER_DEBUGPATH)\kmdecomp.pdb /t keyman-developer - -test-manifest: - @rem This target needed as dependency for KMDECOMP - -install: - $(COPY) $(DEVELOPER_PROGRAM)\kmdecomp.exe "$(INSTALLPATH_KEYMANDEVELOPER)\kmdecomp.exe" - -!include ..\Target.mak diff --git a/developer/src/test/auto/Makefile b/developer/src/test/auto/Makefile deleted file mode 100644 index bb5e826f81..0000000000 --- a/developer/src/test/auto/Makefile +++ /dev/null @@ -1,111 +0,0 @@ -# -# E2E and Unit Tests for Keyman Developer projects -# - -# ---------------------------------------------------------------------- - -TARGETS=developer-tests - -test: - $(MAKE) "TARGET=test" $(TARGETS) - -!include ..\..\Header.mak - -# ---------------------------------------------------------------------- - -developer-tests: \ - compile-supplementary-support \ - keyboard-js-info \ - kmcomp \ - kmconvert \ - kmx-file-languages \ - model-ts-parser \ - package-info \ - kmc \ - kmc-analyze \ - kmc-keyboard-info \ - kmc-kmn \ - kmc-ldml \ - kmc-model \ - kmc-model-info \ - kmc-package \ - kmcmplib - -# ---------------------------------------------------------------------- - -compile-supplementary-support: .virtual - cd $(DEVELOPER_ROOT)\src\test\auto\compile-supplementary-support - $(MAKE) $(TARGET) - -keyboard-js-info: .virtual - cd $(DEVELOPER_ROOT)\src\test\auto\keyboard-js-info - $(MAKE) $(TARGET) - -kmx-file-languages: .virtual - cd $(DEVELOPER_ROOT)\src\test\auto\kmx-file-languages - $(MAKE) $(TARGET) - -kmcomp: .virtual - cd $(DEVELOPER_ROOT)\src\test\auto\kmcomp - $(MAKE) $(TARGET) - -kmconvert: .virtual - cd $(DEVELOPER_ROOT)\src\test\auto\kmconvert - $(MAKE) $(TARGET) - -model-ts-parser: .virtual - rem TODO -# cd $(DEVELOPER_ROOT)\src\test\auto\model-ts-parser -# $(MAKE) $(TARGET) - -package-info: .virtual - cd $(DEVELOPER_ROOT)\src\test\auto\package-info - $(MAKE) $(TARGET) - -# ---------------------------------------------------------------------- -# Tests outside the test/auto folder -# ---------------------------------------------------------------------- - -kmc: .virtual - cd $(DEVELOPER_ROOT)\src\kmc - $(MAKE) $(TARGET) - -kmc-analyze: .virtual - cd $(DEVELOPER_ROOT)\src\kmc-analyze - $(MAKE) $(TARGET) - -kmc-keyboard-info: .virtual - cd $(DEVELOPER_ROOT)\src\kmc-keyboard-info - $(MAKE) $(TARGET) - -kmc-kmn: .virtual - cd $(DEVELOPER_ROOT)\src\kmc-kmn - $(MAKE) $(TARGET) - -kmc-ldml: .virtual - cd $(DEVELOPER_ROOT)\src\kmc-ldml - $(MAKE) $(TARGET) - -kmc-model: .virtual - cd $(DEVELOPER_ROOT)\src\kmc-model - $(MAKE) $(TARGET) - -kmc-model-info: .virtual - cd $(DEVELOPER_ROOT)\src\kmc-model-info - $(MAKE) $(TARGET) - -kmc-package: .virtual - cd $(DEVELOPER_ROOT)\src\kmc-package - $(MAKE) $(TARGET) - -kmcmplib: .virtual - cd $(DEVELOPER_ROOT)\src\kmcmplib - $(MAKE) $(TARGET) - -# ---------------------------------------------------------------------- - -!include ..\..\Target.mak - -# ---------------------------------------------------------------------- -# EOF -# ---------------------------------------------------------------------- diff --git a/developer/src/test/auto/compile-supplementary-support/Makefile b/developer/src/test/auto/compile-supplementary-support/Makefile deleted file mode 100644 index f2bff60933..0000000000 --- a/developer/src/test/auto/compile-supplementary-support/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# -# test if KS=1 is in the right files, both in debug and non-debug versions -# - -KMC="..\..\..\..\bin\kmc.cmd" build -KMC_DEBUG=$(KMC) -d - -test: test-nodebug test-debug - -KMN=i3317_nosupp.kmn i3317_withsupp.kmn i3317_withsupp_incontext.kmn i3317_withsupp_inmatch.kmn i3317_withsupp_innomatch.kmn i3317_withsupp_instore.kmn - -# TODO: replace with build.sh script -test-nodebug: - $(KMC) $(KMN) - findstr /v /m "KS=1" i3317_nosupp.js - findstr /m "KS=1" i3317_withsupp.js - findstr /m "KS=1" i3317_withsupp_incontext.js - findstr /m "KS=1" i3317_withsupp_inmatch.js - findstr /m "KS=1" i3317_withsupp_innomatch.js - findstr /m "KS=1" i3317_withsupp_instore.js - -test-debug: - $(KMC_DEBUG) $(KMN) - findstr /v /m "KS=1" i3317_nosupp.js - findstr /m "KS=1" i3317_withsupp.js - findstr /m "KS=1" i3317_withsupp_incontext.js - findstr /m "KS=1" i3317_withsupp_inmatch.js - findstr /m "KS=1" i3317_withsupp_innomatch.js - findstr /m "KS=1" i3317_withsupp_instore.js - -clean: - -del *.js - -del *.json diff --git a/developer/src/test/auto/keyboard-js-info/Makefile b/developer/src/test/auto/keyboard-js-info/Makefile deleted file mode 100644 index e81ce4cd07..0000000000 --- a/developer/src/test/auto/keyboard-js-info/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# -# Test the read of basic keyboard info info from js files -# -# NOTE: The .dproj needs $(CI) added to the Delphi Compiler/Conditional defines (All -# configurations - all platforms) section in order for the CI flag to be passed in. -# (It's best to make this change in Delphi IDE). -# - -!include ..\..\..\Defines.mak - -test: build - $(WIN32_TARGET_PATH)\keyboardjsinfotestsuite.exe -b -exit:continue - -build: - $(DELPHI_MSBUILD) "/p:CI=CI" keyboardjsinfotestsuite.dproj - -clean: def-clean - -!include ..\..\..\Target.mak diff --git a/developer/src/test/auto/kmcomp/Makefile b/developer/src/test/auto/kmcomp/Makefile deleted file mode 100644 index cbbeb5c8a1..0000000000 --- a/developer/src/test/auto/kmcomp/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# -# Test that kmc passes various compile tests -# -# Uses kmc.js (via kmc.cmd) rather than attempting to run a separate test -# - -!include ..\..\..\Defines.mak - -test: build - test.bat -c $(DEVELOPER_PROGRAM)\kmc.cmd - -build: - rem Nothing to do - -clean: def-clean - -del *.kmx - -del *.js - -del *.kmp - -del *.kpj.user - -!include ..\..\..\Target.mak diff --git a/developer/src/test/auto/kmconvert/Makefile b/developer/src/test/auto/kmconvert/Makefile deleted file mode 100644 index 2bb73846c1..0000000000 --- a/developer/src/test/auto/kmconvert/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# -# Test kmconvert various units -# -# NOTE: The .dproj needs $(CI) added to the Delphi Compiler/Conditional defines (All -# configurations - all platforms) section in order for the CI flag to be passed in. -# (It's best to make this change in Delphi IDE). -# - -!include ..\..\..\Defines.mak - -test: build - $(WIN32_TARGET_PATH)\kmconverttest.exe -b -exit:continue - -build: - $(DELPHI_MSBUILD) "/p:CI=CI" kmconverttest.dproj - -clean: def-clean - -!include ..\..\..\Target.mak diff --git a/developer/src/test/auto/kmx-file-languages/Makefile b/developer/src/test/auto/kmx-file-languages/Makefile deleted file mode 100644 index 7ac6ea1629..0000000000 --- a/developer/src/test/auto/kmx-file-languages/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# -# Test the read of language info from kmx files and translation -# from legacy ids to BCP47 -# -# NOTE: The .dproj needs $(CI) added to the Delphi Compiler/Conditional defines (All -# configurations - all platforms) section in order for the CI flag to be passed in. -# (It's best to make this change in Delphi IDE). -# - -!include ..\..\..\Defines.mak - -test: build - $(WIN32_TARGET_PATH)\kmxfilelanguagestestsuite.exe -b -exit:continue - -build: - $(DELPHI_MSBUILD) "/p:CI=CI" kmxfilelanguagestestsuite.dproj - -clean: def-clean - -!include ..\..\..\Target.mak diff --git a/developer/src/test/auto/package-info/Makefile b/developer/src/test/auto/package-info/Makefile deleted file mode 100644 index face4c24ea..0000000000 --- a/developer/src/test/auto/package-info/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# -# Test the PackageInfo file format read and write - xml and inf -# - -!include ..\..\..\Defines.mak - -test: build - $(WIN32_TARGET_PATH)\packageinfotestsuite.exe -b -exit:continue - -build: - $(DELPHI_MSBUILD) "/p:CI=CI" packageinfotestsuite.dproj - -clean: def-clean - -del test\*.out.* - -!include ..\..\..\Target.mak diff --git a/developer/src/tike/tests/Makefile b/developer/src/tike/tests/Makefile deleted file mode 100644 index 245e1bd609..0000000000 --- a/developer/src/tike/tests/Makefile +++ /dev/null @@ -1,11 +0,0 @@ - -!include ..\..\Defines.mak - -all: - for %d in (*.kmn) do $(DEVELOPER_PROGRAM)\kmc.cmd build "%d" - -.kmn.kmx: - &$(DEVELOPER_PROGRAM)\kmc.cmd build $** - -clean: - -del *.kmx diff --git a/developer/src/tools/verify_signatures/Makefile b/developer/src/tools/verify_signatures/Makefile deleted file mode 100644 index 003f6aa5d5..0000000000 --- a/developer/src/tools/verify_signatures/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# -# test for signatures and version information being correct in bin folder -# - -!include ..\..\Defines.mak - -test: prereq - $(SIGCHECK) $(DEVELOPER_PROGRAM)\* > sig1 - $(VERIFY_SIGNATURES) < sig1 - -# prereq may not be needed? -prereq: - cd $(VERIFY_SIGNATURES_PATH) - $(MAKE) - -clean: def-clean - -del sig1 - -!include ..\..\Target.mak