Fossil SCM

accidently committed two unrelated files...

jan.nijtmans 2012-11-08 15:45 trunk

Commit b1199eb92bf09b55054d3a87ebc6fc40e8adc021

Parent 44d5ad59b40b0db…

2 files changed +4 -4 +5 -5

M src/main.c

+4 -4

		--- src/main.c
		+++ src/main.c
		@@ -341,11 +341,11 @@
341	341	if(g.db){
342	342	db_close(0);
343	343	}
344	344	}
345	345
346		-#if defined(_WIN32)
	346	+#if defined(_WIN32) && !defined(__MINGW32__)
347	347	/*
348	348	** Parse the command-line arguments passed to windows. We do this
349	349	** ourselves to work around bugs in the command-line parsing of MinGW.
350	350	** It is possible (in theory) to only use this routine when compiling
351	351	** with MinGW and to use built-in command-line parsing for MSVC and
		@@ -454,11 +454,11 @@
454	454	}
455	455	argv[argc] = NULL;
456	456	*argcPtr = argc;
457	457	((WCHAR **)argvPtr) = argv;
458	458	}
459		-#endif /* defined(_WIN32) */
	459	+#endif /* defined(_WIN32) && !defined(__MINGW32__) */
460	460
461	461
462	462	/*
463	463	** Convert all arguments from mbcs (or unicode) to UTF-8. Then
464	464	** search g.argv for arguments "--args FILENAME". If found, then
		@@ -478,17 +478,17 @@
478	478	int n; /* Number of bytes in one line */
479	479	char z; / General use string pointer */
480	480	char *newArgv; / New expanded g.argv under construction */
481	481	char const * zFileName; /* input file name */
482	482	FILE * zInFile; /* input FILE */
483		-#if defined(_WIN32)
	483	+#if defined(_WIN32) && !defined(__MINGW32__)
484	484	WCHAR buf[MAX_PATH];
485	485	#endif
486	486
487	487	g.argc = argc;
488	488	g.argv = argv;
489		-#if defined(_WIN32)
	489	+#if defined(_WIN32) && !defined(__MINGW32__)
490	490	parse_windows_command_line(&g.argc, &g.argv);
491	491	GetModuleFileNameW(NULL, buf, MAX_PATH);
492	492	g.nameOfExe = fossil_unicode_to_utf8(buf);
493	493	for(i=0; i<g.argc; i++) g.argv[i] = fossil_unicode_to_utf8(g.argv[i]);
494	494	#else
495	495

	--- src/main.c
	+++ src/main.c
	@@ -341,11 +341,11 @@
341	if(g.db){
342	db_close(0);
343	}
344	}
345
346	#if defined(_WIN32)
347	/*
348	** Parse the command-line arguments passed to windows. We do this
349	** ourselves to work around bugs in the command-line parsing of MinGW.
350	** It is possible (in theory) to only use this routine when compiling
351	** with MinGW and to use built-in command-line parsing for MSVC and
	@@ -454,11 +454,11 @@
454	}
455	argv[argc] = NULL;
456	*argcPtr = argc;
457	((WCHAR **)argvPtr) = argv;
458	}
459	#endif /* defined(_WIN32) */
460
461
462	/*
463	** Convert all arguments from mbcs (or unicode) to UTF-8. Then
464	** search g.argv for arguments "--args FILENAME". If found, then
	@@ -478,17 +478,17 @@
478	int n; /* Number of bytes in one line */
479	char z; / General use string pointer */
480	char *newArgv; / New expanded g.argv under construction */
481	char const * zFileName; /* input file name */
482	FILE * zInFile; /* input FILE */
483	#if defined(_WIN32)
484	WCHAR buf[MAX_PATH];
485	#endif
486
487	g.argc = argc;
488	g.argv = argv;
489	#if defined(_WIN32)
490	parse_windows_command_line(&g.argc, &g.argv);
491	GetModuleFileNameW(NULL, buf, MAX_PATH);
492	g.nameOfExe = fossil_unicode_to_utf8(buf);
493	for(i=0; i<g.argc; i++) g.argv[i] = fossil_unicode_to_utf8(g.argv[i]);
494	#else
495

	--- src/main.c
	+++ src/main.c
	@@ -341,11 +341,11 @@
