Fossil SCM

Put back 'win32-longpath' VFS as default for Cygwin: Cygwin doesn't suffer from path limitations (at least, not until 4096 chars), so usage of the 'win32' VFS is not reasonable as default.

jan.nijtmans 2013-12-12 08:43 trunk
Commit a76039815d75ec274a72139903670f2e799e140b
Parent 19de4b5bcdc8236…
3 files changed +5 +1 -1 +1 -1
~ src/main.c ~ src/main.mk ~ src/makemake.tcl
M src/main.c
+5
--- src/main.c
+++ src/main.c
@@ -580,10 +580,15 @@
580580
 #endif
581581
 g.mainTimerId = fossil_timer_start();
582582
 g.zVfsName = find_option("vfs",0,1);
583583
 if( g.zVfsName==0 ){
584584
 g.zVfsName = fossil_getenv("FOSSIL_VFS");
585
+#if defined(__CYGWIN__)
586
+ if( g.zVfsName==0 && sqlite3_libversion_number()>=3008001 ){
587
+ g.zVfsName = "win32-longpath";
588
+ }
589
+#endif
585590
 }
586591
 if( g.zVfsName ){
587592
 sqlite3_vfs *pVfs = sqlite3_vfs_find(g.zVfsName);
588593
 if( pVfs ){
589594
 sqlite3_vfs_register(pVfs, 1);
590595
--- src/main.c
+++ src/main.c
@@ -580,10 +580,15 @@
580 #endif
581 g.mainTimerId = fossil_timer_start();
582 g.zVfsName = find_option("vfs",0,1);
583 if( g.zVfsName==0 ){
584 g.zVfsName = fossil_getenv("FOSSIL_VFS");
 
 
 
 
 
585 }
586 if( g.zVfsName ){
587 sqlite3_vfs *pVfs = sqlite3_vfs_find(g.zVfsName);
588 if( pVfs ){
589 sqlite3_vfs_register(pVfs, 1);
590
--- src/main.c
+++ src/main.c
@@ -580,10 +580,15 @@
580 #endif
581 g.mainTimerId = fossil_timer_start();
582 g.zVfsName = find_option("vfs",0,1);
583 if( g.zVfsName==0 ){
584 g.zVfsName = fossil_getenv("FOSSIL_VFS");
585 #if defined(__CYGWIN__)
586 if( g.zVfsName==0 && sqlite3_libversion_number()>=3008001 ){
587 g.zVfsName = "win32-longpath";
588 }
589 #endif
590 }
591 if( g.zVfsName ){
592 sqlite3_vfs *pVfs = sqlite3_vfs_find(g.zVfsName);
593 if( pVfs ){
594 sqlite3_vfs_register(pVfs, 1);
595
M src/main.mk
+1 -1
--- src/main.mk
+++ src/main.mk
@@ -1160,11 +1160,11 @@
11601160
 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
11611161
 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
11621162
11631163
 $(OBJDIR)/zip.h: $(OBJDIR)/headers
11641164
 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1165
- $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1165
+ $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI -DSQLITE_WINNT_MAX_PATH_CHARS=4096 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
11661166
11671167
 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
11681168
 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
11691169
11701170
 $(OBJDIR)/th.o: $(SRCDIR)/th.c
11711171
--- src/main.mk
+++ src/main.mk
@@ -1160,11 +1160,11 @@
1160 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1161 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1162
1163 $(OBJDIR)/zip.h: $(OBJDIR)/headers
1164 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1165 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1166
1167 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1168 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1169
1170 $(OBJDIR)/th.o: $(SRCDIR)/th.c
1171
--- src/main.mk
+++ src/main.mk
@@ -1160,11 +1160,11 @@
1160 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1161 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1162
1163 $(OBJDIR)/zip.h: $(OBJDIR)/headers
1164 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1165 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI -DSQLITE_WINNT_MAX_PATH_CHARS=4096 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1166
1167 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1168 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1169
1170 $(OBJDIR)/th.o: $(SRCDIR)/th.c
1171
M src/makemake.tcl
+1 -1
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -295,11 +295,11 @@
295295
 append opt " -DSQLITE_ENABLE_EXPLAIN_COMMENTS"
296296
 append opt " -Dlocaltime=fossil_localtime"
297297
 append opt " -DSQLITE_ENABLE_LOCKING_STYLE=0"
298298
 append opt " -DSQLITE_WIN32_NO_ANSI"
299299
 set SQLITE_OPTIONS $opt
300
-writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
300
+writeln "\t\$(XTCC) $opt -DSQLITE_WINNT_MAX_PATH_CHARS=4096 -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
301301
302302
 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
303303
 set opt {-Dmain=sqlite3_shell}
304304
 append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
305305
 append opt " -Dsqlite3_strglob=strglob"
306306
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -295,11 +295,11 @@
295 append opt " -DSQLITE_ENABLE_EXPLAIN_COMMENTS"
296 append opt " -Dlocaltime=fossil_localtime"
297 append opt " -DSQLITE_ENABLE_LOCKING_STYLE=0"
298 append opt " -DSQLITE_WIN32_NO_ANSI"
299 set SQLITE_OPTIONS $opt
300 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
301
302 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
303 set opt {-Dmain=sqlite3_shell}
304 append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
305 append opt " -Dsqlite3_strglob=strglob"
306
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -295,11 +295,11 @@
295 append opt " -DSQLITE_ENABLE_EXPLAIN_COMMENTS"
296 append opt " -Dlocaltime=fossil_localtime"
297 append opt " -DSQLITE_ENABLE_LOCKING_STYLE=0"
298 append opt " -DSQLITE_WIN32_NO_ANSI"
299 set SQLITE_OPTIONS $opt
300 writeln "\t\$(XTCC) $opt -DSQLITE_WINNT_MAX_PATH_CHARS=4096 -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
301
302 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
303 set opt {-Dmain=sqlite3_shell}
304 append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
305 append opt " -Dsqlite3_strglob=strglob"
306

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button