Skip to content
Snippets Groups Projects
Commit e9193a26 authored by Simon Rose's avatar Simon Rose
Browse files

Updating E3_GIT_STATUS variable

parent c8032528
No related branches found
No related tags found
1 merge request!23.3.0
......@@ -12,7 +12,7 @@ E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += E3_SITEMODS_PATH="$(E3_SITEMODS_PATH)"
E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += E3_SITEAPPS_PATH="$(E3_SITEAPPS_PATH)"
E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += E3_SITELIBS_PATH="$(E3_SITELIBS_PATH)"
E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += $(E3_MODULE_NAME)_E3_GIT_DESC="$(shell git describe --tags 2> /dev/null || git rev-parse HEAD 2> /dev/null || Not a git repository)"
E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += $(E3_MODULE_NAME)_E3_GIT_STATUS="$(shell git status --porcelain | sed 's/^/ - /')"
E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += $(E3_MODULE_NAME)_E3_GIT_STATUS="[ $(shell git status --porcelain | sed 's/^/\\\\\\\"/' | sed 's/$$/\\\\\\\", /')]"
E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += $(E3_MODULE_NAME)_E3_GIT_URL="$(shell git remote get-url origin)"
......
Subproject commit cab9eb16c9bb34b8b0b798b7d14cd55113eb6999
Subproject commit 8461ac5d127b84e69f1e9cc103d535f6089e3ba0
......@@ -40,16 +40,7 @@ SOURCES += require.c
DBDS += require.dbd
SOURCES += runScript.c
DBDS += runScript.dbd
# PSI split expression at 0b6d1dd. So, require.Makefile should
# handel the different require source files with and without
# expr.c in the same way. Thus, I added the additional logic
# to handle to cover entire cases.
# If there is no expr.c, it is now safe to ignore it
# Friday, May 11 21:58:24 CEST 2018, jhlee
expr_src=expr.c
SOURCES += $(filter $(expr_src), $(wildcard *.c))
SOURCES += expr.c
##
......
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