341	if(g.db){
342	db_close(0);
343	}
344	}
345
346	#if defined(_WIN32) && !defined(__MINGW32__)
347	/*
348	** Parse the command-line arguments passed to windows. We do this
349	** ourselves to work around bugs in the command-line parsing of MinGW.
350	** It is possible (in theory) to only use this routine when compiling
351	** with MinGW and to use built-in command-line parsing for MSVC and
	@@ -454,11 +454,11 @@
454	}
455	argv[argc] = NULL;
456	*argcPtr = argc;
457	((WCHAR **)argvPtr) = argv;
458	}
459	#endif /* defined(_WIN32) && !defined(__MINGW32__) */
460
461
462	/*
463	** Convert all arguments from mbcs (or unicode) to UTF-8. Then
464	** search g.argv for arguments "--args FILENAME". If found, then
	@@ -478,17 +478,17 @@
478	int n; /* Number of bytes in one line */
479	char z; / General use string pointer */
480	char *newArgv; / New expanded g.argv under construction */
481	char const * zFileName; /* input file name */
482	FILE * zInFile; /* input FILE */
483	#if defined(_WIN32) && !defined(__MINGW32__)
484	WCHAR buf[MAX_PATH];
485	#endif
486
487	g.argc = argc;
488	g.argv = argv;
489	#if defined(_WIN32) && !defined(__MINGW32__)
490	parse_windows_command_line(&g.argc, &g.argv);
491	GetModuleFileNameW(NULL, buf, MAX_PATH);
492	g.nameOfExe = fossil_unicode_to_utf8(buf);
493	for(i=0; i<g.argc; i++) g.argv[i] = fossil_unicode_to_utf8(g.argv[i]);
494	#else
495

M win/Makefile.mingw

+5 -5

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -13,14 +13,14 @@
13	13	#
14	14
15	15	#### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
16	16	# By default, this is an empty string (i.e. use the native compiler).
17	17	#
18		-# PREFIX =
	18	+PREFIX =
19	19	# PREFIX = mingw32-
20	20	# PREFIX = i686-pc-mingw32-
21		-PREFIX = i686-w64-mingw32-
	21	+# PREFIX = i686-w64-mingw32-
22	22	# PREFIX = x86_64-w64-mingw32-
23	23
24	24	#### The toplevel directory of the source tree. Fossil can be built
25	25	# in a directory that is separate from the source tree. Just change
26	26	# the following to point from the build directory to the src/ folder.
		@@ -42,19 +42,19 @@
42	42	#
43	43	# FOSSIL_ENABLE_JSON = 1
44	44
45	45	#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
46	46	#
47		-FOSSIL_ENABLE_SSL = 1
	47	+# FOSSIL_ENABLE_SSL = 1
48	48
49	49	#### Enable scripting support via Tcl/Tk
50	50	#
51		-FOSSIL_ENABLE_TCL = 1
	51	+# FOSSIL_ENABLE_TCL = 1
52	52
53	53	#### Load Tcl using the stubs mechanism
54	54	#
55		-FOSSIL_ENABLE_TCL_STUBS = 1
	55	+# FOSSIL_ENABLE_TCL_STUBS = 1
56	56
57	57	#### Use the Tcl source directory instead of the install directory?
58	58	# This is useful when Tcl has been compiled statically with MinGW.
59	59	#
60	60	FOSSIL_TCL_SOURCE = 1
61	61

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -13,14 +13,14 @@
13	#
14
15	#### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
16	# By default, this is an empty string (i.e. use the native compiler).
17	#
18	# PREFIX =
19	# PREFIX = mingw32-
20	# PREFIX = i686-pc-mingw32-
21	PREFIX = i686-w64-mingw32-
22	# PREFIX = x86_64-w64-mingw32-
23
24	#### The toplevel directory of the source tree. Fossil can be built
25	# in a directory that is separate from the source tree. Just change
26	# the following to point from the build directory to the src/ folder.
	@@ -42,19 +42,19 @@
42	#
43	# FOSSIL_ENABLE_JSON = 1
44
45	#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
46	#
47	FOSSIL_ENABLE_SSL = 1
48
49	#### Enable scripting support via Tcl/Tk
50	#
51	FOSSIL_ENABLE_TCL = 1
52
53	#### Load Tcl using the stubs mechanism
54	#
55	FOSSIL_ENABLE_TCL_STUBS = 1
56
57	#### Use the Tcl source directory instead of the install directory?
58	# This is useful when Tcl has been compiled statically with MinGW.
59	#
60	FOSSIL_TCL_SOURCE = 1
61

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -13,14 +13,14 @@
13	#
14
15	#### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
16	# By default, this is an empty string (i.e. use the native compiler).
17	#
18	PREFIX =
19	# PREFIX = mingw32-
20	# PREFIX = i686-pc-mingw32-
21	# PREFIX = i686-w64-mingw32-
22	# PREFIX = x86_64-w64-mingw32-
23
24	#### The toplevel directory of the source tree. Fossil can be built
25	# in a directory that is separate from the source tree. Just change
26	# the following to point from the build directory to the src/ folder.
	@@ -42,19 +42,19 @@
42	#
43	# FOSSIL_ENABLE_JSON = 1
44
45	#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
46	#
47	# FOSSIL_ENABLE_SSL = 1
48
49	#### Enable scripting support via Tcl/Tk
50	#
51	# FOSSIL_ENABLE_TCL = 1
52
53	#### Load Tcl using the stubs mechanism
54	#
55	# FOSSIL_ENABLE_TCL_STUBS = 1
56
57	#### Use the Tcl source directory instead of the install directory?
58	# This is useful when Tcl has been compiled statically with MinGW.
59	#
60	FOSSIL_TCL_SOURCE = 1
61

Fossil SCM

Keyboard Shortcuts