Check-in [6b5f67f98b]
Not logged in
Bounty program for improvements to Tcl and certain Tcl packages.
Tcl 2018 Conference, Houston/TX, US, Oct 15-19
Send your abstracts to tclconference@googlegroups.com or submit via the online form
by Aug 20.

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

Overview
Comment:Bumping sqlite back down to 3.8.7.2
Timelines: family | ancestors | descendants | both | autosetup
Files: files | file ages | folders
SHA1: 6b5f67f98b8027639c700887b7c2e9723d22aa78
User & Date: hypnotoad 2015-05-14 09:58:58
Context
2015-05-19
15:35
Integrating the autosetup feature branch into trunk check-in: 80e134d2db user: hypnotoad tags: trunk
2015-05-14
09:58
Bumping sqlite back down to 3.8.7.2 Closed-Leaf check-in: 6b5f67f98b user: hypnotoad tags: autosetup
2015-05-06
02:42
Adding in the -static-libgcc to prevent a dependency on mingw dlls check-in: ac26e907d3 user: hypnotoad tags: autosetup
Changes
Unified Diff Ignore Whitespace Patch
Changes to scripts/common.tcl.
129
130
131
132
133
134
135

136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
  }
}

proc ::sherpa_bootstrap::build_sqlite {pkg action} {
    ###
    # Sqlite
    ###

    set SQLITE_VERSION 3.8.7.4
    set SQLITE_TFNAME sqlite-autoconf-3080704
    set SQLITE_SRCPATH $::odie(sandbox)/sqlite
    set SQLITE_URL http://sqlite.org/2014/${SQLITE_TFNAME}.tar.gz
    # In MSYS, tar may not understand the prefix
    set download_msys [::cygpath [pwd]]
    set SQLITE_TARBALL [file join [::realpath $::odie(download)] sqlite${SQLITE_VERSION}.tar.gz]
    cd [::realpath $::odie(src_dir)]
    if {![file exists $SQLITE_TARBALL]} {
      doexec $::odie(build_tclsh) scripts/url-get.tcl ${SQLITE_URL} ${SQLITE_TARBALL}
    }
    if {![file exists ${SQLITE_SRCPATH}/README]} {
      file delete -force ${SQLITE_SRCPATH}
      cd $::odie(sandbox)
      doexec tar xfz [::cygpath ${SQLITE_TARBALL}]
      file rename -force ${SQLITE_TFNAME} ${SQLITE_SRCPATH}
    }
    cd ${SQLITE_SRCPATH}/tea
    if {![file exists ${SQLITE_SRCPATH}/tea/Makefile]} {
      doexec sh ./configure --prefix=[::cygpath $::odie(local_repo)] --libdir=[::cygpath $::odie(local_repo)/lib] --host=$::odie(host)
    }

}

proc ::sherpa_bootstrap::install_package package {
  variable distribution
  set pkginfo [dict get $distribution $package]
  puts [list $package $pkginfo]
  set download [dict get $pkginfo get_proc]







>
|




















|







129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
  }
}

proc ::sherpa_bootstrap::build_sqlite {pkg action} {
    ###
    # Sqlite
    ###
    puts "INSTALLING SQLITE"
    set SQLITE_VERSION 3.8.7.2
    set SQLITE_TFNAME sqlite-autoconf-3080704
    set SQLITE_SRCPATH $::odie(sandbox)/sqlite
    set SQLITE_URL http://sqlite.org/2014/${SQLITE_TFNAME}.tar.gz
    # In MSYS, tar may not understand the prefix
    set download_msys [::cygpath [pwd]]
    set SQLITE_TARBALL [file join [::realpath $::odie(download)] sqlite${SQLITE_VERSION}.tar.gz]
    cd [::realpath $::odie(src_dir)]
    if {![file exists $SQLITE_TARBALL]} {
      doexec $::odie(build_tclsh) scripts/url-get.tcl ${SQLITE_URL} ${SQLITE_TARBALL}
    }
    if {![file exists ${SQLITE_SRCPATH}/README]} {
      file delete -force ${SQLITE_SRCPATH}
      cd $::odie(sandbox)
      doexec tar xfz [::cygpath ${SQLITE_TARBALL}]
      file rename -force ${SQLITE_TFNAME} ${SQLITE_SRCPATH}
    }
    cd ${SQLITE_SRCPATH}/tea
    if {![file exists ${SQLITE_SRCPATH}/tea/Makefile]} {
      doexec sh ./configure --prefix=[::cygpath $::odie(local_repo)] --libdir=[::cygpath $::odie(local_repo)/lib] --host=$::odie(host)
    }
    doexec make install
}

proc ::sherpa_bootstrap::install_package package {
  variable distribution
  set pkginfo [dict get $distribution $package]
  puts [list $package $pkginfo]
  set download [dict get $pkginfo get_proc]
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
  requires tcllib
  build_proc build_sak
}

::sherpa_bootstrap::distribution odielib {
  get_proc   download_fossil
  fossil_branch autosetup
  requires {tcllib}
  build_proc build_gnumake
}

::sherpa_bootstrap::distribution sherpa {
  get_proc   download_fossil
  fossil_branch trunk
  requires {tcllib odielib taolib}
  build_proc build_gnumake
}

proc ::doexec args {
  exec {*}$args >&@ stdout
}








|






|







221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
  requires tcllib
  build_proc build_sak
}

::sherpa_bootstrap::distribution odielib {
  get_proc   download_fossil
  fossil_branch autosetup
  requires {tcllib sqlite}
  build_proc build_gnumake
}

::sherpa_bootstrap::distribution sherpa {
  get_proc   download_fossil
  fossil_branch trunk
  requires {tcllib odielib taolib sqlite}
  build_proc build_gnumake
}

proc ::doexec args {
  exec {*}$args >&@ stdout
}

Changes to scripts/sherpa.tcl.
55
56
57
58
59
60
61
62
63
64
65






66
67
68
69
70
71
72
          lappend needs $req
        }
      }
      if {[llength $needs]}  {
        puts [list $item needs $needs]
        continue
      }
      ::sherpa_bootstrap::install_package $item
      lappend installed $item
    }
  }






}

set method [lindex $argv 0]
if { [info command ::command::$method] eq {} } {
  puts stderr "Invalid command: $method."
  ::command::help
  exit 1







<



>
>
>
>
>
>







55
56
57
58
59
60
61

62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
          lappend needs $req
        }
      }
      if {[llength $needs]}  {
        puts [list $item needs $needs]
        continue
      }

      lappend installed $item
    }
  }
  foreach item $installed {
    puts "INSTALLING $item"
  }
  foreach item $installed {
    ::sherpa_bootstrap::install_package $item
  }  
}

set method [lindex $argv 0]
if { [info command ::command::$method] eq {} } {
  puts stderr "Invalid command: $method."
  ::command::help
  exit 1