Merge 2 heads. Print correct warning on what overrides are used ENGINE-261
authorDamiano Boppart <damiano@pep-security.net>
Thu, 21 Sep 2017 15:40:02 +0200
branchENGINE-261
changeset 2084c0f658b0289f
parent 2083 361a6dc2c075
parent 2082 253f13cdf056
child 2085 2e4dd9ac1ad3
Merge 2 heads. Print correct warning on what overrides are used
Makefile
     1.1 --- a/.hgignore	Thu Sep 21 15:29:14 2017 +0200
     1.2 +++ b/.hgignore	Thu Sep 21 15:40:02 2017 +0200
     1.3 @@ -4,6 +4,7 @@
     1.4  ^asn\.1/libasn1\.a$
     1.5  .*xcuserdata/
     1.6  ^build/
     1.7 +^local.conf
     1.8  
     1.9  syntax: glob
    1.10  *.orig
     2.1 --- a/Makefile	Thu Sep 21 15:29:14 2017 +0200
     2.2 +++ b/Makefile	Thu Sep 21 15:40:02 2017 +0200
     2.3 @@ -11,7 +11,7 @@
     2.4  export YML_PATH=$(YML2_PATH)
     2.5  
     2.6  .PHONY: all
     2.7 -all: _platform_override_info
     2.8 +all: _override_info
     2.9  	$(MAKE) -C asn.1 generate
    2.10  	$(MAKE) -C asn.1
    2.11  	$(MAKE) -C sync
    2.12 @@ -23,12 +23,12 @@
    2.13  	$(MAKE) -C asn.1 install
    2.14  
    2.15  .PHONY: uninstall
    2.16 -uninstall:
    2.17 +uninstall: _override_info
    2.18  	$(MAKE) -C src uninstall
    2.19  	$(MAKE) -C asn.1 uninstall
    2.20  
    2.21  .PHONY: clean
    2.22 -clean:
    2.23 +clean: _override_info
    2.24  	$(MAKE) -C src clean
    2.25  	$(MAKE) -C test clean
    2.26  	$(MAKE) -C db clean
    2.27 @@ -49,15 +49,24 @@
    2.28  	cd .. ; COPYFILE_DISABLE=true tar cjf pEpEngine.tar.bz2 "$(HERE_REL)"
    2.29  
    2.30  .PHONY: db
    2.31 -db:
    2.32 +db: _override_info
    2.33  	$(MAKE) -C db db
    2.34  
    2.35 -.PHONY: _platform_override
    2.36 -ifdef PLATFORM_OVERRIDE
    2.37 -_platform_override_info:
    2.38 +.PHONY: _override_info
    2.39 +_override_info: _local_conf_info _build_config_info
    2.40 +
    2.41 +.PHONY: _local_conf_info
    2.42 +_local_conf_info:
    2.43 +ifneq ($(wildcard local.conf),)
    2.44  	@echo "================================================"
    2.45 -	@echo "PLATFORM_OVERRIDE is set to '$(PLATFORM_OVERRIDE)'."
    2.46 +	@echo "Overrides in `local.conf` are used."
    2.47  	@echo "================================================"
    2.48 -else
    2.49 -_platform_override_info:
    2.50  endif
    2.51 +
    2.52 +.PHONY: _build_config_info
    2.53 +_build_config_info:
    2.54 +ifdef BUILD_CONFIG
    2.55 +	@echo "================================================"
    2.56 +	@echo "Overrides in '$(BUILD_CONFIG)' are used."
    2.57 +	@echo "================================================"
    2.58 +endif
     3.1 --- a/doc/build-debian.md	Thu Sep 21 15:29:14 2017 +0200
     3.2 +++ b/doc/build-debian.md	Thu Sep 21 15:40:02 2017 +0200
     3.3 @@ -64,6 +64,8 @@
     3.4  mkdir ~/code/pep-engine/build
     3.5  ~~~
     3.6  
     3.7 +Note: Everything PLATFORM_OVERRIDE-related is currenty outdated. Do not rely on the documentation here!
     3.8 +
     3.9  For an explanation of the mechanics of `PLATFORM_OVERRIDE`, see the inline comments in `Makefile.conf`.
    3.10  In this guide, the platform-specific configuration will be called `local`.
    3.11  The installation directory will be a subdirectory of the repository.
     4.1 --- a/doc/build-macos.md	Thu Sep 21 15:29:14 2017 +0200
     4.2 +++ b/doc/build-macos.md	Thu Sep 21 15:40:02 2017 +0200
     4.3 @@ -76,6 +76,8 @@
     4.4  mkdir ~/code/pep-engine/build
     4.5  ~~~
     4.6  
     4.7 +Note: Everything PLATFORM_OVERRIDE-related is currenty outdated. Do not rely on the documentation here!
     4.8 +
     4.9  For an explanation of the mechanics of `PLATFORM_OVERRIDE`, see the inline comments in `Makefile.conf`.
    4.10  In this guide, the platform-specific configuration will be called `local`.
    4.11  The installation directory will be a subdirectory of the repository.