Changeset 2153

Timestamp:

Mar 26, 2011, 7:41:58 PM (14 years ago)

Author:

mmc

Message:

Hooked the new template capability into the builder. Added support for
all other Rappture languages. Some languages also generate a Makefile
that can be used to build the program.

Location:

trunk/builder/scripts

Files:

• Makefile.in (modified) (3 diffs)
• main.tcl (modified) (25 diffs)
• templates.tcl (modified) (11 diffs)
• templates/clang.tl (added)
• templates/fortran77.tl (added)
• templates/java.tl (added)
• templates/matlab.tl (added)
• templates/octave.tl (added)
• templates/perl.tl (added)
• templates/python.tl (modified) (3 diffs)
• templates/ruby.tl (added)
• templates/tcl.tl (modified) (3 diffs)
• tool.rp (modified) (1 diff)

trunk/builder/scripts/Makefile.in

@@ -24 +24 @@
                 $(srcdir)/objpath.tcl \
                 $(srcdir)/slideframes.tcl \
+                $(srcdir)/templates.tcl \
                 $(srcdir)/tool.rp \
                 $(srcdir)/tweener.tcl
+
+TEMPLATEFILES   = \
+                $(srcdir)/templates/clang.tl \
+                $(srcdir)/templates/fortran77.tl \
+                $(srcdir)/templates/java.tl \
+                $(srcdir)/templates/matlab.tl \
+                $(srcdir)/templates/octave.tl \
+                $(srcdir)/templates/perl.tl \
+                $(srcdir)/templates/python.tl \
+                $(srcdir)/templates/ruby.tl \
+                $(srcdir)/templates/tcl.tl
 
 version         = $(PACKAGE_VERSION)
@@ -38 +50 @@
                 --outfile tclIndex
 
-install: install_scripts install_images 
+install: install_scripts install_templates install_images 
 
 install_scripts: 
@@ -48 +60 @@
         $(INSTALL) -m 444 tclIndex $(destdir)
 
+install_templates: $(TEMPLATEFILES)
+        $(MKDIR_P) -m 0755 $(destdir)/templates
+        @for i in $(TEMPLATEFILES); do \
+            echo "Installing $$i" ; \
+            $(INSTALL) -m 555 $$i $(destdir)/templates ; \
+        done
+
 install_images:
         $(MKDIR_P) -m 0755 $(destdir)/images
