Fossil SCM

Simplify the batch tool changes from [0519493f]. The BUILDDIR environment variable can be set before invoking 'buildmsvc.bat' in order to build out-of-tree.

mistachkin 2020-06-06 19:04 trunk

Commit 7c481db74ef6197fe13a3556ec2d2000f35788de6b8a214ddf6a7af5ba0e4773

Parent c9690c73562245e…

3 files changed +1 -1 +1 -1 +22 -20

~ src/makemake.tcl ~ win/Makefile.msc ~ win/buildmsvc.bat

M src/makemake.tcl

+1 -1

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -1483,11 +1483,11 @@
1483	1483	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
1484	1484	# to regenerate this file.
1485	1485	#
1486	1486	B = ..
1487	1487	SRCDIR = $(B)\src
1488		-T = msvcbld
	1488	+T = .
1489	1489	OBJDIR = $(T)
1490	1490	OX = $(OBJDIR)
1491	1491	O = .obj
1492	1492	E = .exe
1493	1493	P = .pdb
1494	1494

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -1483,11 +1483,11 @@
1483	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
1484	# to regenerate this file.
1485	#
1486	B = ..
1487	SRCDIR = $(B)\src
1488	T = msvcbld
1489	OBJDIR = $(T)
1490	OX = $(OBJDIR)
1491	O = .obj
1492	E = .exe
1493	P = .pdb
1494

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -1483,11 +1483,11 @@
1483	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
1484	# to regenerate this file.
1485	#
1486	B = ..
1487	SRCDIR = $(B)\src
1488	T = .
1489	OBJDIR = $(T)
1490	OX = $(OBJDIR)
1491	O = .obj
1492	E = .exe
1493	P = .pdb
1494

M win/Makefile.msc

+1 -1

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -8,11 +8,11 @@
8	8	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
9	9	# to regenerate this file.
10	10	#
11	11	B = ..
12	12	SRCDIR = $(B)\src
13		-T = msvcbld
	13	+T = .
14	14	OBJDIR = $(T)
15	15	OX = $(OBJDIR)
16	16	O = .obj
17	17	E = .exe
18	18	P = .pdb
19	19

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -8,11 +8,11 @@
8	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
9	# to regenerate this file.
10	#
11	B = ..
12	SRCDIR = $(B)\src
13	T = msvcbld
14	OBJDIR = $(T)
15	OX = $(OBJDIR)
16	O = .obj
17	E = .exe
18	P = .pdb
19

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -8,11 +8,11 @@
8	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
9	# to regenerate this file.
10	#
11	B = ..
12	SRCDIR = $(B)\src
13	T = .
14	OBJDIR = $(T)
15	OX = $(OBJDIR)
16	O = .obj
17	E = .exe
18	P = .pdb
19

M win/buildmsvc.bat

+22 -20

		--- win/buildmsvc.bat
		+++ win/buildmsvc.bat
		@@ -183,22 +183,17 @@
183	183	%_VECHO% VcInstallDir = '%VCINSTALLDIR%'
184	184
185	185	REM
186	186	REM NOTE: Attempt to create the build output directory, if necessary.
187	187	REM
188		-
189		-SET OBJDIR=msvcbld
190		-
191		-IF NOT DEFINED BUILDDIR (
192		- IF DEFINED BUILDSUFFIX (
193		- SET BUILDDIR=%ROOT%\%OBJDIR%%BUILDSUFFIX%
194		- )
195		-)
196		-
197		-IF NOT DEFINED BUILDDIR GOTO skip_createBuildDir
198		-
199		-SET OBJDIR=.
	188	+IF DEFINED BUILDDIR (
	189	+ IF DEFINED BUILDSUFFIX (
	190	+ SET BUILDDIR=%BUILDDIR%%BUILDSUFFIX%
	191	+ )
	192	+) ELSE (
	193	+ SET BUILDDIR=%ROOT%\msvcbld%BUILDSUFFIX%
	194	+)
200	195
201	196	%_VECHO% BuildSuffix = '%BUILDSUFFIX%'
202	197	%_VECHO% BuildDir = '%BUILDDIR%'
203	198
204	199	IF NOT EXIST "%BUILDDIR%" (
		@@ -210,19 +205,20 @@
210	205	)
211	206	)
212	207
213	208	REM
214	209	REM NOTE: Attempt to change to the created build output directory so that
215		-REM the generated files will be placed there.
	210	+REM the generated files will be placed there, if needed.
