Fossil SCM
Correct directory detection in the MSVC makefile to permit the batch building tool to function properly.
Commit
a072137b03e3dc1c78f912b998a9cd9ba1667942
Parent
86de8cbeb505eda…
2 files changed
+3
-4
+3
-4
+3
-4
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -1146,15 +1146,14 @@ | ||
| 1146 | 1146 | writeln {# |
| 1147 | 1147 | ############################################################################## |
| 1148 | 1148 | # WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl") |
| 1149 | 1149 | ############################################################################## |
| 1150 | 1150 | # |
| 1151 | -# This Makefile will only function correctly if used from the directory it | |
| 1152 | -# is contained in. Therefore, attempt to detect when that is not the case | |
| 1153 | -# and issue an error message. | |
| 1151 | +# This Makefile will only function correctly if used from a sub-directory | |
| 1152 | +# that is a direct child of the top-level directory for this project. | |
| 1154 | 1153 | # |
| 1155 | -!if !exist("Makefile.msc") | |
| 1154 | +!if !exist("..\.fossil-settings") | |
| 1156 | 1155 | !error "Please change the current directory to the one containing this file." |
| 1157 | 1156 | !endif |
| 1158 | 1157 | |
| 1159 | 1158 | # |
| 1160 | 1159 | # This file is automatically generated. Instead of editing this |
| 1161 | 1160 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -1146,15 +1146,14 @@ | |
| 1146 | writeln {# |
| 1147 | ############################################################################## |
| 1148 | # WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl") |
| 1149 | ############################################################################## |
| 1150 | # |
| 1151 | # This Makefile will only function correctly if used from the directory it |
| 1152 | # is contained in. Therefore, attempt to detect when that is not the case |
| 1153 | # and issue an error message. |
| 1154 | # |
| 1155 | !if !exist("Makefile.msc") |
| 1156 | !error "Please change the current directory to the one containing this file." |
| 1157 | !endif |
| 1158 | |
| 1159 | # |
| 1160 | # This file is automatically generated. Instead of editing this |
| 1161 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -1146,15 +1146,14 @@ | |
| 1146 | writeln {# |
| 1147 | ############################################################################## |
| 1148 | # WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl") |
| 1149 | ############################################################################## |
| 1150 | # |
| 1151 | # This Makefile will only function correctly if used from a sub-directory |
| 1152 | # that is a direct child of the top-level directory for this project. |
| 1153 | # |
| 1154 | !if !exist("..\.fossil-settings") |
| 1155 | !error "Please change the current directory to the one containing this file." |
| 1156 | !endif |
| 1157 | |
| 1158 | # |
| 1159 | # This file is automatically generated. Instead of editing this |
| 1160 |
+3
-4
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -1,15 +1,14 @@ | ||
| 1 | 1 | # |
| 2 | 2 | ############################################################################## |
| 3 | 3 | # WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl") |
| 4 | 4 | ############################################################################## |
| 5 | 5 | # |
| 6 | -# This Makefile will only function correctly if used from the directory it | |
| 7 | -# is contained in. Therefore, attempt to detect when that is not the case | |
| 8 | -# and issue an error message. | |
| 6 | +# This Makefile will only function correctly if used from a sub-directory | |
| 7 | +# that is a direct child of the top-level directory for this project. | |
| 9 | 8 | # |
| 10 | -!if !exist("Makefile.msc") | |
| 9 | +!if !exist("..\.fossil-settings") | |
| 11 | 10 | !error "Please change the current directory to the one containing this file." |
| 12 | 11 | !endif |
| 13 | 12 | |
| 14 | 13 | # |
| 15 | 14 | # This file is automatically generated. Instead of editing this |
| 16 | 15 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -1,15 +1,14 @@ | |
| 1 | # |
| 2 | ############################################################################## |
| 3 | # WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl") |
| 4 | ############################################################################## |
| 5 | # |
| 6 | # This Makefile will only function correctly if used from the directory it |
| 7 | # is contained in. Therefore, attempt to detect when that is not the case |
| 8 | # and issue an error message. |
| 9 | # |
| 10 | !if !exist("Makefile.msc") |
| 11 | !error "Please change the current directory to the one containing this file." |
| 12 | !endif |
| 13 | |
| 14 | # |
| 15 | # This file is automatically generated. Instead of editing this |
| 16 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -1,15 +1,14 @@ | |
| 1 | # |
| 2 | ############################################################################## |
| 3 | # WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl") |
| 4 | ############################################################################## |
| 5 | # |
| 6 | # This Makefile will only function correctly if used from a sub-directory |
| 7 | # that is a direct child of the top-level directory for this project. |
| 8 | # |
| 9 | !if !exist("..\.fossil-settings") |
| 10 | !error "Please change the current directory to the one containing this file." |
| 11 | !endif |
| 12 | |
| 13 | # |
| 14 | # This file is automatically generated. Instead of editing this |
| 15 |