-        @for i in $(srcdir)/images/*.gif $(srcdir)/images/*.png $(srcdir)/images/*.xbm; do \
+        @for i in $(srcdir)/images/*.png $(srcdir)/images/*.xbm; do \
             echo "Installing $$i" ; \
             $(INSTALL) -m 444 $$i $(destdir)/images ; \

trunk/builder/scripts/main.tcl

@@ -74 +74 @@
 option add *saveas*progv*Button.padX 2
 option add *saveas*progv*Button.padY 2
-option add *saveas*progl*Label.font {Helvetica -12}
-option add *saveas*progl*Combobox.textBackground #d9d9d9
-option add *saveas*progl*Combobox.borderWidth 1
 
 switch $tcl_platform(platform) {
@@ -88 +85 @@
 
 wm protocol . WM_DELETE_WINDOW main_exit
-wm title . "Instant Rappture"
+wm title . "Rappture Builder"
 
 # install a better bug handler
@@ -118 +115 @@
     exit 1
 }
+
+# load all languages recognized by the builder
+RapptureBuilder::templates::init
 
 # ----------------------------------------------------------------------
@@ -169 +169 @@
         return
     }
+    set win [.func.build.options.panes pane 0]
+    $win.scrl.skel select none
+
     main_generate_xml
 
-    if {[string length $LastToolXmlLoaded] > 0 && ![string equal [$ToolXml xml] $LastToolXmlLoaded]} {
-        set choice [tk_messageBox -icon warning -type yesno -title "iRappture: Save Changes?" -message "Changes to the current tool haven't been saved.\n\nSave changes?"]
+    if {[string length $LastToolXmlLoaded] > 0 && [$ToolXml xml] ne $LastToolXmlLoaded} {
+puts ">>>>"
+puts $LastToolXmlLoaded
+puts "----"
+puts [$ToolXml xml]
+puts "<<<<"
+        set choice [tk_messageBox -icon warning -type yesno -title "Rappture: Save Changes?" -message "Changes to the current tool haven't been saved.\n\nSave changes?"]
         if {$choice == "yes" && ![main_saveas]} {
             return
@@ -179 +187 @@
 
     if {$what == "-new"} {
-        set xmlobj [Rappture::LibraryObj ::#auto "<?xml version=\"1.0\"?><run><tool/></run>"]
+        set xmlobj [Rappture::LibraryObj ::#auto "<?xml version=\"1.0\"?><run/>"]
+        $xmlobj put tool.command ""
     } else {
         if {$what == "-file"} {
-            set fname [tk_getOpenFile -title "iRappture: Open Tool" -initialfile "tool.xml" -defaultextension .xml -filetypes { {{XML files} .xml} {{All files} *} }]
+            set fname [tk_getOpenFile -title "Rappture: Open Tool" -initialfile "tool.xml" -defaultextension .xml -filetypes { {{XML files} .xml} {{All files} *} }]
         } else {
             set fname $what
@@ -197 +206 @@
 
         if {[catch {Rappture::library $fname} xmlobj]} {
-            tk_messageBox -icon error -title "iRappture: Error" -message "Error loading tool description: $xmlobj"
+            tk_messageBox -icon error -title "Rappture: Error" -message "Error loading tool description: $xmlobj"
             return
         }
@@ -402 +411 @@
         }
 
-        set choice [tk_messageBox -icon error -type yesno -title "iRappture: Problems with your tool definition" -message "$thereis $phrases for your current tool definition.  Examine and resolve $problem?"]
+        set choice [tk_messageBox -icon error -type yesno -title "Rappture: Problems with your tool definition" -message "$thereis $phrases for your current tool definition.  Examine and resolve $problem?"]
         if {$choice == "yes"} {
             return 1
@@ -582 +591 @@
                 return
             }
+            set win [.func.build.options.panes pane 0]
+            $win.scrl.skel select none
+
             # generate now to catch any errors
             main_generate_xml
+
+            # get the language choice and update the skeleton program option
+            set lang ""
+            set cmd [$ToolXml get tool.command]
+            if {[string index $cmd 0] == "!"} {
+                set lang [string range $cmd 1 end]
+            } else {
+                # It's hard to reload a real command from a tool.xml file.
+                # Scan through all languages and treat @@FILENAME@@ as a
+                # wildcard.  See if any of the languages match.
+                foreach name [RapptureBuilder::templates::languages] {
+                    set pat [RapptureBuilder::templates::generate command \
+                        -language $name -macros {@@FILENAME@@ * @@FILEROOT@@ *}]
+
+                    if {[string match $pat $cmd]} {
+                        set lang $name
+                        break
+                    }
+                }
+            }
+            if {$lang ne ""} {
+                .saveas.opts.prog configure -text "Skeleton program ($lang)" -state normal
+                .saveas.opts.progv.getfile configure -state normal
+                set ext [RapptureBuilder::templates::generate extension -language $lang]
+                .saveas.opts.progv.file configure -text "main$ext"
+                set SaveAs(lang) $lang
+                set SaveAs(ext) $ext
+
+                # see if there's a makefile for this program
+                if {[catch {RapptureBuilder::templates::generate makefile -language $lang}]} {
+                    set SaveAs(make) 0
+                    .saveas.opts.make configure -state disabled
+                } else {
+                    .saveas.opts.make configure -state normal
+                }
+            } else {
+                .saveas.opts.prog configure -text "Skeleton program (select language under Tool section)" -state disabled
+                .saveas.opts.progv.file configure -text "select a file"
+                .saveas.opts.progv.getfile configure -state disabled
+                .saveas.opts.make configure -state disabled
+                set SaveAs(lang) ?
+                set SaveAs(ext) ?
+                set SaveAs(prog) 0
+                set SaveAs(make) 0
+            }
+            main_saveas update
 
             # make the saveas dialog big enough and center it on the main win
@@ -621 +679 @@
             set pfile [.saveas.opts.progv.file cget -text]
 
-            if {$SaveAs(tool) && ![string equal "select a file" $tfile]} {
+            if {$SaveAs(tool) && $tfile ne "select a file"} {
+                set tfile [file normalize $tfile]
+
+                if {$SaveAs(prog) && $pfile ne "select a file"} {
+                    # if we have a tool.xml file, put the program in same dir
+                    set tail [file tail $pfile]
+                    set pfile [file join [file dirname $tfile] $tail]
+                }
+            }
+
+            if {$SaveAs(tool) && $tfile ne "select a file"} {
                 # generate again now that we know the file name to get
                 # relative file paths for things like <note>'s
                 set LastToolXmlFile $tfile
                 main_generate_xml
+
+                set cmd [$ToolXml get tool.command]
+                if {[string index $cmd 0] eq "!"} {
+                    if {$pfile eq "select a file"} {
+                        set pfile "main$SaveAs(ext)"
+                    }
+                    set tail [file tail $pfile]
+                    set cmd [RapptureBuilder::templates::generate command \
+                        -language $SaveAs(lang) \
+                        -macros [list @@FILENAME@@ $tail \
+                                      @@FILEROOT@@ [file rootname $tail]]]
+                    $ToolXml put tool.command $cmd
+                }
 
                 set cmds {
@@ -634 +715 @@
                 }
                 if {[catch $cmds result]} {
-                    tk_messageBox -icon error -title "iRappture: Error" -message "Error saving tool description: $result"
+                    tk_messageBox -icon error -title "Rappture: Error" -message "Error saving tool description: $result"
                     set status "error"
                 } else {
@@ -641 +722 @@
             }
 
-            if {$SaveAs(prog) && ![string equal "select a file" $pfile]} {
-                tk_messageBox -icon error -title "iRappture: Error" -message "Generating script file is not yet implemented"
+            if {$SaveAs(prog) && $pfile ne "select a file"} {
+                if {[file exists $pfile]} {
+                    set choice [tk_messageBox -icon warning -type yesno -title "Rappture: Confirm" -message "File \"$pfile\" already exists.\n\nOverwrite?"]
+                    if {$choice == "no"} {
+                        # pop the dialog back up
+                        wm deiconify .saveas
+                        raise .saveas
+                        grab set .saveas
+                        return
+                    }
+                }
+                set code [RapptureBuilder::templates::generate main \
+                    -language $SaveAs(lang) -xmlobj $ToolXml]
+
+                set cmds {
+                    set fid [open $pfile w]
+                    puts -nonewline $fid $code
+                    close $fid
+                }
+                if {[catch $cmds result]} {
+                    tk_messageBox -icon error -title "Rappture: Error" -message "Error saving skeleton program file: $result"
+                    set status "error"
+                }
+            }
+
+            if {$SaveAs(make)} {
+                if {$pfile eq "select a file"} {
+                    set pfile "main$SaveAs(ext)"
+                }
+                set mfile [file join [file dirname $pfile] Makefile]
+                if {[file exists $mfile]} {
+                    set choice [tk_messageBox -icon warning -type yesno -title "Rappture: Confirm" -message "File \"$mfile\" already exists.\n\nOverwrite?"]
+                    if {$choice == "no"} {
+                        # pop the dialog back up
+                        wm deiconify .saveas
+                        raise .saveas
+                        grab set .saveas
+                        return
+                    }
+                }
+
+                set fname [file tail $pfile]
+                set dir [file dirname [file dirname $::Rappture::installdir]]
+                set macros [list @@RAPPTUREDIR@@ $dir]
+                lappend macros @@FILENAME@@ $fname
+                lappend macros @@FILEROOT@@ [file rootname $fname]
+                if {[catch {RapptureBuilder::templates::generate makefile -language $SaveAs(lang) -macros $macros} code] == 0} {
+                    set cmds {
+                        set fid [open $mfile w]
+                        puts -nonewline $fid $code
+                        close $fid
+                    }
+                    if {[catch $cmds result]} {
+                        tk_messageBox -icon error -title "Rappture: Error" -message "Error saving Makefile: $result"
+                        set status "error"
+                    }
+                }
             }
 
@@ -650 +786 @@
         update {
             set havefile 0
+            set missingfile 0
             set tfile [.saveas.opts.toolv.file cget -text]
-            if {$SaveAs(tool) && ![string equal $tfile "select a file"]} {
-                .saveas.opts.toolv.file configure -fg black
-                set havefile 1
+            if {$SaveAs(tool)} {
+                if {$tfile ne "select a file"} {
+                    .saveas.opts.toolv.file configure -fg black
+                    set havefile 1
+                } else {
+                    set missingfile 1
+                }
             } else {
                 .saveas.opts.toolv.file configure -fg gray60
@@ -659 +800 @@
 
             set pfile [.saveas.opts.progv.file cget -text]
-            if {$SaveAs(prog) && ![string equal $pfile "select a file"]} {
-                .saveas.opts.progv.file configure -fg black
-                set havefile 1
+            if {$SaveAs(prog)} {
+                if {$pfile ne "select a file"} {
+                    .saveas.opts.progv.file configure -fg black
+                    set havefile 1
+                } else {
+                    set missingfile 1
+                }
             } else {
                 .saveas.opts.progv.file configure -fg gray60
             }
 
-            if {$havefile} {
+            if {$havefile && !$missingfile} {
                 .saveas.cntls.save configure -state normal
             } else {
@@ -674 +819 @@
 
         gettoolfile {
-            set fname [tk_getSaveFile -title "iRappture: Save Tool" -parent .saveas -initialfile "tool.xml" -defaultextension .xml -filetypes { {{XML files} .xml} {{All files} *} }]
+            set fname [tk_getSaveFile -title "Rappture: Save Tool" -parent .saveas -initialfile "tool.xml" -defaultextension .xml -filetypes { {{XML files} .xml} {{All files} *} }]
 
             if {"" != $fname} {
@@ -684 +829 @@
 
         getprogfile {
-            set ext .tcl
-            set fname [tk_getSaveFile -title "iRappture: Save Program Skeleton" -parent .saveas -initialfile "wrapper$ext" -defaultextension $ext -filetypes {
-    {{C programs} .c}
-    {{C++ programs} .cpp}
-    {{F77 programs} .f}
-    {{MATLAB scripts} .m}
-    {{Perl scripts} .pl}
-    {{Python scripts} .py}
-    {{Tcl scripts} .tcl}
-    {{Ruby scripts} .ruby}
-    {{All files} *}
-}]
+            set flist ""
+            lappend flist [list "$SaveAs(lang) files" $SaveAs(ext)]
+            lappend flist [list "All files" *]
+
+            set pfile [.saveas.opts.progv.file cget -text]
+            if {$pfile eq "select a file"} {
+                set init ""
+                set ext ""
+            } else {
+                set init $pfile
+                set ext [file extension $pfile]
+            }
+
+            set fname [tk_getSaveFile -title "Rappture: Save Program Skeleton" -parent .saveas -initialfile $init -defaultextension $ext -filetypes $flist]
 
             if {"" != $fname} {
@@ -724 +871 @@
         return
     }
+    set win [.func.build.options.panes pane 0]
+    $win.scrl.skel select none
+
     main_generate_xml
 
-    if {![string equal [$ToolXml xml] $LastToolXmlLoaded]} {
-        set choice [tk_messageBox -icon warning -type yesno -title "iRappture: Save Changes?" -message "Changes to the current tool haven't been saved.\n\nSave changes?"]
+    if {[$ToolXml xml] ne $LastToolXmlLoaded} {
+        set choice [tk_messageBox -icon warning -type yesno -title "Rappture: Save Changes?" -message "Changes to the current tool haven't been saved.\n\nSave changes?"]
         if {$choice == "yes" && ![main_saveas]} {
             return
@@ -846 +996 @@
 # ----------------------------------------------------------------------
 wm geometry . 800x600
-
-# ----------------------------------------------------------------------
-# MAIN WINDOW
-# ----------------------------------------------------------------------
-wm geometry . 600x500
 Rappture::Postern .postern
 pack .postern -side bottom -fill x
@@ -1004 +1149 @@
         grid $frame.cntls -row 0 -column 0 -columnspan 2 -sticky nsew
 
-        if {![string equal $type "Tool"]} {
+        if {$type ne "Tool"} {
             # can't let people delete the tool info
             button $frame.cntls.del -text "Delete" -command main_options_delete
@@ -1018 +1163 @@
         pack $frame.cntls.path -side left -expand yes -fill both
 
-        if {[string equal $type "Tool"]} {
+        if {$type eq "Tool"} {
             # if this is a tool, then lose the rename button
             pack forget [$frame.cntls.path component button]
@@ -1065 +1210 @@
 
             # if an error was found at this attribute, set focus there
-            if {[string equal $name $ErrFocusAttr]} {
+            if {$name eq $ErrFocusAttr} {
                 $obj edit
                 set ErrFocusAttr ""
@@ -1134 +1279 @@
         catch {unset OptionsPanelObjs}
 
-        set win [.func.build.options.panes pane 1]
-        set frame [$win.vals contents frame]
-        foreach win [winfo children $frame] {
-            destroy $win
+        set bwin [.func.build.options.panes pane 1]
+        set frame [$bwin.vals contents frame]
+        foreach w [winfo children $frame] {
+            destroy $w
         }
     }
@@ -1218 +1363 @@
 toplevel .saveas
 pack propagate .saveas off
-wm title .saveas "iRappture: Save As..."
+wm title .saveas "Rappture: Save As..."
 wm withdraw .saveas
 wm protocol .saveas WM_DELETE_WINDOW {.saveas.cntls.cancel invoke}
@@ -1240 +1385 @@
 frame .saveas.opts.toolv
 pack .saveas.opts.toolv -anchor w
-label .saveas.opts.toolv.filel -text "File:" -width 12 -anchor e
+label .saveas.opts.toolv.filel -text "File:" -width 7 -anchor e
 pack .saveas.opts.toolv.filel -side left
 button .saveas.opts.toolv.getfile -text "Choose..." -command {main_saveas gettoolfile}
@@ -1252 +1397 @@
 frame .saveas.opts.progv
 pack .saveas.opts.progv -anchor w
-label .saveas.opts.progv.filel -text "File:" -width 12 -anchor e
+label .saveas.opts.progv.filel -text "File:" -width 7 -anchor e
 pack .saveas.opts.progv.filel -side left
 button .saveas.opts.progv.getfile -text "Choose..." -command {main_saveas getprogfile}
@@ -1258 +1403 @@
 label .saveas.opts.progv.file -text "select a file" -anchor e -fg gray60
 pack .saveas.opts.progv.file -side left -expand yes -fill x
-frame .saveas.opts.progl
-pack .saveas.opts.progl -anchor w
-label .saveas.opts.progl.l -text "Language:" -width 12 -anchor e
-pack .saveas.opts.progl.l -side left
-Rappture::Combobox .saveas.opts.progl.val -width 20 -editable no
-pack .saveas.opts.progl.val -side left -pady {4 0}
-.saveas.opts.progl.val choices insert end \
-    .c    "C programs" \
-    .cpp  "C++ programs" \
-    .f    "F77 programs" \
-    .m    "MATLAB scripts" \
-    .pl   "Perl scripts" \
-    .py   "Python scripts" \
-    .tcl  "Tcl scripts" \
-    .ruby "Ruby scripts"
-.saveas.opts.progl.val value "Python scripts"
+
+checkbutton .saveas.opts.make -text "Makefile for building this program" -variable SaveAs(make) -command {main_saveas update}
+pack .saveas.opts.make -side top -anchor w -pady {10 0}
 
 # ----------------------------------------------------------------------

trunk/builder/scripts/templates.tcl

@@ -21 +21 @@
 # ======================================================================
 package require Itcl
-
-namespace eval RapptureBuilder { # forward declaration }
+package require RapptureBuilder
+
 namespace eval RapptureBuilder::templates {
     #
@@ -44 +44 @@
         $langParser hide $cmd
     }
+    $langParser alias extension RapptureBuilder::templates::parse_template extension
+    $langParser alias command RapptureBuilder::templates::parse_template command
+    $langParser alias makefile RapptureBuilder::templates::parse_template makefile
+
     $langParser alias main RapptureBuilder::templates::parse_template main
     $langParser alias input RapptureBuilder::templates::parse_pattern input
     $langParser alias output RapptureBuilder::templates::parse_pattern output
+
     $langParser alias unknown RapptureBuilder::templates::parse_lang_unknown
     proc ::RapptureBuilder::templates::parse_lang_unknown {args} {
@@ -110 +115 @@
 # ----------------------------------------------------------------------
 # USAGE: RapptureBuilder::templates::generate <what> \
-#           ?-language name? ?-xmlobj obj?
+#           ?-language name? ?-xmlobj obj? ?-macros <string-map>?
 #
 # Builds a string of generated information starting with <what> as
-# the main template.  This string may contain other @NAME@ fields,
+# the main template.  This string may contain other @@NAME@@ fields,
 # which are substituted recursively until all substitutions have
 # been made.  The -language option specifies which language template
-# should be used.  The -xmlobj option gives data for the @NAME@
+# should be used.  The -xmlobj option gives data for the @@NAME@@
 # substitutions.
 #
@@ -127 +132 @@
         value -language ""
         value -xmlobj ""
+        value -macros ""
     }
     if {[llength $args] > 0} {
@@ -151 +157 @@
     if {$xmlobj ne ""} {
         foreach path [Rappture::entities -as path $xmlobj input] {
-            append inputs [$langDefs($lang) generate $xmlobj $path]
+            append inputs [$langDefs($lang) generate $xmlobj $path -code]
         }
     }
@@ -159 +165 @@
     if {$xmlobj ne ""} {
         foreach path [Rappture::entities -as path $xmlobj output] {
-            append outputs [$langDefs($lang) generate $xmlobj $path]
-        }
-    }
-
-    set info [string map [list @@INPUTS@@ $inputs @@OUTPUTS@@ $outputs] $info]
+            append outputs [$langDefs($lang) generate $xmlobj $path -code]
+        }
+    }
+
+    # produce the @@DECLARATIONS@@ section...
+    set decls ""
+    if {$xmlobj ne ""} {
+        foreach path [Rappture::entities -as path $xmlobj input] {
+            append decls [$langDefs($lang) generate $xmlobj $path -decl]
+        }
+        foreach path [Rappture::entities -as path $xmlobj output] {
+            append decls [$langDefs($lang) generate $xmlobj $path -decl]
+        }
+    }
+
+    # handle the @@INPUTS@@ / @@OUTPUTS@@ / @@DECLARATIONS@@ specially
+    # preserve the indent at the beginning of each line
+    foreach {macro var} {
+        @@INPUTS@@ inputs
+        @@OUTPUTS@@ outputs
+        @@DECLARATIONS@@ decls
+    } {
+        set re [format {(?:^|\n)([ \t]*)%s} $macro]
+        while {[regexp -indices $re $info match indent]} {
+            set code [set $var]
+            foreach {m0 m1} $match break
+            foreach {i0 i1} $indent break
+            if {$i1-$i0 > 0} {
+                set indent [string range $info $i0 $i1]
+                set newcode ""
+                foreach line [split $code \n] {
+                    append newcode $indent $line "\n"
+                }
+                set code [string trimright $newcode \n]
+            }
+            if {[string index $info $m0] eq "\n"} { set code "\n$code" }
+            set info [string replace $info $m0 $m1 $code]
+        }
+    }
+
+    # make substitutions for any remaining macros
+    set info [string map $params(-macros) $info]
 
     # return the generated code
@@ -265 +308 @@
     # used to register a script that processes an input/output element
     public method handler {pattern body} {
-        set i [lsearch $_patterns $pattern]
+        set i [lsearch -exact $_patterns $pattern]
         if {$i < 0} { lappend _patterns $pattern }
         set _pat2code($pattern) $body
@@ -271 +314 @@
 
     # used to generate the output for a specific Rappture object in this lang
-    public method generate {xmlobj path} {
+    public method generate {xmlobj path {what "-code"}} {
         variable genParser
         variable genOutput ""
+        variable genDecls ""
         variable genXmlobj $xmlobj
         variable genPath $path
@@ -297 +341 @@
         $genParser eval $code
 
-        return $genOutput
+        switch -- $what {
+            -code   { return $genOutput }
+            -decl   { return $genDecls }
+            default { error "bad option \"$what\": should be -code, -decl" }
+        }
     }
 
@@ -309 +357 @@
     #
     private common genParser [interp create -safe]
-    $genParser alias puts RapptureBuilder::templates::LangDef::cmd_puts
+    $genParser alias code RapptureBuilder::templates::LangDef::cmd_code
+    $genParser alias decl RapptureBuilder::templates::LangDef::cmd_decl
     $genParser alias attr RapptureBuilder::templates::LangDef::cmd_attr
 
-    private common genOutput ""  ;# gathers the output from genParser
+    private common genOutput ""  ;# gathers code output from genParser
+    private common genDecls ""   ;# gathers declarations from genParser
     private common genXmlobj ""  ;# Rappture tool spec
     private common genPath ""    ;# current path in the genXmlobj data
 
     # like the std "puts" command, but adds output to the generated code
-    proc cmd_puts {args} {
+    proc cmd_code {args} {
         set nl "\n"
         while {[llength $args] > 1} {
@@ -334 +384 @@
     }
 
+    # like the std "puts" command, but adds output to code declarations
+    proc cmd_decl {args} {
+        set nl "\n"
+        while {[llength $args] > 1} {
+            set opt [lindex $args 0]
+            set args [lrange $args 1 end]
+            if {$opt eq "-nonewline"} {
+                set nl ""
+            } else {
+                error "bad option \"$opt\": should be -nonewline"
+            }
+        }
+        if {[llength $args] != 1} {
+            error "wrong # args: should be \"puts ?-nonewline? string\""
+        }
+        append genDecls [lindex $args 0] $nl
+    }
+
     # used to query attribute info for the current object
     proc cmd_attr {option name} {

trunk/builder/scripts/templates/python.tl

@@ -9 +9 @@
 # ======================================================================
 language "Python" {
+  extension ".py"
+  command {python @tool/@@FILENAME@@ @driver}
+
   main {# ----------------------------------------------------------------------
 #  MAIN PROGRAM - generated by the Rappture Builder
@@ -24 +27 @@
 @@INPUTS@@
 
-# : : : : : : : : : : : : : : : : : : : : : : : : : : : :
+#########################################################
 #  Add your code here for the main body of your program
-# : : : : : : : : : : : : : : : : : : : : : : : : : : : :
+#########################################################
 
 # spit out progress messages as you go along...
@@ -44 +47 @@
 
   input boolean {
-    puts "\n# get input value for $path"
-    puts "# returns value as string \"yes\" or \"no\""
-    puts "$id = io.get('$path.current')"
+    code "\n# get input value for $path"
+    code "# returns value as string \"yes\" or \"no\""
+    code "$id = io.get('$path.current')"
   }
   input image {
-    puts "\n# get input value for $path"
-    puts "# returns base64-encoded image data"
-    puts "$id = io.get('$path.current')"
+    code "\n# get input value for $path"
+    code "# returns base64-encoded image data"
+    code "$id = io.get('$path.current')"
   }
   input number {
     set units [attr get units]
     if {$units ne ""} {
-      puts "\n# get input value for $path and convert to $units"
-      puts "str = io.get('$path.current')"
-      puts "$id = Rappture.Units.convert(str, to=\"$units\", units=\"off\")"
+      code "\n# get input value for $path and convert to $units"
+      code "str = io.get('$path.current')"
+      code "$id = Rappture.Units.convert(str, to=\"$units\", units=\"off\")"
     } else {
-      puts "\n# get input value for $path"
-      puts "$id = io.get('$path.current')"
+      code "\n# get input value for $path"
+      code "$id = io.get('$path.current')"
     }
   }
   input * {
-    puts "\n# get input value for $path"
-    puts "$id = io.get('$path.current')"
+    code "\n# get input value for $path"
+    code "$id = io.get('$path.current')"
   }
 
   output curve {
-    puts "\n# save output value for $path"
-    puts "# this shows just one (x,y) point -- modify as needed"
-    puts "line = "%g %g\n" % (x, y)"
-    puts "io.put('$path.component.xy', line, append=1)"
+    code "\n# save output value for $path"
+    code "# this shows just one (x,y) point -- modify as needed"
+    code "line = "%g %g\n" % (x, y)"
+    code "io.put('$path.component.xy', line, append=1)"
   }
   output histogram {
-    puts "\n# save output value for $path"
-    puts "# this shows just one point -- modify as needed"
-    puts "# (x,h,w) = x-coord, height of bar, and width of bar (optional)"
-    puts "line = "%g %g %g\n" % (x, h, w)"
-    puts "io.put('$path.component.xhw', line, append=1)"
+    code "\n# save output value for $path"
+    code "# this shows just one point -- modify as needed"
+    code "# (x,h,w) = x-coord, height of bar, and width of bar (optional)"
+    code "line = "%g %g %g\n" % (x, h, w)"
+    code "io.put('$path.component.xhw', line, append=1)"
   }
   output image {
-    puts "\n# save output value for $path"
-    puts "# data should be base64-encoded image data"
-    puts "io.put('$path.current', imdata)"
+    code "\n# save output value for $path"
+    code "# data should be base64-encoded image data"
+    code "io.put('$path.current', imdata)"
   }
   output * {
-    puts "\n# save output value for $path"
-    puts "io.put('$path.current',$id)"
+    code "\n# save output value for $path"
+    code "io.put('$path.current',$id)"
   }
 }

trunk/builder/scripts/templates/tcl.tl

@@ -9 +9 @@
 # ======================================================================
 language "Tcl" {
+  extension ".tcl"
+  command {tclsh @tool/@@FILENAME@@ @driver}
+
   main {# ----------------------------------------------------------------------
 #  MAIN PROGRAM - generated by the Rappture Builder
@@ -22 +25 @@
 @@INPUTS@@
 
-# : : : : : : : : : : : : : : : : : : : : : : : : : : : :
+#########################################################
 #  Add your code here for the main body of your program
-# : : : : : : : : : : : : : : : : : : : : : : : : : : : :
+#########################################################
 
 # spit out progress messages as you go along...
@@ -42 +45 @@
 
   input boolean {
-    puts "\n# get input value for $path"
-    puts "# returns value as string \"yes\" or \"no\""
-    puts "set $id \[\$io get $path.current\]"
+    code "\n# get input value for $path"
+    code "# returns value as string \"yes\" or \"no\""
+    code "set $id \[\$io get $path.current\]"
   }
   input image {
-    puts "\n# get input value for $path"
-    puts "# returns base64-encoded image data"
-    puts "set imdata \[\$io get $path.current\]"
-    puts "set $id \[image create photo -data \$imdata\]"
+    code "\n# get input value for $path"
+    code "# returns base64-encoded image data"
+    code "set imdata \[\$io get $path.current\]"
+    code "set $id \[image create photo -data \$imdata\]"
   }
   input number {
     set units [attr get units]
     if {$units ne ""} {
-      puts "\n# get input value for $path and convert to $units"
-      puts "set str \[\$io get $path.current\]"
-      puts "set $id \[Rappture::Units::convert \$str -to $units -units off\]"
+      code "\n# get input value for $path and convert to $units"
+      code "set str \[\$io get $path.current\]"
+      code "set $id \[Rappture::Units::convert \$str -to $units -units off\]"
     } else {
-      puts "\n# get input value for $path"
-      puts "set $id \[\$io get $path.current\]"
+      code "\n# get input value for $path"
+      code "set $id \[\$io get $path.current\]"
     }
   }
   input * {
-    puts "\n# get input value for $path"
-    puts "set $id \[\$io get $path.current\]"
+    code "\n# get input value for $path"
+    code "set $id \[\$io get $path.current\]"
   }
 
   output curve {
-    puts "\n# save output value for $path"
-    puts "# this shows just one (x,y) point -- modify as needed"
-    puts "\$io put -append yes $path.component.xy \"\$x \$y\\n\""
+    code "\n# save output value for $path"
+    code "# this shows just one (x,y) point -- modify as needed"
+    code "\$io put -append yes $path.component.xy \"\$x \$y\\n\""
   }
   output histogram {
-    puts "\n# save output value for $path"
-    puts "# this shows just one point -- modify as needed"
-    puts "# (x,h,w) = x-coord, height of bar, and width of bar (optional)"
-    puts "\$io put -append yes $path.component.xy \"\$x \$h \$w\\n\""
+    code "\n# save output value for $path"
+    code "# this shows just one point -- modify as needed"
+    code "# (x,h,w) = x-coord, height of bar, and width of bar (optional)"
+    code "\$io put -append yes $path.component.xy \"\$x \$h \$w\\n\""
   }
   output image {
-    puts "\n# save output value for $path"
-    puts "# this assumes that \$imh is the handle for a Tk photo image"
-    puts "\$io put $path.current \[\$imh data -format gif\]"
+    code "\n# save output value for $path"
+    code "# this assumes that \$imh is the handle for a Tk photo image"
+    code "\$io put $path.current \[\$imh data -format gif\]"
   }
   output * {
-    puts "\n# save output value for $path"
-    puts "\$io put $path.current \$id"
+    code "\n# save output value for $path"
+    code "\$io put $path.current \$id"
   }
 }

trunk/builder/scripts/tool.rp

@@ -4 +4 @@
     attr title -type string -path title
     attr description -type string:lines=6 -expand yes -path about
-    attr command -type string -path command
+    attr command -title "Program" -type language -path command
 
     check title {