216	211	REM
217	212	%__ECHO2% PUSHD "%BUILDDIR%"
218	213
219	214	IF ERRORLEVEL 1 (
220	215	ECHO Could not change to directory "%BUILDDIR%".
221	216	GOTO errors
222	217	)
223		-:skip_createBuildDir
	218	+
	219	+SET NEED_POPD=1
224	220
225	221	REM
226	222	REM NOTE: If requested, setup the build environment to refer to the Windows
227	223	REM SDK v7.1A, which is required if the binaries are being built with
228	224	REM Visual Studio 201x and need to work on Windows XP.
		@@ -233,32 +229,38 @@
233	229	)
234	230
235	231	%_VECHO% Path = '%PATH%'
236	232	%_VECHO% Include = '%INCLUDE%'
237	233	%_VECHO% Lib = '%LIB%'
	234	+%_VECHO% Tools = '%TOOLS%'
	235	+%_VECHO% Root = '%ROOT%'
238	236	%_VECHO% NmakeArgs = '%NMAKE_ARGS%'
239	237
240	238	REM
241	239	REM NOTE: Attempt to execute NMAKE for the Fossil MSVC makefile, passing
242	240	REM anything extra from our command line along (e.g. extra options).
243	241	REM Also, pass the base directory of the Fossil source tree as this
244	242	REM allows an out-of-source-tree build.
245	243	REM
246		-%__ECHO% nmake /f "%TOOLS%\Makefile.msc" B="%ROOT%" T="%OBJDIR%" %NMAKE_ARGS% %*
	244	+%__ECHO% nmake /f "%TOOLS%\Makefile.msc" B="%ROOT%" %NMAKE_ARGS% %*
247	245
248	246	IF ERRORLEVEL 1 (
249	247	GOTO errors
250	248	)
251	249
252	250	REM
253		-REM NOTE: Attempt to restore the previously saved directory.
	251	+REM NOTE: Attempt to restore the previously saved directory, if needed.
254	252	REM
255		-%__ECHO2% POPD
	253	+IF DEFINED NEED_POPD (
	254	+ %__ECHO2% POPD
	255	+
	256	+ IF ERRORLEVEL 1 (
	257	+ ECHO Could not restore directory.
	258	+ GOTO errors
	259	+ )
256	260
257		-IF ERRORLEVEL 1 (
258		- ECHO Could not restore directory.
259		- GOTO errors
	261	+ CALL :fn_UnsetVariable NEED_POPD
260	262	)
261	263
262	264	GOTO no_errors
263	265
264	266	:fn_UseV110Sdk71A
265	267

	--- win/buildmsvc.bat
	+++ win/buildmsvc.bat
	@@ -183,22 +183,17 @@
183	%_VECHO% VcInstallDir = '%VCINSTALLDIR%'
184
185	REM
186	REM NOTE: Attempt to create the build output directory, if necessary.
187	REM
188
189	SET OBJDIR=msvcbld
190
191	IF NOT DEFINED BUILDDIR (
192	IF DEFINED BUILDSUFFIX (
193	SET BUILDDIR=%ROOT%\%OBJDIR%%BUILDSUFFIX%
194	)
195	)
196
197	IF NOT DEFINED BUILDDIR GOTO skip_createBuildDir
198
199	SET OBJDIR=.
200
201	%_VECHO% BuildSuffix = '%BUILDSUFFIX%'
202	%_VECHO% BuildDir = '%BUILDDIR%'
203
204	IF NOT EXIST "%BUILDDIR%" (
	@@ -210,19 +205,20 @@
210	)
211	)
212
213	REM
214	REM NOTE: Attempt to change to the created build output directory so that
215	REM the generated files will be placed there.
216	REM
217	%__ECHO2% PUSHD "%BUILDDIR%"
218
219	IF ERRORLEVEL 1 (
220	ECHO Could not change to directory "%BUILDDIR%".
221	GOTO errors
222	)
223	:skip_createBuildDir

