Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Minor build reorgs as part of integrating (fossil diff -tk)-ish feature. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
574b521a2b8a70494a678f2b8b83d3af |
User & Date: | stephan 2022-01-03 16:39:27.838 |
Context
2022-01-03
| ||
17:21 | Ported in fossil's diff -tk script bits and implemented (f-vdiff --format tk) but the output currently goes to stdout instead of launching tclsh. The TCL dibu can optionally include the TK bits or not, depending on its flags. check-in: 82bf08414f user: stephan tags: trunk | |
16:39 | Minor build reorgs as part of integrating (fossil diff -tk)-ish feature. check-in: 574b521a2b user: stephan tags: trunk | |
2022-01-02
| ||
16:10 | Minor doc updates and code reformatting. check-in: 707fecabb9 user: stephan tags: trunk | |
Changes
Changes to GNUmakefile.in.
︙ | ︙ | |||
9 10 11 12 13 14 15 | #ShakeNMake.CISH_SOURCES := $(wildcard *.c) $(wildcard $(SRC.DIR)/*.c) ######################################################################## # Some common vars used by shakenmake.make and/or the sub-makes # (make-*.make). DIR.top := @srcdir@ | | | | | | | > > | 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | #ShakeNMake.CISH_SOURCES := $(wildcard *.c) $(wildcard $(SRC.DIR)/*.c) ######################################################################## # Some common vars used by shakenmake.make and/or the sub-makes # (make-*.make). DIR.top := @srcdir@ DIR.src := $(DIR.top)/src DIR.client := $(DIR.top)/client DIR.tools := $(DIR.top)/tools DIR.include := $(DIR.top)/include DIR.bindings := $(DIR.top)/bindings DIR.f-apps := $(DIR.top)/f-apps DIR.sql := $(DIR.top)/sql LIB_CURSES := @LIB_CURSES@ CFLAGS_CURSES := @CFLAGS_CURSES@ ShakeNMake.CISH_SOURCES := $(patsubst %~,%,$(wildcard \ $(DIR.src)/*.[ch] \ $(DIR.f-apps)/*.[ch] \ $(DIR.client)/fnc/*.[ch] \ $(DIR.bindings)/cpp/*.[ch]pp \ |
︙ | ︙ | |||
38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 | # dependencies makefile, as that file, in turn, depends on the files # it scans for dependencies. ifneq (,$(ShakeNMake.CISH_DEPS_FILE)) PACKAGE.C_DEPS.MAKEFILES := $(subst $(ShakeNMake.CISH_DEPS_FILE),,$(MAKEFILE_LIST)) else PACKAGE.C_DEPS.MAKEFILES := endif ######################################################################## # Subdir/module builds... # # Maintenance reminders: all relevant symbols in the sub-makefiles # (make-XXX.make) MUST be unique across the whole global # namespace. Similarly, all relevant paths must point to that # subdir. That is particularly of interest with the BIN/DLL/LIB and # CLEAN.xxx rules, which may require another level of $(var) # indirection for that purpose. It's also important when using # CPPFLAGS and such, to keep subdir-specific flags from leaking across | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 | # dependencies makefile, as that file, in turn, depends on the files # it scans for dependencies. ifneq (,$(ShakeNMake.CISH_DEPS_FILE)) PACKAGE.C_DEPS.MAKEFILES := $(subst $(ShakeNMake.CISH_DEPS_FILE),,$(MAKEFILE_LIST)) else PACKAGE.C_DEPS.MAKEFILES := endif ######################################################################## # Transform schema SQL files into source form. We don't use fossil(1)'s # approach because it relies on unspecified length limits on C string # literals. Yeah, it works, but i'm funny about the C Standard. #include $(TOP_SRCDIR_REL)/tools.make BIN.TEXT2C := $(DIR.tools)/text2c $(BIN.TEXT2C): $(DIR.tools)/text2c.c cc $< -o $@ DISTCLEAN.root += $(BIN.TEXT2C) ######################################################################## # Transforms file $(2) to $(1).c in the form of a byte array and # accessor function. define FILE2C $(2): $(1).c: $(2) $$(BIN.TEXT2C) $(PACKAGE.C_DEPS.MAKEFILES) ifneq (1,$(MAKING_CLEAN)) @echo "Creating $$@ from $(2)..."; \ { \ echo '/** @page page_$$(notdir $1) $$(notdir $(2))'; echo; \ echo 'Binary form of file $(2).'; echo; \ echo '*/'; \ $$(BIN.TEXT2C) fsl_$$(notdir $1) < $(2); \ echo '/* end of $(2) */'; \ } > $$@; endif endef ######################################################################## # Subdir/module builds... # # Maintenance reminders: all relevant symbols in the sub-makefiles # (make-XXX.make) MUST be unique across the whole global # namespace. Similarly, all relevant paths must point to that # subdir. That is particularly of interest with the BIN/DLL/LIB and # CLEAN.xxx rules, which may require another level of $(var) # indirection for that purpose. It's also important when using # CPPFLAGS and such, to keep subdir-specific flags from leaking across # makefiles. Similarly, when using ShakeNMake.install.XXX, the install # vars must appended to instead of overwritten. ######################################################################## # INCLUDE_SINGLE_SUBMAKE includes file make-$(1).make if it exists, # else this is a no-op. It protects against multiple inclusion. INCLUDED_SUBMAKES := define INCLUDE_SINGLE_SUBMAKE SINGLE.$(1) := $$(wildcard make-$(1).make) ifneq (,$$(SINGLE.$(1))) |
︙ | ︙ |
Changes to make-libf.make.in.
︙ | ︙ | |||
95 96 97 98 99 100 101 | FSL.SRC += $(SQLITE3.C) endif FSL.OBJ := $(patsubst %.c,%.o,$(FSL.SRC)) $(FSL.OBJ): $(LIBF.MAKEFILE) CLEAN.libf += $(FSL.OBJ) | < < < < < < < < < > | < < < < < < < < < < < < < < < < < < | | | | | | | | 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 | FSL.SRC += $(SQLITE3.C) endif FSL.OBJ := $(patsubst %.c,%.o,$(FSL.SRC)) $(FSL.OBJ): $(LIBF.MAKEFILE) CLEAN.libf += $(FSL.OBJ) $(FSL.OBJ): CPPFLAGS+=$(LIBF.CPPFLAGS) define SQL2C $(call FILE2C,$(1),$(2)) FSL.SRC += $(1).c FSL.SRC.BASE += $(1).c FSL.OBJ += $(1).o DISTCLEAN.libf += $(1).c sql: $(1).c endef $(eval $(call SQL2C,$(DIR.src)/schema_config_cstr,$(DIR.sql)/config.sql)) $(eval $(call SQL2C,$(DIR.src)/schema_repo1_cstr,$(DIR.sql)/repo-static.sql)) $(eval $(call SQL2C,$(DIR.src)/schema_repo2_cstr,$(DIR.sql)/repo-transient.sql)) $(eval $(call SQL2C,$(DIR.src)/schema_ckout_cstr,$(DIR.sql)/checkout.sql)) $(eval $(call SQL2C,$(DIR.src)/schema_ticket_cstr,$(DIR.sql)/ticket.sql)) $(eval $(call SQL2C,$(DIR.src)/schema_ticket_reports_cstr,$(DIR.sql)/ticket-reports.sql)) $(eval $(call SQL2C,$(DIR.src)/schema_forum_cstr,$(DIR.sql)/forum.sql)) # end SQL transformation bits ######################################################################## # These are the flags used by fossil's embedded sqlite3: $(SQLITE3.OBJ): CPPFLAGS+=-DNDEBUG=1 \ -DSQLITE_DQS=0 \ -DSQLITE_THREADSAFE=0 \ |
︙ | ︙ |
Changes to src/schema_ckout_cstr.c.
|
| < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 1 2 3 4 5 6 7 8 9 10 11 | /** @page page_schema_ckout_cstr checkout.sql Binary form of file ./sql/checkout.sql. */ /* auto-generated code - edit at your own risk! (Good luck with that!) */ static char const fsl_schema_ckout_cstr_a[] = { 45, 45, 32, 84, 104, 101, 32, 86, 86, 65, 82, 32, 116, 97, 98, 108, 101, 32, 104, 111, 108, 100, 115, 32, 109, 105, 115, 99, 101, 108, 108, 97, 110, 111, 117, 115, 32, 105, 110, 102, 111, 114, 109, 97, 116, 105, 111, 110, 32, 97, 98, 111, 117, 116, 32, 116, 104, 101, 32, 108, 111, 99, 97, 108, 32, 100, 97, 116, 97, 98, 97, 115, 101, 10, 45, 45, 32, 105, 110, 32, |
︙ | ︙ |
Changes to src/schema_config_cstr.c.
|
| < | | < < < | < < < < < < < < | 1 2 3 4 5 6 7 8 9 10 11 | /** @page page_schema_config_cstr config.sql Binary form of file ./sql/config.sql. */ /* auto-generated code - edit at your own risk! (Good luck with that!) */ static char const fsl_schema_config_cstr_a[] = { 45, 45, 32, 84, 104, 105, 115, 32, 102, 105, 108, 101, 32, 99, 111, 110, 116, 97, 105, 110, 115, 32, 116, 104, 101, 32, 115, 99, 104, 101, 109, 97, 32, 102, 111, 114, 32, 116, 104, 101, 32, 100, 97, 116, 97, 98, 97, 115, 101, 32, 116, 104, 97, 116, 32, 105, 115, 32, 107, 101, 112, 116, 32, 105, 110, 32, 116, 104, 101, 10, 45, 45, 32, 126, 47, 46, 102, 111, 115, 115, |
︙ | ︙ |
Changes to src/schema_forum_cstr.c.
|
| < | | > | < < < < < < < < < | 1 2 3 4 5 6 7 8 9 10 11 | /** @page page_schema_forum_cstr forum.sql Binary form of file ./sql/forum.sql. */ /* auto-generated code - edit at your own risk! (Good luck with that!) */ static char const fsl_schema_forum_cstr_a[] = { 67, 82, 69, 65, 84, 69, 32, 84, 65, 66, 76, 69, 32, 114, 101, 112, 111, 46, 102, 111, 114, 117, 109, 112, 111, 115, 116, 40, 10, 32, 32, 102, 112, 105, 100, 32, 73, 78, 84, 69, 71, 69, 82, 32, 80, 82, 73, 77, 65, 82, 89, 32, 75, 69, 89, 44, 32, 32, 45, 45, 32, 66, 76, 79, 66, 46, 114, 105, 100, 32, 102, 111, 114, 32, 116, 104, 101, 32, 97, 114, |
︙ | ︙ |
Changes to src/schema_repo1_cstr.c.
|
| < | < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 1 2 3 4 5 6 7 8 9 10 11 | /** @page page_schema_repo1_cstr repo-static.sql Binary form of file ./sql/repo-static.sql. */ /* auto-generated code - edit at your own risk! (Good luck with that!) */ static char const fsl_schema_repo1_cstr_a[] = { 45, 45, 32, 84, 104, 105, 115, 32, 102, 105, 108, 101, 32, 99, 111, 110, 116, 97, 105, 110, 115, 32, 112, 97, 114, 116, 115, 32, 111, 102, 32, 116, 104, 101, 32, 115, 99, 104, 101, 109, 97, 32, 116, 104, 97, 116, 32, 97, 114, 101, 32, 102, 105, 120, 101, 100, 32, 97, 110, 100, 10, 45, 45, 32, 117, 110, 99, 104, 97, 110, 103, 105, 110, 103, 32, 97, 99, 114, 111, 115, |
︙ | ︙ |
Changes to src/schema_repo2_cstr.c.
|
| < | < < < < < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 1 2 3 4 5 6 7 8 9 10 11 | /** @page page_schema_repo2_cstr repo-transient.sql Binary form of file ./sql/repo-transient.sql. */ /* auto-generated code - edit at your own risk! (Good luck with that!) */ static char const fsl_schema_repo2_cstr_a[] = { 45, 45, 32, 84, 104, 105, 115, 32, 102, 105, 108, 101, 32, 99, 111, 110, 116, 97, 105, 110, 115, 32, 112, 97, 114, 116, 115, 32, 111, 102, 32, 116, 104, 101, 32, 115, 99, 104, 101, 109, 97, 32, 116, 104, 97, 116, 32, 99, 97, 110, 32, 99, 104, 97, 110, 103, 101, 32, 102, 114, 111, 109, 32, 111, 110, 101, 10, 45, 45, 32, 118, 101, 114, 115, 105, 111, 110, 32, 116, 111, |
︙ | ︙ |
Changes to src/schema_ticket_cstr.c.
|
| < | | < | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 1 2 3 4 5 6 7 8 9 10 11 | /** @page page_schema_ticket_cstr ticket.sql Binary form of file ./sql/ticket.sql. */ /* auto-generated code - edit at your own risk! (Good luck with that!) */ static char const fsl_schema_ticket_cstr_a[] = { 45, 45, 32, 84, 101, 109, 112, 108, 97, 116, 101, 32, 102, 111, 114, 32, 116, 104, 101, 32, 84, 73, 67, 75, 69, 84, 32, 116, 97, 98, 108, 101, 10, 67, 82, 69, 65, 84, 69, 32, 84, 65, 66, 76, 69, 32, 114, 101, 112, 111, 46, 116, 105, 99, 107, 101, 116, 40, 10, 32, 32, 45, 45, 32, 68, 111, 32, 110, 111, 116, 32, 99, 104, 97, 110, 103, 101, 32, 97, 110, |
︙ | ︙ |
Changes to src/schema_ticket_reports_cstr.c.
|
| < | | < < < < < < < < < < < < < < < < < < < < | | < | 1 2 3 4 5 6 7 8 9 10 11 | /** @page page_schema_ticket_reports_cstr ticket-reports.sql Binary form of file ./sql/ticket-reports.sql. */ /* auto-generated code - edit at your own risk! (Good luck with that!) */ static char const fsl_schema_ticket_reports_cstr_a[] = { 73, 78, 83, 69, 82, 84, 32, 73, 78, 84, 79, 32, 114, 101, 112, 111, 114, 116, 102, 109, 116, 40, 116, 105, 116, 108, 101, 44, 109, 116, 105, 109, 101, 44, 99, 111, 108, 115, 44, 115, 113, 108, 99, 111, 100, 101, 41, 32, 10, 86, 65, 76, 85, 69, 83, 40, 39, 65, 108, 108, 32, 84, 105, 99, 107, 101, 116, 115, 39, 44, 106, 117, 108, 105, 97, 110, 100, 97, 121, 40, |
︙ | ︙ |
Deleted subdir-inc.make.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < |