Fossil SCM
The generated makefiles expect dat you do mkdir build cd build nmake -f ..\win\Makefile.msc This will put all the files in build. So no polution of the root of the source tree and you can build for the different compilers
Commit
99e0a29efec1997ae459b0170cf640211ea4f3ca
Parent
c00f79d054e2610…
3 files changed
+35
-36
+18
-22
+16
-13
+35
-36
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -215,19 +215,20 @@ | ||
| 215 | 215 | # |
| 216 | 216 | # This file is automatically generated. Instead of editing this |
| 217 | 217 | # file, edit "makemake.tcl" then run |
| 218 | 218 | # "tclsh src/makemake.tcl dmc > win/Makefile.dmc" |
| 219 | 219 | # to regenerate this file. |
| 220 | -SRCDIR = src | |
| 221 | -OBJDIR = dmcobj | |
| 220 | +B = .. | |
| 221 | +SRCDIR = $B\src | |
| 222 | +OBJDIR = . | |
| 222 | 223 | O = .obj |
| 223 | 224 | E = .exe |
| 224 | 225 | |
| 225 | 226 | |
| 226 | 227 | # Maybe DMDIR, SSL or INCL needs adjustment |
| 227 | 228 | DMDIR = c:\DM |
| 228 | -INCL = -I. -I$(SRCDIR) -Iwin\include -I$(DMDIR)\extra\include | |
| 229 | +INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(DMDIR)\extra\include | |
| 229 | 230 | |
| 230 | 231 | #SSL = -DFOSSIL_ENABLE_SSL=1 |
| 231 | 232 | SSL = |
| 232 | 233 | |
| 233 | 234 | DMCDEF = -Dstrncasecmp=memicmp -Dstrcasecmp=stricmp |
| @@ -250,11 +251,11 @@ | ||
| 250 | 251 | puts "\$(OBJDIR)\\sqlite3\$O \$(OBJDIR)\\th\$O \$(OBJDIR)\\th_lang\$O " |
| 251 | 252 | puts { |
| 252 | 253 | |
| 253 | 254 | APPNAME = $(OBJDIR)\fossil$(E) |
| 254 | 255 | |
| 255 | -all: $(OBJDIR) $(APPNAME) | |
| 256 | +all: $(APPNAME) | |
| 256 | 257 | |
| 257 | 258 | $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OBJDIR)\link |
| 258 | 259 | cd $(OBJDIR) |
| 259 | 260 | $(DMDIR)\bin\link @link |
| 260 | 261 | |
| @@ -267,25 +268,20 @@ | ||
| 267 | 268 | puts "\t+echo fossil >> \$@" |
| 268 | 269 | puts "\t+echo fossil >> \$@" |
| 269 | 270 | puts "\t+echo \$(LIBS) >> \$@\n\n" |
| 270 | 271 | |
| 271 | 272 | puts { |
| 272 | - | |
| 273 | - | |
| 274 | -$(OBJDIR): | |
| 275 | - @-mkdir $@ | |
| 276 | - | |
| 277 | -translate$E: $(SRCDIR)/translate.c | |
| 278 | - $(BCC) -o$@ $** | |
| 279 | - | |
| 280 | -makeheaders$E: $(SRCDIR)/makeheaders.c | |
| 281 | - $(BCC) -o$@ $** | |
| 282 | - | |
| 283 | -mkindex$E: $(SRCDIR)/mkindex.c | |
| 284 | - $(BCC) -o$@ $** | |
| 285 | - | |
| 286 | -version$E: win/version.c | |
| 273 | +translate$E: $(SRCDIR)\translate.c | |
| 274 | + $(BCC) -o$@ $** | |
| 275 | + | |
| 276 | +makeheaders$E: $(SRCDIR)\makeheaders.c | |
| 277 | + $(BCC) -o$@ $** | |
| 278 | + | |
| 279 | +mkindex$E: $(SRCDIR)\mkindex.c | |
| 280 | + $(BCC) -o$@ $** | |
| 281 | + | |
| 282 | +version$E: $B\win\version.c | |
| 287 | 283 | $(BCC) -o$@ $** |
| 288 | 284 | |
| 289 | 285 | $(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c |
| 290 | 286 | $(TCC) -o$@ -c -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 $** |
| 291 | 287 | |
| @@ -293,11 +289,11 @@ | ||
| 293 | 289 | $(TCC) -o$@ -c $** |
| 294 | 290 | |
| 295 | 291 | $(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c |
| 296 | 292 | $(TCC) -o$@ -c $** |
| 297 | 293 | |
| 298 | -VERSION.h : version$E manifest.uuid manifest | |
| 294 | +VERSION.h : version$E $B\manifest.uuid $B\manifest | |
| 299 | 295 | +$** > $@ |
| 300 | 296 | |
| 301 | 297 | page_index.h: mkindex$E $(SRC) |
| 302 | 298 | +$** > $@ |
| 303 | 299 | |
| @@ -318,12 +314,12 @@ | ||
| 318 | 314 | |
| 319 | 315 | puts -nonewline "headers: makeheaders\$E page_index.h VERSION.h\n\t +makeheaders\$E " |
| 320 | 316 | foreach s [lsort $src] { |
| 321 | 317 | puts -nonewline "${s}_.c:$s.h " |
| 322 | 318 | } |
| 323 | -puts "src\\sqlite3.h src\\th.h VERSION.h" | |
| 324 | -puts "\tcopy nul headers" | |
| 319 | +puts "\$(SRCDIR)\\sqlite3.h \$(SRCDIR)\\th.h VERSION.h" | |
| 320 | +puts "\t@copy /Y nul: headers" | |
| 325 | 321 | exit |
| 326 | 322 | } |
| 327 | 323 | |
| 328 | 324 | if { "msc" == [lindex $argv 0] } { |
| 329 | 325 | |
| @@ -331,30 +327,33 @@ | ||
| 331 | 327 | # |
| 332 | 328 | # This file is automatically generated. Instead of editing this |
| 333 | 329 | # file, edit "makemake.tcl" then run |
| 334 | 330 | # "tclsh src/makemake.tcl msc > win/Makefile.msc" |
| 335 | 331 | # to regenerate this file. |
| 336 | -SRCDIR = src | |
| 337 | -OBJDIR = mscobj | |
| 332 | +B = .. | |
| 333 | +SRCDIR = $B\src | |
| 334 | +OBJDIR = . | |
| 338 | 335 | O = .obj |
| 339 | 336 | E = .exe |
| 340 | 337 | |
| 341 | 338 | |
| 342 | 339 | # Maybe MSCDIR, SSL or INCL needs adjustment |
| 343 | 340 | MSCDIR = c:\msc |
| 344 | -INCL = -I. -I$(SRCDIR) -Iwin\include -I$(MSCDIR)\extra\include | |
| 341 | +INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include | |
| 345 | 342 | |
| 346 | 343 | #SSL = -DFOSSIL_ENABLE_SSL=1 |
| 347 | 344 | SSL = |
| 348 | 345 | |
| 349 | 346 | MSCDEF = -Dstrncasecmp=memicmp -Dstrcasecmp=stricmp |
| 350 | 347 | I18N = -DFOSSIL_I18N=0 |
| 351 | 348 | |
| 352 | 349 | CFLAGS = -nologo -MD -O2 -Oy- -Zi |
| 350 | +CFLAGS = -nologo -MD -O2 -Oy- | |
| 353 | 351 | BCC = $(CC) $(CFLAGS) |
| 354 | 352 | TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(I18N) $(SSL) $(INCL) |
| 355 | 353 | LIBS = zlib.lib ws2_32.lib |
| 354 | +LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib | |
| 356 | 355 | } |
| 357 | 356 | puts -nonewline "SRC = " |
| 358 | 357 | foreach s [lsort $src] { |
| 359 | 358 | puts -nonewline "${s}_.c " |
| 360 | 359 | } |
| @@ -370,11 +369,11 @@ | ||
| 370 | 369 | |
| 371 | 370 | all: $(OBJDIR) $(APPNAME) |
| 372 | 371 | |
| 373 | 372 | $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OBJDIR)\link |
| 374 | 373 | cd $(OBJDIR) |
| 375 | - link -LINK -OUT:fossil$E -LIBPATH:$(MSCDIR)\extra\lib @link | |
| 374 | + link -LINK -OUT:$@ $(LIBDIR) @link | |
| 376 | 375 | |
| 377 | 376 | $(OBJDIR)\link:} |
| 378 | 377 | puts -nonewline "\techo " |
| 379 | 378 | foreach s [lsort $src] { |
| 380 | 379 | puts -nonewline "$s " |
| @@ -386,20 +385,20 @@ | ||
| 386 | 385 | |
| 387 | 386 | |
| 388 | 387 | $(OBJDIR): |
| 389 | 388 | @-mkdir $@ |
| 390 | 389 | |
| 391 | -translate$E: $(SRCDIR)/translate.c | |
| 390 | +translate$E: $(SRCDIR)\translate.c | |
| 391 | + $(BCC) $** | |
| 392 | + | |
| 393 | +makeheaders$E: $(SRCDIR)\makeheaders.c | |
| 392 | 394 | $(BCC) $** |
| 393 | 395 | |
| 394 | -makeheaders$E: $(SRCDIR)/makeheaders.c | |
| 396 | +mkindex$E: $(SRCDIR)\mkindex.c | |
| 395 | 397 | $(BCC) $** |
| 396 | 398 | |
| 397 | -mkindex$E: $(SRCDIR)/mkindex.c | |
| 398 | - $(BCC) $** | |
| 399 | - | |
| 400 | -version$E: win/version.c | |
| 399 | +version$E: $B\win\version.c | |
| 401 | 400 | $(BCC) $** |
| 402 | 401 | |
| 403 | 402 | $(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c |
| 404 | 403 | $(TCC) /Fo$@ -c -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 $** |
| 405 | 404 | |
| @@ -407,11 +406,11 @@ | ||
| 407 | 406 | $(TCC) /Fo$@ -c $** |
| 408 | 407 | |
| 409 | 408 | $(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c |
| 410 | 409 | $(TCC) /Fo$@ -c $** |
| 411 | 410 | |
| 412 | -VERSION.h : version$E manifest.uuid manifest | |
| 411 | +VERSION.h : version$E $B\manifest.uuid $B\manifest | |
| 413 | 412 | $** > $@ |
| 414 | 413 | |
| 415 | 414 | page_index.h: mkindex$E $(SRC) |
| 416 | 415 | $** > $@ |
| 417 | 416 | |
| @@ -428,13 +427,13 @@ | ||
| 428 | 427 | puts "\t\$(TCC) /Fo\$@ -c \$**\n" |
| 429 | 428 | puts "${s}_.c : \$(SRCDIR)\\$s.c" |
| 430 | 429 | puts "\ttranslate\$E \$** > \$@\n" |
| 431 | 430 | } |
| 432 | 431 | |
| 433 | -puts -nonewline "headers: makeheaders\$E page_index.h VERSION.h\n\t makeheaders\$E " | |
| 432 | +puts -nonewline "headers: makeheaders\$E page_index.h VERSION.h\n\tmakeheaders\$E " | |
| 434 | 433 | foreach s [lsort $src] { |
| 435 | 434 | puts -nonewline "${s}_.c:$s.h " |
| 436 | 435 | } |
| 437 | -puts "src\\sqlite3.h src\\th.h VERSION.h" | |
| 438 | -puts "\tcopy /Y nul: headers" | |
| 436 | +puts "\$(SRCDIR)\\sqlite3.h \$(SRCDIR)\\th.h VERSION.h" | |
| 437 | +puts "\t@copy /Y nul: headers" | |
| 439 | 438 | |
| 440 | 439 | } |
| 441 | 440 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -215,19 +215,20 @@ | |
| 215 | # |
| 216 | # This file is automatically generated. Instead of editing this |
| 217 | # file, edit "makemake.tcl" then run |
| 218 | # "tclsh src/makemake.tcl dmc > win/Makefile.dmc" |
| 219 | # to regenerate this file. |
| 220 | SRCDIR = src |
| 221 | OBJDIR = dmcobj |
| 222 | O = .obj |
| 223 | E = .exe |
| 224 | |
| 225 | |
| 226 | # Maybe DMDIR, SSL or INCL needs adjustment |
| 227 | DMDIR = c:\DM |
| 228 | INCL = -I. -I$(SRCDIR) -Iwin\include -I$(DMDIR)\extra\include |
| 229 | |
| 230 | #SSL = -DFOSSIL_ENABLE_SSL=1 |
| 231 | SSL = |
| 232 | |
| 233 | DMCDEF = -Dstrncasecmp=memicmp -Dstrcasecmp=stricmp |
| @@ -250,11 +251,11 @@ | |
| 250 | puts "\$(OBJDIR)\\sqlite3\$O \$(OBJDIR)\\th\$O \$(OBJDIR)\\th_lang\$O " |
| 251 | puts { |
| 252 | |
| 253 | APPNAME = $(OBJDIR)\fossil$(E) |
| 254 | |
| 255 | all: $(OBJDIR) $(APPNAME) |
| 256 | |
| 257 | $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OBJDIR)\link |
| 258 | cd $(OBJDIR) |
| 259 | $(DMDIR)\bin\link @link |
| 260 | |
| @@ -267,25 +268,20 @@ | |
| 267 | puts "\t+echo fossil >> \$@" |
| 268 | puts "\t+echo fossil >> \$@" |
| 269 | puts "\t+echo \$(LIBS) >> \$@\n\n" |
| 270 | |
| 271 | puts { |
| 272 | |
| 273 | |
| 274 | $(OBJDIR): |
| 275 | @-mkdir $@ |
| 276 | |
| 277 | translate$E: $(SRCDIR)/translate.c |
| 278 | $(BCC) -o$@ $** |
| 279 | |
| 280 | makeheaders$E: $(SRCDIR)/makeheaders.c |
| 281 | $(BCC) -o$@ $** |
| 282 | |
| 283 | mkindex$E: $(SRCDIR)/mkindex.c |
| 284 | $(BCC) -o$@ $** |
| 285 | |
| 286 | version$E: win/version.c |
| 287 | $(BCC) -o$@ $** |
| 288 | |
| 289 | $(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c |
| 290 | $(TCC) -o$@ -c -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 $** |
| 291 | |
| @@ -293,11 +289,11 @@ | |
| 293 | $(TCC) -o$@ -c $** |
| 294 | |
| 295 | $(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c |
| 296 | $(TCC) -o$@ -c $** |
| 297 | |
| 298 | VERSION.h : version$E manifest.uuid manifest |
| 299 | +$** > $@ |
| 300 | |
| 301 | page_index.h: mkindex$E $(SRC) |
| 302 | +$** > $@ |
| 303 | |
| @@ -318,12 +314,12 @@ | |
| 318 | |
| 319 | puts -nonewline "headers: makeheaders\$E page_index.h VERSION.h\n\t +makeheaders\$E " |
| 320 | foreach s [lsort $src] { |
| 321 | puts -nonewline "${s}_.c:$s.h " |
| 322 | } |
| 323 | puts "src\\sqlite3.h src\\th.h VERSION.h" |
| 324 | puts "\tcopy nul headers" |
| 325 | exit |
| 326 | } |
| 327 | |
| 328 | if { "msc" == [lindex $argv 0] } { |
| 329 | |
| @@ -331,30 +327,33 @@ | |
| 331 | # |
| 332 | # This file is automatically generated. Instead of editing this |
| 333 | # file, edit "makemake.tcl" then run |
| 334 | # "tclsh src/makemake.tcl msc > win/Makefile.msc" |
| 335 | # to regenerate this file. |
| 336 | SRCDIR = src |
| 337 | OBJDIR = mscobj |
| 338 | O = .obj |
| 339 | E = .exe |
| 340 | |
| 341 | |
| 342 | # Maybe MSCDIR, SSL or INCL needs adjustment |
| 343 | MSCDIR = c:\msc |
| 344 | INCL = -I. -I$(SRCDIR) -Iwin\include -I$(MSCDIR)\extra\include |
| 345 | |
| 346 | #SSL = -DFOSSIL_ENABLE_SSL=1 |
| 347 | SSL = |
| 348 | |
| 349 | MSCDEF = -Dstrncasecmp=memicmp -Dstrcasecmp=stricmp |
| 350 | I18N = -DFOSSIL_I18N=0 |
| 351 | |
| 352 | CFLAGS = -nologo -MD -O2 -Oy- -Zi |
| 353 | BCC = $(CC) $(CFLAGS) |
| 354 | TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(I18N) $(SSL) $(INCL) |
| 355 | LIBS = zlib.lib ws2_32.lib |
| 356 | } |
| 357 | puts -nonewline "SRC = " |
| 358 | foreach s [lsort $src] { |
| 359 | puts -nonewline "${s}_.c " |
| 360 | } |
| @@ -370,11 +369,11 @@ | |
| 370 | |
| 371 | all: $(OBJDIR) $(APPNAME) |
| 372 | |
| 373 | $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OBJDIR)\link |
| 374 | cd $(OBJDIR) |
| 375 | link -LINK -OUT:fossil$E -LIBPATH:$(MSCDIR)\extra\lib @link |
| 376 | |
| 377 | $(OBJDIR)\link:} |
| 378 | puts -nonewline "\techo " |
| 379 | foreach s [lsort $src] { |
| 380 | puts -nonewline "$s " |
| @@ -386,20 +385,20 @@ | |
| 386 | |
| 387 | |
| 388 | $(OBJDIR): |
| 389 | @-mkdir $@ |
| 390 | |
| 391 | translate$E: $(SRCDIR)/translate.c |
| 392 | $(BCC) $** |
| 393 | |
| 394 | makeheaders$E: $(SRCDIR)/makeheaders.c |
| 395 | $(BCC) $** |
| 396 | |
| 397 | mkindex$E: $(SRCDIR)/mkindex.c |
| 398 | $(BCC) $** |
| 399 | |
| 400 | version$E: win/version.c |
| 401 | $(BCC) $** |
| 402 | |
| 403 | $(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c |
| 404 | $(TCC) /Fo$@ -c -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 $** |
| 405 | |
| @@ -407,11 +406,11 @@ | |
| 407 | $(TCC) /Fo$@ -c $** |
| 408 | |
| 409 | $(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c |
| 410 | $(TCC) /Fo$@ -c $** |
| 411 | |
| 412 | VERSION.h : version$E manifest.uuid manifest |
| 413 | $** > $@ |
| 414 | |
| 415 | page_index.h: mkindex$E $(SRC) |
| 416 | $** > $@ |
| 417 | |
| @@ -428,13 +427,13 @@ | |
| 428 | puts "\t\$(TCC) /Fo\$@ -c \$**\n" |
| 429 | puts "${s}_.c : \$(SRCDIR)\\$s.c" |
| 430 | puts "\ttranslate\$E \$** > \$@\n" |
| 431 | } |
| 432 | |
| 433 | puts -nonewline "headers: makeheaders\$E page_index.h VERSION.h\n\t makeheaders\$E " |
| 434 | foreach s [lsort $src] { |
| 435 | puts -nonewline "${s}_.c:$s.h " |
| 436 | } |
| 437 | puts "src\\sqlite3.h src\\th.h VERSION.h" |
| 438 | puts "\tcopy /Y nul: headers" |
| 439 | |
| 440 | } |
| 441 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -215,19 +215,20 @@ | |
| 215 | # |
| 216 | # This file is automatically generated. Instead of editing this |
| 217 | # file, edit "makemake.tcl" then run |
| 218 | # "tclsh src/makemake.tcl dmc > win/Makefile.dmc" |
| 219 | # to regenerate this file. |
| 220 | B = .. |
| 221 | SRCDIR = $B\src |
| 222 | OBJDIR = . |
| 223 | O = .obj |
| 224 | E = .exe |
| 225 | |
| 226 | |
| 227 | # Maybe DMDIR, SSL or INCL needs adjustment |
| 228 | DMDIR = c:\DM |
| 229 | INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(DMDIR)\extra\include |
| 230 | |
| 231 | #SSL = -DFOSSIL_ENABLE_SSL=1 |
| 232 | SSL = |
| 233 | |
| 234 | DMCDEF = -Dstrncasecmp=memicmp -Dstrcasecmp=stricmp |
| @@ -250,11 +251,11 @@ | |
| 251 | puts "\$(OBJDIR)\\sqlite3\$O \$(OBJDIR)\\th\$O \$(OBJDIR)\\th_lang\$O " |
| 252 | puts { |
| 253 | |
| 254 | APPNAME = $(OBJDIR)\fossil$(E) |
| 255 | |
| 256 | all: $(APPNAME) |
| 257 | |
| 258 | $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OBJDIR)\link |
| 259 | cd $(OBJDIR) |
| 260 | $(DMDIR)\bin\link @link |
| 261 | |
| @@ -267,25 +268,20 @@ | |
| 268 | puts "\t+echo fossil >> \$@" |
| 269 | puts "\t+echo fossil >> \$@" |
| 270 | puts "\t+echo \$(LIBS) >> \$@\n\n" |
| 271 | |
| 272 | puts { |
| 273 | translate$E: $(SRCDIR)\translate.c |
| 274 | $(BCC) -o$@ $** |
| 275 | |
| 276 | makeheaders$E: $(SRCDIR)\makeheaders.c |
| 277 | $(BCC) -o$@ $** |
| 278 | |
| 279 | mkindex$E: $(SRCDIR)\mkindex.c |
| 280 | $(BCC) -o$@ $** |
| 281 | |
| 282 | version$E: $B\win\version.c |
| 283 | $(BCC) -o$@ $** |
| 284 | |
| 285 | $(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c |
| 286 | $(TCC) -o$@ -c -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 $** |
| 287 | |
| @@ -293,11 +289,11 @@ | |
| 289 | $(TCC) -o$@ -c $** |
| 290 | |
| 291 | $(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c |
| 292 | $(TCC) -o$@ -c $** |
| 293 | |
| 294 | VERSION.h : version$E $B\manifest.uuid $B\manifest |
| 295 | +$** > $@ |
| 296 | |
| 297 | page_index.h: mkindex$E $(SRC) |
| 298 | +$** > $@ |
| 299 | |
| @@ -318,12 +314,12 @@ | |
| 314 | |
| 315 | puts -nonewline "headers: makeheaders\$E page_index.h VERSION.h\n\t +makeheaders\$E " |
| 316 | foreach s [lsort $src] { |
| 317 | puts -nonewline "${s}_.c:$s.h " |
| 318 | } |
| 319 | puts "\$(SRCDIR)\\sqlite3.h \$(SRCDIR)\\th.h VERSION.h" |
| 320 | puts "\t@copy /Y nul: headers" |
| 321 | exit |
| 322 | } |
| 323 | |
| 324 | if { "msc" == [lindex $argv 0] } { |
| 325 | |
| @@ -331,30 +327,33 @@ | |
| 327 | # |
| 328 | # This file is automatically generated. Instead of editing this |
| 329 | # file, edit "makemake.tcl" then run |
| 330 | # "tclsh src/makemake.tcl msc > win/Makefile.msc" |
| 331 | # to regenerate this file. |
| 332 | B = .. |
| 333 | SRCDIR = $B\src |
| 334 | OBJDIR = . |
| 335 | O = .obj |
| 336 | E = .exe |
| 337 | |
| 338 | |
| 339 | # Maybe MSCDIR, SSL or INCL needs adjustment |
| 340 | MSCDIR = c:\msc |
| 341 | INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include |
| 342 | |
| 343 | #SSL = -DFOSSIL_ENABLE_SSL=1 |
| 344 | SSL = |
| 345 | |
| 346 | MSCDEF = -Dstrncasecmp=memicmp -Dstrcasecmp=stricmp |
| 347 | I18N = -DFOSSIL_I18N=0 |
| 348 | |
| 349 | CFLAGS = -nologo -MD -O2 -Oy- -Zi |
| 350 | CFLAGS = -nologo -MD -O2 -Oy- |
| 351 | BCC = $(CC) $(CFLAGS) |
| 352 | TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(I18N) $(SSL) $(INCL) |
| 353 | LIBS = zlib.lib ws2_32.lib |
| 354 | LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib |
| 355 | } |
| 356 | puts -nonewline "SRC = " |
| 357 | foreach s [lsort $src] { |
| 358 | puts -nonewline "${s}_.c " |
| 359 | } |
| @@ -370,11 +369,11 @@ | |
| 369 | |
| 370 | all: $(OBJDIR) $(APPNAME) |
| 371 | |
| 372 | $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OBJDIR)\link |
| 373 | cd $(OBJDIR) |
| 374 | link -LINK -OUT:$@ $(LIBDIR) @link |
| 375 | |
| 376 | $(OBJDIR)\link:} |
| 377 | puts -nonewline "\techo " |
| 378 | foreach s [lsort $src] { |
| 379 | puts -nonewline "$s " |
| @@ -386,20 +385,20 @@ | |
| 385 | |
| 386 | |
| 387 | $(OBJDIR): |
| 388 | @-mkdir $@ |
| 389 | |
| 390 | translate$E: $(SRCDIR)\translate.c |
| 391 | $(BCC) $** |
| 392 | |
| 393 | makeheaders$E: $(SRCDIR)\makeheaders.c |
| 394 | $(BCC) $** |
| 395 | |
| 396 | mkindex$E: $(SRCDIR)\mkindex.c |
| 397 | $(BCC) $** |
| 398 | |
| 399 | version$E: $B\win\version.c |
| 400 | $(BCC) $** |
| 401 | |
| 402 | $(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c |
| 403 | $(TCC) /Fo$@ -c -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 $** |
| 404 | |
| @@ -407,11 +406,11 @@ | |
| 406 | $(TCC) /Fo$@ -c $** |
| 407 | |
| 408 | $(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c |
| 409 | $(TCC) /Fo$@ -c $** |
| 410 | |
| 411 | VERSION.h : version$E $B\manifest.uuid $B\manifest |
| 412 | $** > $@ |
| 413 | |
| 414 | page_index.h: mkindex$E $(SRC) |
| 415 | $** > $@ |
| 416 | |
| @@ -428,13 +427,13 @@ | |
| 427 | puts "\t\$(TCC) /Fo\$@ -c \$**\n" |
| 428 | puts "${s}_.c : \$(SRCDIR)\\$s.c" |
| 429 | puts "\ttranslate\$E \$** > \$@\n" |
| 430 | } |
| 431 | |
| 432 | puts -nonewline "headers: makeheaders\$E page_index.h VERSION.h\n\tmakeheaders\$E " |
| 433 | foreach s [lsort $src] { |
| 434 | puts -nonewline "${s}_.c:$s.h " |
| 435 | } |
| 436 | puts "\$(SRCDIR)\\sqlite3.h \$(SRCDIR)\\th.h VERSION.h" |
| 437 | puts "\t@copy /Y nul: headers" |
| 438 | |
| 439 | } |
| 440 |
+18
-22
| --- win/Makefile.dmc | ||
| +++ win/Makefile.dmc | ||
| @@ -2,19 +2,20 @@ | ||
| 2 | 2 | # |
| 3 | 3 | # This file is automatically generated. Instead of editing this |
| 4 | 4 | # file, edit "makemake.tcl" then run |
| 5 | 5 | # "tclsh src/makemake.tcl dmc > win/Makefile.dmc" |
| 6 | 6 | # to regenerate this file. |
| 7 | -SRCDIR = src | |
| 8 | -OBJDIR = dmcobj | |
| 7 | +B = .. | |
| 8 | +SRCDIR = $B\src | |
| 9 | +OBJDIR = . | |
| 9 | 10 | O = .obj |
| 10 | 11 | E = .exe |
| 11 | 12 | |
| 12 | 13 | |
| 13 | 14 | # Maybe DMDIR, SSL or INCL needs adjustment |
| 14 | 15 | DMDIR = c:\DM |
| 15 | -INCL = -I. -I$(SRCDIR) -Iwin\include -I$(DMDIR)\extra\include | |
| 16 | +INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(DMDIR)\extra\include | |
| 16 | 17 | |
| 17 | 18 | #SSL = -DFOSSIL_ENABLE_SSL=1 |
| 18 | 19 | SSL = |
| 19 | 20 | |
| 20 | 21 | DMCDEF = -Dstrncasecmp=memicmp -Dstrcasecmp=stricmp |
| @@ -30,11 +31,11 @@ | ||
| 30 | 31 | OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\graph$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\info$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O |
| 31 | 32 | |
| 32 | 33 | |
| 33 | 34 | APPNAME = $(OBJDIR)\fossil$(E) |
| 34 | 35 | |
| 35 | -all: $(OBJDIR) $(APPNAME) | |
| 36 | +all: $(APPNAME) | |
| 36 | 37 | |
| 37 | 38 | $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OBJDIR)\link |
| 38 | 39 | cd $(OBJDIR) |
| 39 | 40 | $(DMDIR)\bin\link @link |
| 40 | 41 | |
| @@ -44,25 +45,20 @@ | ||
| 44 | 45 | +echo fossil >> $@ |
| 45 | 46 | +echo $(LIBS) >> $@ |
| 46 | 47 | |
| 47 | 48 | |
| 48 | 49 | |
| 49 | - | |
| 50 | - | |
| 51 | -$(OBJDIR): | |
| 52 | - @-mkdir $@ | |
| 53 | - | |
| 54 | -translate$E: $(SRCDIR)/translate.c | |
| 55 | - $(BCC) -o$@ $** | |
| 56 | - | |
| 57 | -makeheaders$E: $(SRCDIR)/makeheaders.c | |
| 58 | - $(BCC) -o$@ $** | |
| 59 | - | |
| 60 | -mkindex$E: $(SRCDIR)/mkindex.c | |
| 61 | - $(BCC) -o$@ $** | |
| 62 | - | |
| 63 | -version$E: win/version.c | |
| 50 | +translate$E: $(SRCDIR)\translate.c | |
| 51 | + $(BCC) -o$@ $** | |
| 52 | + | |
| 53 | +makeheaders$E: $(SRCDIR)\makeheaders.c | |
| 54 | + $(BCC) -o$@ $** | |
| 55 | + | |
| 56 | +mkindex$E: $(SRCDIR)\mkindex.c | |
| 57 | + $(BCC) -o$@ $** | |
| 58 | + | |
| 59 | +version$E: $B\win\version.c | |
| 64 | 60 | $(BCC) -o$@ $** |
| 65 | 61 | |
| 66 | 62 | $(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c |
| 67 | 63 | $(TCC) -o$@ -c -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 $** |
| 68 | 64 | |
| @@ -70,11 +66,11 @@ | ||
| 70 | 66 | $(TCC) -o$@ -c $** |
| 71 | 67 | |
| 72 | 68 | $(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c |
| 73 | 69 | $(TCC) -o$@ -c $** |
| 74 | 70 | |
| 75 | -VERSION.h : version$E manifest.uuid manifest | |
| 71 | +VERSION.h : version$E $B\manifest.uuid $B\manifest | |
| 76 | 72 | +$** > $@ |
| 77 | 73 | |
| 78 | 74 | page_index.h: mkindex$E $(SRC) |
| 79 | 75 | +$** > $@ |
| 80 | 76 | |
| @@ -511,7 +507,7 @@ | ||
| 511 | 507 | |
| 512 | 508 | zip_.c : $(SRCDIR)\zip.c |
| 513 | 509 | +translate$E $** > $@ |
| 514 | 510 | |
| 515 | 511 | headers: makeheaders$E page_index.h VERSION.h |
| 516 | - +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h file_.c:file.h finfo_.c:finfo.h graph_.c:graph.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h info_.c:info.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h src\sqlite3.h src\th.h VERSION.h | |
| 517 | - copy nul headers | |
| 512 | + +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h file_.c:file.h finfo_.c:finfo.h graph_.c:graph.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h info_.c:info.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h | |
| 513 | + @copy /Y nul: headers | |
| 518 | 514 |
| --- win/Makefile.dmc | |
| +++ win/Makefile.dmc | |
| @@ -2,19 +2,20 @@ | |
| 2 | # |
| 3 | # This file is automatically generated. Instead of editing this |
| 4 | # file, edit "makemake.tcl" then run |
| 5 | # "tclsh src/makemake.tcl dmc > win/Makefile.dmc" |
| 6 | # to regenerate this file. |
| 7 | SRCDIR = src |
| 8 | OBJDIR = dmcobj |
| 9 | O = .obj |
| 10 | E = .exe |
| 11 | |
| 12 | |
| 13 | # Maybe DMDIR, SSL or INCL needs adjustment |
| 14 | DMDIR = c:\DM |
| 15 | INCL = -I. -I$(SRCDIR) -Iwin\include -I$(DMDIR)\extra\include |
| 16 | |
| 17 | #SSL = -DFOSSIL_ENABLE_SSL=1 |
| 18 | SSL = |
| 19 | |
| 20 | DMCDEF = -Dstrncasecmp=memicmp -Dstrcasecmp=stricmp |
| @@ -30,11 +31,11 @@ | |
| 30 | OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\graph$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\info$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O |
| 31 | |
| 32 | |
| 33 | APPNAME = $(OBJDIR)\fossil$(E) |
| 34 | |
| 35 | all: $(OBJDIR) $(APPNAME) |
| 36 | |
| 37 | $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OBJDIR)\link |
| 38 | cd $(OBJDIR) |
| 39 | $(DMDIR)\bin\link @link |
| 40 | |
| @@ -44,25 +45,20 @@ | |
| 44 | +echo fossil >> $@ |
| 45 | +echo $(LIBS) >> $@ |
| 46 | |
| 47 | |
| 48 | |
| 49 | |
| 50 | |
| 51 | $(OBJDIR): |
| 52 | @-mkdir $@ |
| 53 | |
| 54 | translate$E: $(SRCDIR)/translate.c |
| 55 | $(BCC) -o$@ $** |
| 56 | |
| 57 | makeheaders$E: $(SRCDIR)/makeheaders.c |
| 58 | $(BCC) -o$@ $** |
| 59 | |
| 60 | mkindex$E: $(SRCDIR)/mkindex.c |
| 61 | $(BCC) -o$@ $** |
| 62 | |
| 63 | version$E: win/version.c |
| 64 | $(BCC) -o$@ $** |
| 65 | |
| 66 | $(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c |
| 67 | $(TCC) -o$@ -c -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 $** |
| 68 | |
| @@ -70,11 +66,11 @@ | |
| 70 | $(TCC) -o$@ -c $** |
| 71 | |
| 72 | $(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c |
| 73 | $(TCC) -o$@ -c $** |
| 74 | |
| 75 | VERSION.h : version$E manifest.uuid manifest |
| 76 | +$** > $@ |
| 77 | |
| 78 | page_index.h: mkindex$E $(SRC) |
| 79 | +$** > $@ |
| 80 | |
| @@ -511,7 +507,7 @@ | |
| 511 | |
| 512 | zip_.c : $(SRCDIR)\zip.c |
| 513 | +translate$E $** > $@ |
| 514 | |
| 515 | headers: makeheaders$E page_index.h VERSION.h |
| 516 | +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h file_.c:file.h finfo_.c:finfo.h graph_.c:graph.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h info_.c:info.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h src\sqlite3.h src\th.h VERSION.h |
| 517 | copy nul headers |
| 518 |
| --- win/Makefile.dmc | |
| +++ win/Makefile.dmc | |
| @@ -2,19 +2,20 @@ | |
| 2 | # |
| 3 | # This file is automatically generated. Instead of editing this |
| 4 | # file, edit "makemake.tcl" then run |
| 5 | # "tclsh src/makemake.tcl dmc > win/Makefile.dmc" |
| 6 | # to regenerate this file. |
| 7 | B = .. |
| 8 | SRCDIR = $B\src |
| 9 | OBJDIR = . |
| 10 | O = .obj |
| 11 | E = .exe |
| 12 | |
| 13 | |
| 14 | # Maybe DMDIR, SSL or INCL needs adjustment |
| 15 | DMDIR = c:\DM |
| 16 | INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(DMDIR)\extra\include |
| 17 | |
| 18 | #SSL = -DFOSSIL_ENABLE_SSL=1 |
| 19 | SSL = |
| 20 | |
| 21 | DMCDEF = -Dstrncasecmp=memicmp -Dstrcasecmp=stricmp |
| @@ -30,11 +31,11 @@ | |
| 31 | OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\graph$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\info$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O |
| 32 | |
| 33 | |
| 34 | APPNAME = $(OBJDIR)\fossil$(E) |
| 35 | |
| 36 | all: $(APPNAME) |
| 37 | |
| 38 | $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OBJDIR)\link |
| 39 | cd $(OBJDIR) |
| 40 | $(DMDIR)\bin\link @link |
| 41 | |
| @@ -44,25 +45,20 @@ | |
| 45 | +echo fossil >> $@ |
| 46 | +echo $(LIBS) >> $@ |
| 47 | |
| 48 | |
| 49 | |
| 50 | translate$E: $(SRCDIR)\translate.c |
| 51 | $(BCC) -o$@ $** |
| 52 | |
| 53 | makeheaders$E: $(SRCDIR)\makeheaders.c |
| 54 | $(BCC) -o$@ $** |
| 55 | |
| 56 | mkindex$E: $(SRCDIR)\mkindex.c |
| 57 | $(BCC) -o$@ $** |
| 58 | |
| 59 | version$E: $B\win\version.c |
| 60 | $(BCC) -o$@ $** |
| 61 | |
| 62 | $(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c |
| 63 | $(TCC) -o$@ -c -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 $** |
| 64 | |
| @@ -70,11 +66,11 @@ | |
| 66 | $(TCC) -o$@ -c $** |
| 67 | |
| 68 | $(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c |
| 69 | $(TCC) -o$@ -c $** |
| 70 | |
| 71 | VERSION.h : version$E $B\manifest.uuid $B\manifest |
| 72 | +$** > $@ |
| 73 | |
| 74 | page_index.h: mkindex$E $(SRC) |
| 75 | +$** > $@ |
| 76 | |
| @@ -511,7 +507,7 @@ | |
| 507 | |
| 508 | zip_.c : $(SRCDIR)\zip.c |
| 509 | +translate$E $** > $@ |
| 510 | |
| 511 | headers: makeheaders$E page_index.h VERSION.h |
| 512 | +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h file_.c:file.h finfo_.c:finfo.h graph_.c:graph.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h info_.c:info.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h |
| 513 | @copy /Y nul: headers |
| 514 |
+16
-13
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -2,30 +2,33 @@ | ||
| 2 | 2 | # |
| 3 | 3 | # This file is automatically generated. Instead of editing this |
| 4 | 4 | # file, edit "makemake.tcl" then run |
| 5 | 5 | # "tclsh src/makemake.tcl msc > win/Makefile.msc" |
| 6 | 6 | # to regenerate this file. |
| 7 | -SRCDIR = src | |
| 8 | -OBJDIR = mscobj | |
| 7 | +B = .. | |
| 8 | +SRCDIR = $B\src | |
| 9 | +OBJDIR = . | |
| 9 | 10 | O = .obj |
| 10 | 11 | E = .exe |
| 11 | 12 | |
| 12 | 13 | |
| 13 | 14 | # Maybe MSCDIR, SSL or INCL needs adjustment |
| 14 | 15 | MSCDIR = c:\msc |
| 15 | -INCL = -I. -I$(SRCDIR) -Iwin\include -I$(MSCDIR)\extra\include | |
| 16 | +INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include | |
| 16 | 17 | |
| 17 | 18 | #SSL = -DFOSSIL_ENABLE_SSL=1 |
| 18 | 19 | SSL = |
| 19 | 20 | |
| 20 | 21 | MSCDEF = -Dstrncasecmp=memicmp -Dstrcasecmp=stricmp |
| 21 | 22 | I18N = -DFOSSIL_I18N=0 |
| 22 | 23 | |
| 23 | 24 | CFLAGS = -nologo -MD -O2 -Oy- -Zi |
| 25 | +CFLAGS = -nologo -MD -O2 -Oy- | |
| 24 | 26 | BCC = $(CC) $(CFLAGS) |
| 25 | 27 | TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(I18N) $(SSL) $(INCL) |
| 26 | 28 | LIBS = zlib.lib ws2_32.lib |
| 29 | +LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib | |
| 27 | 30 | |
| 28 | 31 | SRC = add_.c allrepo_.c attach_.c bag_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c file_.c finfo_.c graph_.c http_.c http_socket_.c http_ssl_.c http_transport_.c info_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c stat_.c style_.c sync_.c tag_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c |
| 29 | 32 | |
| 30 | 33 | OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\graph$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\info$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O |
| 31 | 34 | |
| @@ -34,11 +37,11 @@ | ||
| 34 | 37 | |
| 35 | 38 | all: $(OBJDIR) $(APPNAME) |
| 36 | 39 | |
| 37 | 40 | $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OBJDIR)\link |
| 38 | 41 | cd $(OBJDIR) |
| 39 | - link -LINK -OUT:fossil$E -LIBPATH:$(MSCDIR)\extra\lib @link | |
| 42 | + link -LINK -OUT:$@ $(LIBDIR) @link | |
| 40 | 43 | |
| 41 | 44 | $(OBJDIR)\link: |
| 42 | 45 | echo add allrepo attach bag blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode file finfo graph http http_socket http_ssl http_transport info login main manifest md5 merge merge3 name pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins stat style sync tag th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer zip sqlite3 th th_lang > $@ |
| 43 | 46 | echo $(LIBS) >> $@ |
| 44 | 47 | |
| @@ -47,20 +50,20 @@ | ||
| 47 | 50 | |
| 48 | 51 | |
| 49 | 52 | $(OBJDIR): |
| 50 | 53 | @-mkdir $@ |
| 51 | 54 | |
| 52 | -translate$E: $(SRCDIR)/translate.c | |
| 55 | +translate$E: $(SRCDIR)\translate.c | |
| 56 | + $(BCC) $** | |
| 57 | + | |
| 58 | +makeheaders$E: $(SRCDIR)\makeheaders.c | |
| 53 | 59 | $(BCC) $** |
| 54 | 60 | |
| 55 | -makeheaders$E: $(SRCDIR)/makeheaders.c | |
| 61 | +mkindex$E: $(SRCDIR)\mkindex.c | |
| 56 | 62 | $(BCC) $** |
| 57 | 63 | |
| 58 | -mkindex$E: $(SRCDIR)/mkindex.c | |
| 59 | - $(BCC) $** | |
| 60 | - | |
| 61 | -version$E: win/version.c | |
| 64 | +version$E: $B\win\version.c | |
| 62 | 65 | $(BCC) $** |
| 63 | 66 | |
| 64 | 67 | $(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c |
| 65 | 68 | $(TCC) /Fo$@ -c -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 $** |
| 66 | 69 | |
| @@ -68,11 +71,11 @@ | ||
| 68 | 71 | $(TCC) /Fo$@ -c $** |
| 69 | 72 | |
| 70 | 73 | $(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c |
| 71 | 74 | $(TCC) /Fo$@ -c $** |
| 72 | 75 | |
| 73 | -VERSION.h : version$E manifest.uuid manifest | |
| 76 | +VERSION.h : version$E $B\manifest.uuid $B\manifest | |
| 74 | 77 | $** > $@ |
| 75 | 78 | |
| 76 | 79 | page_index.h: mkindex$E $(SRC) |
| 77 | 80 | $** > $@ |
| 78 | 81 | |
| @@ -509,7 +512,7 @@ | ||
| 509 | 512 | |
| 510 | 513 | zip_.c : $(SRCDIR)\zip.c |
| 511 | 514 | translate$E $** > $@ |
| 512 | 515 | |
| 513 | 516 | headers: makeheaders$E page_index.h VERSION.h |
| 514 | - makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h file_.c:file.h finfo_.c:finfo.h graph_.c:graph.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h info_.c:info.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h src\sqlite3.h src\th.h VERSION.h | |
| 515 | - copy /Y nul: headers | |
| 517 | + makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h file_.c:file.h finfo_.c:finfo.h graph_.c:graph.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h info_.c:info.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h | |
| 518 | + @copy /Y nul: headers | |
| 516 | 519 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -2,30 +2,33 @@ | |
| 2 | # |
| 3 | # This file is automatically generated. Instead of editing this |
| 4 | # file, edit "makemake.tcl" then run |
| 5 | # "tclsh src/makemake.tcl msc > win/Makefile.msc" |
| 6 | # to regenerate this file. |
| 7 | SRCDIR = src |
| 8 | OBJDIR = mscobj |
| 9 | O = .obj |
| 10 | E = .exe |
| 11 | |
| 12 | |
| 13 | # Maybe MSCDIR, SSL or INCL needs adjustment |
| 14 | MSCDIR = c:\msc |
| 15 | INCL = -I. -I$(SRCDIR) -Iwin\include -I$(MSCDIR)\extra\include |
| 16 | |
| 17 | #SSL = -DFOSSIL_ENABLE_SSL=1 |
| 18 | SSL = |
| 19 | |
| 20 | MSCDEF = -Dstrncasecmp=memicmp -Dstrcasecmp=stricmp |
| 21 | I18N = -DFOSSIL_I18N=0 |
| 22 | |
| 23 | CFLAGS = -nologo -MD -O2 -Oy- -Zi |
| 24 | BCC = $(CC) $(CFLAGS) |
| 25 | TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(I18N) $(SSL) $(INCL) |
| 26 | LIBS = zlib.lib ws2_32.lib |
| 27 | |
| 28 | SRC = add_.c allrepo_.c attach_.c bag_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c file_.c finfo_.c graph_.c http_.c http_socket_.c http_ssl_.c http_transport_.c info_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c stat_.c style_.c sync_.c tag_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c |
| 29 | |
| 30 | OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\graph$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\info$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O |
| 31 | |
| @@ -34,11 +37,11 @@ | |
| 34 | |
| 35 | all: $(OBJDIR) $(APPNAME) |
| 36 | |
| 37 | $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OBJDIR)\link |
| 38 | cd $(OBJDIR) |
| 39 | link -LINK -OUT:fossil$E -LIBPATH:$(MSCDIR)\extra\lib @link |
| 40 | |
| 41 | $(OBJDIR)\link: |
| 42 | echo add allrepo attach bag blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode file finfo graph http http_socket http_ssl http_transport info login main manifest md5 merge merge3 name pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins stat style sync tag th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer zip sqlite3 th th_lang > $@ |
| 43 | echo $(LIBS) >> $@ |
| 44 | |
| @@ -47,20 +50,20 @@ | |
| 47 | |
| 48 | |
| 49 | $(OBJDIR): |
| 50 | @-mkdir $@ |
| 51 | |
| 52 | translate$E: $(SRCDIR)/translate.c |
| 53 | $(BCC) $** |
| 54 | |
| 55 | makeheaders$E: $(SRCDIR)/makeheaders.c |
| 56 | $(BCC) $** |
| 57 | |
| 58 | mkindex$E: $(SRCDIR)/mkindex.c |
| 59 | $(BCC) $** |
| 60 | |
| 61 | version$E: win/version.c |
| 62 | $(BCC) $** |
| 63 | |
| 64 | $(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c |
| 65 | $(TCC) /Fo$@ -c -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 $** |
| 66 | |
| @@ -68,11 +71,11 @@ | |
| 68 | $(TCC) /Fo$@ -c $** |
| 69 | |
| 70 | $(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c |
| 71 | $(TCC) /Fo$@ -c $** |
| 72 | |
| 73 | VERSION.h : version$E manifest.uuid manifest |
| 74 | $** > $@ |
| 75 | |
| 76 | page_index.h: mkindex$E $(SRC) |
| 77 | $** > $@ |
| 78 | |
| @@ -509,7 +512,7 @@ | |
| 509 | |
| 510 | zip_.c : $(SRCDIR)\zip.c |
| 511 | translate$E $** > $@ |
| 512 | |
| 513 | headers: makeheaders$E page_index.h VERSION.h |
| 514 | makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h file_.c:file.h finfo_.c:finfo.h graph_.c:graph.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h info_.c:info.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h src\sqlite3.h src\th.h VERSION.h |
| 515 | copy /Y nul: headers |
| 516 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -2,30 +2,33 @@ | |
| 2 | # |
| 3 | # This file is automatically generated. Instead of editing this |
| 4 | # file, edit "makemake.tcl" then run |
| 5 | # "tclsh src/makemake.tcl msc > win/Makefile.msc" |
| 6 | # to regenerate this file. |
| 7 | B = .. |
| 8 | SRCDIR = $B\src |
| 9 | OBJDIR = . |
| 10 | O = .obj |
| 11 | E = .exe |
| 12 | |
| 13 | |
| 14 | # Maybe MSCDIR, SSL or INCL needs adjustment |
| 15 | MSCDIR = c:\msc |
| 16 | INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include |
| 17 | |
| 18 | #SSL = -DFOSSIL_ENABLE_SSL=1 |
| 19 | SSL = |
| 20 | |
| 21 | MSCDEF = -Dstrncasecmp=memicmp -Dstrcasecmp=stricmp |
| 22 | I18N = -DFOSSIL_I18N=0 |
| 23 | |
| 24 | CFLAGS = -nologo -MD -O2 -Oy- -Zi |
| 25 | CFLAGS = -nologo -MD -O2 -Oy- |
| 26 | BCC = $(CC) $(CFLAGS) |
| 27 | TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(I18N) $(SSL) $(INCL) |
| 28 | LIBS = zlib.lib ws2_32.lib |
| 29 | LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib |
| 30 | |
| 31 | SRC = add_.c allrepo_.c attach_.c bag_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c file_.c finfo_.c graph_.c http_.c http_socket_.c http_ssl_.c http_transport_.c info_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c stat_.c style_.c sync_.c tag_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c |
| 32 | |
| 33 | OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\graph$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\info$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O |
| 34 | |
| @@ -34,11 +37,11 @@ | |
| 37 | |
| 38 | all: $(OBJDIR) $(APPNAME) |
| 39 | |
| 40 | $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OBJDIR)\link |
| 41 | cd $(OBJDIR) |
| 42 | link -LINK -OUT:$@ $(LIBDIR) @link |
| 43 | |
| 44 | $(OBJDIR)\link: |
| 45 | echo add allrepo attach bag blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode file finfo graph http http_socket http_ssl http_transport info login main manifest md5 merge merge3 name pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins stat style sync tag th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer zip sqlite3 th th_lang > $@ |
| 46 | echo $(LIBS) >> $@ |
| 47 | |
| @@ -47,20 +50,20 @@ | |
| 50 | |
| 51 | |
| 52 | $(OBJDIR): |
| 53 | @-mkdir $@ |
| 54 | |
| 55 | translate$E: $(SRCDIR)\translate.c |
| 56 | $(BCC) $** |
| 57 | |
| 58 | makeheaders$E: $(SRCDIR)\makeheaders.c |
| 59 | $(BCC) $** |
| 60 | |
| 61 | mkindex$E: $(SRCDIR)\mkindex.c |
| 62 | $(BCC) $** |
| 63 | |
| 64 | version$E: $B\win\version.c |
| 65 | $(BCC) $** |
| 66 | |
| 67 | $(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c |
| 68 | $(TCC) /Fo$@ -c -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 $** |
| 69 | |
| @@ -68,11 +71,11 @@ | |
| 71 | $(TCC) /Fo$@ -c $** |
| 72 | |
| 73 | $(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c |
| 74 | $(TCC) /Fo$@ -c $** |
| 75 | |
| 76 | VERSION.h : version$E $B\manifest.uuid $B\manifest |
| 77 | $** > $@ |
| 78 | |
| 79 | page_index.h: mkindex$E $(SRC) |
| 80 | $** > $@ |
| 81 | |
| @@ -509,7 +512,7 @@ | |
| 512 | |
| 513 | zip_.c : $(SRCDIR)\zip.c |
| 514 | translate$E $** > $@ |
| 515 | |
| 516 | headers: makeheaders$E page_index.h VERSION.h |
| 517 | makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h file_.c:file.h finfo_.c:finfo.h graph_.c:graph.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h info_.c:info.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h |
| 518 | @copy /Y nul: headers |
| 519 |