Increase robustness of nmake BaseTools build for space also used by make

Increase robustness of nmake BaseTools build for space also used by make

[Burt Silverman]

[-- Attachment #1.1: Type: text/plain, Size: 653 bytes --]

Author: Burt Silverman <burtms@gmail.com>
Date:   Sat Sep 7 16:33:53 2019 -0400

Improve robustness for multiple build environments

When building BaseTools, GNUmakefile builds create directory
BaseTools/Source/C/libs/. On the other hand, Makefile builds use libs
as an nmake pseudo target, so it either must NOT exist as a file or
directory, OR it must phony dependency like .PHONY. The latter
solution conflicts with NmakeSubdirs.py. Therefore, I make it go away
in the cleanall target. I could also add it to the clean target, but
it strikes me that cleanall should be more forceful.

Signed-off-by: Burt Silverman <burtms@gmail.com>

[-- Attachment #1.2: Type: text/html, Size: 896 bytes --]

[-- Attachment #2: 0001-Improve-robustness-for-multiple-build-environments.patch --]
[-- Type: application/octet-stream, Size: 1421 bytes --]

From 21db9399234705549f518ec1838199ad675d1faf Mon Sep 17 00:00:00 2001
From: Burt Silverman <burtms@gmail.com>
Date: Sat, 7 Sep 2019 16:33:53 -0400
Subject: [PATCH] BaseTools: Robustness for multiple build environments

When building BaseTools, GNUmakefile builds create directory
BaseTools/Source/C/libs/. On the other hand, Makefile builds use libs
as an nmake pseudo target, so it either must NOT exist as a file or
directory, OR it must phony dependency like .PHONY. The latter
solution conflicts with NmakeSubdirs.py. Therefore, I make it go away
in the cleanall target. I could also add it to the clean target, but
it strikes me that cleanall should be more forceful.

Signed-off-by: Burt Silverman <burtms@gmail.com>
---
 BaseTools/Source/C/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/BaseTools/Source/C/Makefile b/BaseTools/Source/C/Makefile
index 217fc2b91d..e8f8abe59a 100644
--- a/BaseTools/Source/C/Makefile
+++ b/BaseTools/Source/C/Makefile
@@ -63,6 +63,8 @@ clean:
 cleanall:
   @if defined PYTHON_COMMAND $(PYTHON_COMMAND) Makefiles\NmakeSubdirs.py cleanall $(LIBRARIES) $(APPLICATIONS)
   @if not defined PYTHON_COMMAND $(PYTHON_HOME)\python.exe Makefiles\NmakeSubdirs.py cleanall $(LIBRARIES) $(APPLICATIONS)
+# Next line protects the libs pseudo target from inadvertent GNU make activity
+  if exist libs RMDIR /S /Q libs
 
 !INCLUDE Makefiles\ms.rule
 
-- 
2.23.0.windows.1

Re: [edk2-devel] Increase robustness of nmake BaseTools build for space also used by make

[Burt Silverman]

[-- Attachment #1: Type: text/plain, Size: 79 bytes --]

>it must phony dependency
I meant to write "it must have a phony dependency"

[-- Attachment #2: Type: text/html, Size: 86 bytes --]

Re: [edk2-devel] Increase robustness of nmake BaseTools build for space also used by make

[Liming Gao]

[-- Attachment #1: Type: text/plain, Size: 1040 bytes --]

Reviewed-by: Liming Gao <liming.gao@intel.com>

From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Burt Silverman
Sent: Sunday, September 8, 2019 6:10 AM
To: devel@edk2.groups.io
Subject: [edk2-devel] Increase robustness of nmake BaseTools build for space also used by make

Author: Burt Silverman <burtms@gmail.com<mailto:burtms@gmail.com>>
Date:   Sat Sep 7 16:33:53 2019 -0400

    Improve robustness for multiple build environments

    When building BaseTools, GNUmakefile builds create directory
    BaseTools/Source/C/libs/. On the other hand, Makefile builds use libs
    as an nmake pseudo target, so it either must NOT exist as a file or
    directory, OR it must phony dependency like .PHONY. The latter
    solution conflicts with NmakeSubdirs.py. Therefore, I make it go away
    in the cleanall target. I could also add it to the clean target, but
    it strikes me that cleanall should be more forceful.

    Signed-off-by: Burt Silverman <burtms@gmail.com<mailto:burtms@gmail.com>>


[-- Attachment #2: Type: text/html, Size: 4379 bytes --]

Re: [edk2-devel] Increase robustness of nmake BaseTools build for space also used by make

[Liming Gao]

[-- Attachment #1: Type: text/plain, Size: 1448 bytes --]

push@5e5abfcab4c2962005be89c951a86f55db27555e

From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Liming Gao
Sent: Tuesday, September 10, 2019 11:23 PM
To: devel@edk2.groups.io; burtms@gmail.com
Subject: Re: [edk2-devel] Increase robustness of nmake BaseTools build for space also used by make

Reviewed-by: Liming Gao <liming.gao@intel.com<mailto:liming.gao@intel.com>>

From: devel@edk2.groups.io<mailto:devel@edk2.groups.io> [mailto:devel@edk2.groups.io] On Behalf Of Burt Silverman
Sent: Sunday, September 8, 2019 6:10 AM
To: devel@edk2.groups.io<mailto:devel@edk2.groups.io>
Subject: [edk2-devel] Increase robustness of nmake BaseTools build for space also used by make

Author: Burt Silverman <burtms@gmail.com<mailto:burtms@gmail.com>>
Date:   Sat Sep 7 16:33:53 2019 -0400

    Improve robustness for multiple build environments

    When building BaseTools, GNUmakefile builds create directory
    BaseTools/Source/C/libs/. On the other hand, Makefile builds use libs
    as an nmake pseudo target, so it either must NOT exist as a file or
    directory, OR it must phony dependency like .PHONY. The latter
    solution conflicts with NmakeSubdirs.py. Therefore, I make it go away
    in the cleanall target. I could also add it to the clean target, but
    it strikes me that cleanall should be more forceful.

    Signed-off-by: Burt Silverman <burtms@gmail.com<mailto:burtms@gmail.com>>


[-- Attachment #2: Type: text/html, Size: 5508 bytes --]