Fossil SCM

Generate the big cssDefaultList table in the middle of style.c using default_css.txt as the source. The default_css.txt file will be easier to understand, edit, and comment.

drh 2017-11-29 19:18 trunk
Commit 5c9c51be5f033de2ba5bf38566ae7a14ee3e13438ae311c76856720f9a3fc2b3
Parent f9fc914eaef2c9e…
9 files changed +2 +9 -3 +42 -8 +87 +13 -829 +4 -1 +8 -2 +11 -3 +10 -1
+ src/default_css.txt ~ src/main.mk ~ src/makemake.tcl + src/mkcss.c ~ src/style.c ~ win/Makefile.PellesCGMake ~ win/Makefile.dmc ~ win/Makefile.mingw ~ win/Makefile.msc
A src/default_css.txt
+2
--- a/src/default_css.txt
+++ b/src/default_css.txt
@@ -0,0 +1,2 @@
1
+tr.timelineSpacer {
2
+ height: 1exhr
--- a/src/default_css.txt
+++ b/src/default_css.txt
@@ -0,0 +1,2 @@
 
 
--- a/src/default_css.txt
+++ b/src/default_css.txt
@@ -0,0 +1,2 @@
1 tr.timelineSpacer {
2 height: 1exhr
M src/main.mk
+9 -3
--- src/main.mk
+++ src/main.mk
@@ -486,10 +486,13 @@
486486
 $(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR)/mkbuiltin.c
487487
488488
 $(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
489489
 $(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
490490
491
+$(OBJDIR)/mkcss: $(SRCDIR)/mkcss.c
492
+ $(XBCC) -o $(OBJDIR)/mkcss $(SRCDIR)/mkcss.c
493
+
491494
 $(OBJDIR)/codecheck1: $(SRCDIR)/codecheck1.c
492495
 $(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR)/codecheck1.c
493496
494497
 # Run the test suite.
495498
 # Other flags that can be included in TESTFLAGS are:
@@ -507,10 +510,13 @@
507510
 test: $(OBJDIR) $(APPNAME)
508511
 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) -quiet $(TESTFLAGS)
509512
510513
 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
511514
 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
515
+
516
+$(OBJDIR)/default_css.h: $(SRCDIR)/default_css.txt $(OBJDIR)/mkcss
517
+ $(OBJDIR)/mkcss $(SRCDIR)/default_css.txt $(OBJDIR)/default_css.h
512518
513519
 # Setup the options used to compile the included SQLite library.
514520
 SQLITE_OPTIONS = -DNDEBUG=1 \
515521
 -DSQLITE_THREADSAFE=0 \
516522
 -DSQLITE_DEFAULT_MEMSTATUS=0 \
@@ -618,11 +624,11 @@
618624
 $(OBJDIR)/mkindex $(TRANS_SRC) >$@
619625
620626
 $(OBJDIR)/builtin_data.h: $(OBJDIR)/mkbuiltin $(EXTRA_FILES)
621627
 $(OBJDIR)/mkbuiltin --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
622628
623
-$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
629
+$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/default_css.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
624630
 $(OBJDIR)/makeheaders $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
625631
 $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
626632
 $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
627633
 $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
628634
 $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
@@ -748,11 +754,11 @@
748754
 $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h \
749755
 $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h \
750756
 $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h \
751757
 $(SRCDIR)/sqlite3.h \
752758
 $(SRCDIR)/th.h \
753
- $(OBJDIR)/VERSION.h
759
+ $(OBJDIR)/VERSION.h
754760
 touch $(OBJDIR)/headers
755761
 $(OBJDIR)/headers: Makefile
756762
 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/json_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
757763
 Makefile:
758764
 $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate
@@ -1564,11 +1570,11 @@
15641570
 $(OBJDIR)/statrep.h: $(OBJDIR)/headers
15651571
15661572
 $(OBJDIR)/style_.c: $(SRCDIR)/style.c $(OBJDIR)/translate
15671573
 $(OBJDIR)/translate $(SRCDIR)/style.c >$@
15681574
1569
-$(OBJDIR)/style.o: $(OBJDIR)/style_.c $(OBJDIR)/style.h $(SRCDIR)/config.h
1575
+$(OBJDIR)/style.o: $(OBJDIR)/style_.c $(OBJDIR)/style.h $(OBJDIR)/default_css.h $(SRCDIR)/config.h
15701576
 $(XTCC) -o $(OBJDIR)/style.o -c $(OBJDIR)/style_.c
15711577
15721578
 $(OBJDIR)/style.h: $(OBJDIR)/headers
15731579
15741580
 $(OBJDIR)/sync_.c: $(SRCDIR)/sync.c $(OBJDIR)/translate
15751581
--- src/main.mk
+++ src/main.mk
@@ -486,10 +486,13 @@
486 $(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR)/mkbuiltin.c
487
488 $(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
489 $(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
490
 
 
 
491 $(OBJDIR)/codecheck1: $(SRCDIR)/codecheck1.c
492 $(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR)/codecheck1.c
493
494 # Run the test suite.
495 # Other flags that can be included in TESTFLAGS are:
@@ -507,10 +510,13 @@
507 test: $(OBJDIR) $(APPNAME)
508 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) -quiet $(TESTFLAGS)
509
510 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
511 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
 
 
 
512
513 # Setup the options used to compile the included SQLite library.
514 SQLITE_OPTIONS = -DNDEBUG=1 \
515 -DSQLITE_THREADSAFE=0 \
516 -DSQLITE_DEFAULT_MEMSTATUS=0 \
@@ -618,11 +624,11 @@
618 $(OBJDIR)/mkindex $(TRANS_SRC) >$@
619
620 $(OBJDIR)/builtin_data.h: $(OBJDIR)/mkbuiltin $(EXTRA_FILES)
621 $(OBJDIR)/mkbuiltin --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
622
623 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
624 $(OBJDIR)/makeheaders $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
625 $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
626 $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
627 $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
628 $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
@@ -748,11 +754,11 @@
748 $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h \
749 $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h \
750 $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h \
751 $(SRCDIR)/sqlite3.h \
752 $(SRCDIR)/th.h \
753 $(OBJDIR)/VERSION.h
754 touch $(OBJDIR)/headers
755 $(OBJDIR)/headers: Makefile
756 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/json_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
757 Makefile:
758 $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate
@@ -1564,11 +1570,11 @@
1564 $(OBJDIR)/statrep.h: $(OBJDIR)/headers
1565
1566 $(OBJDIR)/style_.c: $(SRCDIR)/style.c $(OBJDIR)/translate
1567 $(OBJDIR)/translate $(SRCDIR)/style.c >$@
1568
1569 $(OBJDIR)/style.o: $(OBJDIR)/style_.c $(OBJDIR)/style.h $(SRCDIR)/config.h
1570 $(XTCC) -o $(OBJDIR)/style.o -c $(OBJDIR)/style_.c
1571
1572 $(OBJDIR)/style.h: $(OBJDIR)/headers
1573
1574 $(OBJDIR)/sync_.c: $(SRCDIR)/sync.c $(OBJDIR)/translate
1575
--- src/main.mk
+++ src/main.mk
@@ -486,10 +486,13 @@
486 $(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR)/mkbuiltin.c
487
488 $(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
489 $(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
490
491 $(OBJDIR)/mkcss: $(SRCDIR)/mkcss.c
492 $(XBCC) -o $(OBJDIR)/mkcss $(SRCDIR)/mkcss.c
493
494 $(OBJDIR)/codecheck1: $(SRCDIR)/codecheck1.c
495 $(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR)/codecheck1.c
496
497 # Run the test suite.
498 # Other flags that can be included in TESTFLAGS are:
@@ -507,10 +510,13 @@
510 test: $(OBJDIR) $(APPNAME)
511 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) -quiet $(TESTFLAGS)
512
513 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
514 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
515
516 $(OBJDIR)/default_css.h: $(SRCDIR)/default_css.txt $(OBJDIR)/mkcss
517 $(OBJDIR)/mkcss $(SRCDIR)/default_css.txt $(OBJDIR)/default_css.h
518
519 # Setup the options used to compile the included SQLite library.
520 SQLITE_OPTIONS = -DNDEBUG=1 \
521 -DSQLITE_THREADSAFE=0 \
522 -DSQLITE_DEFAULT_MEMSTATUS=0 \
@@ -618,11 +624,11 @@
624 $(OBJDIR)/mkindex $(TRANS_SRC) >$@
625
626 $(OBJDIR)/builtin_data.h: $(OBJDIR)/mkbuiltin $(EXTRA_FILES)
627 $(OBJDIR)/mkbuiltin --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
628
629 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/default_css.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
630 $(OBJDIR)/makeheaders $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
631 $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
632 $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
633 $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
634 $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
@@ -748,11 +754,11 @@
754 $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h \
755 $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h \
756 $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h \
757 $(SRCDIR)/sqlite3.h \
758 $(SRCDIR)/th.h \
759 $(OBJDIR)/VERSION.h
760 touch $(OBJDIR)/headers
761 $(OBJDIR)/headers: Makefile
762 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/json_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
763 Makefile:
764 $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate
@@ -1564,11 +1570,11 @@
1570 $(OBJDIR)/statrep.h: $(OBJDIR)/headers
1571
1572 $(OBJDIR)/style_.c: $(SRCDIR)/style.c $(OBJDIR)/translate
1573 $(OBJDIR)/translate $(SRCDIR)/style.c >$@
1574
1575 $(OBJDIR)/style.o: $(OBJDIR)/style_.c $(OBJDIR)/style.h $(OBJDIR)/default_css.h $(SRCDIR)/config.h
1576 $(XTCC) -o $(OBJDIR)/style.o -c $(OBJDIR)/style_.c
1577
1578 $(OBJDIR)/style.h: $(OBJDIR)/headers
1579
1580 $(OBJDIR)/sync_.c: $(SRCDIR)/sync.c $(OBJDIR)/translate
1581
M src/makemake.tcl
+42 -8
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -328,10 +328,13 @@
328328
 $(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR)/mkbuiltin.c
329329
330330
 $(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
331331
 $(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
332332
333
+$(OBJDIR)/mkcss: $(SRCDIR)/mkcss.c
334
+ $(XBCC) -o $(OBJDIR)/mkcss $(SRCDIR)/mkcss.c
335
+
333336
 $(OBJDIR)/codecheck1: $(SRCDIR)/codecheck1.c
334337
 $(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR)/codecheck1.c
335338
336339
 # Run the test suite.
337340
 # Other flags that can be included in TESTFLAGS are:
@@ -351,10 +354,13 @@
351354
352355
 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
353356
 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \
354357
 $(SRCDIR)/../manifest \
355358
 $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
359
+
360
+$(OBJDIR)/default_css.h: $(SRCDIR)/default_css.txt $(OBJDIR)/mkcss
361
+ $(OBJDIR)/mkcss $(SRCDIR)/default_css.txt $(OBJDIR)/default_css.h
356362
357363
 # Setup the options used to compile the included SQLite library.
358364
 SQLITE_OPTIONS = <<<SQLITE_OPTIONS>>>
359365
360366
 # Setup the options used to compile the included SQLite shell.
@@ -440,26 +446,27 @@
440446
 set extra_h($s) { }
441447
 }
442448
 append mhargs "\$(SRCDIR)/sqlite3.h <<<NEXT_LINE>>>"
443449
 append mhargs "\$(SRCDIR)/th.h <<<NEXT_LINE>>>"
444450
 #append mhargs "\$(SRCDIR)/cson_amalgamation.h <<<NEXT_LINE>>>"
445
-append mhargs "\$(OBJDIR)/VERSION.h"
451
+append mhargs "\$(OBJDIR)/VERSION.h "
446452
 set mhargs [string map [list <<<NEXT_LINE>>> \\\n\t] $mhargs]
447453
 writeln "\$(OBJDIR)/page_index.h: \$(TRANS_SRC) \$(OBJDIR)/mkindex"
448454
 writeln "\t\$(OBJDIR)/mkindex \$(TRANS_SRC) >\$@\n"
449455
450456
 writeln "\$(OBJDIR)/builtin_data.h: \$(OBJDIR)/mkbuiltin \$(EXTRA_FILES)"
451457
 writeln "\t\$(OBJDIR)/mkbuiltin --prefix \$(SRCDIR)/ \$(EXTRA_FILES) >\$@\n"
452458
453
-writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/builtin_data.h \$(OBJDIR)/makeheaders \$(OBJDIR)/VERSION.h"
459
+writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/builtin_data.h \$(OBJDIR)/default_css.h \$(OBJDIR)/makeheaders \$(OBJDIR)/VERSION.h"
454460
 writeln "\t\$(OBJDIR)/makeheaders $mhargs"
455461
 writeln "\ttouch \$(OBJDIR)/headers"
456462
 writeln "\$(OBJDIR)/headers: Makefile"
457463
 writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/json_finfo.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_status.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h"
458464
 writeln "Makefile:"
459465
 set extra_h(dispatch) " \$(OBJDIR)/page_index.h "
460466
 set extra_h(builtin) " \$(OBJDIR)/builtin_data.h "
467
+set extra_h(style) " \$(OBJDIR)/default_css.h "
461468
462469
 foreach s [lsort $src] {
463470
 writeln "\$(OBJDIR)/${s}_.c:\t\$(SRCDIR)/$s.c \$(OBJDIR)/translate"
464471
 writeln "\t\$(OBJDIR)/translate \$(SRCDIR)/$s.c >\$@\n"
465472
 writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h$extra_h($s)\$(SRCDIR)/config.h"
@@ -972,10 +979,11 @@
972979
 TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
973980
 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
974981
 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)
975982
 MKBUILTIN = $(subst /,\,$(OBJDIR)/mkbuiltin.exe)
976983
 MKVERSION = $(subst /,\,$(OBJDIR)/mkversion.exe)
984
+MKCSS = $(subst /,\,$(OBJDIR)/mkcss.exe)
977985
 CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe)
978986
 CAT = type
979987
 CP = copy
980988
 GREP = find
981989
 MV = copy
@@ -986,10 +994,11 @@
986994
 TRANSLATE = $(OBJDIR)/translate.exe
987995
 MAKEHEADERS = $(OBJDIR)/makeheaders.exe
988996
 MKINDEX = $(OBJDIR)/mkindex.exe
989997
 MKBUILTIN = $(OBJDIR)/mkbuiltin.exe
990998
 MKVERSION = $(OBJDIR)/mkversion.exe
999
+MKCSS = $(OBJDIR)/mkcss.exe
9911000
 CODECHECK1 = $(OBJDIR)/codecheck1.exe
9921001
 CAT = cat
9931002
 CP = cp
9941003
 GREP = grep
9951004
 MV = mv
@@ -999,11 +1008,11 @@
9991008
 endif}
10001009
10011010
 writeln {
10021011
 all: $(OBJDIR) $(APPNAME)
10031012
1004
-$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
1013
+$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h $(OBJDIR)/default_css.h
10051014
 ifdef USE_WINDOWS
10061015
 $(CAT) $(subst /,\,$(SRCDIR)\miniz.c) | $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
10071016
 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
10081017
 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
10091018
 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
@@ -1044,10 +1053,13 @@
10441053
 $(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c
10451054
10461055
 $(MKVERSION): $(SRCDIR)/mkversion.c
10471056
 $(XBCC) -o $@ $(SRCDIR)/mkversion.c
10481057
1058
+$(MKCSS): $(SRCDIR)/mkcss.c
1059
+ $(XBCC) -o $@ $(SRCDIR)/mkcss.c
1060
+
10491061
 $(CODECHECK1): $(SRCDIR)/codecheck1.c
10501062
 $(XBCC) -o $@ $(SRCDIR)/codecheck1.c
10511063
10521064
 # WARNING. DANGER. Running the test suite modifies the repository the
10531065
 # build is done from, i.e. the checkout belongs to. Do not sync/push
@@ -1055,10 +1067,13 @@
10551067
 test: $(OBJDIR) $(APPNAME)
10561068
 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
10571069
10581070
 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION)
10591071
 $(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$@
1072
+
1073
+$(OBJDIR)/default_css.h: $(SRCDIR)/default_css.txt $(MKCSS)
1074
+ $(MKCSS) $(SRCDIR)/default_css.txt $@
10601075
10611076
 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
10621077
 # to 1. If it is set to 1, then there is no need to build or link
10631078
 # the sqlite3.o object. Instead, the system SQLite will be linked
10641079
 # using -lsqlite3.
@@ -1180,17 +1195,18 @@
11801195
 writeln "\t\$(MKINDEX) \$(TRANS_SRC) >\$@\n"
11811196
11821197
 writeln "\$(OBJDIR)/builtin_data.h:\t\$(MKBUILTIN) \$(EXTRA_FILES)"
11831198
 writeln "\t\$(MKBUILTIN) --prefix \$(SRCDIR)/ \$(EXTRA_FILES) >\$@\n"
11841199
1185
-writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/builtin_data.h \$(MAKEHEADERS) \$(OBJDIR)/VERSION.h"
1200
+writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/builtin_data.h \$(OBJDIR)/default_css.h \$(MAKEHEADERS) \$(OBJDIR)/VERSION.h"
11861201
 writeln "\t\$(MAKEHEADERS) $mhargs"
11871202
 writeln "\techo Done >\$(OBJDIR)/headers\n"
11881203
 writeln "\$(OBJDIR)/headers: Makefile\n"
11891204
 writeln "Makefile:\n"
11901205
 set extra_h(main) " \$(OBJDIR)/page_index.h "
11911206
 set extra_h(builtin) " \$(OBJDIR)/builtin_data.h "
1207
+set extra_h(style) " \$(OBJDIR)/default_css.h "
11921208
11931209
 foreach s [lsort $src] {
11941210
 writeln "\$(OBJDIR)/${s}_.c:\t\$(SRCDIR)/$s.c \$(TRANSLATE)"
11951211
 writeln "\t\$(TRANSLATE) \$(SRCDIR)/$s.c >\$@\n"
11961212
 writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h$extra_h($s)\$(SRCDIR)/config.h"
@@ -1335,10 +1351,13 @@
13351351
 mkbuiltin$E: $(SRCDIR)\mkbuiltin.c
13361352
 $(BCC) -o$@ $**
13371353
13381354
 mkversion$E: $(SRCDIR)\mkversion.c
13391355
 $(BCC) -o$@ $**
1356
+
1357
+mkcss$E: $(SRCDIR)\mkcss.c
1358
+ $(BCC) -o$@ $**
13401359
13411360
 codecheck1$E: $(SRCDIR)\codecheck1.c
13421361
 $(BCC) -o$@ $**
13431362
13441363
 $(OBJDIR)\shell$O : $(SRCDIR)\shell.c
@@ -1357,10 +1376,13 @@
13571376
 cp $@ $@
13581377
13591378
 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
13601379
 +$** > $@
13611380
1381
+default_css.h : mkcss$E $B\src\default_css.txt
1382
+ +$** $B\src\default_css.txt $@
1383
+
13621384
 page_index.h: mkindex$E $(SRC)
13631385
 +$** > $@
13641386
13651387
 builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
13661388
 mkbuiltin$E --prefix $(SRCDIR)/ $(EXTRA_FILES) > $@
@@ -1368,11 +1390,11 @@
13681390
 clean:
13691391
 -del $(OBJDIR)\*.obj
13701392
 -del *.obj *_.c *.h *.map
13711393
13721394
 realclean:
1373
- -del $(APPNAME) translate$E mkindex$E makeheaders$E mkversion$E codecheck1$E mkbuiltin$E
1395
+ -del $(APPNAME) translate$E mkindex$E makeheaders$E mkversion$E codecheck1$E mkbuiltin$E mkcss$E
13741396
13751397
 $(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
13761398
 $(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
13771399
 $(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
13781400
 $(OBJDIR)\json_config$O : $(SRCDIR)\json_detail.h
@@ -1395,11 +1417,11 @@
13951417
 writeln "\t\$(TCC) -o\$@ -c ${s}_.c\n"
13961418
 writeln "${s}_.c : \$(SRCDIR)\\$s.c"
13971419
 writeln "\t+translate\$E \$** > \$@\n"
13981420
 }
13991421
1400
-writeln -nonewline "headers: makeheaders\$E page_index.h builtin_data.h VERSION.h\n\t +makeheaders\$E "
1422
+writeln -nonewline "headers: makeheaders\$E page_index.h builtin_data.h default_css.h VERSION.h\n\t +makeheaders\$E "
14011423
 foreach s [lsort $src] {
14021424
 writeln -nonewline "${s}_.c:$s.h "
14031425
 }
14041426
 writeln "\$(SRCDIR)\\sqlite3.h \$(SRCDIR)\\th.h VERSION.h \$(SRCDIR)\\cson_amalgamation.h"
14051427
 writeln "\t@copy /Y nul: headers"
@@ -1857,10 +1879,13 @@
18571879
 mkbuiltin$E: $(SRCDIR)\mkbuiltin.c
18581880
 $(BCC) $**
18591881
18601882
 mkversion$E: $(SRCDIR)\mkversion.c
18611883
 $(BCC) $**
1884
+
1885
+mkcss$E: $(SRCDIR)\mkcss.c
1886
+ $(BCC) $**
18621887
18631888
 codecheck1$E: $(SRCDIR)\codecheck1.c
18641889
 $(BCC) $**
18651890
18661891
 !if $(USE_SEE)!=0
@@ -1891,12 +1916,16 @@
18911916
 $(OX)\miniz$O : $(SRCDIR)\miniz.c
18921917
 $(TCC) /Fo$@ -c $(MINIZ_OPTIONS) $(SRCDIR)\miniz.c
18931918
18941919
 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
18951920
 $** > $@
1921
+
18961922
 $(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
18971923
 $(TCC) /Fo$@ /c $**
1924
+
1925
+default_css.h: mkcss$E $(SRCDIR)\default_css.txt
1926
+ $** $(SRCDIR)\default_css.txt $@
18981927
18991928
 page_index.h: mkindex$E $(SRC)
19001929
 $** > $@
19011930
19021931
 builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
@@ -1923,10 +1952,12 @@
19231952
 del mkindex$P 2>NUL
19241953
 del makeheaders$E 2>NUL
19251954
 del makeheaders$P 2>NUL
19261955
 del mkversion$E 2>NUL
19271956
 del mkversion$P 2>NUL
1957
+ del mkcss$E 2>NUL
1958
+ del mkcss$P 2>NUL
19281959
 del codecheck1$E 2>NUL
19291960
 del codecheck1$P 2>NUL
19301961
 del mkbuiltin$E 2>NUL
19311962
 del mkbuiltin$P 2>NUL
19321963
@@ -1954,11 +1985,11 @@
19541985
 }
19551986
19561987
 writeln "fossil.res : \$B\\win\\fossil.rc"
19571988
 writeln "\t\$(RCC) /fo \$@ \$**\n"
19581989
1959
-writeln "headers: makeheaders\$E page_index.h builtin_data.h VERSION.h"
1990
+writeln "headers: makeheaders\$E page_index.h builtin_data.h default_css.h VERSION.h"
19601991
 writeln -nonewline "\tmakeheaders\$E "
19611992
 set i 0
19621993
 foreach s [lsort $src] {
19631994
 if {$i > 0} {
19641995
 writeln " \\"
@@ -2135,13 +2166,16 @@
21352166
 mkbuiltin.exe --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
21362167
21372168
 # extracting version info from manifest
21382169
 VERSION.h: version.exe ..\manifest.uuid ..\manifest ..\VERSION
21392170
 version.exe ..\manifest.uuid ..\manifest ..\VERSION >$@
2171
+
2172
+default_css.h: mkcss.exe default_css.txt
2173
+ mkcss.exe default_css.txt $@
21402174
21412175
 # generate the simplified headers
2142
-headers: makeheaders.exe page_index.h builtin_data.h VERSION.h ../src/sqlite3.h ../src/th.h VERSION.h
2176
+headers: makeheaders.exe page_index.h builtin_data.h default_css.h VERSION.h ../src/sqlite3.h ../src/th.h
21432177
 makeheaders.exe $(foreach ts,$(TRANSLATEDSRC),$(ts):$(ts:_.c=.h)) ../src/sqlite3.h ../src/th.h VERSION.h
21442178
 echo Done >$@
21452179
21462180
 # compile C sources with relevant options
21472181
21482182
21492183
ADDED src/mkcss.c
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -328,10 +328,13 @@
328 $(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR)/mkbuiltin.c
329
330 $(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
331 $(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
332
 
 
 
333 $(OBJDIR)/codecheck1: $(SRCDIR)/codecheck1.c
334 $(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR)/codecheck1.c
335
336 # Run the test suite.
337 # Other flags that can be included in TESTFLAGS are:
@@ -351,10 +354,13 @@
351
352 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
353 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \
354 $(SRCDIR)/../manifest \
355 $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
 
 
 
356
357 # Setup the options used to compile the included SQLite library.
358 SQLITE_OPTIONS = <<<SQLITE_OPTIONS>>>
359
360 # Setup the options used to compile the included SQLite shell.
@@ -440,26 +446,27 @@
440 set extra_h($s) { }
441 }
442 append mhargs "\$(SRCDIR)/sqlite3.h <<<NEXT_LINE>>>"
443 append mhargs "\$(SRCDIR)/th.h <<<NEXT_LINE>>>"
444 #append mhargs "\$(SRCDIR)/cson_amalgamation.h <<<NEXT_LINE>>>"
445 append mhargs "\$(OBJDIR)/VERSION.h"
446 set mhargs [string map [list <<<NEXT_LINE>>> \\\n\t] $mhargs]
447 writeln "\$(OBJDIR)/page_index.h: \$(TRANS_SRC) \$(OBJDIR)/mkindex"
448 writeln "\t\$(OBJDIR)/mkindex \$(TRANS_SRC) >\$@\n"
449
450 writeln "\$(OBJDIR)/builtin_data.h: \$(OBJDIR)/mkbuiltin \$(EXTRA_FILES)"
451 writeln "\t\$(OBJDIR)/mkbuiltin --prefix \$(SRCDIR)/ \$(EXTRA_FILES) >\$@\n"
452
453 writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/builtin_data.h \$(OBJDIR)/makeheaders \$(OBJDIR)/VERSION.h"
454 writeln "\t\$(OBJDIR)/makeheaders $mhargs"
455 writeln "\ttouch \$(OBJDIR)/headers"
456 writeln "\$(OBJDIR)/headers: Makefile"
457 writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/json_finfo.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_status.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h"
458 writeln "Makefile:"
459 set extra_h(dispatch) " \$(OBJDIR)/page_index.h "
460 set extra_h(builtin) " \$(OBJDIR)/builtin_data.h "
 
461
462 foreach s [lsort $src] {
463 writeln "\$(OBJDIR)/${s}_.c:\t\$(SRCDIR)/$s.c \$(OBJDIR)/translate"
464 writeln "\t\$(OBJDIR)/translate \$(SRCDIR)/$s.c >\$@\n"
465 writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h$extra_h($s)\$(SRCDIR)/config.h"
@@ -972,10 +979,11 @@
972 TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
973 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
974 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)
975 MKBUILTIN = $(subst /,\,$(OBJDIR)/mkbuiltin.exe)
976 MKVERSION = $(subst /,\,$(OBJDIR)/mkversion.exe)
 
977 CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe)
978 CAT = type
979 CP = copy
980 GREP = find
981 MV = copy
@@ -986,10 +994,11 @@
986 TRANSLATE = $(OBJDIR)/translate.exe
987 MAKEHEADERS = $(OBJDIR)/makeheaders.exe
988 MKINDEX = $(OBJDIR)/mkindex.exe
989 MKBUILTIN = $(OBJDIR)/mkbuiltin.exe
990 MKVERSION = $(OBJDIR)/mkversion.exe
 
991 CODECHECK1 = $(OBJDIR)/codecheck1.exe
992 CAT = cat
993 CP = cp
994 GREP = grep
995 MV = mv
@@ -999,11 +1008,11 @@
999 endif}
1000
1001 writeln {
1002 all: $(OBJDIR) $(APPNAME)
1003
1004 $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
1005 ifdef USE_WINDOWS
1006 $(CAT) $(subst /,\,$(SRCDIR)\miniz.c) | $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
1007 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
1008 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
1009 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
@@ -1044,10 +1053,13 @@
1044 $(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c
1045
1046 $(MKVERSION): $(SRCDIR)/mkversion.c
1047 $(XBCC) -o $@ $(SRCDIR)/mkversion.c
1048
 
 
 
1049 $(CODECHECK1): $(SRCDIR)/codecheck1.c
1050 $(XBCC) -o $@ $(SRCDIR)/codecheck1.c
1051
1052 # WARNING. DANGER. Running the test suite modifies the repository the
1053 # build is done from, i.e. the checkout belongs to. Do not sync/push
@@ -1055,10 +1067,13 @@
1055 test: $(OBJDIR) $(APPNAME)
1056 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
1057
1058 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION)
1059 $(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$@
 
 
 
1060
1061 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
1062 # to 1. If it is set to 1, then there is no need to build or link
1063 # the sqlite3.o object. Instead, the system SQLite will be linked
1064 # using -lsqlite3.
@@ -1180,17 +1195,18 @@
1180 writeln "\t\$(MKINDEX) \$(TRANS_SRC) >\$@\n"
1181
1182 writeln "\$(OBJDIR)/builtin_data.h:\t\$(MKBUILTIN) \$(EXTRA_FILES)"
1183 writeln "\t\$(MKBUILTIN) --prefix \$(SRCDIR)/ \$(EXTRA_FILES) >\$@\n"
1184
1185 writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/builtin_data.h \$(MAKEHEADERS) \$(OBJDIR)/VERSION.h"
1186 writeln "\t\$(MAKEHEADERS) $mhargs"
1187 writeln "\techo Done >\$(OBJDIR)/headers\n"
1188 writeln "\$(OBJDIR)/headers: Makefile\n"
1189 writeln "Makefile:\n"
1190 set extra_h(main) " \$(OBJDIR)/page_index.h "
1191 set extra_h(builtin) " \$(OBJDIR)/builtin_data.h "
 
1192
1193 foreach s [lsort $src] {
1194 writeln "\$(OBJDIR)/${s}_.c:\t\$(SRCDIR)/$s.c \$(TRANSLATE)"
1195 writeln "\t\$(TRANSLATE) \$(SRCDIR)/$s.c >\$@\n"
1196 writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h$extra_h($s)\$(SRCDIR)/config.h"
@@ -1335,10 +1351,13 @@
1335 mkbuiltin$E: $(SRCDIR)\mkbuiltin.c
1336 $(BCC) -o$@ $**
1337
1338 mkversion$E: $(SRCDIR)\mkversion.c
1339 $(BCC) -o$@ $**
 
 
 
1340
1341 codecheck1$E: $(SRCDIR)\codecheck1.c
1342 $(BCC) -o$@ $**
1343
1344 $(OBJDIR)\shell$O : $(SRCDIR)\shell.c
@@ -1357,10 +1376,13 @@
1357 cp $@ $@
1358
1359 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
1360 +$** > $@
1361
 
 
 
1362 page_index.h: mkindex$E $(SRC)
1363 +$** > $@
1364
1365 builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
1366 mkbuiltin$E --prefix $(SRCDIR)/ $(EXTRA_FILES) > $@
@@ -1368,11 +1390,11 @@
1368 clean:
1369 -del $(OBJDIR)\*.obj
1370 -del *.obj *_.c *.h *.map
1371
1372 realclean:
1373 -del $(APPNAME) translate$E mkindex$E makeheaders$E mkversion$E codecheck1$E mkbuiltin$E
1374
1375 $(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
1376 $(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
1377 $(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
1378 $(OBJDIR)\json_config$O : $(SRCDIR)\json_detail.h
@@ -1395,11 +1417,11 @@
1395 writeln "\t\$(TCC) -o\$@ -c ${s}_.c\n"
1396 writeln "${s}_.c : \$(SRCDIR)\\$s.c"
1397 writeln "\t+translate\$E \$** > \$@\n"
1398 }
1399
1400 writeln -nonewline "headers: makeheaders\$E page_index.h builtin_data.h VERSION.h\n\t +makeheaders\$E "
1401 foreach s [lsort $src] {
1402 writeln -nonewline "${s}_.c:$s.h "
1403 }
1404 writeln "\$(SRCDIR)\\sqlite3.h \$(SRCDIR)\\th.h VERSION.h \$(SRCDIR)\\cson_amalgamation.h"
1405 writeln "\t@copy /Y nul: headers"
@@ -1857,10 +1879,13 @@
1857 mkbuiltin$E: $(SRCDIR)\mkbuiltin.c
1858 $(BCC) $**
1859
1860 mkversion$E: $(SRCDIR)\mkversion.c
1861 $(BCC) $**
 
 
 
1862
1863 codecheck1$E: $(SRCDIR)\codecheck1.c
1864 $(BCC) $**
1865
1866 !if $(USE_SEE)!=0
@@ -1891,12 +1916,16 @@
1891 $(OX)\miniz$O : $(SRCDIR)\miniz.c
1892 $(TCC) /Fo$@ -c $(MINIZ_OPTIONS) $(SRCDIR)\miniz.c
1893
1894 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
1895 $** > $@
 
1896 $(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
1897 $(TCC) /Fo$@ /c $**
 
 
 
1898
1899 page_index.h: mkindex$E $(SRC)
1900 $** > $@
1901
1902 builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
@@ -1923,10 +1952,12 @@
1923 del mkindex$P 2>NUL
1924 del makeheaders$E 2>NUL
1925 del makeheaders$P 2>NUL
1926 del mkversion$E 2>NUL
1927 del mkversion$P 2>NUL
 
 
1928 del codecheck1$E 2>NUL
1929 del codecheck1$P 2>NUL
1930 del mkbuiltin$E 2>NUL
1931 del mkbuiltin$P 2>NUL
1932
@@ -1954,11 +1985,11 @@
1954 }
1955
1956 writeln "fossil.res : \$B\\win\\fossil.rc"
1957 writeln "\t\$(RCC) /fo \$@ \$**\n"
1958
1959 writeln "headers: makeheaders\$E page_index.h builtin_data.h VERSION.h"
1960 writeln -nonewline "\tmakeheaders\$E "
1961 set i 0
1962 foreach s [lsort $src] {
1963 if {$i > 0} {
1964 writeln " \\"
@@ -2135,13 +2166,16 @@
2135 mkbuiltin.exe --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
2136
2137 # extracting version info from manifest
2138 VERSION.h: version.exe ..\manifest.uuid ..\manifest ..\VERSION
2139 version.exe ..\manifest.uuid ..\manifest ..\VERSION >$@
 
 
 
2140
2141 # generate the simplified headers
2142 headers: makeheaders.exe page_index.h builtin_data.h VERSION.h ../src/sqlite3.h ../src/th.h VERSION.h
2143 makeheaders.exe $(foreach ts,$(TRANSLATEDSRC),$(ts):$(ts:_.c=.h)) ../src/sqlite3.h ../src/th.h VERSION.h
2144 echo Done >$@
2145
2146 # compile C sources with relevant options
2147
2148
2149 DDED src/mkcss.c
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -328,10 +328,13 @@
328 $(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR)/mkbuiltin.c
329
330 $(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
331 $(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
332
333 $(OBJDIR)/mkcss: $(SRCDIR)/mkcss.c
334 $(XBCC) -o $(OBJDIR)/mkcss $(SRCDIR)/mkcss.c
335
336 $(OBJDIR)/codecheck1: $(SRCDIR)/codecheck1.c
337 $(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR)/codecheck1.c
338
339 # Run the test suite.
340 # Other flags that can be included in TESTFLAGS are:
@@ -351,10 +354,13 @@
354
355 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
356 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \
357 $(SRCDIR)/../manifest \
358 $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
359
360 $(OBJDIR)/default_css.h: $(SRCDIR)/default_css.txt $(OBJDIR)/mkcss
361 $(OBJDIR)/mkcss $(SRCDIR)/default_css.txt $(OBJDIR)/default_css.h
362
363 # Setup the options used to compile the included SQLite library.
364 SQLITE_OPTIONS = <<<SQLITE_OPTIONS>>>
365
366 # Setup the options used to compile the included SQLite shell.
@@ -440,26 +446,27 @@
446 set extra_h($s) { }
447 }
448 append mhargs "\$(SRCDIR)/sqlite3.h <<<NEXT_LINE>>>"
449 append mhargs "\$(SRCDIR)/th.h <<<NEXT_LINE>>>"
450 #append mhargs "\$(SRCDIR)/cson_amalgamation.h <<<NEXT_LINE>>>"
451 append mhargs "\$(OBJDIR)/VERSION.h "
452 set mhargs [string map [list <<<NEXT_LINE>>> \\\n\t] $mhargs]
453 writeln "\$(OBJDIR)/page_index.h: \$(TRANS_SRC) \$(OBJDIR)/mkindex"
454 writeln "\t\$(OBJDIR)/mkindex \$(TRANS_SRC) >\$@\n"
455
456 writeln "\$(OBJDIR)/builtin_data.h: \$(OBJDIR)/mkbuiltin \$(EXTRA_FILES)"
457 writeln "\t\$(OBJDIR)/mkbuiltin --prefix \$(SRCDIR)/ \$(EXTRA_FILES) >\$@\n"
458
459 writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/builtin_data.h \$(OBJDIR)/default_css.h \$(OBJDIR)/makeheaders \$(OBJDIR)/VERSION.h"
460 writeln "\t\$(OBJDIR)/makeheaders $mhargs"
461 writeln "\ttouch \$(OBJDIR)/headers"
462 writeln "\$(OBJDIR)/headers: Makefile"
463 writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/json_finfo.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_status.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h"
464 writeln "Makefile:"
465 set extra_h(dispatch) " \$(OBJDIR)/page_index.h "
466 set extra_h(builtin) " \$(OBJDIR)/builtin_data.h "
467 set extra_h(style) " \$(OBJDIR)/default_css.h "
468
469 foreach s [lsort $src] {
470 writeln "\$(OBJDIR)/${s}_.c:\t\$(SRCDIR)/$s.c \$(OBJDIR)/translate"
471 writeln "\t\$(OBJDIR)/translate \$(SRCDIR)/$s.c >\$@\n"
472 writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h$extra_h($s)\$(SRCDIR)/config.h"
@@ -972,10 +979,11 @@
979 TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
980 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
981 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)
982 MKBUILTIN = $(subst /,\,$(OBJDIR)/mkbuiltin.exe)
983 MKVERSION = $(subst /,\,$(OBJDIR)/mkversion.exe)
984 MKCSS = $(subst /,\,$(OBJDIR)/mkcss.exe)
985 CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe)
986 CAT = type
987 CP = copy
988 GREP = find
989 MV = copy
@@ -986,10 +994,11 @@
994 TRANSLATE = $(OBJDIR)/translate.exe
995 MAKEHEADERS = $(OBJDIR)/makeheaders.exe
996 MKINDEX = $(OBJDIR)/mkindex.exe
997 MKBUILTIN = $(OBJDIR)/mkbuiltin.exe
998 MKVERSION = $(OBJDIR)/mkversion.exe
999 MKCSS = $(OBJDIR)/mkcss.exe
1000 CODECHECK1 = $(OBJDIR)/codecheck1.exe
1001 CAT = cat
1002 CP = cp
1003 GREP = grep
1004 MV = mv
@@ -999,11 +1008,11 @@
1008 endif}
1009
1010 writeln {
1011 all: $(OBJDIR) $(APPNAME)
1012
1013 $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h $(OBJDIR)/default_css.h
1014 ifdef USE_WINDOWS
1015 $(CAT) $(subst /,\,$(SRCDIR)\miniz.c) | $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
1016 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
1017 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
1018 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
@@ -1044,10 +1053,13 @@
1053 $(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c
1054
1055 $(MKVERSION): $(SRCDIR)/mkversion.c
1056 $(XBCC) -o $@ $(SRCDIR)/mkversion.c
1057
1058 $(MKCSS): $(SRCDIR)/mkcss.c
1059 $(XBCC) -o $@ $(SRCDIR)/mkcss.c
1060
1061 $(CODECHECK1): $(SRCDIR)/codecheck1.c
1062 $(XBCC) -o $@ $(SRCDIR)/codecheck1.c
1063
1064 # WARNING. DANGER. Running the test suite modifies the repository the
1065 # build is done from, i.e. the checkout belongs to. Do not sync/push
@@ -1055,10 +1067,13 @@
1067 test: $(OBJDIR) $(APPNAME)
1068 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
1069
1070 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION)
1071 $(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$@
1072
1073 $(OBJDIR)/default_css.h: $(SRCDIR)/default_css.txt $(MKCSS)
1074 $(MKCSS) $(SRCDIR)/default_css.txt $@
1075
1076 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
1077 # to 1. If it is set to 1, then there is no need to build or link
1078 # the sqlite3.o object. Instead, the system SQLite will be linked
1079 # using -lsqlite3.
@@ -1180,17 +1195,18 @@
1195 writeln "\t\$(MKINDEX) \$(TRANS_SRC) >\$@\n"
1196
1197 writeln "\$(OBJDIR)/builtin_data.h:\t\$(MKBUILTIN) \$(EXTRA_FILES)"
1198 writeln "\t\$(MKBUILTIN) --prefix \$(SRCDIR)/ \$(EXTRA_FILES) >\$@\n"
1199
1200 writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/builtin_data.h \$(OBJDIR)/default_css.h \$(MAKEHEADERS) \$(OBJDIR)/VERSION.h"
1201 writeln "\t\$(MAKEHEADERS) $mhargs"
1202 writeln "\techo Done >\$(OBJDIR)/headers\n"
1203 writeln "\$(OBJDIR)/headers: Makefile\n"
1204 writeln "Makefile:\n"
1205 set extra_h(main) " \$(OBJDIR)/page_index.h "
1206 set extra_h(builtin) " \$(OBJDIR)/builtin_data.h "
1207 set extra_h(style) " \$(OBJDIR)/default_css.h "
1208
1209 foreach s [lsort $src] {
1210 writeln "\$(OBJDIR)/${s}_.c:\t\$(SRCDIR)/$s.c \$(TRANSLATE)"
1211 writeln "\t\$(TRANSLATE) \$(SRCDIR)/$s.c >\$@\n"
1212 writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h$extra_h($s)\$(SRCDIR)/config.h"
@@ -1335,10 +1351,13 @@
1351 mkbuiltin$E: $(SRCDIR)\mkbuiltin.c
1352 $(BCC) -o$@ $**
1353
1354 mkversion$E: $(SRCDIR)\mkversion.c
1355 $(BCC) -o$@ $**
1356
1357 mkcss$E: $(SRCDIR)\mkcss.c
1358 $(BCC) -o$@ $**
1359
1360 codecheck1$E: $(SRCDIR)\codecheck1.c
1361 $(BCC) -o$@ $**
1362
1363 $(OBJDIR)\shell$O : $(SRCDIR)\shell.c
@@ -1357,10 +1376,13 @@
1376 cp $@ $@
1377
1378 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
1379 +$** > $@
1380
1381 default_css.h : mkcss$E $B\src\default_css.txt
1382 +$** $B\src\default_css.txt $@
1383
1384 page_index.h: mkindex$E $(SRC)
1385 +$** > $@
1386
1387 builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
1388 mkbuiltin$E --prefix $(SRCDIR)/ $(EXTRA_FILES) > $@
@@ -1368,11 +1390,11 @@
1390 clean:
1391 -del $(OBJDIR)\*.obj
1392 -del *.obj *_.c *.h *.map
1393
1394 realclean:
1395 -del $(APPNAME) translate$E mkindex$E makeheaders$E mkversion$E codecheck1$E mkbuiltin$E mkcss$E
1396
1397 $(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
1398 $(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
1399 $(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
1400 $(OBJDIR)\json_config$O : $(SRCDIR)\json_detail.h
@@ -1395,11 +1417,11 @@
1417 writeln "\t\$(TCC) -o\$@ -c ${s}_.c\n"
1418 writeln "${s}_.c : \$(SRCDIR)\\$s.c"
1419 writeln "\t+translate\$E \$** > \$@\n"
1420 }
1421
1422 writeln -nonewline "headers: makeheaders\$E page_index.h builtin_data.h default_css.h VERSION.h\n\t +makeheaders\$E "
1423 foreach s [lsort $src] {
1424 writeln -nonewline "${s}_.c:$s.h "
1425 }
1426 writeln "\$(SRCDIR)\\sqlite3.h \$(SRCDIR)\\th.h VERSION.h \$(SRCDIR)\\cson_amalgamation.h"
1427 writeln "\t@copy /Y nul: headers"
@@ -1857,10 +1879,13 @@
1879 mkbuiltin$E: $(SRCDIR)\mkbuiltin.c
1880 $(BCC) $**
1881
1882 mkversion$E: $(SRCDIR)\mkversion.c
1883 $(BCC) $**
1884
1885 mkcss$E: $(SRCDIR)\mkcss.c
1886 $(BCC) $**
1887
1888 codecheck1$E: $(SRCDIR)\codecheck1.c
1889 $(BCC) $**
1890
1891 !if $(USE_SEE)!=0
@@ -1891,12 +1916,16 @@
1916 $(OX)\miniz$O : $(SRCDIR)\miniz.c
1917 $(TCC) /Fo$@ -c $(MINIZ_OPTIONS) $(SRCDIR)\miniz.c
1918
1919 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
1920 $** > $@
1921
1922 $(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
1923 $(TCC) /Fo$@ /c $**
1924
1925 default_css.h: mkcss$E $(SRCDIR)\default_css.txt
1926 $** $(SRCDIR)\default_css.txt $@
1927
1928 page_index.h: mkindex$E $(SRC)
1929 $** > $@
1930
1931 builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
@@ -1923,10 +1952,12 @@
1952 del mkindex$P 2>NUL
1953 del makeheaders$E 2>NUL
1954 del makeheaders$P 2>NUL
1955 del mkversion$E 2>NUL
1956 del mkversion$P 2>NUL
1957 del mkcss$E 2>NUL
1958 del mkcss$P 2>NUL
1959 del codecheck1$E 2>NUL
1960 del codecheck1$P 2>NUL
1961 del mkbuiltin$E 2>NUL
1962 del mkbuiltin$P 2>NUL
1963
@@ -1954,11 +1985,11 @@
1985 }
1986
1987 writeln "fossil.res : \$B\\win\\fossil.rc"
1988 writeln "\t\$(RCC) /fo \$@ \$**\n"
1989
1990 writeln "headers: makeheaders\$E page_index.h builtin_data.h default_css.h VERSION.h"
1991 writeln -nonewline "\tmakeheaders\$E "
1992 set i 0
1993 foreach s [lsort $src] {
1994 if {$i > 0} {
1995 writeln " \\"
@@ -2135,13 +2166,16 @@
2166 mkbuiltin.exe --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
2167
2168 # extracting version info from manifest
2169 VERSION.h: version.exe ..\manifest.uuid ..\manifest ..\VERSION
2170 version.exe ..\manifest.uuid ..\manifest ..\VERSION >$@
2171
2172 default_css.h: mkcss.exe default_css.txt
2173 mkcss.exe default_css.txt $@
2174
2175 # generate the simplified headers
2176 headers: makeheaders.exe page_index.h builtin_data.h default_css.h VERSION.h ../src/sqlite3.h ../src/th.h
2177 makeheaders.exe $(foreach ts,$(TRANSLATEDSRC),$(ts):$(ts:_.c=.h)) ../src/sqlite3.h ../src/th.h VERSION.h
2178 echo Done >$@
2179
2180 # compile C sources with relevant options
2181
2182
2183 DDED src/mkcss.c
A src/mkcss.c
+87
--- a/src/mkcss.c
+++ b/src/mkcss.c
@@ -0,0 +1,87 @@
1
+/*
2
+** This C program g/*
3
+** This C program generates the generates the "default_css.h" header file from
4
+** "default_css.txt" source file.
5
+**
6
+** The default_css.h header contains a definition of a structure
7
+** with lots of default CSS snippets. This information is used to
8
+** generate the /style.css page as follows:
9
+**
10
+** (1) Read the repository-specific CSS page from the skin
11
+** (2) Initialize the output to a copy of the repo-CSS from (1).
12
+** (3) For each entry in the cssDefaultList[], if the selector
13
+** described by cssDefaultList[i] is not found in the
14
+** repo-CSS, then append it to the output.
15
+**
16
+** The input file, "default_css.txt", is plain text with lots of
17
+** comments. This routine strips out the comments and breaks the
18
+** text up into individual cssDefaultList[] elements.
19
+**
20
+** To run this program:
21
+**
22
+** ./mkcss default_css.txt default_css.h
23
+**
24
+** In other words, there are two arguments. The first is the name of
25
+** the input file and the second is the name of the output file.
26
+** Either argument can be "-" to indicate standard input or output.
27
+**
28
+** Input Format Summary:
29
+**
30
+** # comment
31
+** selector {
32
+** rule; # comment
33
+** }
34
+** # comment
35
+**
36
+** It would be much easier to do this using a script, but that would
37
+** make the Fossil source-code less cross-platform because it would then
38
+** require that the script engine be installed on the build platform.
39
+*/
40
+#include <stdio.h>
41
+#include <string.h>
42
+#include <stdlib.h>
43
+#include <ctype.h>
44
+
45
+static FILE *open_for_reading(const char *zFilename){
46
+ FILE *f;
47
+ if( strcmp(zFilename, "-")==0 ) return stdin;
48
+ f = fopen(zFilename, "r");
49
+ if( f==0 ){
50
+ fprintf(stderr, "cannot open \"%s\" for reading\n", zFilename);
51
+ exit(1);
52
+ }
53
+ return f;
54
+}
55
+static FILE *open_for_writing(const char *zFilename){
56
+ FILE *f;
57
+ if( strcmp(zFilename, "-")==0 ) return stdout;
58
+ f = fopen(zFilename, "w");
59
+ if( f==0 ){
60
+ fprintf(stderr, "cannot open \"%s\" for writing\n", zFilename);
61
+ exit(1);
62
+ }
63
+ return f;
64
+}
65
+static void close_f");ce(z[n-1]) ){ z[--n] = 0+i);"default_css.h" header /*
66
+** This C program generates the "default_css.h" header file from
67
+** "default_css.txt" source file.
68
+**
69
+** The default_css.h header contains a definition of a structure
70
+** with lots of default CSS snippets. This information is used to
71
+** generate the /style.css page as follows:
72
+**
73
+** (1) Read the repository-specific CSS page from the skin
74
+** (2) Initialize the output to a copy of the repo-CSS from (1).
75
+** (3) For each entry in the cssDefaultList[], if the selector
76
+** described by cssDefaultList[i] is not found in the
77
+** repo-CSS, then append it to the output.
78
+**
79
+** The input file, "default_css.txt", is plain text with lots of
80
+** comments. This routine strips out the comments and breaks the
81
+** text up into individual cssDefaultList[] elements.
82
+**
83
+** To run this program:
84
+**
85
+** ./mkcss default_css.txt default_css.h
86
+**
87
+** In other words, there are two arguments.
--- a/src/mkcss.c
+++ b/src/mkcss.c
@@ -0,0 +1,87 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
--- a/src/mkcss.c
+++ b/src/mkcss.c
@@ -0,0 +1,87 @@
1 /*
2 ** This C program g/*
3 ** This C program generates the generates the "default_css.h" header file from
4 ** "default_css.txt" source file.
5 **
6 ** The default_css.h header contains a definition of a structure
7 ** with lots of default CSS snippets. This information is used to
8 ** generate the /style.css page as follows:
9 **
10 ** (1) Read the repository-specific CSS page from the skin
11 ** (2) Initialize the output to a copy of the repo-CSS from (1).
12 ** (3) For each entry in the cssDefaultList[], if the selector
13 ** described by cssDefaultList[i] is not found in the
14 ** repo-CSS, then append it to the output.
15 **
16 ** The input file, "default_css.txt", is plain text with lots of
17 ** comments. This routine strips out the comments and breaks the
18 ** text up into individual cssDefaultList[] elements.
19 **
20 ** To run this program:
21 **
22 ** ./mkcss default_css.txt default_css.h
23 **
24 ** In other words, there are two arguments. The first is the name of
25 ** the input file and the second is the name of the output file.
26 ** Either argument can be "-" to indicate standard input or output.
27 **
28 ** Input Format Summary:
29 **
30 ** # comment
31 ** selector {
32 ** rule; # comment
33 ** }
34 ** # comment
35 **
36 ** It would be much easier to do this using a script, but that would
37 ** make the Fossil source-code less cross-platform because it would then
38 ** require that the script engine be installed on the build platform.
39 */
40 #include <stdio.h>
41 #include <string.h>
42 #include <stdlib.h>
43 #include <ctype.h>
44
45 static FILE *open_for_reading(const char *zFilename){
46 FILE *f;
47 if( strcmp(zFilename, "-")==0 ) return stdin;
48 f = fopen(zFilename, "r");
49 if( f==0 ){
50 fprintf(stderr, "cannot open \"%s\" for reading\n", zFilename);
51 exit(1);
52 }
53 return f;
54 }
55 static FILE *open_for_writing(const char *zFilename){
56 FILE *f;
57 if( strcmp(zFilename, "-")==0 ) return stdout;
58 f = fopen(zFilename, "w");
59 if( f==0 ){
60 fprintf(stderr, "cannot open \"%s\" for writing\n", zFilename);
61 exit(1);
62 }
63 return f;
64 }
65 static void close_f");ce(z[n-1]) ){ z[--n] = 0+i);"default_css.h" header /*
66 ** This C program generates the "default_css.h" header file from
67 ** "default_css.txt" source file.
68 **
69 ** The default_css.h header contains a definition of a structure
70 ** with lots of default CSS snippets. This information is used to
71 ** generate the /style.css page as follows:
72 **
73 ** (1) Read the repository-specific CSS page from the skin
74 ** (2) Initialize the output to a copy of the repo-CSS from (1).
75 ** (3) For each entry in the cssDefaultList[], if the selector
76 ** described by cssDefaultList[i] is not found in the
77 ** repo-CSS, then append it to the output.
78 **
79 ** The input file, "default_css.txt", is plain text with lots of
80 ** comments. This routine strips out the comments and breaks the
81 ** text up into individual cssDefaultList[] elements.
82 **
83 ** To run this program:
84 **
85 ** ./mkcss default_css.txt default_css.h
86 **
87 ** In other words, there are two arguments.
M src/style.c
+13 -829
--- src/style.c
+++ src/style.c
@@ -745,836 +745,15 @@
745745
 */
746746
 void style_sidebox_end(void){
747747
 @ </div>
748748
 }
749749
750
-
751
-/* The following table contains bits of default CSS that must
752
-** be included if they are not found in the application-defined
753
-** CSS.
750
+/*
751
+** Insert the cssDefaultList[] table, generated from default_css.txt
752
+** using the mkcss.c program.
754753
 */
755
-const struct strctCssDefaults {
756
- const char *elementClass; /* Name of element needed */
757
- const char *comment; /* Comment text */
758
- const char *value; /* CSS text */
759
-} cssDefaultList[] = {
760
- { "div.sidebox",
761
- "The nomenclature sidebox for branches,..",
762
- @ float: right;
763
- @ background-color: white;
764
- @ border-width: medium;
765
- @ border-style: double;
766
- @ margin: 10px;
767
- },
768
- { "div.sideboxTitle",
769
- "The nomenclature title in sideboxes for branches,..",
770
- @ display: inline;
771
- @ font-weight: bold;
772
- },
773
- { "div.sideboxDescribed",
774
- "The defined element in sideboxes for branches,..",
775
- @ display: inline;
776
- @ font-weight: bold;
777
- },
778
- { "span.disabled",
779
- "The defined element in sideboxes for branches,..",
780
- @ color: red;
781
- },
782
- { "table.timelineTable",
783
- "The table that holds a timeline",
784
- @ border-spacing: 0px 2px;
785
- },
786
- { "span.timelineDisabled",
787
- "The suppressed duplicates lines in timeline, ..",
788
- @ font-style: italic;
789
- @ font-size: small;
790
- },
791
- { "tr.timelineCurrent",
792
- "the format for the timeline data cell of the current checkout",
793
- @ padding: .1em .2em;
794
- @ border: 1px dashed #446979;
795
- @ box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.5);
796
- },
797
- { "tr.timelineSelected",
798
- "The row in the timeline table that contains the entry of interest",
799
- @ padding: .1em .2em;
800
- @ border: 2px solid lightgray;
801
- @ background-color: #ffc;
802
- @ box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.5);
803
- },
804
- { "tr.timelineSelected td",
805
- "Cells within a selected row of a timeline",
806
- @ border-radius: 0;
807
- @ border-width: 0;
808
- },
809
- { "tr.timelineCurrent td",
810
- "Cells within a selected row of a timeline",
811
- @ border-radius: 0;
812
- @ border-width: 0;
813
- },
814
- { "tr.timelineSpacer",
815
- "An extra row inserted to give vertical space between two rows",
816
- @ height: 1ex;
817
- },
818
- { "span.timelineLeaf",
819
- "the format for the timeline leaf marks",
820
- @ font-weight: bold;
821
- },
822
- { "a.timelineHistLink",
823
- "the format for the timeline version links",
824
- @
825
- },
826
- { "span.timelineHistDsp",
827
- "the format for the timeline version display(no history permission!)",
828
- @ font-weight: bold;
829
- },
830
- { "td.timelineTime",
831
- "the format for the timeline time display",
832
- @ vertical-align: top;
833
- @ text-align: right;
834
- @ white-space: nowrap;
835
- },
836
- { "td.timelineGraph",
837
- "the format for the graph placeholder cells in timelines",
838
- @ width: 20px;
839
- @ text-align: left;
840
- @ vertical-align: top;
841
- },
842
- { "span.timelineCompactComment",
843
- "The check-in comment text in Compact mode",
844
- @ cursor: pointer;
845
- },
846
- { "span.timelineEllipsis",
847
- "The ellipsis mark at the end of a compact comment in a timeline",
848
- @ cursor: pointer;
849
- },
850
- { ".timelineModernCell, .timelineColumnarCell, .timelineDetailCell",
851
- "The entry details for a normal timeline",
852
- @ vertical-align: top;
853
- @ text-align: left;
854
- @ padding: 0.75em;
855
- @ border: 1px #ccc solid;
856
- @ border-radius: 1em;
857
- },
858
- { ".timelineModernDetail",
859
- "Detail text for a normal timeline display",
860
- @ font-size: 80%;
861
- @ text-align: right;
862
- @ float: right;
863
- @ opacity: 0.75;
864
- @ margin-top: 0.5em;
865
- },
866
- { "td.timelineGraph",
867
- "the format for the graph placeholder cells in timelines",
868
- @ width: 20px;
869
- @ text-align: left;
870
- @ vertical-align: top;
871
- },
872
- { ".tl-canvas",
873
- "timeline graph canvas",
874
- @ margin: 0 6px 0 10px;
875
- },
876
- { ".tl-rail",
877
- "maximum rail spacing",
878
- @ width: 18px;
879
- },
880
- { ".tl-mergeoffset",
881
- "maximum spacing between merge risers and primary child risers",
882
- @ width: 2px;
883
- },
884
- { ".tl-nodemark",
885
- "adjusts the vertical position of graph nodes",
886
- @ margin-top: 5px;
887
- },
888
- { ".tl-node",
889
- "commit node",
890
- @ width: 10px;
891
- @ height: 10px;
892
- @ border: 1px solid #000;
893
- @ background: #fff;
894
- @ cursor: pointer;
895
- },
896
- { ".tl-node.leaf:after",
897
- "leaf commit marker",
898
- @ content: '';
899
- @ position: absolute;
900
- @ top: 3px;
901
- @ left: 3px;
902
- @ width: 4px;
903
- @ height: 4px;
904
- @ background: #000;
905
- },
906
- { ".tl-node.sel:after",
907
- "selected commit node marker",
908
- @ content: '';
909
- @ position: absolute;
910
- @ top: 2px;
911
- @ left: 2px;
912
- @ width: 6px;
913
- @ height: 6px;
914
- @ background: red;
915
- },
916
- { ".tl-arrow",
917
- "arrow",
918
- @ width: 0;
919
- @ height: 0;
920
- @ transform: scale(.999);
921
- @ border: 0 solid transparent;
922
- },
923
- { ".tl-arrow.u",
924
- "up arrow",
925
- @ margin-top: -1px;
926
- @ border-width: 0 3px;
927
- @ border-bottom: 7px solid #000;
928
- },
929
- { ".tl-arrow.u.sm",
930
- "small up arrow",
931
- @ border-bottom: 5px solid #000;
932
- },
933
- { ".tl-line",
934
- "line",
935
- @ background: #000;
936
- @ width: 2px;
937
- },
938
- { ".tl-arrow.merge",
939
- "merge arrow",
940
- @ height: 1px;
941
- @ border-width: 2px 0;
942
- },
943
- { ".tl-arrow.merge.l",
944
- "left merge arrow",
945
- @ border-right: 3px solid #000;
946
- },
947
- { ".tl-arrow.merge.r",
948
- "right merge arrow",
949
- @ border-left: 3px solid #000;
950
- },
951
- { ".tl-line.merge",
952
- "merge line",
953
- @ width: 1px;
954
- },
955
- { ".tl-arrow.warp",
956
- "timewarp arrow",
957
- @ margin-left: 1px;
958
- @ border-width: 3px 0;
959
- @ border-left: 7px solid #600000;
960
- },
961
- { ".tl-line.warp",
962
- "timewarp line",
963
- @ background: #600000;
964
- },
965
- { "a.tagLink",
966
- "the format for the tag links",
967
- @
968
- },
969
- { "span.tagDsp",
970
- "the format for the tag display(no history permission!)",
971
- @ font-weight: bold;
972
- },
973
- { "span.wikiError",
974
- "the format for wiki errors",
975
- @ font-weight: bold;
976
- @ color: red;
977
- },
978
- { "span.infoTagCancelled",
979
- "the format for fixed/canceled tags,..",
980
- @ font-weight: bold;
981
- @ text-decoration: line-through;
982
- },
983
- { "span.infoTag",
984
- "the format for tags,..",
985
- @ font-weight: bold;
986
- },
987
- { "span.wikiTagCancelled",
988
- "the format for fixed/cancelled tags,.. on wiki pages",
989
- @ text-decoration: line-through;
990
- },
991
- { "table.browser",
992
- "format for the file display table",
993
- @ /* the format for wiki errors */
994
- @ width: 100%;
995
- @ border: 0;
996
- },
997
- { "td.browser",
998
- "format for cells in the file browser",
999
- @ width: 24%;
1000
- @ vertical-align: top;
1001
- },
1002
- { ".filetree",
1003
- "tree-view file browser",
1004
- @ margin: 1em 0;
1005
- @ line-height: 1.5;
1006
- },
1007
- {
1008
- ".filetree > ul",
1009
- "tree-view top-level list",
1010
- @ display: inline-block;
1011
- },
1012
- { ".filetree ul",
1013
- "tree-view lists",
1014
- @ margin: 0;
1015
- @ padding: 0;
1016
- @ list-style: none;
1017
- },
1018
- { ".filetree ul.collapsed",
1019
- "tree-view collapsed list",
1020
- @ display: none;
1021
- },
1022
- { ".filetree ul ul",
1023
- "tree-view lists below the root",
1024
- @ position: relative;
1025
- @ margin: 0 0 0 21px;
1026
- },
1027
- { ".filetree li",
1028
- "tree-view lists items",
1029
- @ position: relative;
1030
- @ margin: 0;
1031
- @ padding: 0;
1032
- },
1033
- { ".filetree li li:before",
1034
- "tree-view node lines",
1035
- @ content: '';
1036
- @ position: absolute;
1037
- @ top: -.8em;
1038
- @ left: -14px;
1039
- @ width: 14px;
1040
- @ height: 1.5em;
1041
- @ border-left: 2px solid #aaa;
1042
- @ border-bottom: 2px solid #aaa;
1043
- },
1044
- { ".filetree li > ul:before",
1045
- "tree-view directory lines",
1046
- @ content: '';
1047
- @ position: absolute;
1048
- @ top: -1.5em;
1049
- @ bottom: 0;
1050
- @ left: -35px;
1051
- @ border-left: 2px solid #aaa;
1052
- },
1053
- { ".filetree li.last > ul:before",
1054
- "hide lines for last-child directories",
1055
- @ display: none;
1056
- },
1057
- { ".filetree a",
1058
- "tree-view links",
1059
- " position: relative;\n"
1060
- " z-index: 1;\n"
1061
- " display: table-cell;\n"
1062
- " min-height: 16px;\n"
1063
- " padding-left: 21px;\n"
1064
- " background-image: url(data:image/gif;base64,R0lGODlhEAAQAJEAAP"
1065
- "\\/\\/\\/yEhIf\\/\\/\\/wAAACH5BAEHAAIALAAAAAAQABAAAAIvlIKpxqcfmg"
1066
- "OUvoaqDSCxrEEfF14GqFXImJZsu73wepJzVMNxrtNTj3NATMKhpwAAOw==);\n"
1067
- " background-position: center left;\n"
1068
- " background-repeat: no-repeat;\n"
1069
- },
1070
- { "ul.browser",
1071
- "list of files in the 'flat-view' file browser",
1072
- @ list-style-type: none;
1073
- @ padding: 10px;
1074
- @ margin: 0px;
1075
- @ white-space: nowrap;
1076
- },
1077
- { "ul.browser li.file",
1078
- "List element in the 'flat-view' file browser for a file",
1079
- " background-image: url(data:image/gif;base64,R0lGODlhEAAQAJEAAP"
1080
- "\\/\\/\\/yEhIf\\/\\/\\/wAAACH5BAEHAAIALAAAAAAQABAAAAIvlIKpxqcfm"
1081
- "gOUvoaqDSCxrEEfF14GqFXImJZsu73wepJzVMNxrtNTj3NATMKhpwAAOw==);\n"
1082
- " background-repeat: no-repeat;\n"
1083
- " background-position: 0px center;\n"
1084
- " padding-left: 20px;\n"
1085
- " padding-top: 2px;\n"
1086
- },
1087
- { "ul.browser li.dir",
1088
- "List element in the 'flat-view file browser for a directory",
1089
- " background-image: url(data:image/gif;base64,R0lGODlhEAAQAJEAAP/WVCIi"
1090
- "Iv\\/\\/\\/wAAACH5BAEHAAIALAAAAAAQABAAAAInlI9pwa3XYniCgQtkrAFfLXkiFo1jaX"
1091
- "po+jUs6b5Z/K4siDu5RPUFADs=);\n"
1092
- " background-repeat: no-repeat;\n"
1093
- " background-position: 0px center;\n"
1094
- " padding-left: 20px;\n"
1095
- " padding-top: 2px;\n"
1096
- },
1097
- { "div.filetreeline",
1098
- "line of a file tree",
1099
- @ display: table;
1100
- @ width: 100%;
1101
- @ white-space: nowrap;
1102
- },
1103
- { ".filetree .dir > div.filetreeline > a",
1104
- "tree-view directory links",
1105
- " background-image: url(data:image/gif;base64,R0lGODlhEAAQAJEAAP/WVCIi"
1106
- "Iv\\/\\/\\/wAAACH5BAEHAAIALAAAAAAQABAAAAInlI9pwa3XYniCgQtkrAFfLXkiFo1jaXp"
1107
- "o+jUs6b5Z/K4siDu5RPUFADs=);\n"
1108
- },
1109
- { "div.filetreeage",
1110
- "Last change floating display on the right",
1111
- @ display: table-cell;
1112
- @ padding-left: 3em;
1113
- @ text-align: right;
1114
- },
1115
- { "div.filetreeline:hover",
1116
- "Highlight the line of a file tree",
1117
- @ background-color: #eee;
1118
- },
1119
- { "table.login_out",
1120
- "table format for login/out label/input table",
1121
- @ text-align: left;
1122
- @ margin-right: 10px;
1123
- @ margin-left: 10px;
1124
- @ margin-top: 10px;
1125
- },
1126
- { "div.captcha",
1127
- "captcha display options",
1128
- @ text-align: center;
1129
- @ padding: 1ex;
1130
- },
1131
- { "table.captcha",
1132
- "format for the layout table, used for the captcha display",
1133
- @ margin: auto;
1134
- @ padding: 10px;
1135
- @ border-width: 4px;
1136
- @ border-style: double;
1137
- @ border-color: black;
1138
- },
1139
- { "td.login_out_label",
1140
- "format for the label cells in the login/out table",
1141
- @ text-align: center;
1142
- },
1143
- { "span.loginError",
1144
- "format for login error messages",
1145
- @ color: red;
1146
- },
1147
- { "span.note",
1148
- "format for leading text for notes",
1149
- @ font-weight: bold;
1150
- },
1151
- { "span.textareaLabel",
1152
- "format for textarea labels",
1153
- @ font-weight: bold;
1154
- },
1155
- { "table.usetupLayoutTable",
1156
- "format for the user setup layout table",
1157
- @ outline-style: none;
1158
- @ padding: 0;
1159
- @ margin: 25px;
1160
- },
1161
- { "td.usetupColumnLayout",
1162
- "format of the columns on the user setup list page",
1163
- @ vertical-align: top
1164
- },
1165
- { "table.usetupUserList",
1166
- "format for the user list table on the user setup page",
1167
- @ outline-style: double;
1168
- @ outline-width: 1px;
1169
- @ padding: 10px;
1170
- },
1171
- { "th.usetupListUser",
1172
- "format for table header user in user list on user setup page",
1173
- @ text-align: right;
1174
- @ padding-right: 20px;
1175
- },
1176
- { "th.usetupListCap",
1177
- "format for table header capabilities in user list on user setup page",
1178
- @ text-align: center;
1179
- @ padding-right: 15px;
1180
- },
1181
- { "th.usetupListCon",
1182
- "format for table header contact info in user list on user setup page",
1183
- @ text-align: left;
1184
- },
1185
- { "td.usetupListUser",
1186
- "format for table cell user in user list on user setup page",
1187
- @ text-align: right;
1188
- @ padding-right: 20px;
1189
- @ white-space:nowrap;
1190
- },
1191
- { "td.usetupListCap",
1192
- "format for table cell capabilities in user list on user setup page",
1193
- @ text-align: center;
1194
- @ padding-right: 15px;
1195
- },
1196
- { "td.usetupListCon",
1197
- "format for table cell contact info in user list on user setup page",
1198
- @ text-align: left
1199
- },
1200
- { "div.ueditCapBox",
1201
- "layout definition for the capabilities box on the user edit detail page",
1202
- @ float: left;
1203
- @ margin-right: 20px;
1204
- @ margin-bottom: 20px;
1205
- },
1206
- { "td.usetupEditLabel",
1207
- "format of the label cells in the detailed user edit page",
1208
- @ text-align: right;
1209
- @ vertical-align: top;
1210
- @ white-space: nowrap;
1211
- },
1212
- { "span.ueditInheritNobody",
1213
- "color for capabilities, inherited by nobody",
1214
- @ color: green;
1215
- @ padding: .2em;
1216
- },
1217
- { "span.ueditInheritDeveloper",
1218
- "color for capabilities, inherited by developer",
1219
- @ color: red;
1220
- @ padding: .2em;
1221
- },
1222
- { "span.ueditInheritReader",
1223
- "color for capabilities, inherited by reader",
1224
- @ color: black;
1225
- @ padding: .2em;
1226
- },
1227
- { "span.ueditInheritAnonymous",
1228
- "color for capabilities, inherited by anonymous",
1229
- @ color: blue;
1230
- @ padding: .2em;
1231
- },
1232
- { "span.capability",
1233
- "format for capabilities, mentioned on the user edit page",
1234
- @ font-weight: bold;
1235
- },
1236
- { "span.usertype",
1237
- "format for different user types, mentioned on the user edit page",
1238
- @ font-weight: bold;
1239
- },
1240
- { "span.usertype:before",
1241
- "leading text for user types, mentioned on the user edit page",
1242
- @ content:"'";
1243
- },
1244
- { "span.usertype:after",
1245
- "trailing text for user types, mentioned on the user edit page",
1246
- @ content:"'";
1247
- },
1248
- { "div.selectedText",
1249
- "selected lines of text within a linenumbered artifact display",
1250
- @ font-weight: bold;
1251
- @ color: blue;
1252
- @ background-color: #d5d5ff;
1253
- @ border: 1px blue solid;
1254
- },
1255
- { "p.missingPriv",
1256
- "format for missing privileges note on user setup page",
1257
- @ color: blue;
1258
- },
1259
- { "span.wikiruleHead",
1260
- "format for leading text in wikirules definitions",
1261
- @ font-weight: bold;
1262
- },
1263
- { "td.tktDspLabel",
1264
- "format for labels on ticket display page",
1265
- @ text-align: right;
1266
- },
1267
- { "td.tktDspValue",
1268
- "format for values on ticket display page",
1269
- @ text-align: left;
1270
- @ vertical-align: top;
1271
- @ background-color: #d0d0d0;
1272
- },
1273
- { "span.tktError",
1274
- "format for ticket error messages",
1275
- @ color: red;
1276
- @ font-weight: bold;
1277
- },
1278
- { "table.rpteditex",
1279
- "format for example tables on the report edit page",
1280
- @ float: right;
1281
- @ margin: 0;
1282
- @ padding: 0;
1283
- @ width: 125px;
1284
- @ text-align: center;
1285
- @ border-collapse: collapse;
1286
- @ border-spacing: 0;
1287
- },
1288
- { "table.report",
1289
- "Ticket report table formatting",
1290
- @ border-collapse:collapse;
1291
- @ border: 1px solid #999;
1292
- @ margin: 1em 0 1em 0;
1293
- @ cursor: pointer;
1294
- },
1295
- { "td.rpteditex",
1296
- "format for example table cells on the report edit page",
1297
- @ border-width: thin;
1298
- @ border-color: #000000;
1299
- @ border-style: solid;
1300
- },
1301
- { "input.checkinUserColor",
1302
- "format for user color input on check-in edit page",
1303
- @ /* no special definitions, class defined, to enable color pickers, f.e.:
1304
- @ ** add the color picker found at http:jscolor.com as java script include
1305
- @ ** to the header and configure the java script file with
1306
- @ ** 1. use as bindClass :checkinUserColor
1307
- @ ** 2. change the default hash adding behaviour to ON
1308
- @ ** or change the class defition of element identified by id="clrcust"
1309
- @ ** to a standard jscolor definition with java script in the footer. */
1310
- },
1311
- { "div.endContent",
1312
- "format for end of content area, to be used to clear page flow.",
1313
- @ clear: both;
1314
- },
1315
- { "p.generalError",
1316
- "format for general errors",
1317
- @ color: red;
1318
- },
1319
- { "p.tktsetupError",
1320
- "format for tktsetup errors",
1321
- @ color: red;
1322
- @ font-weight: bold;
1323
- },
1324
- { "p.xfersetupError",
1325
- "format for xfersetup errors",
1326
- @ color: red;
1327
- @ font-weight: bold;
1328
- },
1329
- { "p.thmainError",
1330
- "format for th script errors",
1331
- @ color: red;
1332
- @ font-weight: bold;
1333
- },
1334
- { "span.thTrace",
1335
- "format for th script trace messages",
1336
- @ color: red;
1337
- },
1338
- { "p.reportError",
1339
- "format for report configuration errors",
1340
- @ color: red;
1341
- @ font-weight: bold;
1342
- },
1343
- { "blockquote.reportError",
1344
- "format for report configuration errors",
1345
- @ color: red;
1346
- @ font-weight: bold;
1347
- },
1348
- { "p.noMoreShun",
1349
- "format for artifact lines, no longer shunned",
1350
- @ color: blue;
1351
- },
1352
- { "p.shunned",
1353
- "format for artifact lines beeing shunned",
1354
- @ color: blue;
1355
- },
1356
- { "span.brokenlink",
1357
- "a broken hyperlink",
1358
- @ color: red;
1359
- },
1360
- { "ul.filelist",
1361
- "List of files in a timeline",
1362
- @ margin-top: 3px;
1363
- @ line-height: 100%;
1364
- },
1365
- { "ul.filelist li",
1366
- "List of files in a timeline",
1367
- @ padding-top: 1px;
1368
- },
1369
- { "table.sbsdiffcols",
1370
- "side-by-side diff display (column-based)",
1371
- @ width: 90%;
1372
- @ border-spacing: 0;
1373
- @ font-size: xx-small;
1374
- },
1375
- { "table.sbsdiffcols td",
1376
- "sbs diff table cell",
1377
- @ padding: 0;
1378
- @ vertical-align: top;
1379
- },
1380
- { "table.sbsdiffcols pre",
1381
- "sbs diff pre block",
1382
- @ margin: 0;
1383
- @ padding: 0;
1384
- @ border: 0;
1385
- @ font-size: inherit;
1386
- @ background: inherit;
1387
- @ color: inherit;
1388
- },
1389
- { "div.difflncol",
1390
- "diff line number column",
1391
- @ padding-right: 1em;
1392
- @ text-align: right;
1393
- @ color: #a0a0a0;
1394
- },
1395
- { "div.difftxtcol",
1396
- "diff text column",
1397
- @ width: 45em;
1398
- @ overflow-x: auto;
1399
- },
1400
- { "div.diffmkrcol",
1401
- "diff marker column",
1402
- @ padding: 0 1em;
1403
- },
1404
- { "span.diffchng",
1405
- "changes in a diff",
1406
- @ background-color: #c0c0ff;
1407
- },
1408
- { "span.diffadd",
1409
- "added code in a diff",
1410
- @ background-color: #c0ffc0;
1411
- },
1412
- { "span.diffrm",
1413
- "deleted in a diff",
1414
- @ background-color: #ffc8c8;
1415
- },
1416
- { "span.diffhr",
1417
- "suppressed lines in a diff",
1418
- @ display: inline-block;
1419
- @ margin: .5em 0 1em;
1420
- @ color: #0000ff;
1421
- },
1422
- { "span.diffln",
1423
- "line numbers in a diff",
1424
- @ color: #a0a0a0;
1425
- },
1426
- { "span.modpending",
1427
- "Moderation Pending message on timeline",
1428
- @ color: #b03800;
1429
- @ font-style: italic;
1430
- },
1431
- { "pre.th1result",
1432
- "format for th1 script results",
1433
- @ white-space: pre-wrap;
1434
- @ word-wrap: break-word;
1435
- },
1436
- { "pre.th1error",
1437
- "format for th1 script errors",
1438
- @ white-space: pre-wrap;
1439
- @ word-wrap: break-word;
1440
- @ color: red;
1441
- },
1442
- { "table.label-value th",
1443
- "The label/value pairs on (for example) the ci page",
1444
- @ vertical-align: top;
1445
- @ text-align: right;
1446
- @ padding: 0.2ex 2ex;
1447
- },
1448
- { ".statistics-report-graph-line",
1449
- "for the /reports views",
1450
- @ background-color: #446979;
1451
- },
1452
- { ".statistics-report-table-events th",
1453
- "",
1454
- @ padding: 0 1em 0 1em;
1455
- },
1456
- { ".statistics-report-table-events td",
1457
- "",
1458
- @ padding: 0.1em 1em 0.1em 1em;
1459
- },
1460
- { ".statistics-report-row-year",
1461
- "",
1462
- @ text-align: left;
1463
- },
1464
- { ".statistics-report-week-number-label",
1465
- "for the /stats_report views",
1466
- @ text-align: right;
1467
- @ font-size: 0.8em;
1468
- },
1469
- { ".statistics-report-week-of-year-list",
1470
- "for the /stats_report views",
1471
- @ font-size: 0.8em;
1472
- },
1473
- { "tr.row0",
1474
- "even table row color",
1475
- @ /* use default */
1476
- },
1477
- { "tr.row1",
1478
- "odd table row color",
1479
- @ /* Use default */
1480
- },
1481
- { "#usetupEditCapability",
1482
- "format for capabilities string, mentioned on the user edit page",
1483
- @ font-weight: bold;
1484
- },
1485
- { "table.adminLogTable",
1486
- "Class for the /admin_log table",
1487
- @ text-align: left;
1488
- },
1489
- { ".adminLogTable .adminTime",
1490
- "Class for the /admin_log table",
1491
- @ text-align: left;
1492
- @ vertical-align: top;
1493
- @ white-space: nowrap;
1494
- },
1495
- { ".fileage table",
1496
- "The fileage table",
1497
- @ border-spacing: 0;
1498
- },
1499
- { ".fileage tr:hover",
1500
- "Mouse-over effects for the file-age table",
1501
- @ background-color: #eee;
1502
- },
1503
- { ".fileage td",
1504
- "fileage table cells",
1505
- @ vertical-align: top;
1506
- @ text-align: left;
1507
- @ border-top: 1px solid #ddd;
1508
- @ padding-top: 3px;
1509
- },
1510
- { ".fileage td:first-child",
1511
- "fileage first column (the age)",
1512
- @ white-space: nowrap;
1513
- },
1514
- { ".fileage td:nth-child(2)",
1515
- "fileage second column (the filename)",
1516
- @ padding-left: 1em;
1517
- @ padding-right: 1em;
1518
- },
1519
- { ".fileage td:nth-child(3)",
1520
- "fileage third column (the check-in comment)",
1521
- @ word-wrap: break-word;
1522
- @ max-width: 50%;
1523
- },
1524
- { ".brlist table", "The list of branches",
1525
- @ border-spacing: 0;
1526
- },
1527
- { ".brlist table th", "Branch list table headers",
1528
- @ text-align: left;
1529
- @ padding: 0px 1em 0.5ex 0px;
1530
- @ vertical-align: bottom;
1531
- },
1532
- { ".brlist table td", "Branch list table headers",
1533
- @ padding: 0px 2em 0px 0px;
1534
- @ white-space: nowrap;
1535
- },
1536
- { "th.sort:after",
1537
- "General styles for sortable column marker",
1538
- @ margin-left: .4em;
1539
- @ cursor: pointer;
1540
- @ text-shadow: 0 0 0 #000; /* Makes arrow darker */
1541
- },
1542
- { "th.sort.none:after",
1543
- "None sort column marker",
1544
- @ content: '\2666';
1545
- },
1546
- { "th.sort.asc:after",
1547
- "Ascending sort column marker",
1548
- @ content: '\2193';
1549
- },
1550
- { "th.sort.desc:after",
1551
- "Descending sort column marker",
1552
- @ content: '\2191';
1553
- },
1554
- { "span.snippet>mark",
1555
- "Search markup",
1556
- @ background-color: inherit;
1557
- @ font-weight: bold;
1558
- },
1559
- { "div.searchForm",
1560
- "Container for the search terms entry box",
1561
- @ text-align: center;
1562
- },
1563
- { "p.searchEmpty",
1564
- "Message explaining that there are no search results",
1565
- @ font-style: italic;
1566
- },
1567
- { ".clutter",
1568
- "Detail screen objects",
1569
- @ display: none;
1570
- },
1571
- { 0,
1572
- 0,
1573
- 0
1574
- }
1575
-};
754
+#include "default_css.h"
1576755
1577756
 /*
1578757
 ** Append all of the default CSS to the CGI output.
1579758
 */
1580759
 void cgi_append_default_css(void) {
@@ -1581,12 +760,11 @@
1581760
 int i;
1582761
1583762
 cgi_printf("%s", builtin_text("skins/default/css.txt"));
1584763
 for( i=0; cssDefaultList[i].elementClass; i++ ){
1585764
 if( cssDefaultList[i].elementClass[0] ){
1586
- cgi_printf("/* %s */\n%s {\n%s\n}\n\n",
1587
- cssDefaultList[i].comment,
765
+ cgi_printf("%s {\n%s\n}\n\n",
1588766
 cssDefaultList[i].elementClass,
1589767
 cssDefaultList[i].value
1590768
 );
1591769
 }
1592770
 }
@@ -1641,20 +819,26 @@
1641819
 ** Return the style sheet.
1642820
 */
1643821
 void page_style_css(void){
1644822
 Blob css;
1645823
 int i;
824
+ int isInit = 0;
1646825
1647826
 cgi_set_content_type("text/css");
1648827
 blob_init(&css,skin_get("css"),-1);
1649828
1650829
 /* add special missing definitions */
1651830
 for(i=1; cssDefaultList[i].elementClass; i++){
1652831
 char *z = blob_str(&css);
1653832
 if( !containsSelector(z, cssDefaultList[i].elementClass) ){
1654
- blob_appendf(&css, "/* %s */\n%s {\n%s}\n",
1655
- cssDefaultList[i].comment,
833
+ if( !isInit ){
834
+ isInit = 1;
835
+ blob_append(&css,
836
+ "/*** All the follows is supplemental CSS automatically generated"
837
+ " by Fossil ***/\n", -1);
838
+ }
839
+ blob_appendf(&css, "%s {\n%s}\n",
1656840
 cssDefaultList[i].elementClass,
1657841
 cssDefaultList[i].value);
1658842
 }
1659843
 }
1660844
1661845
--- src/style.c
+++ src/style.c
@@ -745,836 +745,15 @@
745 */
746 void style_sidebox_end(void){
747 @ </div>
748 }
749
750
751 /* The following table contains bits of default CSS that must
752 ** be included if they are not found in the application-defined
753 ** CSS.
754 */
755 const struct strctCssDefaults {
756 const char *elementClass; /* Name of element needed */
757 const char *comment; /* Comment text */
758 const char *value; /* CSS text */
759 } cssDefaultList[] = {
760 { "div.sidebox",
761 "The nomenclature sidebox for branches,..",
762 @ float: right;
763 @ background-color: white;
764 @ border-width: medium;
765 @ border-style: double;
766 @ margin: 10px;
767 },
768 { "div.sideboxTitle",
769 "The nomenclature title in sideboxes for branches,..",
770 @ display: inline;
771 @ font-weight: bold;
772 },
773 { "div.sideboxDescribed",
774 "The defined element in sideboxes for branches,..",
775 @ display: inline;
776 @ font-weight: bold;
777 },
778 { "span.disabled",
779 "The defined element in sideboxes for branches,..",
780 @ color: red;
781 },
782 { "table.timelineTable",
783 "The table that holds a timeline",
784 @ border-spacing: 0px 2px;
785 },
786 { "span.timelineDisabled",
787 "The suppressed duplicates lines in timeline, ..",
788 @ font-style: italic;
789 @ font-size: small;
790 },
791 { "tr.timelineCurrent",
792 "the format for the timeline data cell of the current checkout",
793 @ padding: .1em .2em;
794 @ border: 1px dashed #446979;
795 @ box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.5);
796 },
797 { "tr.timelineSelected",
798 "The row in the timeline table that contains the entry of interest",
799 @ padding: .1em .2em;
800 @ border: 2px solid lightgray;
801 @ background-color: #ffc;
802 @ box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.5);
803 },
804 { "tr.timelineSelected td",
805 "Cells within a selected row of a timeline",
806 @ border-radius: 0;
807 @ border-width: 0;
808 },
809 { "tr.timelineCurrent td",
810 "Cells within a selected row of a timeline",
811 @ border-radius: 0;
812 @ border-width: 0;
813 },
814 { "tr.timelineSpacer",
815 "An extra row inserted to give vertical space between two rows",
816 @ height: 1ex;
817 },
818 { "span.timelineLeaf",
819 "the format for the timeline leaf marks",
820 @ font-weight: bold;
821 },
822 { "a.timelineHistLink",
823 "the format for the timeline version links",
824 @
825 },
826 { "span.timelineHistDsp",
827 "the format for the timeline version display(no history permission!)",
828 @ font-weight: bold;
829 },
830 { "td.timelineTime",
831 "the format for the timeline time display",
832 @ vertical-align: top;
833 @ text-align: right;
834 @ white-space: nowrap;
835 },
836 { "td.timelineGraph",
837 "the format for the graph placeholder cells in timelines",
838 @ width: 20px;
839 @ text-align: left;
840 @ vertical-align: top;
841 },
842 { "span.timelineCompactComment",
843 "The check-in comment text in Compact mode",
844 @ cursor: pointer;
845 },
846 { "span.timelineEllipsis",
847 "The ellipsis mark at the end of a compact comment in a timeline",
848 @ cursor: pointer;
849 },
850 { ".timelineModernCell, .timelineColumnarCell, .timelineDetailCell",
851 "The entry details for a normal timeline",
852 @ vertical-align: top;
853 @ text-align: left;
854 @ padding: 0.75em;
855 @ border: 1px #ccc solid;
856 @ border-radius: 1em;
857 },
858 { ".timelineModernDetail",
859 "Detail text for a normal timeline display",
860 @ font-size: 80%;
861 @ text-align: right;
862 @ float: right;
863 @ opacity: 0.75;
864 @ margin-top: 0.5em;
865 },
866 { "td.timelineGraph",
867 "the format for the graph placeholder cells in timelines",
868 @ width: 20px;
869 @ text-align: left;
870 @ vertical-align: top;
871 },
872 { ".tl-canvas",
873 "timeline graph canvas",
874 @ margin: 0 6px 0 10px;
875 },
876 { ".tl-rail",
877 "maximum rail spacing",
878 @ width: 18px;
879 },
880 { ".tl-mergeoffset",
881 "maximum spacing between merge risers and primary child risers",
882 @ width: 2px;
883 },
884 { ".tl-nodemark",
885 "adjusts the vertical position of graph nodes",
886 @ margin-top: 5px;
887 },
888 { ".tl-node",
889 "commit node",
890 @ width: 10px;
891 @ height: 10px;
892 @ border: 1px solid #000;
893 @ background: #fff;
894 @ cursor: pointer;
895 },
896 { ".tl-node.leaf:after",
897 "leaf commit marker",
898 @ content: '';
899 @ position: absolute;
900 @ top: 3px;
901 @ left: 3px;
902 @ width: 4px;
903 @ height: 4px;
904 @ background: #000;
905 },
906 { ".tl-node.sel:after",
907 "selected commit node marker",
908 @ content: '';
909 @ position: absolute;
910 @ top: 2px;
911 @ left: 2px;
912 @ width: 6px;
913 @ height: 6px;
914 @ background: red;
915 },
916 { ".tl-arrow",
917 "arrow",
918 @ width: 0;
919 @ height: 0;
920 @ transform: scale(.999);
921 @ border: 0 solid transparent;
922 },
923 { ".tl-arrow.u",
924 "up arrow",
925 @ margin-top: -1px;
926 @ border-width: 0 3px;
927 @ border-bottom: 7px solid #000;
928 },
929 { ".tl-arrow.u.sm",
930 "small up arrow",
931 @ border-bottom: 5px solid #000;
932 },
933 { ".tl-line",
934 "line",
935 @ background: #000;
936 @ width: 2px;
937 },
938 { ".tl-arrow.merge",
939 "merge arrow",
940 @ height: 1px;
941 @ border-width: 2px 0;
942 },
943 { ".tl-arrow.merge.l",
944 "left merge arrow",
945 @ border-right: 3px solid #000;
946 },
947 { ".tl-arrow.merge.r",
948 "right merge arrow",
949 @ border-left: 3px solid #000;
950 },
951 { ".tl-line.merge",
952 "merge line",
953 @ width: 1px;
954 },
955 { ".tl-arrow.warp",
956 "timewarp arrow",
957 @ margin-left: 1px;
958 @ border-width: 3px 0;
959 @ border-left: 7px solid #600000;
960 },
961 { ".tl-line.warp",
962 "timewarp line",
963 @ background: #600000;
964 },
965 { "a.tagLink",
966 "the format for the tag links",
967 @
968 },
969 { "span.tagDsp",
970 "the format for the tag display(no history permission!)",
971 @ font-weight: bold;
972 },
973 { "span.wikiError",
974 "the format for wiki errors",
975 @ font-weight: bold;
976 @ color: red;
977 },
978 { "span.infoTagCancelled",
979 "the format for fixed/canceled tags,..",
980 @ font-weight: bold;
981 @ text-decoration: line-through;
982 },
983 { "span.infoTag",
984 "the format for tags,..",
985 @ font-weight: bold;
986 },
987 { "span.wikiTagCancelled",
988 "the format for fixed/cancelled tags,.. on wiki pages",
989 @ text-decoration: line-through;
990 },
991 { "table.browser",
992 "format for the file display table",
993 @ /* the format for wiki errors */
994 @ width: 100%;
995 @ border: 0;
996 },
997 { "td.browser",
998 "format for cells in the file browser",
999 @ width: 24%;
1000 @ vertical-align: top;
1001 },
1002 { ".filetree",
1003 "tree-view file browser",
1004 @ margin: 1em 0;
1005 @ line-height: 1.5;
1006 },
1007 {
1008 ".filetree > ul",
1009 "tree-view top-level list",
1010 @ display: inline-block;
1011 },
1012 { ".filetree ul",
1013 "tree-view lists",
1014 @ margin: 0;
1015 @ padding: 0;
1016 @ list-style: none;
1017 },
1018 { ".filetree ul.collapsed",
1019 "tree-view collapsed list",
1020 @ display: none;
1021 },
1022 { ".filetree ul ul",
1023 "tree-view lists below the root",
1024 @ position: relative;
1025 @ margin: 0 0 0 21px;
1026 },
1027 { ".filetree li",
1028 "tree-view lists items",
1029 @ position: relative;
1030 @ margin: 0;
1031 @ padding: 0;
1032 },
1033 { ".filetree li li:before",
1034 "tree-view node lines",
1035 @ content: '';
1036 @ position: absolute;
1037 @ top: -.8em;
1038 @ left: -14px;
1039 @ width: 14px;
1040 @ height: 1.5em;
1041 @ border-left: 2px solid #aaa;
1042 @ border-bottom: 2px solid #aaa;
1043 },
1044 { ".filetree li > ul:before",
1045 "tree-view directory lines",
1046 @ content: '';
1047 @ position: absolute;
1048 @ top: -1.5em;
1049 @ bottom: 0;
1050 @ left: -35px;
1051 @ border-left: 2px solid #aaa;
1052 },
1053 { ".filetree li.last > ul:before",
1054 "hide lines for last-child directories",
1055 @ display: none;
1056 },
1057 { ".filetree a",
1058 "tree-view links",
1059 " position: relative;\n"
1060 " z-index: 1;\n"
1061 " display: table-cell;\n"
1062 " min-height: 16px;\n"
1063 " padding-left: 21px;\n"
1064 " background-image: url(data:image/gif;base64,R0lGODlhEAAQAJEAAP"
1065 "\\/\\/\\/yEhIf\\/\\/\\/wAAACH5BAEHAAIALAAAAAAQABAAAAIvlIKpxqcfmg"
1066 "OUvoaqDSCxrEEfF14GqFXImJZsu73wepJzVMNxrtNTj3NATMKhpwAAOw==);\n"
1067 " background-position: center left;\n"
1068 " background-repeat: no-repeat;\n"
1069 },
1070 { "ul.browser",
1071 "list of files in the 'flat-view' file browser",
1072 @ list-style-type: none;
1073 @ padding: 10px;
1074 @ margin: 0px;
1075 @ white-space: nowrap;
1076 },
1077 { "ul.browser li.file",
1078 "List element in the 'flat-view' file browser for a file",
1079 " background-image: url(data:image/gif;base64,R0lGODlhEAAQAJEAAP"
1080 "\\/\\/\\/yEhIf\\/\\/\\/wAAACH5BAEHAAIALAAAAAAQABAAAAIvlIKpxqcfm"
1081 "gOUvoaqDSCxrEEfF14GqFXImJZsu73wepJzVMNxrtNTj3NATMKhpwAAOw==);\n"
1082 " background-repeat: no-repeat;\n"
1083 " background-position: 0px center;\n"
1084 " padding-left: 20px;\n"
1085 " padding-top: 2px;\n"
1086 },
1087 { "ul.browser li.dir",
1088 "List element in the 'flat-view file browser for a directory",
1089 " background-image: url(data:image/gif;base64,R0lGODlhEAAQAJEAAP/WVCIi"
1090 "Iv\\/\\/\\/wAAACH5BAEHAAIALAAAAAAQABAAAAInlI9pwa3XYniCgQtkrAFfLXkiFo1jaX"
1091 "po+jUs6b5Z/K4siDu5RPUFADs=);\n"
1092 " background-repeat: no-repeat;\n"
1093 " background-position: 0px center;\n"
1094 " padding-left: 20px;\n"
1095 " padding-top: 2px;\n"
1096 },
1097 { "div.filetreeline",
1098 "line of a file tree",
1099 @ display: table;
1100 @ width: 100%;
1101 @ white-space: nowrap;
1102 },
1103 { ".filetree .dir > div.filetreeline > a",
1104 "tree-view directory links",
1105 " background-image: url(data:image/gif;base64,R0lGODlhEAAQAJEAAP/WVCIi"
1106 "Iv\\/\\/\\/wAAACH5BAEHAAIALAAAAAAQABAAAAInlI9pwa3XYniCgQtkrAFfLXkiFo1jaXp"
1107 "o+jUs6b5Z/K4siDu5RPUFADs=);\n"
1108 },
1109 { "div.filetreeage",
1110 "Last change floating display on the right",
1111 @ display: table-cell;
1112 @ padding-left: 3em;
1113 @ text-align: right;
1114 },
1115 { "div.filetreeline:hover",
1116 "Highlight the line of a file tree",
1117 @ background-color: #eee;
1118 },
1119 { "table.login_out",
1120 "table format for login/out label/input table",
1121 @ text-align: left;
1122 @ margin-right: 10px;
1123 @ margin-left: 10px;
1124 @ margin-top: 10px;
1125 },
1126 { "div.captcha",
1127 "captcha display options",
1128 @ text-align: center;
1129 @ padding: 1ex;
1130 },
1131 { "table.captcha",
1132 "format for the layout table, used for the captcha display",
1133 @ margin: auto;
1134 @ padding: 10px;
1135 @ border-width: 4px;
1136 @ border-style: double;
1137 @ border-color: black;
1138 },
1139 { "td.login_out_label",
1140 "format for the label cells in the login/out table",
1141 @ text-align: center;
1142 },
1143 { "span.loginError",
1144 "format for login error messages",
1145 @ color: red;
1146 },
1147 { "span.note",
1148 "format for leading text for notes",
1149 @ font-weight: bold;
1150 },
1151 { "span.textareaLabel",
1152 "format for textarea labels",
1153 @ font-weight: bold;
1154 },
1155 { "table.usetupLayoutTable",
1156 "format for the user setup layout table",
1157 @ outline-style: none;
1158 @ padding: 0;
1159 @ margin: 25px;
1160 },
1161 { "td.usetupColumnLayout",
1162 "format of the columns on the user setup list page",
1163 @ vertical-align: top
1164 },
1165 { "table.usetupUserList",
1166 "format for the user list table on the user setup page",
1167 @ outline-style: double;
1168 @ outline-width: 1px;
1169 @ padding: 10px;
1170 },
1171 { "th.usetupListUser",
1172 "format for table header user in user list on user setup page",
1173 @ text-align: right;
1174 @ padding-right: 20px;
1175 },
1176 { "th.usetupListCap",
1177 "format for table header capabilities in user list on user setup page",
1178 @ text-align: center;
1179 @ padding-right: 15px;
1180 },
1181 { "th.usetupListCon",
1182 "format for table header contact info in user list on user setup page",
1183 @ text-align: left;
1184 },
1185 { "td.usetupListUser",
1186 "format for table cell user in user list on user setup page",
1187 @ text-align: right;
1188 @ padding-right: 20px;
1189 @ white-space:nowrap;
1190 },
1191 { "td.usetupListCap",
1192 "format for table cell capabilities in user list on user setup page",
1193 @ text-align: center;
1194 @ padding-right: 15px;
1195 },
1196 { "td.usetupListCon",
1197 "format for table cell contact info in user list on user setup page",
1198 @ text-align: left
1199 },
1200 { "div.ueditCapBox",
1201 "layout definition for the capabilities box on the user edit detail page",
1202 @ float: left;
1203 @ margin-right: 20px;
1204 @ margin-bottom: 20px;
1205 },
1206 { "td.usetupEditLabel",
1207 "format of the label cells in the detailed user edit page",
1208 @ text-align: right;
1209 @ vertical-align: top;
1210 @ white-space: nowrap;
1211 },
1212 { "span.ueditInheritNobody",
1213 "color for capabilities, inherited by nobody",
1214 @ color: green;
1215 @ padding: .2em;
1216 },
1217 { "span.ueditInheritDeveloper",
1218 "color for capabilities, inherited by developer",
1219 @ color: red;
1220 @ padding: .2em;
1221 },
1222 { "span.ueditInheritReader",
1223 "color for capabilities, inherited by reader",
1224 @ color: black;
1225 @ padding: .2em;
1226 },
1227 { "span.ueditInheritAnonymous",
1228 "color for capabilities, inherited by anonymous",
1229 @ color: blue;
1230 @ padding: .2em;
1231 },
1232 { "span.capability",
1233 "format for capabilities, mentioned on the user edit page",
1234 @ font-weight: bold;
1235 },
1236 { "span.usertype",
1237 "format for different user types, mentioned on the user edit page",
1238 @ font-weight: bold;
1239 },
1240 { "span.usertype:before",
1241 "leading text for user types, mentioned on the user edit page",
1242 @ content:"'";
1243 },
1244 { "span.usertype:after",
1245 "trailing text for user types, mentioned on the user edit page",
1246 @ content:"'";
1247 },
1248 { "div.selectedText",
1249 "selected lines of text within a linenumbered artifact display",
1250 @ font-weight: bold;
1251 @ color: blue;
1252 @ background-color: #d5d5ff;
1253 @ border: 1px blue solid;
1254 },
1255 { "p.missingPriv",
1256 "format for missing privileges note on user setup page",
1257 @ color: blue;
1258 },
1259 { "span.wikiruleHead",
1260 "format for leading text in wikirules definitions",
1261 @ font-weight: bold;
1262 },
1263 { "td.tktDspLabel",
1264 "format for labels on ticket display page",
1265 @ text-align: right;
1266 },
1267 { "td.tktDspValue",
1268 "format for values on ticket display page",
1269 @ text-align: left;
1270 @ vertical-align: top;
1271 @ background-color: #d0d0d0;
1272 },
1273 { "span.tktError",
1274 "format for ticket error messages",
1275 @ color: red;
1276 @ font-weight: bold;
1277 },
1278 { "table.rpteditex",
1279 "format for example tables on the report edit page",
1280 @ float: right;
1281 @ margin: 0;
1282 @ padding: 0;
1283 @ width: 125px;
1284 @ text-align: center;
1285 @ border-collapse: collapse;
1286 @ border-spacing: 0;
1287 },
1288 { "table.report",
1289 "Ticket report table formatting",
1290 @ border-collapse:collapse;
1291 @ border: 1px solid #999;
1292 @ margin: 1em 0 1em 0;
1293 @ cursor: pointer;
1294 },
1295 { "td.rpteditex",
1296 "format for example table cells on the report edit page",
1297 @ border-width: thin;
1298 @ border-color: #000000;
1299 @ border-style: solid;
1300 },
1301 { "input.checkinUserColor",
1302 "format for user color input on check-in edit page",
1303 @ /* no special definitions, class defined, to enable color pickers, f.e.:
1304 @ ** add the color picker found at http:jscolor.com as java script include
1305 @ ** to the header and configure the java script file with
1306 @ ** 1. use as bindClass :checkinUserColor
1307 @ ** 2. change the default hash adding behaviour to ON
1308 @ ** or change the class defition of element identified by id="clrcust"
1309 @ ** to a standard jscolor definition with java script in the footer. */
1310 },
1311 { "div.endContent",
1312 "format for end of content area, to be used to clear page flow.",
1313 @ clear: both;
1314 },
1315 { "p.generalError",
1316 "format for general errors",
1317 @ color: red;
1318 },
1319 { "p.tktsetupError",
1320 "format for tktsetup errors",
1321 @ color: red;
1322 @ font-weight: bold;
1323 },
1324 { "p.xfersetupError",
1325 "format for xfersetup errors",
1326 @ color: red;
1327 @ font-weight: bold;
1328 },
1329 { "p.thmainError",
1330 "format for th script errors",
1331 @ color: red;
1332 @ font-weight: bold;
1333 },
1334 { "span.thTrace",
1335 "format for th script trace messages",
1336 @ color: red;
1337 },
1338 { "p.reportError",
1339 "format for report configuration errors",
1340 @ color: red;
1341 @ font-weight: bold;
1342 },
1343 { "blockquote.reportError",
1344 "format for report configuration errors",
1345 @ color: red;
1346 @ font-weight: bold;
1347 },
1348 { "p.noMoreShun",
1349 "format for artifact lines, no longer shunned",
1350 @ color: blue;
1351 },
1352 { "p.shunned",
1353 "format for artifact lines beeing shunned",
1354 @ color: blue;
1355 },
1356 { "span.brokenlink",
1357 "a broken hyperlink",
1358 @ color: red;
1359 },
1360 { "ul.filelist",
1361 "List of files in a timeline",
1362 @ margin-top: 3px;
1363 @ line-height: 100%;
1364 },
1365 { "ul.filelist li",
1366 "List of files in a timeline",
1367 @ padding-top: 1px;
1368 },
1369 { "table.sbsdiffcols",
1370 "side-by-side diff display (column-based)",
1371 @ width: 90%;
1372 @ border-spacing: 0;
1373 @ font-size: xx-small;
1374 },
1375 { "table.sbsdiffcols td",
1376 "sbs diff table cell",
1377 @ padding: 0;
1378 @ vertical-align: top;
1379 },
1380 { "table.sbsdiffcols pre",
1381 "sbs diff pre block",
1382 @ margin: 0;
1383 @ padding: 0;
1384 @ border: 0;
1385 @ font-size: inherit;
1386 @ background: inherit;
1387 @ color: inherit;
1388 },
1389 { "div.difflncol",
1390 "diff line number column",
1391 @ padding-right: 1em;
1392 @ text-align: right;
1393 @ color: #a0a0a0;
1394 },
1395 { "div.difftxtcol",
1396 "diff text column",
1397 @ width: 45em;
1398 @ overflow-x: auto;
1399 },
1400 { "div.diffmkrcol",
1401 "diff marker column",
1402 @ padding: 0 1em;
1403 },
1404 { "span.diffchng",
1405 "changes in a diff",
1406 @ background-color: #c0c0ff;
1407 },
1408 { "span.diffadd",
1409 "added code in a diff",
1410 @ background-color: #c0ffc0;
1411 },
1412 { "span.diffrm",
1413 "deleted in a diff",
1414 @ background-color: #ffc8c8;
1415 },
1416 { "span.diffhr",
1417 "suppressed lines in a diff",
1418 @ display: inline-block;
1419 @ margin: .5em 0 1em;
1420 @ color: #0000ff;
1421 },
1422 { "span.diffln",
1423 "line numbers in a diff",
1424 @ color: #a0a0a0;
1425 },
1426 { "span.modpending",
1427 "Moderation Pending message on timeline",
1428 @ color: #b03800;
1429 @ font-style: italic;
1430 },
1431 { "pre.th1result",
1432 "format for th1 script results",
1433 @ white-space: pre-wrap;
1434 @ word-wrap: break-word;
1435 },
1436 { "pre.th1error",
1437 "format for th1 script errors",
1438 @ white-space: pre-wrap;
1439 @ word-wrap: break-word;
1440 @ color: red;
1441 },
1442 { "table.label-value th",
1443 "The label/value pairs on (for example) the ci page",
1444 @ vertical-align: top;
1445 @ text-align: right;
1446 @ padding: 0.2ex 2ex;
1447 },
1448 { ".statistics-report-graph-line",
1449 "for the /reports views",
1450 @ background-color: #446979;
1451 },
1452 { ".statistics-report-table-events th",
1453 "",
1454 @ padding: 0 1em 0 1em;
1455 },
1456 { ".statistics-report-table-events td",
1457 "",
1458 @ padding: 0.1em 1em 0.1em 1em;
1459 },
1460 { ".statistics-report-row-year",
1461 "",
1462 @ text-align: left;
1463 },
1464 { ".statistics-report-week-number-label",
1465 "for the /stats_report views",
1466 @ text-align: right;
1467 @ font-size: 0.8em;
1468 },
1469 { ".statistics-report-week-of-year-list",
1470 "for the /stats_report views",
1471 @ font-size: 0.8em;
1472 },
1473 { "tr.row0",
1474 "even table row color",
1475 @ /* use default */
1476 },
1477 { "tr.row1",
1478 "odd table row color",
1479 @ /* Use default */
1480 },
1481 { "#usetupEditCapability",
1482 "format for capabilities string, mentioned on the user edit page",
1483 @ font-weight: bold;
1484 },
1485 { "table.adminLogTable",
1486 "Class for the /admin_log table",
1487 @ text-align: left;
1488 },
1489 { ".adminLogTable .adminTime",
1490 "Class for the /admin_log table",
1491 @ text-align: left;
1492 @ vertical-align: top;
1493 @ white-space: nowrap;
1494 },
1495 { ".fileage table",
1496 "The fileage table",
1497 @ border-spacing: 0;
1498 },
1499 { ".fileage tr:hover",
1500 "Mouse-over effects for the file-age table",
1501 @ background-color: #eee;
1502 },
1503 { ".fileage td",
1504 "fileage table cells",
1505 @ vertical-align: top;
1506 @ text-align: left;
1507 @ border-top: 1px solid #ddd;
1508 @ padding-top: 3px;
1509 },
1510 { ".fileage td:first-child",
1511 "fileage first column (the age)",
1512 @ white-space: nowrap;
1513 },
1514 { ".fileage td:nth-child(2)",
1515 "fileage second column (the filename)",
1516 @ padding-left: 1em;
1517 @ padding-right: 1em;
1518 },
1519 { ".fileage td:nth-child(3)",
1520 "fileage third column (the check-in comment)",
1521 @ word-wrap: break-word;
1522 @ max-width: 50%;
1523 },
1524 { ".brlist table", "The list of branches",
1525 @ border-spacing: 0;
1526 },
1527 { ".brlist table th", "Branch list table headers",
1528 @ text-align: left;
1529 @ padding: 0px 1em 0.5ex 0px;
1530 @ vertical-align: bottom;
1531 },
1532 { ".brlist table td", "Branch list table headers",
1533 @ padding: 0px 2em 0px 0px;
1534 @ white-space: nowrap;
1535 },
1536 { "th.sort:after",
1537 "General styles for sortable column marker",
1538 @ margin-left: .4em;
1539 @ cursor: pointer;
1540 @ text-shadow: 0 0 0 #000; /* Makes arrow darker */
1541 },
1542 { "th.sort.none:after",
1543 "None sort column marker",
1544 @ content: '\2666';
1545 },
1546 { "th.sort.asc:after",
1547 "Ascending sort column marker",
1548 @ content: '\2193';
1549 },
1550 { "th.sort.desc:after",
1551 "Descending sort column marker",
1552 @ content: '\2191';
1553 },
1554 { "span.snippet>mark",
1555 "Search markup",
1556 @ background-color: inherit;
1557 @ font-weight: bold;
1558 },
1559 { "div.searchForm",
1560 "Container for the search terms entry box",
1561 @ text-align: center;
1562 },
1563 { "p.searchEmpty",
1564 "Message explaining that there are no search results",
1565 @ font-style: italic;
1566 },
1567 { ".clutter",
1568 "Detail screen objects",
1569 @ display: none;
1570 },
1571 { 0,
1572 0,
1573 0
1574 }
1575 };
1576
1577 /*
1578 ** Append all of the default CSS to the CGI output.
1579 */
1580 void cgi_append_default_css(void) {
@@ -1581,12 +760,11 @@
1581 int i;
1582
1583 cgi_printf("%s", builtin_text("skins/default/css.txt"));
1584 for( i=0; cssDefaultList[i].elementClass; i++ ){
1585 if( cssDefaultList[i].elementClass[0] ){
1586 cgi_printf("/* %s */\n%s {\n%s\n}\n\n",
1587 cssDefaultList[i].comment,
1588 cssDefaultList[i].elementClass,
1589 cssDefaultList[i].value
1590 );
1591 }
1592 }
@@ -1641,20 +819,26 @@
1641 ** Return the style sheet.
1642 */
1643 void page_style_css(void){
1644 Blob css;
1645 int i;
 
1646
1647 cgi_set_content_type("text/css");
1648 blob_init(&css,skin_get("css"),-1);
1649
1650 /* add special missing definitions */
1651 for(i=1; cssDefaultList[i].elementClass; i++){
1652 char *z = blob_str(&css);
1653 if( !containsSelector(z, cssDefaultList[i].elementClass) ){
1654 blob_appendf(&css, "/* %s */\n%s {\n%s}\n",
1655 cssDefaultList[i].comment,
 
 
 
 
 
1656 cssDefaultList[i].elementClass,
1657 cssDefaultList[i].value);
1658 }
1659 }
1660
1661
--- src/style.c
+++ src/style.c
@@ -745,836 +745,15 @@
745 */
746 void style_sidebox_end(void){
747 @ </div>
748 }
749
750 /*
751 ** Insert the cssDefaultList[] table, generated from default_css.txt
752 ** using the mkcss.c program.
 
753 */
754 #include "default_css.h"
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
755
756 /*
757 ** Append all of the default CSS to the CGI output.
758 */
759 void cgi_append_default_css(void) {
@@ -1581,12 +760,11 @@
760 int i;
761
762 cgi_printf("%s", builtin_text("skins/default/css.txt"));
763 for( i=0; cssDefaultList[i].elementClass; i++ ){
764 if( cssDefaultList[i].elementClass[0] ){
765 cgi_printf("%s {\n%s\n}\n\n",
 
766 cssDefaultList[i].elementClass,
767 cssDefaultList[i].value
768 );
769 }
770 }
@@ -1641,20 +819,26 @@
819 ** Return the style sheet.
820 */
821 void page_style_css(void){
822 Blob css;
823 int i;
824 int isInit = 0;
825
826 cgi_set_content_type("text/css");
827 blob_init(&css,skin_get("css"),-1);
828
829 /* add special missing definitions */
830 for(i=1; cssDefaultList[i].elementClass; i++){
831 char *z = blob_str(&css);
832 if( !containsSelector(z, cssDefaultList[i].elementClass) ){
833 if( !isInit ){
834 isInit = 1;
835 blob_append(&css,
836 "/*** All the follows is supplemental CSS automatically generated"
837 " by Fossil ***/\n", -1);
838 }
839 blob_appendf(&css, "%s {\n%s}\n",
840 cssDefaultList[i].elementClass,
841 cssDefaultList[i].value);
842 }
843 }
844
845
M win/Makefile.PellesCGMake
+4 -1
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -146,13 +146,16 @@
146146
 mkbuiltin.exe --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
147147
148148
 # extracting version info from manifest
149149
 VERSION.h: version.exe ..\manifest.uuid ..\manifest ..\VERSION
150150
 version.exe ..\manifest.uuid ..\manifest ..\VERSION >$@
151
+
152
+default_css.h: mkcss.exe default_css.txt
153
+ mkcss.exe default_css.txt $@
151154
152155
 # generate the simplified headers
153
-headers: makeheaders.exe page_index.h builtin_data.h VERSION.h ../src/sqlite3.h ../src/th.h VERSION.h
156
+headers: makeheaders.exe page_index.h builtin_data.h default_css.h VERSION.h ../src/sqlite3.h ../src/th.h
154157
 makeheaders.exe $(foreach ts,$(TRANSLATEDSRC),$(ts):$(ts:_.c=.h)) ../src/sqlite3.h ../src/th.h VERSION.h
155158
 echo Done >$@
156159
157160
 # compile C sources with relevant options
158161
159162
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -146,13 +146,16 @@
146 mkbuiltin.exe --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
147
148 # extracting version info from manifest
149 VERSION.h: version.exe ..\manifest.uuid ..\manifest ..\VERSION
150 version.exe ..\manifest.uuid ..\manifest ..\VERSION >$@
 
 
 
151
152 # generate the simplified headers
153 headers: makeheaders.exe page_index.h builtin_data.h VERSION.h ../src/sqlite3.h ../src/th.h VERSION.h
154 makeheaders.exe $(foreach ts,$(TRANSLATEDSRC),$(ts):$(ts:_.c=.h)) ../src/sqlite3.h ../src/th.h VERSION.h
155 echo Done >$@
156
157 # compile C sources with relevant options
158
159
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -146,13 +146,16 @@
146 mkbuiltin.exe --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
147
148 # extracting version info from manifest
149 VERSION.h: version.exe ..\manifest.uuid ..\manifest ..\VERSION
150 version.exe ..\manifest.uuid ..\manifest ..\VERSION >$@
151
152 default_css.h: mkcss.exe default_css.txt
153 mkcss.exe default_css.txt $@
154
155 # generate the simplified headers
156 headers: makeheaders.exe page_index.h builtin_data.h default_css.h VERSION.h ../src/sqlite3.h ../src/th.h
157 makeheaders.exe $(foreach ts,$(TRANSLATEDSRC),$(ts):$(ts:_.c=.h)) ../src/sqlite3.h ../src/th.h VERSION.h
158 echo Done >$@
159
160 # compile C sources with relevant options
161
162
M win/Makefile.dmc
+8 -2
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -70,10 +70,13 @@
7070
 mkbuiltin$E: $(SRCDIR)\mkbuiltin.c
7171
 $(BCC) -o$@ $**
7272
7373
 mkversion$E: $(SRCDIR)\mkversion.c
7474
 $(BCC) -o$@ $**
75
+
76
+mkcss$E: $(SRCDIR)\mkcss.c
77
+ $(BCC) -o$@ $**
7578
7679
 codecheck1$E: $(SRCDIR)\codecheck1.c
7780
 $(BCC) -o$@ $**
7881
7982
 $(OBJDIR)\shell$O : $(SRCDIR)\shell.c
@@ -92,10 +95,13 @@
9295
 cp $@ $@
9396
9497
 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
9598
 +$** > $@
9699
100
+default_css.h : mkcss$E $B\src\default_css.txt
101
+ +$** $B\src\default_css.txt $@
102
+
97103
 page_index.h: mkindex$E $(SRC)
98104
 +$** > $@
99105
100106
 builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
101107
 mkbuiltin$E --prefix $(SRCDIR)/ $(EXTRA_FILES) > $@
@@ -103,11 +109,11 @@
103109
 clean:
104110
 -del $(OBJDIR)\*.obj
105111
 -del *.obj *_.c *.h *.map
106112
107113
 realclean:
108
- -del $(APPNAME) translate$E mkindex$E makeheaders$E mkversion$E codecheck1$E mkbuiltin$E
114
+ -del $(APPNAME) translate$E mkindex$E makeheaders$E mkversion$E codecheck1$E mkbuiltin$E mkcss$E
109115
110116
 $(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
111117
 $(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
112118
 $(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
113119
 $(OBJDIR)\json_config$O : $(SRCDIR)\json_detail.h
@@ -885,8 +891,8 @@
885891
 $(TCC) -o$@ -c zip_.c
886892
887893
 zip_.c : $(SRCDIR)\zip.c
888894
 +translate$E $** > $@
889895
890
-headers: makeheaders$E page_index.h builtin_data.h VERSION.h
896
+headers: makeheaders$E page_index.h builtin_data.h default_css.h VERSION.h
891897
 +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h builtin_.c:builtin.h bundle_.c:bundle.h cache_.c:cache.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 cookies_.c:cookies.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 dispatch_.c:dispatch.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h foci_.c:foci.h fshell_.c:fshell.h fusefs_.c:fusefs.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h hname_.c:hname.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_config_.c:json_config.h json_diff_.c:json_diff.h json_dir_.c:json_dir.h json_finfo_.c:json_finfo.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_status_.c:json_status.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_user_.c:json_user.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h loadctrl_.c:loadctrl.h login_.c:login.h lookslike_.c:lookslike.h main_.c:main.h manifest_.c:manifest.h markdown_.c:markdown.h markdown_html_.c:markdown_html.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h moderate_.c:moderate.h name_.c:name.h path_.c:path.h piechart_.c:piechart.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h publish_.c:publish.h purge_.c:purge.h rebuild_.c:rebuild.h regexp_.c:regexp.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h security_audit_.c:security_audit.h setup_.c:setup.h sha1_.c:sha1.h sha1hard_.c:sha1hard.h sha3_.c:sha3.h shun_.c:shun.h sitemap_.c:sitemap.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h statrep_.c:statrep.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h unicode_.c:unicode.h unversioned_.c:unversioned.h update_.c:update.h url_.c:url.h user_.c:user.h utf8_.c:utf8.h util_.c:util.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winfile_.c:winfile.h winhttp_.c:winhttp.h wysiwyg_.c:wysiwyg.h xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h
892898
 @copy /Y nul: headers
893899
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -70,10 +70,13 @@
70 mkbuiltin$E: $(SRCDIR)\mkbuiltin.c
71 $(BCC) -o$@ $**
72
73 mkversion$E: $(SRCDIR)\mkversion.c
74 $(BCC) -o$@ $**
 
 
 
75
76 codecheck1$E: $(SRCDIR)\codecheck1.c
77 $(BCC) -o$@ $**
78
79 $(OBJDIR)\shell$O : $(SRCDIR)\shell.c
@@ -92,10 +95,13 @@
92 cp $@ $@
93
94 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
95 +$** > $@
96
 
 
 
97 page_index.h: mkindex$E $(SRC)
98 +$** > $@
99
100 builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
101 mkbuiltin$E --prefix $(SRCDIR)/ $(EXTRA_FILES) > $@
@@ -103,11 +109,11 @@
103 clean:
104 -del $(OBJDIR)\*.obj
105 -del *.obj *_.c *.h *.map
106
107 realclean:
108 -del $(APPNAME) translate$E mkindex$E makeheaders$E mkversion$E codecheck1$E mkbuiltin$E
109
110 $(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
111 $(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
112 $(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
113 $(OBJDIR)\json_config$O : $(SRCDIR)\json_detail.h
@@ -885,8 +891,8 @@
885 $(TCC) -o$@ -c zip_.c
886
887 zip_.c : $(SRCDIR)\zip.c
888 +translate$E $** > $@
889
890 headers: makeheaders$E page_index.h builtin_data.h VERSION.h
891 +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h builtin_.c:builtin.h bundle_.c:bundle.h cache_.c:cache.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 cookies_.c:cookies.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 dispatch_.c:dispatch.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h foci_.c:foci.h fshell_.c:fshell.h fusefs_.c:fusefs.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h hname_.c:hname.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_config_.c:json_config.h json_diff_.c:json_diff.h json_dir_.c:json_dir.h json_finfo_.c:json_finfo.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_status_.c:json_status.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_user_.c:json_user.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h loadctrl_.c:loadctrl.h login_.c:login.h lookslike_.c:lookslike.h main_.c:main.h manifest_.c:manifest.h markdown_.c:markdown.h markdown_html_.c:markdown_html.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h moderate_.c:moderate.h name_.c:name.h path_.c:path.h piechart_.c:piechart.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h publish_.c:publish.h purge_.c:purge.h rebuild_.c:rebuild.h regexp_.c:regexp.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h security_audit_.c:security_audit.h setup_.c:setup.h sha1_.c:sha1.h sha1hard_.c:sha1hard.h sha3_.c:sha3.h shun_.c:shun.h sitemap_.c:sitemap.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h statrep_.c:statrep.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h unicode_.c:unicode.h unversioned_.c:unversioned.h update_.c:update.h url_.c:url.h user_.c:user.h utf8_.c:utf8.h util_.c:util.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winfile_.c:winfile.h winhttp_.c:winhttp.h wysiwyg_.c:wysiwyg.h xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h
892 @copy /Y nul: headers
893
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -70,10 +70,13 @@
70 mkbuiltin$E: $(SRCDIR)\mkbuiltin.c
71 $(BCC) -o$@ $**
72
73 mkversion$E: $(SRCDIR)\mkversion.c
74 $(BCC) -o$@ $**
75
76 mkcss$E: $(SRCDIR)\mkcss.c
77 $(BCC) -o$@ $**
78
79 codecheck1$E: $(SRCDIR)\codecheck1.c
80 $(BCC) -o$@ $**
81
82 $(OBJDIR)\shell$O : $(SRCDIR)\shell.c
@@ -92,10 +95,13 @@
95 cp $@ $@
96
97 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
98 +$** > $@
99
100 default_css.h : mkcss$E $B\src\default_css.txt
101 +$** $B\src\default_css.txt $@
102
103 page_index.h: mkindex$E $(SRC)
104 +$** > $@
105
106 builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
107 mkbuiltin$E --prefix $(SRCDIR)/ $(EXTRA_FILES) > $@
@@ -103,11 +109,11 @@
109 clean:
110 -del $(OBJDIR)\*.obj
111 -del *.obj *_.c *.h *.map
112
113 realclean:
114 -del $(APPNAME) translate$E mkindex$E makeheaders$E mkversion$E codecheck1$E mkbuiltin$E mkcss$E
115
116 $(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
117 $(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
118 $(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
119 $(OBJDIR)\json_config$O : $(SRCDIR)\json_detail.h
@@ -885,8 +891,8 @@
891 $(TCC) -o$@ -c zip_.c
892
893 zip_.c : $(SRCDIR)\zip.c
894 +translate$E $** > $@
895
896 headers: makeheaders$E page_index.h builtin_data.h default_css.h VERSION.h
897 +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h builtin_.c:builtin.h bundle_.c:bundle.h cache_.c:cache.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 cookies_.c:cookies.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 dispatch_.c:dispatch.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h foci_.c:foci.h fshell_.c:fshell.h fusefs_.c:fusefs.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h hname_.c:hname.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_config_.c:json_config.h json_diff_.c:json_diff.h json_dir_.c:json_dir.h json_finfo_.c:json_finfo.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_status_.c:json_status.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_user_.c:json_user.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h loadctrl_.c:loadctrl.h login_.c:login.h lookslike_.c:lookslike.h main_.c:main.h manifest_.c:manifest.h markdown_.c:markdown.h markdown_html_.c:markdown_html.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h moderate_.c:moderate.h name_.c:name.h path_.c:path.h piechart_.c:piechart.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h publish_.c:publish.h purge_.c:purge.h rebuild_.c:rebuild.h regexp_.c:regexp.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h security_audit_.c:security_audit.h setup_.c:setup.h sha1_.c:sha1.h sha1hard_.c:sha1hard.h sha3_.c:sha3.h shun_.c:shun.h sitemap_.c:sitemap.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h statrep_.c:statrep.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h unicode_.c:unicode.h unversioned_.c:unversioned.h update_.c:update.h url_.c:url.h user_.c:user.h utf8_.c:utf8.h util_.c:util.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winfile_.c:winfile.h winhttp_.c:winhttp.h wysiwyg_.c:wysiwyg.h xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h
898 @copy /Y nul: headers
899
M win/Makefile.mingw
+11 -3
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -880,10 +880,11 @@
880880
 TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
881881
 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
882882
 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)
883883
 MKBUILTIN = $(subst /,\,$(OBJDIR)/mkbuiltin.exe)
884884
 MKVERSION = $(subst /,\,$(OBJDIR)/mkversion.exe)
885
+MKCSS = $(subst /,\,$(OBJDIR)/mkcss.exe)
885886
 CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe)
886887
 CAT = type
887888
 CP = copy
888889
 GREP = find
889890
 MV = copy
@@ -894,10 +895,11 @@
894895
 TRANSLATE = $(OBJDIR)/translate.exe
895896
 MAKEHEADERS = $(OBJDIR)/makeheaders.exe
896897
 MKINDEX = $(OBJDIR)/mkindex.exe
897898
 MKBUILTIN = $(OBJDIR)/mkbuiltin.exe
898899
 MKVERSION = $(OBJDIR)/mkversion.exe
900
+MKCSS = $(OBJDIR)/mkcss.exe
899901
 CODECHECK1 = $(OBJDIR)/codecheck1.exe
900902
 CAT = cat
901903
 CP = cp
902904
 GREP = grep
903905
 MV = mv
@@ -906,11 +908,11 @@
906908
 RMDIR = rm -rf
907909
 endif
908910
909911
 all: $(OBJDIR) $(APPNAME)
910912
911
-$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
913
+$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h $(OBJDIR)/default_css.h
912914
 ifdef USE_WINDOWS
913915
 $(CAT) $(subst /,\,$(SRCDIR)\miniz.c) | $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
914916
 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
915917
 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
916918
 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
@@ -951,10 +953,13 @@
951953
 $(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c
952954
953955
 $(MKVERSION): $(SRCDIR)/mkversion.c
954956
 $(XBCC) -o $@ $(SRCDIR)/mkversion.c
955957
958
+$(MKCSS): $(SRCDIR)/mkcss.c
959
+ $(XBCC) -o $@ $(SRCDIR)/mkcss.c
960
+
956961
 $(CODECHECK1): $(SRCDIR)/codecheck1.c
957962
 $(XBCC) -o $@ $(SRCDIR)/codecheck1.c
958963
959964
 # WARNING. DANGER. Running the test suite modifies the repository the
960965
 # build is done from, i.e. the checkout belongs to. Do not sync/push
@@ -962,10 +967,13 @@
962967
 test: $(OBJDIR) $(APPNAME)
963968
 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
964969
965970
 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION)
966971
 $(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$@
972
+
973
+$(OBJDIR)/default_css.h: $(SRCDIR)/default_css.txt $(MKCSS)
974
+ $(MKCSS) $(SRCDIR)/default_css.txt $@
967975
968976
 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
969977
 # to 1. If it is set to 1, then there is no need to build or link
970978
 # the sqlite3.o object. Instead, the system SQLite will be linked
971979
 # using -lsqlite3.
@@ -1075,11 +1083,11 @@
10751083
 $(MKINDEX) $(TRANS_SRC) >$@
10761084
10771085
 $(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES)
10781086
 $(MKBUILTIN) --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
10791087
1080
-$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h
1088
+$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/default_css.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h
10811089
 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
10821090
 $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
10831091
 $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
10841092
 $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
10851093
 $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
@@ -2023,11 +2031,11 @@
20232031
 $(OBJDIR)/statrep.h: $(OBJDIR)/headers
20242032
20252033
 $(OBJDIR)/style_.c: $(SRCDIR)/style.c $(TRANSLATE)
20262034
 $(TRANSLATE) $(SRCDIR)/style.c >$@
20272035
2028
-$(OBJDIR)/style.o: $(OBJDIR)/style_.c $(OBJDIR)/style.h $(SRCDIR)/config.h
2036
+$(OBJDIR)/style.o: $(OBJDIR)/style_.c $(OBJDIR)/style.h $(OBJDIR)/default_css.h $(SRCDIR)/config.h
20292037
 $(XTCC) -o $(OBJDIR)/style.o -c $(OBJDIR)/style_.c
20302038
20312039
 $(OBJDIR)/style.h: $(OBJDIR)/headers
20322040
20332041
 $(OBJDIR)/sync_.c: $(SRCDIR)/sync.c $(TRANSLATE)
20342042
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -880,10 +880,11 @@
880 TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
881 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
882 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)
883 MKBUILTIN = $(subst /,\,$(OBJDIR)/mkbuiltin.exe)
884 MKVERSION = $(subst /,\,$(OBJDIR)/mkversion.exe)
 
885 CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe)
886 CAT = type
887 CP = copy
888 GREP = find
889 MV = copy
@@ -894,10 +895,11 @@
894 TRANSLATE = $(OBJDIR)/translate.exe
895 MAKEHEADERS = $(OBJDIR)/makeheaders.exe
896 MKINDEX = $(OBJDIR)/mkindex.exe
897 MKBUILTIN = $(OBJDIR)/mkbuiltin.exe
898 MKVERSION = $(OBJDIR)/mkversion.exe
 
899 CODECHECK1 = $(OBJDIR)/codecheck1.exe
900 CAT = cat
901 CP = cp
902 GREP = grep
903 MV = mv
@@ -906,11 +908,11 @@
906 RMDIR = rm -rf
907 endif
908
909 all: $(OBJDIR) $(APPNAME)
910
911 $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
912 ifdef USE_WINDOWS
913 $(CAT) $(subst /,\,$(SRCDIR)\miniz.c) | $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
914 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
915 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
916 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
@@ -951,10 +953,13 @@
951 $(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c
952
953 $(MKVERSION): $(SRCDIR)/mkversion.c
954 $(XBCC) -o $@ $(SRCDIR)/mkversion.c
955
 
 
 
956 $(CODECHECK1): $(SRCDIR)/codecheck1.c
957 $(XBCC) -o $@ $(SRCDIR)/codecheck1.c
958
959 # WARNING. DANGER. Running the test suite modifies the repository the
960 # build is done from, i.e. the checkout belongs to. Do not sync/push
@@ -962,10 +967,13 @@
962 test: $(OBJDIR) $(APPNAME)
963 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
964
965 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION)
966 $(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$@
 
 
 
967
968 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
969 # to 1. If it is set to 1, then there is no need to build or link
970 # the sqlite3.o object. Instead, the system SQLite will be linked
971 # using -lsqlite3.
@@ -1075,11 +1083,11 @@
1075 $(MKINDEX) $(TRANS_SRC) >$@
1076
1077 $(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES)
1078 $(MKBUILTIN) --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
1079
1080 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h
1081 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
1082 $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
1083 $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
1084 $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
1085 $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
@@ -2023,11 +2031,11 @@
2023 $(OBJDIR)/statrep.h: $(OBJDIR)/headers
2024
2025 $(OBJDIR)/style_.c: $(SRCDIR)/style.c $(TRANSLATE)
2026 $(TRANSLATE) $(SRCDIR)/style.c >$@
2027
2028 $(OBJDIR)/style.o: $(OBJDIR)/style_.c $(OBJDIR)/style.h $(SRCDIR)/config.h
2029 $(XTCC) -o $(OBJDIR)/style.o -c $(OBJDIR)/style_.c
2030
2031 $(OBJDIR)/style.h: $(OBJDIR)/headers
2032
2033 $(OBJDIR)/sync_.c: $(SRCDIR)/sync.c $(TRANSLATE)
2034
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -880,10 +880,11 @@
880 TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
881 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
882 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)
883 MKBUILTIN = $(subst /,\,$(OBJDIR)/mkbuiltin.exe)
884 MKVERSION = $(subst /,\,$(OBJDIR)/mkversion.exe)
885 MKCSS = $(subst /,\,$(OBJDIR)/mkcss.exe)
886 CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe)
887 CAT = type
888 CP = copy
889 GREP = find
890 MV = copy
@@ -894,10 +895,11 @@
895 TRANSLATE = $(OBJDIR)/translate.exe
896 MAKEHEADERS = $(OBJDIR)/makeheaders.exe
897 MKINDEX = $(OBJDIR)/mkindex.exe
898 MKBUILTIN = $(OBJDIR)/mkbuiltin.exe
899 MKVERSION = $(OBJDIR)/mkversion.exe
900 MKCSS = $(OBJDIR)/mkcss.exe
901 CODECHECK1 = $(OBJDIR)/codecheck1.exe
902 CAT = cat
903 CP = cp
904 GREP = grep
905 MV = mv
@@ -906,11 +908,11 @@
908 RMDIR = rm -rf
909 endif
910
911 all: $(OBJDIR) $(APPNAME)
912
913 $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h $(OBJDIR)/default_css.h
914 ifdef USE_WINDOWS
915 $(CAT) $(subst /,\,$(SRCDIR)\miniz.c) | $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
916 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
917 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
918 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
@@ -951,10 +953,13 @@
953 $(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c
954
955 $(MKVERSION): $(SRCDIR)/mkversion.c
956 $(XBCC) -o $@ $(SRCDIR)/mkversion.c
957
958 $(MKCSS): $(SRCDIR)/mkcss.c
959 $(XBCC) -o $@ $(SRCDIR)/mkcss.c
960
961 $(CODECHECK1): $(SRCDIR)/codecheck1.c
962 $(XBCC) -o $@ $(SRCDIR)/codecheck1.c
963
964 # WARNING. DANGER. Running the test suite modifies the repository the
965 # build is done from, i.e. the checkout belongs to. Do not sync/push
@@ -962,10 +967,13 @@
967 test: $(OBJDIR) $(APPNAME)
968 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
969
970 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION)
971 $(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$@
972
973 $(OBJDIR)/default_css.h: $(SRCDIR)/default_css.txt $(MKCSS)
974 $(MKCSS) $(SRCDIR)/default_css.txt $@
975
976 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
977 # to 1. If it is set to 1, then there is no need to build or link
978 # the sqlite3.o object. Instead, the system SQLite will be linked
979 # using -lsqlite3.
@@ -1075,11 +1083,11 @@
1083 $(MKINDEX) $(TRANS_SRC) >$@
1084
1085 $(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES)
1086 $(MKBUILTIN) --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
1087
1088 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/default_css.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h
1089 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
1090 $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
1091 $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
1092 $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
1093 $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
@@ -2023,11 +2031,11 @@
2031 $(OBJDIR)/statrep.h: $(OBJDIR)/headers
2032
2033 $(OBJDIR)/style_.c: $(SRCDIR)/style.c $(TRANSLATE)
2034 $(TRANSLATE) $(SRCDIR)/style.c >$@
2035
2036 $(OBJDIR)/style.o: $(OBJDIR)/style_.c $(OBJDIR)/style.h $(OBJDIR)/default_css.h $(SRCDIR)/config.h
2037 $(XTCC) -o $(OBJDIR)/style.o -c $(OBJDIR)/style_.c
2038
2039 $(OBJDIR)/style.h: $(OBJDIR)/headers
2040
2041 $(OBJDIR)/sync_.c: $(SRCDIR)/sync.c $(TRANSLATE)
2042
M win/Makefile.msc
+10 -1
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -875,10 +875,13 @@
875875
 mkbuiltin$E: $(SRCDIR)\mkbuiltin.c
876876
 $(BCC) $**
877877
878878
 mkversion$E: $(SRCDIR)\mkversion.c
879879
 $(BCC) $**
880
+
881
+mkcss$E: $(SRCDIR)\mkcss.c
882
+ $(BCC) $**
880883
881884
 codecheck1$E: $(SRCDIR)\codecheck1.c
882885
 $(BCC) $**
883886
884887
 !if $(USE_SEE)!=0
@@ -909,12 +912,16 @@
909912
 $(OX)\miniz$O : $(SRCDIR)\miniz.c
910913
 $(TCC) /Fo$@ -c $(MINIZ_OPTIONS) $(SRCDIR)\miniz.c
911914
912915
 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
913916
 $** > $@
917
+
914918
 $(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
915919
 $(TCC) /Fo$@ /c $**
920
+
921
+default_css.h: mkcss$E $(SRCDIR)\default_css.txt
922
+ $** $(SRCDIR)\default_css.txt $@
916923
917924
 page_index.h: mkindex$E $(SRC)
918925
 $** > $@
919926
920927
 builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
@@ -941,10 +948,12 @@
941948
 del mkindex$P 2>NUL
942949
 del makeheaders$E 2>NUL
943950
 del makeheaders$P 2>NUL
944951
 del mkversion$E 2>NUL
945952
 del mkversion$P 2>NUL
953
+ del mkcss$E 2>NUL
954
+ del mkcss$P 2>NUL
946955
 del codecheck1$E 2>NUL
947956
 del codecheck1$P 2>NUL
948957
 del mkbuiltin$E 2>NUL
949958
 del mkbuiltin$P 2>NUL
950959
@@ -1727,11 +1736,11 @@
17271736
 translate$E $** > $@
17281737
17291738
 fossil.res : $B\win\fossil.rc
17301739
 $(RCC) /fo $@ $**
17311740
1732
-headers: makeheaders$E page_index.h builtin_data.h VERSION.h
1741
+headers: makeheaders$E page_index.h builtin_data.h default_css.h VERSION.h
17331742
 makeheaders$E add_.c:add.h \
17341743
 allrepo_.c:allrepo.h \
17351744
 attach_.c:attach.h \
17361745
 bag_.c:bag.h \
17371746
 bisect_.c:bisect.h \
17381747
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -875,10 +875,13 @@
875 mkbuiltin$E: $(SRCDIR)\mkbuiltin.c
876 $(BCC) $**
877
878 mkversion$E: $(SRCDIR)\mkversion.c
879 $(BCC) $**
 
 
 
880
881 codecheck1$E: $(SRCDIR)\codecheck1.c
882 $(BCC) $**
883
884 !if $(USE_SEE)!=0
@@ -909,12 +912,16 @@
909 $(OX)\miniz$O : $(SRCDIR)\miniz.c
910 $(TCC) /Fo$@ -c $(MINIZ_OPTIONS) $(SRCDIR)\miniz.c
911
912 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
913 $** > $@
 
914 $(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
915 $(TCC) /Fo$@ /c $**
 
 
 
916
917 page_index.h: mkindex$E $(SRC)
918 $** > $@
919
920 builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
@@ -941,10 +948,12 @@
941 del mkindex$P 2>NUL
942 del makeheaders$E 2>NUL
943 del makeheaders$P 2>NUL
944 del mkversion$E 2>NUL
945 del mkversion$P 2>NUL
 
 
946 del codecheck1$E 2>NUL
947 del codecheck1$P 2>NUL
948 del mkbuiltin$E 2>NUL
949 del mkbuiltin$P 2>NUL
950
@@ -1727,11 +1736,11 @@
1727 translate$E $** > $@
1728
1729 fossil.res : $B\win\fossil.rc
1730 $(RCC) /fo $@ $**
1731
1732 headers: makeheaders$E page_index.h builtin_data.h VERSION.h
1733 makeheaders$E add_.c:add.h \
1734 allrepo_.c:allrepo.h \
1735 attach_.c:attach.h \
1736 bag_.c:bag.h \
1737 bisect_.c:bisect.h \
1738
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -875,10 +875,13 @@
875 mkbuiltin$E: $(SRCDIR)\mkbuiltin.c
876 $(BCC) $**
877
878 mkversion$E: $(SRCDIR)\mkversion.c
879 $(BCC) $**
880
881 mkcss$E: $(SRCDIR)\mkcss.c
882 $(BCC) $**
883
884 codecheck1$E: $(SRCDIR)\codecheck1.c
885 $(BCC) $**
886
887 !if $(USE_SEE)!=0
@@ -909,12 +912,16 @@
912 $(OX)\miniz$O : $(SRCDIR)\miniz.c
913 $(TCC) /Fo$@ -c $(MINIZ_OPTIONS) $(SRCDIR)\miniz.c
914
915 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
916 $** > $@
917
918 $(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
919 $(TCC) /Fo$@ /c $**
920
921 default_css.h: mkcss$E $(SRCDIR)\default_css.txt
922 $** $(SRCDIR)\default_css.txt $@
923
924 page_index.h: mkindex$E $(SRC)
925 $** > $@
926
927 builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
@@ -941,10 +948,12 @@
948 del mkindex$P 2>NUL
949 del makeheaders$E 2>NUL
950 del makeheaders$P 2>NUL
951 del mkversion$E 2>NUL
952 del mkversion$P 2>NUL
953 del mkcss$E 2>NUL
954 del mkcss$P 2>NUL
955 del codecheck1$E 2>NUL
956 del codecheck1$P 2>NUL
957 del mkbuiltin$E 2>NUL
958 del mkbuiltin$P 2>NUL
959
@@ -1727,11 +1736,11 @@
1736 translate$E $** > $@
1737
1738 fossil.res : $B\win\fossil.rc
1739 $(RCC) /fo $@ $**
1740
1741 headers: makeheaders$E page_index.h builtin_data.h default_css.h VERSION.h
1742 makeheaders$E add_.c:add.h \
1743 allrepo_.c:allrepo.h \
1744 attach_.c:attach.h \
1745 bag_.c:bag.h \
1746 bisect_.c:bisect.h \
1747

Keyboard Shortcuts

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