/ Check-in [b76bffd3]
Login

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

Overview
Comment:Force the autoconf makefile for MSVC to always use the 'find.exe' included with Windows.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: b76bffd332585e8412a0a994ae6dee79a83213d8b709d7f858c5c05678ab0887
User & Date: mistachkin 2017-10-24 21:17:12
Context
2017-10-25
01:34
Add the sqlite_btreeinfo eponymous-only table for introspecting the schema and estimating the sizes of various btrees. check-in: 1e30f477 user: drh tags: trunk
2017-10-24
21:17
Force the autoconf makefile for MSVC to always use the 'find.exe' included with Windows. check-in: b76bffd3 user: mistachkin tags: trunk
19:05
Merge all of the fixes from the 3.21.0 release. check-in: 5ab662b4 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to autoconf/Makefile.msc.

   970    970   
   971    971   
   972    972   # Rule to build the Win32 resources object file.
   973    973   #
   974    974   !IF $(USE_RC)!=0
   975    975   _HASHCHAR=^#
   976    976   !IF ![echo !IFNDEF VERSION > rcver.vc] && \
   977         -    ![for /F "delims=" %V in ('type "$(SQLITE3H)" ^| find "$(_HASHCHAR)define SQLITE_VERSION "') do (echo VERSION = ^^%V >> rcver.vc)] && \
          977  +    ![for /F "delims=" %V in ('type "$(SQLITE3H)" ^| "%SystemRoot%\System32\find.exe" "$(_HASHCHAR)define SQLITE_VERSION "') do (echo VERSION = ^^%V >> rcver.vc)] && \
   978    978       ![echo !ENDIF >> rcver.vc]
   979    979   !INCLUDE rcver.vc
   980    980   !ENDIF
   981    981   
   982    982   RESOURCE_VERSION = $(VERSION:^#=)
   983    983   RESOURCE_VERSION = $(RESOURCE_VERSION:define=)
   984    984   RESOURCE_VERSION = $(RESOURCE_VERSION:SQLITE_VERSION=)

Changes to tool/mkmsvcmin.tcl.

    50     50   #
    51     51   # NOTE: This block is used to replace the section marked <<block1>> in
    52     52   #       the Makefile, if it exists.
    53     53   #
    54     54   set blocks(1) [string trimleft [string map [list \\\\ \\] {
    55     55   _HASHCHAR=^#
    56     56   !IF ![echo !IFNDEF VERSION > rcver.vc] && \\
    57         -    ![for /F "delims=" %V in ('type "$(SQLITE3H)" ^| find "$(_HASHCHAR)define SQLITE_VERSION "') do (echo VERSION = ^^%V >> rcver.vc)] && \\
           57  +    ![for /F "delims=" %V in ('type "$(SQLITE3H)" ^| "%SystemRoot%\System32\find.exe" "$(_HASHCHAR)define SQLITE_VERSION "') do (echo VERSION = ^^%V >> rcver.vc)] && \\
    58     58       ![echo !ENDIF >> rcver.vc]
    59     59   !INCLUDE rcver.vc
    60     60   !ENDIF
    61     61   
    62     62   RESOURCE_VERSION = $(VERSION:^#=)
    63     63   RESOURCE_VERSION = $(RESOURCE_VERSION:define=)
    64     64   RESOURCE_VERSION = $(RESOURCE_VERSION:SQLITE_VERSION=)