Skip to content

Commit 4259b28

Browse files
GitHubber17GitHubber17
authored
Merge pull request #2237 from corob-msft/cr-nmake-again
NMAKE consolidation, part 1
2 parents a6efd99 + b6c193e commit 4259b28

8 files changed

Lines changed: 95 additions & 127 deletions

File tree

‎.openpublishing.redirection.json‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,12 @@
347347
},
348348
{
349349
"source_path": "docs/build/exit-codes-from-nmake.md",
350-
"redirect_url": "/cpp/build/reference/exit-codes-from-nmake",
350+
"redirect_url": "/cpp/build/reference/running-nmake",
351+
"redirect_document_id": false
352+
},
353+
{
354+
"source_path": "docs/build/reference/exit-codes-from-nmake.md",
355+
"redirect_url": "/cpp/build/reference/running-nmake",
351356
"redirect_document_id": false
352357
},
353358
{
@@ -432,7 +437,12 @@
432437
},
433438
{
434439
"source_path": "docs/build/nmake-options.md",
435-
"redirect_url": "/cpp/build/reference/nmake-options",
440+
"redirect_url": "/cpp/build/reference/running-nmake",
441+
"redirect_document_id": false
442+
},
443+
{
444+
"source_path": "docs/build/reference/nmake-options.md",
445+
"redirect_url": "/cpp/build/reference/running-nmake",
436446
"redirect_document_id": false
437447
},
438448
{
@@ -532,7 +542,12 @@
532542
},
533543
{
534544
"source_path": "docs/build/tools-ini-and-nmake.md",
535-
"redirect_url": "/cpp/build/reference/tools-ini-and-nmake",
545+
"redirect_url": "/cpp/build/reference/running-nmake",
546+
"redirect_document_id": false
547+
},
548+
{
549+
"source_path": "docs/build/reference/tools-ini-and-nmake.md",
550+
"redirect_url": "/cpp/build/reference/running-nmake",
536551
"redirect_document_id": false
537552
},
538553
{

‎docs/build/reference/exit-codes-from-nmake.md‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎docs/build/reference/makefile-preprocessing-directives.md‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,65 @@
11
---
22
title: "Makefile Preprocessing Directives"
3-
ms.date: "06/14/2018"
3+
ms.date: "08/11/2019"
44
f1_keywords: ["!UNDEF", "!INCLUDE", "!IFNDEF", "!MESSAGE"]
55
helpviewer_keywords: ["ERROR directive", "!MESSAGE directive", "IF directive", "!UNDEF directive", "IFDEF directive", "!ELSEIF directive", "!IFDEF directive", "!IF directive", "UNDEF directive", "!CMDSWITCHES directive", "ENDIF directive", "directives, makefile preprocessing", "INCLUDE directive", "IFNDEF directive", "preprocessing directives, makefiles", "!IFNDEF directive", "ELSEIFNDEF directive", "NMAKE program, expressions", "ELSEIF directive", "!ERROR directive", "!ENDIF directive", "MESSAGE directive", "!INCLUDE directive", "!ELSEIFNDEF directive", "CMDSWITCHES directive", "!ELSEIFDEF directive", "!ELSE directive", "NMAKE program, preprocessor directives", "makefiles, preprocessing directives", "ELSE directive", "ELSEIFDEF directive"]
66
ms.assetid: bcedeccb-d981-469d-b9e8-ab5d097fd8c2
77
---
88
# Makefile Preprocessing Directives
99

10-
Preprocessing directives are not case sensitive. The initial exclamation point (!) must appear at the beginning of the line. Zero or more spaces or tabs can appear after the exclamation point, for indentation.
10+
Preprocessing directives aren't case-sensitive. The initial exclamation point (!) must appear at the beginning of the line. Zero or more spaces or tabs can appear after the exclamation point, for indentation.
1111

12-
- **!CMDSWITCHES** {**+** | **-**}*option* ...
12+
- `!CMDSWITCHES` {`+` | `-`}*option* ...
1313

14-
Turns each *option* listed on or off. Spaces or tabs must appear before the + or - operator; none can appear between the operator and the [option letters](nmake-options.md). Letters are not case sensitive and are specified without a slash ( / ). To turn some options on and others off, use separate specifications of **!CMDSWITCHES**.
14+
Turns each *option* listed on or off. Spaces or tabs must appear before the `+` or `-` operator; none can appear between the operator and the [option letters](running-nmake.md#nmake-options). Letters aren't case-sensitive and are specified without a slash (`/`). To turn on some options and turn off others, use separate specifications of `!CMDSWITCHES`.
1515

16-
Only /D, /I, /N, and /S can be used in a makefile. In Tools.ini, all options are allowed except /F, /HELP, /NOLOGO, /X, and /?. Changes specified in a description block do not take effect until the next description block. This directive updates **MAKEFLAGS**; changes are inherited during recursion if **MAKEFLAGS** is specified.
16+
Only /D, /I, /N, and /S can be used in a makefile. In Tools.ini, all options are allowed except /F, /HELP, /NOLOGO, /X, and /?. Changes specified in a description block don't take effect until the next description block. This directive updates **MAKEFLAGS**; changes are inherited during recursion if **MAKEFLAGS** is specified.
1717

18-
- **!ERROR** *text*
18+
- `!ERROR` *text*
1919

20-
Displays *text* in error U1050, then halts NMAKE, even if /K, /I, **.IGNORE**, **!CMDSWITCHES**, or the dash (-) command modifier is used. Spaces or tabs before *text* are ignored.
20+
Displays *text* in error U1050, then halts NMAKE, even if /K, /I, `.IGNORE`, `!CMDSWITCHES`, or the dash (`-`) command modifier is used. Spaces or tabs before *text* are ignored.
2121

22-
- **!MESSAGE** *text*
22+
- `!MESSAGE` *text*
2323

2424
Displays *text* to standard output. Spaces or tabs before *text* are ignored.
2525

26-
- **!INCLUDE** [ **\<** ] *filename* [ **>** ]
26+
- `!INCLUDE` [ `<` ] *filename* [ `>` ]
2727

28-
Reads *filename* as a makefile, then continues with the current makefile. NMAKE searches for *filename* first in the specified or current directory, then recursively through directories of any parent makefiles, then, if *filename* is enclosed by angle brackets (\< >), in directories specified by the **INCLUDE** macro, which is initially set to the INCLUDE environment variable. Useful to pass **.SUFFIXES** settings, **.PRECIOUS**, and inference rules to recursive makefiles.
28+
Reads *filename* as a makefile, then continues with the current makefile. NMAKE searches for *filename* first in the specified or current directory, then recursively through directories of any parent makefiles, then, if *filename* is enclosed by angle brackets (`< >`), in directories specified by the **INCLUDE** macro, which is initially set to the INCLUDE environment variable. Useful to pass `.SUFFIXES` settings, `.PRECIOUS`, and inference rules to recursive makefiles.
2929

30-
- **!IF** *constant_expression*
30+
- `!IF` *constant_expression*
3131

32-
Processes statements between **!IF** and the next **!ELSE** or **!ENDIF** if *constant_expression* evaluates to a nonzero value.
32+
Processes statements between `!IF` and the next `!ELSE` or `!ENDIF` if *constant_expression* evaluates to a nonzero value.
3333

34-
- **!IFDEF** *macroname*
34+
- `!IFDEF` *macroname*
3535

36-
Processes statements between **!IFDEF** and the next **!ELSE** or **!ENDIF** if *macroname* is defined. A null macro is considered to be defined.
36+
Processes statements between `!IFDEF` and the next `!ELSE` or `!ENDIF` if *macroname* is defined. A null macro is considered to be defined.
3737

38-
- **!IFNDEF** *macroname*
38+
- `!IFNDEF` *macroname*
3939

40-
Processes statements between **!IFNDEF** and the next **!ELSE** or **!ENDIF** if *macroname* is not defined.
40+
Processes statements between `!IFNDEF` and the next `!ELSE` or `!ENDIF` if *macroname* isn't defined.
4141

42-
- **!ELSE** [**IF** *constant_expression* &#124; **IFDEF** *macroname* &#124; **IFNDEF** *macroname*]
42+
- `!ELSE` [`IF` *constant_expression* &#124; `IFDEF` *macroname* &#124; `IFNDEF` *macroname*]
4343

44-
Processes statements between **!ELSE** and the next **!ENDIF** if the prior **!IF**, **!IFDEF**, or **!IFNDEF** statement evaluated to zero. The optional keywords give further control of preprocessing.
44+
Processes statements between `!ELSE` and the next `!ENDIF` if the prior `!IF`, `!IFDEF`, or `!IFNDEF` statement evaluated to zero. The optional keywords give further control of preprocessing.
4545

46-
- **!ELSEIF**
46+
- `!ELSEIF`
4747

48-
Synonym for **!ELSE IF**.
48+
Synonym for `!ELSE IF`.
4949

50-
- **!ELSEIFDEF**
50+
- `!ELSEIFDEF`
5151

52-
Synonym for **!ELSE IFDEF**.
52+
Synonym for `!ELSE IFDEF`.
5353

54-
- **!ELSEIFNDEF**
54+
- `!ELSEIFNDEF`
5555

56-
Synonym for **!ELSE IFNDEF**.
56+
Synonym for `!ELSE IFNDEF`.
5757

58-
- **!ENDIF**
58+
- `!ENDIF`
5959

60-
Marks the end of an **!IF**, **!IFDEF**, or **!IFNDEF** block. Any text after **!ENDIF** on the same line is ignored.
60+
Marks the end of an `!IF`, `!IFDEF`, or `!IFNDEF` block. Any text after `!ENDIF` on the same line is ignored.
6161

62-
- **!UNDEF** *macroname*
62+
- `!UNDEF` *macroname*
6363

6464
Undefines *macroname*.
6565

‎docs/build/reference/nmake-options.md‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)