SQLite

Check-in [052a1b4d7c]
Login

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

Overview
Comment:Change several 'file exists' checks for tclsh to file-isexec because that checks for .exe extensions on Windows.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 052a1b4d7cb43b7f65028c41e9a7a17b533c834d8f620fbc7bc0adddb1fdb843
User & Date: stephan 2024-11-07 06:00:14.892
Context
2024-11-07
06:02
Add mention of file-isexec in autosetup/README.md. (check-in: f469356749 user: stephan tags: trunk)
06:00
Change several 'file exists' checks for tclsh to file-isexec because that checks for .exe extensions on Windows. (check-in: 052a1b4d7c user: stephan tags: trunk)
05:26
For platforms where tclsh is found but tclConfig.sh is not, set HAVE_TCL to 0. We can't build the TCL components on those. Problem reported in forum post 5106aee3a8. (check-in: 04d2576b2e user: stephan tags: trunk)
Changes
Unified Diff Ignore Whitespace Patch
Changes to auto.def.
︙︙
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644

      # flag which autosetup determines for the current compiler.
    }
    define TCLLIBDIR $tcllibdir
    define TCLLIB_RPATH $tclrpath
    #msg-debug "TCLLIB_RPATH = [get-define TCLLIB_RPATH]"
  }; # find TCLLIBDIR

  if {[file exists $with_tclsh]} {
    if {$cfg ne ""} {
      msg-result "Using tclsh: $with_tclsh"
      define HAVE_TCL 1
    } else {
      proj-warn "Found tclsh but no tclConfig.sh, so cannot build TCL components."
    }
  } else {








|








630
631
632
633
634
635
636
637
638
639
640
641
642
643
644

      # flag which autosetup determines for the current compiler.
    }
    define TCLLIBDIR $tcllibdir
    define TCLLIB_RPATH $tclrpath
    #msg-debug "TCLLIB_RPATH = [get-define TCLLIB_RPATH]"
  }; # find TCLLIBDIR

  if {[file-isexec $with_tclsh]} {
    if {$cfg ne ""} {
      msg-result "Using tclsh: $with_tclsh"
      define HAVE_TCL 1
    } else {
      proj-warn "Found tclsh but no tclConfig.sh, so cannot build TCL components."
    }
  } else {
︙︙
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723

      if {$sysh && [cc-check-functions realpath]} {
        define-append CFLAGS_JIMSH -DHAVE_REALPATH
        define BTCLSH "\$(JIMSH)"
      } elseif {$sysh && [cc-check-functions _fullpath]} {
        # _fullpath() is a Windows API
        define-append CFLAGS_JIMSH -DHAVE__FULLPATH
        define BTCLSH "\$(JIMSH)"
      } elseif {[file exists [get-define TCLSH_CMD]]} {
        set cgtcl [get-define TCLSH_CMD]
        define BTCLSH "\$(TCLSH_CMD)"
      } else {
        # One last-ditch effort to find TCLSH_CMD: use info from
        # tclConfig.sh to try to find a tclsh
        if {"" eq [get-define TCLSH_CMD]} {
          set tpre [get-define TCL_EXEC_PREFIX]
          if {"" ne $tpre} {
            set tv [get-define TCL_VERSION]
            if {[file-isexec "${tpre}/bin/tclsh${tv}"]} {
              define TCLSH_CMD "${tpre}/bin/tclsh${tv}"
            } elseif {[file-isexec "${tpre}/bin/tclsh"]} {
              define TCLSH_CMD "${tpre}/bin/tclsh"
            }
          }
        }
        set cgtcl [get-define TCLSH_CMD]
        if {![file exists $cgtcl]} {
          proj-fatal "Cannot find a tclsh to use for code generation."
        }
        define BTCLSH "\$(TCLSH_CMD)"
      }
    }
  }; # CC swap-out
  return $cgtcl








|

















|








691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723

      if {$sysh && [cc-check-functions realpath]} {
        define-append CFLAGS_JIMSH -DHAVE_REALPATH
        define BTCLSH "\$(JIMSH)"
      } elseif {$sysh && [cc-check-functions _fullpath]} {
        # _fullpath() is a Windows API
        define-append CFLAGS_JIMSH -DHAVE__FULLPATH
        define BTCLSH "\$(JIMSH)"
      } elseif {[file-isexec [get-define TCLSH_CMD]]} {
        set cgtcl [get-define TCLSH_CMD]
        define BTCLSH "\$(TCLSH_CMD)"
      } else {
        # One last-ditch effort to find TCLSH_CMD: use info from
        # tclConfig.sh to try to find a tclsh
        if {"" eq [get-define TCLSH_CMD]} {
          set tpre [get-define TCL_EXEC_PREFIX]
          if {"" ne $tpre} {
            set tv [get-define TCL_VERSION]
            if {[file-isexec "${tpre}/bin/tclsh${tv}"]} {
              define TCLSH_CMD "${tpre}/bin/tclsh${tv}"
            } elseif {[file-isexec "${tpre}/bin/tclsh"]} {
              define TCLSH_CMD "${tpre}/bin/tclsh"
            }
          }
        }
        set cgtcl [get-define TCLSH_CMD]
        if {![file-isexec $cgtcl]} {
          proj-fatal "Cannot find a tclsh to use for code generation."
        }
        define BTCLSH "\$(TCLSH_CMD)"
      }
    }
  }; # CC swap-out
  return $cgtcl
︙︙