Skip to content
Snippets Groups Projects
Commit 96188e0d authored by Anders Lindh Olsson's avatar Anders Lindh Olsson :8ball:
Browse files

Drop file extension from `build_number.sh`

parent 1a730d71
No related branches found
No related tags found
1 merge request!111Various cleanup, including deletion of `runScript`
Pipeline #122748 passed with warnings
......@@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* Remove Win32 and CYGWIN32 support
* Remove `/tools` directory, including `test_installed_modules.sh` utility
* Remove `runScript`
* Drop file extension from `build_number.sh`
## [4.0.0]
......
......@@ -24,7 +24,7 @@ install: requireconf
requireconf: e3-site-path e3-require-path
$(QUIET) install -m 755 $(wildcard $(E3_MODULE_SRC_PATH)/tools/*.tcl) $(E3_REQUIRE_TOOLS)/
$(QUIET) install -m 644 $(E3_MODULE_SRC_PATH)/tools/driver.makefile $(E3_REQUIRE_TOOLS)/
$(QUIET) install -m 755 $(E3_MODULE_SRC_PATH)/tools/*.sh $(E3_REQUIRE_TOOLS)/
$(QUIET) install -m 755 $(E3_MODULE_SRC_PATH)/tools/build_number $(E3_REQUIRE_TOOLS)/
$(QUIET) install -m 755 $(E3_SHELL_FILES) $(E3_REQUIRE_BIN)/
$(QUIET) install -m 644 $(E3_IOC_CFG_FILES) $(E3_REQUIRE_BIN)/
$(QUIET) install -m 644 $(E3_REQUIRE_CONF_FILES) $(E3_REQUIRE_CONFIG)/
......
File moved
......@@ -141,7 +141,7 @@ endef
# $(call FETCH_BUILD_NUMBER,$(E3_SITEMODS_PATH),module)
#
define FETCH_BUILD_NUMBER
$(shell $(MAKEHOME)/build_number.sh $(1) $(2) $($(2)_VERSION))
$(shell $(MAKEHOME)/build_number $(1) $(2) $($(2)_VERSION))
endef
# Functions used for recursive dependency fetching. These are modified from https://github.com/markpiffer/gmtt.git
......@@ -446,7 +446,7 @@ INSTALL_INCLUDES =
#
# The default behaviour is to start with <module>_VERSION and to select the highest
# available build number, unless a build no. is specified. This is determined with the
# shell script build_number.sh included with require.
# shell script `build_number` included with require.
define ADD_INCLUDES_TEMPLATE
INSTALL_INCLUDES += $$(patsubst %,-I${2}/${1}/%/include,$${${1}_VERSION})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment