Check-in [cb711c1d04]
Not logged in

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

Overview
Comment:fix parsing bug [24f39a9f90] in bones tool
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: cb711c1d0474d355c1d751c412ae7d0c159d4af4
User & Date: chw 2019-07-18 09:23:16
References
2019-07-18
09:24 Closed ticket [24f39a9f90]: Problem with bones - page 3 plus 5 other changes artifact: f918e1f135 user: chw
Context
2019-07-18
10:10
attempt to fix [dac9b7522d] in bones tool check-in: add99d128b user: chw tags: trunk
09:23
fix parsing bug [24f39a9f90] in bones tool check-in: cb711c1d04 user: chw tags: trunk
07:24
change button of some dialogs as requested per ticket [8d184b7421] check-in: 661d4ca97b user: chw tags: trunk
Changes

Changes to sdktools/bones.

8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
...
618
619
620
621
622
623
624






























































625
626
627
628
629
630
631
632
#    Page 1:  package tree                  (which components are included)
#    Page 2:  file tree of .../assets/app                 (custom Tcl code)
#    Page 3:  AndroidManifest.xml                            (App manifest)
#    Page 3a: App icons                        (App icons in various sizes)
#    Page 4:  build options                      (CPU support, APK signing)
#    Page 5:  cleanup and build        (APK generation using gradle or ant)
#
# Copyright (c) 2015-18 Christian Werner chw at ch minus werner dot de
#
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.

package require Tk 8.5
if {[catch {package require Img}]} {
    catch {package require tkpng}
................................................................................
}

##############################################################################
# Returns dictionary from attributes

proc ::XML::Values {attrs} {
    set result {}






























































    foreach attr $attrs {
	set n [string first "=" $attr]
	set name [string range $attr 0 $n-1]
	set value [string range $attr $n+1 end]
	if {[string match {"*"} $value]} {
	    set value [string trim $value "\""]
	} elseif {[string match {'*'} $value]} {
	    set value [string trim $value "'"]







|







 







>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
|







8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
...
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
#    Page 1:  package tree                  (which components are included)
#    Page 2:  file tree of .../assets/app                 (custom Tcl code)
#    Page 3:  AndroidManifest.xml                            (App manifest)
#    Page 3a: App icons                        (App icons in various sizes)
#    Page 4:  build options                      (CPU support, APK signing)
#    Page 5:  cleanup and build        (APK generation using gradle or ant)
#
# Copyright (c) 2015-19 Christian Werner chw at ch minus werner dot de
#
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.

package require Tk 8.5
if {[catch {package require Img}]} {
    catch {package require tkpng}
................................................................................
}

##############################################################################
# Returns dictionary from attributes

proc ::XML::Values {attrs} {
    set result {}
    set nattrs {}
    set st 0
    set str ""
    foreach c [split $attrs ""] {
	switch -- $c {
	    "\n" - " " - "\t" {
		switch $st {
		    0 {
			continue
		    }
		    1 {
			set st 0
			lappend nattrs $str
			set str ""
			continue
		    }
		}
		append str $c
	    }
	    "\"" {
		switch $st {
		    0 - 1 {
			set st 2
		    }
		    2 {
			append str $c
			set st 0
			lappend nattrs $str
			set str ""
			continue
		    }
		}
		append str $c
	    }
	    "'" {
		switch $st {
		    0 - 1 {
			set st 3
		    }
		    3 {
			append str $c
			set st 0
			lappend nattrs $str
			set str ""
			continue
		    }
		}
		append str $c
	    }
	    default {
		switch $st {
		    0 {
			set st 1
		    }
		}
		append str $c
	    }
	}
    }
    if {$st} {
	lappend nattrs $str
    }
    foreach attr $nattrs {
	set n [string first "=" $attr]
	set name [string range $attr 0 $n-1]
	set value [string range $attr $n+1 end]
	if {[string match {"*"} $value]} {
	    set value [string trim $value "\""]
	} elseif {[string match {'*'} $value]} {
	    set value [string trim $value "'"]