From: stephan Date: Mon, 21 Oct 2024 17:50:55 +0000 (+0000) Subject: Start moving most Makefile.in docs over to main.mk. Fix compilation of tclsqlite.c. X-Git-Tag: major-relase~351^2~58 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b124098e51891490b3685830a5bb18cc00444e09;p=thirdparty%2Fsqlite.git Start moving most Makefile.in docs over to main.mk. Fix compilation of tclsqlite.c. FossilOrigin-Name: 5b154e08ab5e8a8fd1ac1b28debd46824ef55b533a60ca5711c55b5a59a871cd --- diff --git a/Makefile.in b/Makefile.in index d79fa66f51..7b6bfedcd2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -8,6 +8,11 @@ # certain blocks are added or removed depending on configure-time # information. # +# The docs for many of its variables are in the primary static +# makefile, main.mk (which this one includes at runtime). +# +all: +clean: ######################################################################## #XX# Lines starting with #XX# are TODOs for the port to autosetup. @@ -39,9 +44,6 @@ # that, but we're limited to POSIX Make compatibility here. The # automatic reconfigures are not too onerous, though, because they're # much, much faster than Autotools configure runs. -# -all: -clean: # # Maintenance reminder: When using the X?=Y variable assignment @@ -57,15 +59,6 @@ clean: # that contains this "Makefile.in" and the "configure" script. # TOP = @abs_top_srcdir@ - -# -# Just testing some default dir expansions... -# srcdir = @srcdir@ -# top_srcdir = @top_srcdir@ -# abs_top_srcdir = @abs_top_srcdir@ -# abs_top_builddir = @abs_top_builddir@ -# - # # Some standard variables and programs # @@ -75,45 +68,34 @@ libdir ?= @libdir@ pkgconfigdir ?= $(libdir)/pkgconfig bindir ?= @bindir@ includedir ?= @includedir@ +# +# Just testing some default dir expansions... +# srcdir = @srcdir@ +# top_srcdir = @top_srcdir@ +# abs_top_srcdir = @abs_top_srcdir@ +# abs_top_builddir = @abs_top_builddir@ +# + INSTALL = @BIN_INSTALL@ AR = @AR@ CC = @CC@ -#LD = @LD@ # isn't actually needed, at least on modern Unixes. - -# -# C Compiler and options for use in building executables that -# will run on the platform that is doing the build. -# BCC = @BUILD_CC@ @BUILD_CFLAGS@ +TCC = $(CC) $(CFLAGS) +CFLAGS = @CFLAGS@ @SH_CFLAGS@ -# -# Rather that stuffing all CFLAGS and LDFLAGS into a single set, we -# break them down on a per-feature basis and expect the build targets -# to use the one(s) it needs. -# +LDFLAGS_SHOBJ = @SHOBJ_LDFLAGS@ LDFLAGS_ZLIB = @LDFLAGS_ZLIB@ LDFLAGS_MATH = @LDFLAGS_MATH@ LDFLAGS_RPATH = @LDFLAGS_RPATH@ -LDFLAGS_READLINE = @LDFLAGS_READLINE@ LDFLAGS_PTHREAD = @LDFLAGS_PTHREAD@ -LDFLAGS_SHOBJ = @SHOBJ_LDFLAGS@ +LDFLAGS_READLINE = @LDFLAGS_READLINE@ +CFLAGS_READLINE = -DHAVE_READLINE=@HAVE_READLINE@ @CFLAGS_READLINE@ ENABLE_SHARED = @ENABLE_SHARED@ HAVE_WASI_SDK = @HAVE_WASI_SDK@ -# -# TCC is the C Compile and options for use in building executables that -# will run on the target platform. (BCC and TCC are usually the -# same unless your are cross-compiling.) Separate CC and CFLAGS macros -# are provide so that these aspects of the build process can be changed -# on the "make" command-line. Ex: "make CC=clang CFLAGS=-fsanitize=undefined" -# -CFLAGS = @CFLAGS@ @SH_CFLAGS@ -TCC = $(CC) $(CFLAGS) - -# Define -DNDEBUG to compile without debugging (i.e., for production usage) -# Omitting the define will cause extra debugging code to be inserted and -# includes extra comments when "EXPLAIN stmt" is used. +# TCCX is $(TCC) plus any flags which are desired for the library +# as a whole, but not necessarily needed for every binary. # TCCX = $(TCC) @TARGET_DEBUG@ # Define this for the autoconf-based build, so that the code knows it @@ -123,10 +105,6 @@ TCCX += -D_HAVE_SQLITE_CONFIG_H -DBUILD_sqlite # # main.mk will fill out TCCX with some flags common to all builds. -# -# Compiler options needed for programs that use the readline() library. -# -CFLAGS_READLINE = -DHAVE_READLINE=@HAVE_READLINE@ @CFLAGS_READLINE@ #XX#CFLAGS_READLINE += -DHAVE_EDITLINE=@TARGET_HAVE_EDITLINE@ #XX#CFLAGS_READLINE += -DHAVE_LINENOISE=@TARGET_HAVE_LINENOISE@ #XX# @@ -143,19 +121,18 @@ CFLAGS_READLINE = -DHAVE_READLINE=@HAVE_READLINE@ @CFLAGS_READLINE@ # # With the autosetup build, the intended way to do this is to set # those in $(LDFLAGS_libsqlite3) and include those flags for both -# $(libsqlite3.SO) and any apps which directly link in either -# sqlite3.o or its origin sources. +# $(libsqlite3.SO) and any apps which directly compile/link in either +# sqlite3.c/o or its origin sources. LIBS += @LIBS@ -TLIBS = $(LIBS) # # JimTCL is part of the autosetup suite and is suitable for all # current in-tree code-generation TCL jobs, but it requires that we # build it with non-default flags. Note that the build tree will, if -# no system-level tclsh is found, also have a ./jimsh0. That one is a -# bare-bones build for the configure process, whereas we need to build -# it with another option enabled for use with the various code -# generators. +# no system-level tclsh is found, also have a ./jimsh0 binary. That +# one is a bare-bones build for the configure process, whereas we need +# to build it with another option enabled for use with the various +# code generators. # JIMSH = @srcdir@/jimsh CFLAGS_JIMSH ?= @CFLAGS_JIMSH@ @@ -169,43 +146,24 @@ $(JIMSH): $(TOP)/autosetup/jimsh0.c BTCLSH = @BTCLSH@ $(BTCLSH): -# -# $(CFLAGS_libsqlite3) must contain any CFLAGS which are relevant for -# compiling the library's own sources, including (sometimes) when -# compiling sqlite3.c directly in to another app. Most notably, it -# should always contain -DSQLITE_TEMP_STORE=N for the sake of -# historical build expecations. -# -# SQLITE_TEMP_STORE is 0 to force temporary tables to be in a file, 1 -# to default to file, 2 to default to memory, and 3 to force temporary -# tables to always be in memory. -# +# $(CFLAGS_libsqlite3) is documented in main.mk. CFLAGS_libsqlite3 = -DSQLITE_TEMP_STORE=@TEMP_STORE@ -# -# Enable/disable loadable extensions, and other optional features -# based on configuration. (-DSQLITE_OMIT*, -DSQLITE_ENABLE*). -# The same set of OMIT and ENABLE flags should be passed to the -# LEMON parser generator and the mkkeywordhash tool as well. -# -# Add OPTIONS=... on the command line to append additional options -# to the OPT_FEATURE_FLAGS. Note that some flags only work if -# the build is specifically configured to account for them. -# OPT_FEATURE_FLAGS = @OPT_FEATURE_FLAGS@ $(OPTIONS) TCC += $(OPT_FEATURE_FLAGS) -# Add in any optional parameters specified on the make commane line -# ie. make "OPTS=-DSQLITE_ENABLE_FOO=1 -DSQLITE_OMIT_FOO=1". +# +# Add in any optional global compilation flags on the make commane +# line ie. make "OPTS=-DSQLITE_ENABLE_FOO=1 -DSQLITE_OMIT_FOO=1". +# +#XX# FIXME: rename one or the other of $(OPTS) and $(OPTIONS), as they +#XX# serve different purposes. TCC += $(OPTS) -# Add in compile-time options for some libraries used by extensions -#TCC += @CFLAGS_ZLIB@ - # Version numbers and release number for the SQLite being compiled. # -VERSION = @VERSION@ +# VERSION = @VERSION@ RELEASE = @RELEASE@ # Filename extensions for binaries and libraries @@ -284,7 +242,7 @@ AS_AUTO_DEF = $(TOP)/auto.def AS_AUTOREMAKE = @SQLITE_AUTOREMAKE@ USE_AMALGAMATION ?= @USE_AMALGAMATION@ -AMALGAMATION_LINE_MACROS ?= --linemacros=@AMALGAMATION_LINE_MACROS@ +AMALGAMATION_GEN_FLAGS ?= --linemacros=@AMALGAMATION_LINE_MACROS@ # # CFLAGS for sqlite3$(TEXE) diff --git a/main.mk b/main.mk index 5ca48a147f..6cd6e5dcc4 100644 --- a/main.mk +++ b/main.mk @@ -6,70 +6,93 @@ # this one. # # Maintenance reminder: this file must remain devoid of GNU Make-isms. -# i.e. it must be POSIX Make compatible. +# i.e. it must be POSIX Make compatible. "bmake" (BSD make) is +# available on most Linux systems, so compatibility is relatively easy +# to test. # #XX# Lines starting with #XX# are TODOs for the port to autosetup # -# The following variables must be defined before this script is -# invoked: +# The variables listed below must be defined before this script is +# invoked. This file will use defaults, very possibly invalid, for any +# which are not defined. # #XX# FIXME: the list of vars from the historical main.mk is dated and #XX# needs to be updated for autosetup. + # -# TOP The toplevel directory of the source tree. This is the -# directory that contains this "Makefile.in" and the -# "configure.in" script. +# RELEASE = # -# BCC C Compiler and options for use in building executables that -# will run on the platform that is doing the build. +# The MAJOR.MINOR.PATCH version number of this build. +RELEASE ?= MAJOR.MINOR.PATCH # -# TCC C Compiler and options for use in building executables that -# will run on the target platform. This is usually the same -# as BCC, unless you are cross-compiling. +# TOP = # -# AR Tool used to build a static library. +# The toplevel directory of the source tree. For canonical builds +# this is the directory that contains this "Makefile.in" and the +# "configure.in" script. +TOP ?= $(PWD) # -# BEXE File extension for executables on the build platform. ".exe" -# for Windows and "" everywhere else. +# BCC = # -# TEXE File extension for executables on the target platform. ".exe" -# for Windows and "" everywhere else. +# C Compiler and options for use in building executables that will run +# on the platform that is doing the build. +BCC ?= $(CC) # -# BTCLSH The TCL interpreter for in-tree code generation. May be -# either JimTCL or the canonical TCL. +# TCC = # -# ... and many, many more ... +# C Compiler and options for use in building executables that will run +# on the target platform. This is usually the same as BCC, unless you +# are cross-compiling. Note that it should only contain flags which +# are used by _all_ build targets. Flags needed only by specific +# targets are defined elsewhere. +TCC ?= $(BCC) # -# Once the variables above are defined, the rest of this make script -# will build the SQLite library and testing tools. -################################################################################ -all: sqlite3.h sqlite3.c - +# AR = +# Tool used to build a static library from object files. # -# Ideally these variables are all defined in the calling makefile, but -# we can provide some sensible defaults for many of them which should -# suffice for conventional Unix-style OSes. +AR ?= ar # -prefix ?= /usr/local -exec_prefix ?= $(prefix) -libdir ?= $(prefix)/lib -pkgconfigdir ?= $(libdir)/pkgconfig -bindir ?= $(prefix)/bin -includedir ?= $(prefix)/include - -USE_AMALGAMATION ?= 1 -AMALGAMATION_LINE_MACROS ?= --linemacros=0 -INSTALL ?= install - -BCC ?= $(CC) -TCC ?= $(BCC) +# BEXE = +# +# File extension for executables on the build platform. ".exe" for +# Windows and "" everywhere else. BEXE ?= -TEXE ?= +# +# BDLL and BLIB = +# +# The DLL resp. static library counterparts of BEXE. BDLL ?= .so -TDLL ?= .so BLIB ?= .lib +# +# TEXE = +# +# File extension for executables on the target platform. ".exe" for +# Windows and "" everywhere else. +TEXE ?= +# +# TDLL and TLIB The DLL resp. static library counterparts of TEXE. +TDLL ?= .so TLIB ?= .lib - +# +# TCLSH_CMD = +# +# The canonical tclsh. +TCLSH_CMD ?= tclsh +# +# BTCLSH = +# +# The TCL interpreter for in-tree code generation. May be either the +# in-tree JimTCL or the canonical TCL. +BTCLSH ?= $(TCLSH_CMD) +# +# LDFLAGS_(FEATURE) and CFLAGS_(FEATURE) = +# +# Linker resp. C/CPP flags required by a specific feature, e.g. +# LDFLAGS_PTHREAD or CFLAGS_READLINE. +# +# Rather that stuffing all CFLAGS and LDFLAGS into a single set, we +# break them down on a per-feature basis and expect the build targets +# to use the one(s) it needs. LDFLAGS_ZLIB ?= -lz LDFLAGS_MATH ?= -lm LDFLAGS_RPATH ?= -Wl,-rpath -Wl,$(prefix)/lib @@ -77,9 +100,64 @@ LDFLAGS_READLINE ?= -lreadline CFLAGS_READLINE ?= LDFLAGS_PTHREAD ?= -lpthread LDFLAGS_SHOBJ ?= -shared +# +# Various system-level directories, mostly needed for installation and +# for finding system-level dependencies. +prefix ?= /usr/local +exec_prefix ?= $(prefix) +libdir ?= $(prefix)/lib +pkgconfigdir ?= $(libdir)/pkgconfig +bindir ?= $(prefix)/bin +includedir ?= $(prefix)/include +# +# INSTALL = +# +# Tool for installing files and directories. It must be compatible +# with conventional Unix /usr/bin/install. Note that libtool's +# install-sh is _not_ compatible with this because it _moves_ targets +# during installation, which may break the build of targets which are +# built after others are installed. +INSTALL ?= install +# +# ENABLE_SHARED +# +# 1 if libsqlite3.$(TDLL) should be built. ENABLE_SHARED ?= 1 +# +# USE_AMALGAMATION 1 if the amalgamation (sqlite3.c/h) should be built/used, +# otherwise the library is built from all of its original +# source files. +USE_AMALGAMATION ?= 1 +# +# AMALGAMATION_GEN_FLAGS Optional flags for the amalgamation generator. +AMALGAMATION_GEN_FLAGS ?= --linemacros=0 +# +# HAVE_WASI_SDK 1 when building with the WASI SDK. This disables certain +# build targets. HAVE_WASI_SDK ?= 0 +# +# OPT_FEATURE_FLAGS is intended to hold preprocessor flags for +# enabling and disabling specific libsqlite3 features (-DSQLITE_OMIT*, +# -DSQLITE_ENABLE*). The same set of OMIT and ENABLE flags must be +# passed to the LEMON parser generator and the mkkeywordhash tool as +# well. +# +# Add OPTIONS=... on the command line to append additional options to +# the OPT_FEATURE_FLAGS. Note that some flags only work if the build +# is specifically configured to account for them. Adding them later, +# when compiling the amalgamation, may or may not work. OPT_FEATURE_FLAGS ?= +# +# ... and many, many more. Sane defaults are selected where possible. +# +# With the above-described defined, the rest of this make script will +# build the project's deliverables and testing tools. +################################################################################ +all: sqlite3.h sqlite3.c + +######################################################################## +# Modifying what follows should not be necessary for most builds. +######################################################################## # # $(INSTALL) invocation for use with non-executable files. @@ -92,19 +170,31 @@ TCOMPILE = $(TCC) $(TCOMPILE_EXTRAS) # TLINK = compiler invocation for when the target will be an executable TLINK = $(TCCX) $(TLINK_EXTRAS) # TLINK_shared = $(TLINK) invocation specifically for shared libraries -LDFLAGS_SHOBJ ?= -shared TLINK_shared = $(TLINK) $(LDFLAGS_SHOBJ) -# TCCX is $(TCC) plus any CFLAGS which are common to most compilations -# for the target platform. In auto-configured builds it is defined by -# the main makefile to include configure-time-dependent options. +# TCCX is $(TCC) plus any flags which are desired for the library +# as a whole, but not necessarily needed for every binary. +# TCCX ?= $(TCC) -TCCX += -I. -I$(TOP)/src -I$(TOP)/ext/rtree -I$(TOP)/ext/icu -TCCX += -I$(TOP)/ext/fts3 -I$(TOP)/ext/async -I$(TOP)/ext/session -TCCX += -I$(TOP)/ext/userauth +CFLAGS_intree_includes = \ + -I. -I$(TOP)/src -I$(TOP)/ext/rtree -I$(TOP)/ext/icu \ + -I$(TOP)/ext/fts3 -I$(TOP)/ext/async -I$(TOP)/ext/session \ + -I$(TOP)/ext/userauth +TCCX += $(CFLAGS_intree_includes) # CFLAGS_stdio3 ==> for sqlite3_stdio.h CFLAGS_stdio3 := -I$(TOP)/ext/misc +# +# $(CFLAGS_libsqlite3) must contain any CFLAGS which are relevant for +# compiling the library's own sources, including (sometimes) when +# compiling sqlite3.c directly in to another app. Most notably, it +# should always contain -DSQLITE_TEMP_STORE=N for the sake of +# historical build expecations. +# +# SQLITE_TEMP_STORE is 0 to force temporary tables to be in a file, 1 +# to default to file, 2 to default to memory, and 3 to force temporary +# tables to always be in memory. +# CFLAGS_libsqlite3 ?= -DSQLITE_TEMP_STORE=1 # @@ -122,7 +212,6 @@ TCLLIBDIR ?= # TCLLIB_RPATH ?= - # # LDFLAGS_libsqlite3 should be used with any target which either # results in building libsqlite3.so, compiles sqlite3.c directly, or @@ -131,7 +220,7 @@ TCLLIB_RPATH ?= # i.e. it should be used with $(TCCX) or $(TLINK) but not $(BCC). # LDFLAGS_libsqlite3 = \ - $(LDFLAGS_RPATH) $(TLIBS) $(LDFLAGS_PTHREAD) \ + $(LDFLAGS_RPATH) $(LDFLAGS_PTHREAD) \ $(LDFLAGS_MATH) $(LDFLAGS_ZLIB) # @@ -695,7 +784,7 @@ sqlite3.h: $(TOP)/src/sqlite.h.in $(TOP)/manifest mksourceid$(BEXE) \ sqlite3.c: .target_source sqlite3.h $(TOP)/tool/mksqlite3c.tcl src-verify \ $(BTCLSH) # has_tclsh84 - $(BTCLSH) $(TOP)/tool/mksqlite3c.tcl $(AMALGAMATION_LINE_MACROS) $(EXTRA_SRC) + $(BTCLSH) $(TOP)/tool/mksqlite3c.tcl $(AMALGAMATION_GEN_FLAGS) $(EXTRA_SRC) cp tsrc/sqlite3ext.h . cp $(TOP)/ext/session/sqlite3session.h . @@ -706,7 +795,7 @@ sqlite3r.c: sqlite3.c sqlite3r.h $(BTCLSH) # has_tclsh84 cp $(TOP)/ext/recover/sqlite3recover.c tsrc/ cp $(TOP)/ext/recover/sqlite3recover.h tsrc/ cp $(TOP)/ext/recover/dbdata.c tsrc/ - $(BTCLSH) $(TOP)/tool/mksqlite3c.tcl --enable-recover $(AMALGAMATION_LINE_MACROS) $(EXTRA_SRC) + $(BTCLSH) $(TOP)/tool/mksqlite3c.tcl --enable-recover $(AMALGAMATION_GEN_FLAGS) $(EXTRA_SRC) sqlite3ext.h: .target_source cp tsrc/sqlite3ext.h . @@ -969,7 +1058,7 @@ window.o: $(TOP)/src/window.c $(HDR) $(TCOMPILE) $(CFLAGS_libsqlite3) -c $(TOP)/src/window.c tclsqlite.o: $(TOP)/src/tclsqlite.c $(HDR) - $(TCOMPILE) -DUSE_TCL_STUBS=1 $(TCL_INCLUDE_SPEC) \ + $(TCOMPILE) -DUSE_TCL_STUBS=1 $(TCL_INCLUDE_SPEC) $(CFLAGS_intree_includes) \ -c $(TOP)/src/tclsqlite.c tclsqlite-shell.o: $(TOP)/src/tclsqlite.c $(HDR) @@ -1091,18 +1180,19 @@ tclsqlite3.c: sqlite3.c echo '#endif /* USE_SYSTEM_SQLITE */' >>tclsqlite3.c cat $(TOP)/src/tclsqlite.c >>tclsqlite3.c +CFLAGS_tclextension = $(CFLAGS_intree_includes) $(CFLAGS) $(OPT_FEATURE_FLAGS) $(OPTS) # Build the SQLite TCL extension in a way that make it compatible # with whatever version of TCL is running as $TCLSH_CMD, possibly defined # by --with-tclsh= # tclextension: tclsqlite3.c - $(TCLSH_CMD) $(TOP)/tool/buildtclext.tcl --build-only --cc "$(CC)" $(CFLAGS) $(OPT_FEATURE_FLAGS) $(OPTS) + $(TCLSH_CMD) $(TOP)/tool/buildtclext.tcl --build-only --cc "$(CC)" $(CFLAGS_tclextension) # Install the SQLite TCL extension in a way that is appropriate for $TCLSH_CMD # to find it. # tclextension-install: tclsqlite3.c - $(TCLSH_CMD) $(TOP)/tool/buildtclext.tcl --cc "$(CC)" $(CFLAGS) $(OPT_FEATURE_FLAGS) $(OPTS) + $(TCLSH_CMD) $(TOP)/tool/buildtclext.tcl --cc "$(CC)" $(CFLAGS_tclextension) # Install the SQLite TCL extension that is used by $TCLSH_CMD # diff --git a/manifest b/manifest index 3b6cbe82b1..983a96d4e0 100644 --- a/manifest +++ b/manifest @@ -1,9 +1,9 @@ -C Add\sdocs\sintroducing\show\sto\sdefine\sand\suse\sautosetup\sconfigure\sflags.\sUse\s-DJIM_COMPAT\swhen\sbuilding\sjimsh\sto\sforce\sits\sexpr\scommand\sto\sbe\ssyntax-compatible\swith\scanonical\sTCL. -D 2024-10-21T16:06:49.337 +C Start\smoving\smost\sMakefile.in\sdocs\sover\sto\smain.mk.\sFix\scompilation\sof\stclsqlite.c. +D 2024-10-21T17:50:55.726 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 -F Makefile.in a2c1b0e12796a0c3f26cde2bf1d6d872168c64e0e8121641df36f248a217b67f +F Makefile.in cc4a99cf1a47782713206d07ab1ddd18b21e2ba44406696bed649523561f97e5 F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6 F Makefile.msc 58b69eda1faad5d475092b8aeffab9156ee4901a82db089b166607f2ec907ee4 F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159 @@ -711,7 +711,7 @@ F ext/wasm/wasmfs.make bc8bb227f35d5bd3863a7bd2233437c37472a0d81585979f058f9b9b5 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0 -F main.mk 6b6d1deaa55692b21903573b24f2215dea8068cab5626928a3fed8ed86ec314f +F main.mk 596c8c96cd37135e54196f4af0d344e24d0ee19c156b06f81805d1637d5fab5c F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421 @@ -2240,8 +2240,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 347a50e66fa17bba997f6cbaa5bd693d029df488e54c24f7e4db47b65e84ce81 -R 4ae42afdfc94f9c9fa6e904f46862477 +P a6a275de3d975fdf7432d71a915b40426a976725ebd81a178b5e80d14cf3a2df +R faf3b808c7fc9f5622befc03c8536d67 U stephan -Z 1d7aa6ac6fc1c8fa8cc634105d5b45fa +Z c53b4cc7ea6efe1093758b649c27a18e # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 1b90055c32..dce868e947 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -a6a275de3d975fdf7432d71a915b40426a976725ebd81a178b5e80d14cf3a2df +5b154e08ab5e8a8fd1ac1b28debd46824ef55b533a60ca5711c55b5a59a871cd