Preparing for Quill 0.2.0 release

Fixed a bug in 'teacup getbase'.
wduquette · Aug 31, 2014 · 090bef4 · 090bef4
1 parent bb545d4
commit 090bef4
Show file tree

Hide file tree

Showing 9 changed files with 87 additions and 28 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@
 /bin/*-osx
 /bin/*-linux
 teapot.txt
+/*.zip
 
 # SublimeText files
 *.sublime-*
diff --git a/TODO.md b/TODO.md
@@ -6,7 +6,6 @@ This is the official list of work to be done.
 
 * Fix the distributions in project.quill; they contain different things.
 * quill new lib
-* Update release docs.
 * Building exes:
   * Allow "exe" apptype for building in just the local flavor, whatever it is.
 * Add check on "teacup" executable for build 298288 or later.

diff --git a/lib/quill/pkgIndex.tcl b/lib/quill/pkgIndex.tcl
@@ -14,6 +14,6 @@
 #-------------------------------------------------------------------------
 
 # -quill-ifneeded-begin DO NOT EDIT BY HAND
-package ifneeded quill 0.2.0a1 [list source [file join $dir pkgModules.tcl]]
+package ifneeded quill 0.2.0 [list source [file join $dir pkgModules.tcl]]
 # -quill-ifneeded-end
 
diff --git a/lib/quill/pkgModules.tcl b/lib/quill/pkgModules.tcl
@@ -14,7 +14,7 @@
 #-----------------------------------------------------------------------
 
 # -quill-provide-begin DO NOT EDIT BY HAND
-package provide quill 0.2.0a1
+package provide quill 0.2.0
 # -quill-provide-end
 
 

diff --git a/lib/quillapp/pkgIndex.tcl b/lib/quillapp/pkgIndex.tcl
@@ -14,6 +14,6 @@
 #-------------------------------------------------------------------------
 
 # -quill-ifneeded-begin DO NOT EDIT BY HAND
-package ifneeded quillapp 0.2.0a1 [list source [file join $dir pkgModules.tcl]]
+package ifneeded quillapp 0.2.0 [list source [file join $dir pkgModules.tcl]]
 # -quill-ifneeded-end
 
diff --git a/lib/quillapp/pkgModules.tcl b/lib/quillapp/pkgModules.tcl
@@ -14,7 +14,7 @@
 #-----------------------------------------------------------------------
 
 # -quill-provide-begin DO NOT EDIT BY HAND
-package provide quillapp 0.2.0a1
+package provide quillapp 0.2.0
 # -quill-provide-end
 
 #-----------------------------------------------------------------------
@@ -23,7 +23,7 @@ package provide quillapp 0.2.0a1
 # -quill-require-begin INSERT PACKAGE REQUIRES HERE
 package require snit 2.3
 package require zipfile::encode 0.3
-package require quill 0.2.0a1
+package require quill 0.2.0
 # -quill-require-end
 
 namespace import quill::*

diff --git a/lib/quillapp/teacup.tcl b/lib/quillapp/teacup.tcl
@@ -108,6 +108,8 @@ snit::type ::quillapp::teacup {
     # on failure.
 
     typemethod getbase {tcltk version flavor outdir} {
+        puts "Looking for TCL $version on $flavor"
+
         # FIRST, get the right arch pattern.
         switch $flavor {
             linux    { set arch "linux-*-ix86"             }
@@ -120,39 +122,86 @@ snit::type ::quillapp::teacup {
         set table [teacup list --is application --all-platforms \
                     base-$tcltk-thread]
 
+        # NEXT, filter the list for the correct platform.
+        set ptable [list]
+
+        foreach record $table {
+            set p [dict get $record platform]
+
+            if {[string match $arch $p]} {
+                lappend ptable $record
+            }
+        }
+        set table $ptable
+
         # NEXT, search through the table for the entry that 
-        # matches the arch pattern and best matches the version.
+        # most exactly matches the version, which is an x.y.z.
+        lassign [ExactBasekitVersion $table $version] bv bp
+
+        if {$bv eq ""} {
+            set version [VerXY $version]
+            lassign [ExactBasekitVersion $table $version] bv bp
+        }
+
+        if {$bv eq ""} {
+            throw NOTFOUND [outdent "
+                Could not find basekit for $tcltk $version on $flavor 
+            "]
+        }
+
 
-        set best(platform) ""
-        set best(version) 0.0
+        puts "Best match: base-$tcltk-thread $bv $bp"
+
+        # NEXT, retrieve it.
+        call get --is application --output $outdir \
+            base-$tcltk-thread $bv $bp
+    }
+
+    # VerXY version
+    #
+    # version - an x.y.z... version string
+    #
+    # Returns the x.y.
+
+    proc VerXY {version} {
+        return [join [lrange [split $version .] 0 1] .]
+    }
+
+    # ExactBasekitVersion table version
+    #
+    # table   - The table of basekits
+    # version - The desired version, either x.y.z or x.y
+    #
+    # Finds the best matching version, and returns a list
+    # "version platform", or the empty string on failure.
+
+    proc ExactBasekitVersion {table version} {
+        set bp ""
+        set bv 0.0
 
         foreach record $table {
             set v [dict get $record version]
             set p [dict get $record platform]
 
-            if {![string match $arch $p]} {
-                continue
-            }
 
             # If they asked for 8.5, say, make sure this is an 8.5.
-            if {![string match $version* $v]} {
+            if {![string match $version.* $v]} {
                 continue
             }
 
-            if {[package vcompare $v $best(version)] == 1} {
-                set best(platform) $p
-                set best(version)  $v
+            if {[package vcompare $v $bv] == 1} {
+                set bp $p
+                set bv $v
             }
         }
 
-        # NEXT, retrieve it.
-        call get --is application --output $outdir \
-            base-$tcltk-thread $best(version) $best(platform)
+        if {$bv ne "0.0"} {
+            return [list $bv $bp]
+        }
+
+        return ""
     }
 
-    # install pkg ver
-    #
-    # pkg    - a package name
     # ver    - A version number
     #
     # Installs the specified package from the default teapot;

diff --git a/lib/quillinfo/quillinfo.tcl b/lib/quillinfo/quillinfo.tcl
@@ -19,7 +19,9 @@ namespace eval ::quillinfo {
     variable meta
     array set meta {distpat-osx {
 	bin/quill-osx
-	%docs
+    docs/*.html
+    docs/*/*.html
+    docs/*.md
 	%libs
 	LICENSE
 	README.md
@@ -33,10 +35,13 @@ namespace eval ::quillinfo {
 	README.md
 } version-textutil::expander 1.3.1 version-snit 2.3 local-Tcl 0 apps quill local-zipfile::encode 0 distpat-linux {
 	bin/quill-linux
-	%docs
+    docs/*.html
+    docs/*/*.html
+    docs/*.md
+	%libs
 	LICENSE
 	README.md
-} local-textutil::expander 0 local-snit 0 version 0.2.0a1 version-Tcl 8.6 project tcl-quill dists {linux osx windows}}
+} local-textutil::expander 0 local-snit 0 version 0.2.0 version-Tcl 8.6 project tcl-quill dists {linux osx windows}}
 
     namespace export \
         project      \

diff --git a/project.quill b/project.quill
@@ -1,4 +1,4 @@
-project tcl-quill 0.2.0a1 "Quill Project Build System for Tcl/Tk"
+project tcl-quill 0.2.0 "Quill Project Build System for Tcl/Tk"
 homepage http://github.com/wduquette/tcl-quill
 app quill -apptypes {linux osx windows}
 provide quill
@@ -10,14 +10,19 @@ require zipfile::encode 0.3
 
 dist linux {
 	bin/quill-linux
-	%docs
+    docs/*.html
+    docs/*/*.html
+    docs/*.md
+	%libs
 	LICENSE
 	README.md
 }
 
 dist osx {
 	bin/quill-osx
-	%docs
+    docs/*.html
+    docs/*/*.html
+    docs/*.md
 	%libs
 	LICENSE
 	README.md