Fossil

Check-in [774bdc83]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Use the native directory separator for the extra files in the MSVC makefile.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256:774bdc83556442c5373ff2c1bb4b98994256e07af678cc62b929ba04ceb8b643
User & Date: mistachkin 2018-08-02 11:56:08
References
2018-08-06
21:19
Fix the mkbuiltin.c code generator so that it tolerates Windows-style backslash path separators on its arguments. This fixes the windows build that was busted by check-in [774bdc83556442c5]. check-in: 030bf200 user: drh tags: trunk
Context
2018-08-03
21:06
Merged in ben-json-timeline (adds /json/timeline/event). check-in: 74c908e7 user: stephan tags: trunk
2018-08-02
11:58
Merge updates from trunk. check-in: b6a0c001 user: mistachkin tags: cmake-ide
11:56
Use the native directory separator for the extra files in the MSVC makefile. check-in: 774bdc83 user: mistachkin tags: trunk
06:54
Refactor to fix an unused var warning in debug build check-in: 811333a5 user: ashepilko tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/makemake.tcl.

1803
1804
1805
1806
1807
1808
1809

1810
1811
1812
1813
1814
1815
1816
writeln -nonewline "EXTRA_FILES   = "
set i 0
foreach s [lsort $extra_files] {
  if {$i > 0} {
    writeln " \\"
    writeln -nonewline "        "
  }

  writeln -nonewline "\$(SRCDIR)\\${s}"; incr i
}
writeln "\n"
set AdditionalObj [list shell sqlite3 th th_lang th_tcl cson_amalgamation]
writeln -nonewline "OBJ   = "
set i 0
foreach s [lsort [concat $src $AdditionalObj]] {







>







1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
writeln -nonewline "EXTRA_FILES   = "
set i 0
foreach s [lsort $extra_files] {
  if {$i > 0} {
    writeln " \\"
    writeln -nonewline "        "
  }
  set s [file nativename $s]
  writeln -nonewline "\$(SRCDIR)\\${s}"; incr i
}
writeln "\n"
set AdditionalObj [list shell sqlite3 th th_lang th_tcl cson_amalgamation]
writeln -nonewline "OBJ   = "
set i 0
foreach s [lsort [concat $src $AdditionalObj]] {

Changes to win/Makefile.msc.

510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
        winfile_.c \
        winhttp_.c \
        wysiwyg_.c \
        xfer_.c \
        xfersetup_.c \
        zip_.c

EXTRA_FILES   = $(SRCDIR)\../skins/aht/details.txt \
        $(SRCDIR)\../skins/ardoise/css.txt \
        $(SRCDIR)\../skins/ardoise/details.txt \
        $(SRCDIR)\../skins/ardoise/footer.txt \
        $(SRCDIR)\../skins/ardoise/header.txt \
        $(SRCDIR)\../skins/black_and_white/css.txt \
        $(SRCDIR)\../skins/black_and_white/details.txt \
        $(SRCDIR)\../skins/black_and_white/footer.txt \
        $(SRCDIR)\../skins/black_and_white/header.txt \
        $(SRCDIR)\../skins/blitz/css.txt \
        $(SRCDIR)\../skins/blitz/details.txt \
        $(SRCDIR)\../skins/blitz/footer.txt \
        $(SRCDIR)\../skins/blitz/header.txt \
        $(SRCDIR)\../skins/blitz/ticket.txt \
        $(SRCDIR)\../skins/blitz_no_logo/css.txt \
        $(SRCDIR)\../skins/blitz_no_logo/details.txt \
        $(SRCDIR)\../skins/blitz_no_logo/footer.txt \
        $(SRCDIR)\../skins/blitz_no_logo/header.txt \
        $(SRCDIR)\../skins/blitz_no_logo/ticket.txt \
        $(SRCDIR)\../skins/bootstrap/css.txt \
        $(SRCDIR)\../skins/bootstrap/details.txt \
        $(SRCDIR)\../skins/bootstrap/footer.txt \
        $(SRCDIR)\../skins/bootstrap/header.txt \
        $(SRCDIR)\../skins/default/css.txt \
        $(SRCDIR)\../skins/default/details.txt \
        $(SRCDIR)\../skins/default/footer.txt \
        $(SRCDIR)\../skins/default/header.txt \
        $(SRCDIR)\../skins/eagle/css.txt \
        $(SRCDIR)\../skins/eagle/details.txt \
        $(SRCDIR)\../skins/eagle/footer.txt \
        $(SRCDIR)\../skins/eagle/header.txt \
        $(SRCDIR)\../skins/enhanced1/css.txt \
        $(SRCDIR)\../skins/enhanced1/details.txt \
        $(SRCDIR)\../skins/enhanced1/footer.txt \
        $(SRCDIR)\../skins/enhanced1/header.txt \
        $(SRCDIR)\../skins/khaki/css.txt \
        $(SRCDIR)\../skins/khaki/details.txt \
        $(SRCDIR)\../skins/khaki/footer.txt \
        $(SRCDIR)\../skins/khaki/header.txt \
        $(SRCDIR)\../skins/original/css.txt \
        $(SRCDIR)\../skins/original/details.txt \
        $(SRCDIR)\../skins/original/footer.txt \
        $(SRCDIR)\../skins/original/header.txt \
        $(SRCDIR)\../skins/plain_gray/css.txt \
        $(SRCDIR)\../skins/plain_gray/details.txt \
        $(SRCDIR)\../skins/plain_gray/footer.txt \
        $(SRCDIR)\../skins/plain_gray/header.txt \
        $(SRCDIR)\../skins/rounded1/css.txt \
        $(SRCDIR)\../skins/rounded1/details.txt \
        $(SRCDIR)\../skins/rounded1/footer.txt \
        $(SRCDIR)\../skins/rounded1/header.txt \
        $(SRCDIR)\../skins/xekri/css.txt \
        $(SRCDIR)\../skins/xekri/details.txt \
        $(SRCDIR)\../skins/xekri/footer.txt \
        $(SRCDIR)\../skins/xekri/header.txt \
        $(SRCDIR)\ci_edit.js \
        $(SRCDIR)\diff.tcl \
        $(SRCDIR)\graph.js \
        $(SRCDIR)\href.js \
        $(SRCDIR)\login.js \
        $(SRCDIR)\markdown.md \
        $(SRCDIR)\menu.js \







|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|







510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
        winfile_.c \
        winhttp_.c \
        wysiwyg_.c \
        xfer_.c \
        xfersetup_.c \
        zip_.c

EXTRA_FILES   = $(SRCDIR)\..\skins\aht\details.txt \
        $(SRCDIR)\..\skins\ardoise\css.txt \
        $(SRCDIR)\..\skins\ardoise\details.txt \
        $(SRCDIR)\..\skins\ardoise\footer.txt \
        $(SRCDIR)\..\skins\ardoise\header.txt \
        $(SRCDIR)\..\skins\black_and_white\css.txt \
        $(SRCDIR)\..\skins\black_and_white\details.txt \
        $(SRCDIR)\..\skins\black_and_white\footer.txt \
        $(SRCDIR)\..\skins\black_and_white\header.txt \
        $(SRCDIR)\..\skins\blitz\css.txt \
        $(SRCDIR)\..\skins\blitz\details.txt \
        $(SRCDIR)\..\skins\blitz\footer.txt \
        $(SRCDIR)\..\skins\blitz\header.txt \
        $(SRCDIR)\..\skins\blitz\ticket.txt \
        $(SRCDIR)\..\skins\blitz_no_logo\css.txt \
        $(SRCDIR)\..\skins\blitz_no_logo\details.txt \
        $(SRCDIR)\..\skins\blitz_no_logo\footer.txt \
        $(SRCDIR)\..\skins\blitz_no_logo\header.txt \
        $(SRCDIR)\..\skins\blitz_no_logo\ticket.txt \
        $(SRCDIR)\..\skins\bootstrap\css.txt \
        $(SRCDIR)\..\skins\bootstrap\details.txt \
        $(SRCDIR)\..\skins\bootstrap\footer.txt \
        $(SRCDIR)\..\skins\bootstrap\header.txt \
        $(SRCDIR)\..\skins\default\css.txt \
        $(SRCDIR)\..\skins\default\details.txt \
        $(SRCDIR)\..\skins\default\footer.txt \
        $(SRCDIR)\..\skins\default\header.txt \
        $(SRCDIR)\..\skins\eagle\css.txt \
        $(SRCDIR)\..\skins\eagle\details.txt \
        $(SRCDIR)\..\skins\eagle\footer.txt \
        $(SRCDIR)\..\skins\eagle\header.txt \
        $(SRCDIR)\..\skins\enhanced1\css.txt \
        $(SRCDIR)\..\skins\enhanced1\details.txt \
        $(SRCDIR)\..\skins\enhanced1\footer.txt \
        $(SRCDIR)\..\skins\enhanced1\header.txt \
        $(SRCDIR)\..\skins\khaki\css.txt \
        $(SRCDIR)\..\skins\khaki\details.txt \
        $(SRCDIR)\..\skins\khaki\footer.txt \
        $(SRCDIR)\..\skins\khaki\header.txt \
        $(SRCDIR)\..\skins\original\css.txt \
        $(SRCDIR)\..\skins\original\details.txt \
        $(SRCDIR)\..\skins\original\footer.txt \
        $(SRCDIR)\..\skins\original\header.txt \
        $(SRCDIR)\..\skins\plain_gray\css.txt \
        $(SRCDIR)\..\skins\plain_gray\details.txt \
        $(SRCDIR)\..\skins\plain_gray\footer.txt \
        $(SRCDIR)\..\skins\plain_gray\header.txt \
        $(SRCDIR)\..\skins\rounded1\css.txt \
        $(SRCDIR)\..\skins\rounded1\details.txt \
        $(SRCDIR)\..\skins\rounded1\footer.txt \
        $(SRCDIR)\..\skins\rounded1\header.txt \
        $(SRCDIR)\..\skins\xekri\css.txt \
        $(SRCDIR)\..\skins\xekri\details.txt \
        $(SRCDIR)\..\skins\xekri\footer.txt \
        $(SRCDIR)\..\skins\xekri\header.txt \
        $(SRCDIR)\ci_edit.js \
        $(SRCDIR)\diff.tcl \
        $(SRCDIR)\graph.js \
        $(SRCDIR)\href.js \
        $(SRCDIR)\login.js \
        $(SRCDIR)\markdown.md \
        $(SRCDIR)\menu.js \