224
225	REM
226	REM NOTE: If requested, setup the build environment to refer to the Windows
227	REM SDK v7.1A, which is required if the binaries are being built with
228	REM Visual Studio 201x and need to work on Windows XP.
	@@ -233,32 +229,38 @@
233	)
234
235	%_VECHO% Path = '%PATH%'
236	%_VECHO% Include = '%INCLUDE%'
237	%_VECHO% Lib = '%LIB%'


238	%_VECHO% NmakeArgs = '%NMAKE_ARGS%'
239
240	REM
241	REM NOTE: Attempt to execute NMAKE for the Fossil MSVC makefile, passing
242	REM anything extra from our command line along (e.g. extra options).
243	REM Also, pass the base directory of the Fossil source tree as this
244	REM allows an out-of-source-tree build.
245	REM
246	%__ECHO% nmake /f "%TOOLS%\Makefile.msc" B="%ROOT%" T="%OBJDIR%" %NMAKE_ARGS% %*
247
248	IF ERRORLEVEL 1 (
249	GOTO errors
250	)
251
252	REM
253	REM NOTE: Attempt to restore the previously saved directory.
254	REM
255	%__ECHO2% POPD






256
257	IF ERRORLEVEL 1 (
258	ECHO Could not restore directory.
259	GOTO errors
260	)
261
262	GOTO no_errors
263
264	:fn_UseV110Sdk71A
265

	--- win/buildmsvc.bat
	+++ win/buildmsvc.bat
	@@ -183,22 +183,17 @@
183	%_VECHO% VcInstallDir = '%VCINSTALLDIR%'
184
185	REM
186	REM NOTE: Attempt to create the build output directory, if necessary.
187	REM
188	IF DEFINED BUILDDIR (
189	IF DEFINED BUILDSUFFIX (
190	SET BUILDDIR=%BUILDDIR%%BUILDSUFFIX%
191	)
192	) ELSE (
193	SET BUILDDIR=%ROOT%\msvcbld%BUILDSUFFIX%
194	)





195
196	%_VECHO% BuildSuffix = '%BUILDSUFFIX%'
197	%_VECHO% BuildDir = '%BUILDDIR%'
198
199	IF NOT EXIST "%BUILDDIR%" (
	@@ -210,19 +205,20 @@
205	)
206	)
207
208	REM
209	REM NOTE: Attempt to change to the created build output directory so that
210	REM the generated files will be placed there, if needed.
211	REM
212	%__ECHO2% PUSHD "%BUILDDIR%"
213
214	IF ERRORLEVEL 1 (
215	ECHO Could not change to directory "%BUILDDIR%".
216	GOTO errors
217	)
218
219	SET NEED_POPD=1
220
221	REM
222	REM NOTE: If requested, setup the build environment to refer to the Windows
223	REM SDK v7.1A, which is required if the binaries are being built with
224	REM Visual Studio 201x and need to work on Windows XP.
	@@ -233,32 +229,38 @@
229	)
230
231	%_VECHO% Path = '%PATH%'
232	%_VECHO% Include = '%INCLUDE%'
233	%_VECHO% Lib = '%LIB%'
234	%_VECHO% Tools = '%TOOLS%'
235	%_VECHO% Root = '%ROOT%'
236	%_VECHO% NmakeArgs = '%NMAKE_ARGS%'
237
238	REM
239	REM NOTE: Attempt to execute NMAKE for the Fossil MSVC makefile, passing
240	REM anything extra from our command line along (e.g. extra options).
241	REM Also, pass the base directory of the Fossil source tree as this
242	REM allows an out-of-source-tree build.
243	REM
244	%__ECHO% nmake /f "%TOOLS%\Makefile.msc" B="%ROOT%" %NMAKE_ARGS% %*
245
246	IF ERRORLEVEL 1 (
247	GOTO errors
248	)
249
250	REM
251	REM NOTE: Attempt to restore the previously saved directory, if needed.
252	REM
253	IF DEFINED NEED_POPD (
254	%__ECHO2% POPD
255
256	IF ERRORLEVEL 1 (
257	ECHO Could not restore directory.
258	GOTO errors
259	)
260
261	CALL :fn_UnsetVariable NEED_POPD


262	)
263
264	GOTO no_errors
265
266	:fn_UseV110Sdk71A
267

Fossil SCM

Keyboard Shortcuts