Fossil SCM
makefile.wiki changes. Small rewrite of final paragraph.
Commit
03313e9c965b684dbf2fa6742e56d391470e439545f2208b2cd4aba49e411dfa
Parent
49c48f336cf8eaa…
1 file changed
+10
-9
+10
-9
| --- www/makefile.wiki | ||
| +++ www/makefile.wiki | ||
| @@ -7,11 +7,11 @@ | ||
| 7 | 7 | before it is compiled. Most users will download a |
| 8 | 8 | [https://fossil-scm.org/home/uv/download.html | precompiled binary] |
| 9 | 9 | so this is of no consequence to them, and even those who |
| 10 | 10 | want to compile the code themselves can use one of the |
| 11 | 11 | [./build.wiki | existing makefiles]. |
| 12 | -So must people do not need to be concerned with the | |
| 12 | +So most people do not need to be concerned with the | |
| 13 | 13 | build complexities of Fossil. But hard-core developers who desire |
| 14 | 14 | a deep understanding of how Fossil is put together can benefit |
| 15 | 15 | from reviewing this article. |
| 16 | 16 | |
| 17 | 17 | <h1 id="srctour">2.0 Source Code Tour</h1> |
| @@ -56,21 +56,21 @@ | ||
| 56 | 56 | The TH1 script engine is implemented using files: |
| 57 | 57 | |
| 58 | 58 | 9. th.c |
| 59 | 59 | 10. th.h |
| 60 | 60 | |
| 61 | -The proprocessing steps are omitted for all of these imported | |
| 61 | +The preprocessing steps are omitted for all of these imported | |
| 62 | 62 | files. |
| 63 | 63 | |
| 64 | 64 | The VERSION.h header file is generated from other information sources |
| 65 | 65 | using a small program called: |
| 66 | 66 | |
| 67 | 67 | 11. [/file/tools/mkversion.c | mkversion.c] |
| 68 | 68 | |
| 69 | 69 | The builtin_data.h header file contains the definitions of C-language |
| 70 | 70 | byte-array constants that contain various resources such as scripts and |
| 71 | -images. The builtin_data.h header file is generate from the original | |
| 71 | +images. The builtin_data.h header file is generated from the original | |
| 72 | 72 | resource files using a small program called: |
| 73 | 73 | |
| 74 | 74 | 12 [/file/tools/mkbuiltin.c | mkbuiltin.c] |
| 75 | 75 | |
| 76 | 76 | Examples of built-in resources include the [/file/src/diff.tcl | diff.tcl] |
| @@ -132,11 +132,11 @@ | ||
| 132 | 132 | the exceptions described above. |
| 133 | 133 | |
| 134 | 134 | <h1>3.0 Automatically generated files</h1> |
| 135 | 135 | |
| 136 | 136 | The "VERSION.h" header file contains some C preprocessor macros that |
| 137 | -identify the version of Fossil that is to be build. The VERSION.h file is | |
| 137 | +identify the version of Fossil that is to be built. The VERSION.h file is | |
| 138 | 138 | generated automatically from information extracted from the "manifest", |
| 139 | 139 | "manifest.uuid", and "VERSION" source files in the root directory of the |
| 140 | 140 | source tree. |
| 141 | 141 | (The "manifest" and "manifest.uuid" files are automatically generated and |
| 142 | 142 | updated by Fossil itself. See the [/help/setting | fossil set manifest] |
| @@ -294,12 +294,12 @@ | ||
| 294 | 294 | link against the standard C library. No other libraries or external |
| 295 | 295 | dependences are used. |
| 296 | 296 | |
| 297 | 297 | <h1>7.0 Debugging</h1> |
| 298 | 298 | |
| 299 | -Debug mode is controlled via FOSSIL_DEBUG preprocessor macro which could be | |
| 300 | -set explicitly at the make command for the target platform. | |
| 299 | +Debug mode is controlled via a FOSSIL_DEBUG preprocessor macro. This can be | |
| 300 | +set explicitly with the make command for the target platform. | |
| 301 | 301 | |
| 302 | 302 | However, in practice it is instead recommended to add a respective configure |
| 303 | 303 | option for the target platform and then perform a clean build. This way the |
| 304 | 304 | Debug flags are consistently applied across the whole build process. For |
| 305 | 305 | example, use these Debug flags in addition to other flags passed to the |
| @@ -313,14 +313,15 @@ | ||
| 313 | 313 | On Windows: |
| 314 | 314 | <pre> |
| 315 | 315 | win\buildmsvc.bat FOSSIL_DEBUG=1 |
| 316 | 316 | </pre> |
| 317 | 317 | |
| 318 | -The resulting fossil binary could then be loaded into a platform-specific | |
| 318 | +The resulting fossil binary can then be loaded into a platform-specific | |
| 319 | 319 | debugger. Source files displayed in the debugger correspond to the ones |
| 320 | -generated from the translation stage of the build process, that is what was | |
| 321 | -actually compiled into the object files. | |
| 320 | +generated from the translation stage of the build process, as that is what | |
| 321 | +was actually compiled into the respective object files that make up the | |
| 322 | +fossil binary. | |
| 322 | 323 | |
| 323 | 324 | <h1>8.0 See Also</h1> |
| 324 | 325 | |
| 325 | 326 | * [./tech_overview.wiki | A Technical Overview Of Fossil] |
| 326 | 327 | * [./adding_code.wiki | How To Add Features To Fossil] |
| 327 | 328 |
| --- www/makefile.wiki | |
| +++ www/makefile.wiki | |
| @@ -7,11 +7,11 @@ | |
| 7 | before it is compiled. Most users will download a |
| 8 | [https://fossil-scm.org/home/uv/download.html | precompiled binary] |
| 9 | so this is of no consequence to them, and even those who |
| 10 | want to compile the code themselves can use one of the |
| 11 | [./build.wiki | existing makefiles]. |
| 12 | So must people do not need to be concerned with the |
| 13 | build complexities of Fossil. But hard-core developers who desire |
| 14 | a deep understanding of how Fossil is put together can benefit |
| 15 | from reviewing this article. |
| 16 | |
| 17 | <h1 id="srctour">2.0 Source Code Tour</h1> |
| @@ -56,21 +56,21 @@ | |
| 56 | The TH1 script engine is implemented using files: |
| 57 | |
| 58 | 9. th.c |
| 59 | 10. th.h |
| 60 | |
| 61 | The proprocessing steps are omitted for all of these imported |
| 62 | files. |
| 63 | |
| 64 | The VERSION.h header file is generated from other information sources |
| 65 | using a small program called: |
| 66 | |
| 67 | 11. [/file/tools/mkversion.c | mkversion.c] |
| 68 | |
| 69 | The builtin_data.h header file contains the definitions of C-language |
| 70 | byte-array constants that contain various resources such as scripts and |
| 71 | images. The builtin_data.h header file is generate from the original |
| 72 | resource files using a small program called: |
| 73 | |
| 74 | 12 [/file/tools/mkbuiltin.c | mkbuiltin.c] |
| 75 | |
| 76 | Examples of built-in resources include the [/file/src/diff.tcl | diff.tcl] |
| @@ -132,11 +132,11 @@ | |
| 132 | the exceptions described above. |
| 133 | |
| 134 | <h1>3.0 Automatically generated files</h1> |
| 135 | |
| 136 | The "VERSION.h" header file contains some C preprocessor macros that |
| 137 | identify the version of Fossil that is to be build. The VERSION.h file is |
| 138 | generated automatically from information extracted from the "manifest", |
| 139 | "manifest.uuid", and "VERSION" source files in the root directory of the |
| 140 | source tree. |
| 141 | (The "manifest" and "manifest.uuid" files are automatically generated and |
| 142 | updated by Fossil itself. See the [/help/setting | fossil set manifest] |
| @@ -294,12 +294,12 @@ | |
| 294 | link against the standard C library. No other libraries or external |
| 295 | dependences are used. |
| 296 | |
| 297 | <h1>7.0 Debugging</h1> |
| 298 | |
| 299 | Debug mode is controlled via FOSSIL_DEBUG preprocessor macro which could be |
| 300 | set explicitly at the make command for the target platform. |
| 301 | |
| 302 | However, in practice it is instead recommended to add a respective configure |
| 303 | option for the target platform and then perform a clean build. This way the |
| 304 | Debug flags are consistently applied across the whole build process. For |
| 305 | example, use these Debug flags in addition to other flags passed to the |
| @@ -313,14 +313,15 @@ | |
| 313 | On Windows: |
| 314 | <pre> |
| 315 | win\buildmsvc.bat FOSSIL_DEBUG=1 |
| 316 | </pre> |
| 317 | |
| 318 | The resulting fossil binary could then be loaded into a platform-specific |
| 319 | debugger. Source files displayed in the debugger correspond to the ones |
| 320 | generated from the translation stage of the build process, that is what was |
| 321 | actually compiled into the object files. |
| 322 | |
| 323 | <h1>8.0 See Also</h1> |
| 324 | |
| 325 | * [./tech_overview.wiki | A Technical Overview Of Fossil] |
| 326 | * [./adding_code.wiki | How To Add Features To Fossil] |
| 327 |
| --- www/makefile.wiki | |
| +++ www/makefile.wiki | |
| @@ -7,11 +7,11 @@ | |
| 7 | before it is compiled. Most users will download a |
| 8 | [https://fossil-scm.org/home/uv/download.html | precompiled binary] |
| 9 | so this is of no consequence to them, and even those who |
| 10 | want to compile the code themselves can use one of the |
| 11 | [./build.wiki | existing makefiles]. |
| 12 | So most people do not need to be concerned with the |
| 13 | build complexities of Fossil. But hard-core developers who desire |
| 14 | a deep understanding of how Fossil is put together can benefit |
| 15 | from reviewing this article. |
| 16 | |
| 17 | <h1 id="srctour">2.0 Source Code Tour</h1> |
| @@ -56,21 +56,21 @@ | |
| 56 | The TH1 script engine is implemented using files: |
| 57 | |
| 58 | 9. th.c |
| 59 | 10. th.h |
| 60 | |
| 61 | The preprocessing steps are omitted for all of these imported |
| 62 | files. |
| 63 | |
| 64 | The VERSION.h header file is generated from other information sources |
| 65 | using a small program called: |
| 66 | |
| 67 | 11. [/file/tools/mkversion.c | mkversion.c] |
| 68 | |
| 69 | The builtin_data.h header file contains the definitions of C-language |
| 70 | byte-array constants that contain various resources such as scripts and |
| 71 | images. The builtin_data.h header file is generated from the original |
| 72 | resource files using a small program called: |
| 73 | |
| 74 | 12 [/file/tools/mkbuiltin.c | mkbuiltin.c] |
| 75 | |
| 76 | Examples of built-in resources include the [/file/src/diff.tcl | diff.tcl] |
| @@ -132,11 +132,11 @@ | |
| 132 | the exceptions described above. |
| 133 | |
| 134 | <h1>3.0 Automatically generated files</h1> |
| 135 | |
| 136 | The "VERSION.h" header file contains some C preprocessor macros that |
| 137 | identify the version of Fossil that is to be built. The VERSION.h file is |
| 138 | generated automatically from information extracted from the "manifest", |
| 139 | "manifest.uuid", and "VERSION" source files in the root directory of the |
| 140 | source tree. |
| 141 | (The "manifest" and "manifest.uuid" files are automatically generated and |
| 142 | updated by Fossil itself. See the [/help/setting | fossil set manifest] |
| @@ -294,12 +294,12 @@ | |
| 294 | link against the standard C library. No other libraries or external |
| 295 | dependences are used. |
| 296 | |
| 297 | <h1>7.0 Debugging</h1> |
| 298 | |
| 299 | Debug mode is controlled via a FOSSIL_DEBUG preprocessor macro. This can be |
| 300 | set explicitly with the make command for the target platform. |
| 301 | |
| 302 | However, in practice it is instead recommended to add a respective configure |
| 303 | option for the target platform and then perform a clean build. This way the |
| 304 | Debug flags are consistently applied across the whole build process. For |
| 305 | example, use these Debug flags in addition to other flags passed to the |
| @@ -313,14 +313,15 @@ | |
| 313 | On Windows: |
| 314 | <pre> |
| 315 | win\buildmsvc.bat FOSSIL_DEBUG=1 |
| 316 | </pre> |
| 317 | |
| 318 | The resulting fossil binary can then be loaded into a platform-specific |
| 319 | debugger. Source files displayed in the debugger correspond to the ones |
| 320 | generated from the translation stage of the build process, as that is what |
| 321 | was actually compiled into the respective object files that make up the |
| 322 | fossil binary. |
| 323 | |
| 324 | <h1>8.0 See Also</h1> |
| 325 | |
| 326 | * [./tech_overview.wiki | A Technical Overview Of Fossil] |
| 327 | * [./adding_code.wiki | How To Add Features To Fossil] |
| 328 |