summaryrefslogtreecommitdiffstats
path: root/library
diff options
context:
space:
mode:
authorandreas_kupries <akupries@shaw.ca>2007-03-05 23:28:25 (GMT)
committerandreas_kupries <akupries@shaw.ca>2007-03-05 23:28:25 (GMT)
commit46c5f7a817b9e5508cde166112d355998c8213dc (patch)
treea44f7c3f3374b976cde326914120ea1697ec91f6 /library
parentbbbcdcbdfc1d81b58a3bd8234b3494b598184c3b (diff)
downloadtcl-46c5f7a817b9e5508cde166112d355998c8213dc.zip
tcl-46c5f7a817b9e5508cde166112d355998c8213dc.tar.gz
tcl-46c5f7a817b9e5508cde166112d355998c8213dc.tar.bz2
* library/platform/shell.tcl (::platform::shell::RUN): In the case
* library/platform/pkgIndex.tcl: of a failure put the captured stderr * unix/Makefile.in: into the error message to aid in debugging. Bumped * win/Makefile.in: package version to 1.1.2, and updated the makefiles installing it as Tcl Module.
Diffstat (limited to 'library')
-rw-r--r--library/platform/pkgIndex.tcl2
-rw-r--r--library/platform/shell.tcl10
2 files changed, 7 insertions, 5 deletions
diff --git a/library/platform/pkgIndex.tcl b/library/platform/pkgIndex.tcl
index 25f24d9..e38e770 100644
--- a/library/platform/pkgIndex.tcl
+++ b/library/platform/pkgIndex.tcl
@@ -1,3 +1,3 @@
package ifneeded platform 1.0.2 [list source [file join $dir platform.tcl]]
-package ifneeded platform::shell 1.1.1 [list source [file join $dir shell.tcl]]
+package ifneeded platform::shell 1.1.2 [list source [file join $dir shell.tcl]]
diff --git a/library/platform/shell.tcl b/library/platform/shell.tcl
index 3c2981c..6c1be5d 100644
--- a/library/platform/shell.tcl
+++ b/library/platform/shell.tcl
@@ -77,7 +77,7 @@ proc ::platform::shell::CHECK {shell} {
return -code error "Shell \"$shell\" does not exist"
}
if {![file executable $shell]} {
- return -code error "Shell \"$shell\" is not executable"
+ return -code error "Shell \"$shell\" is not executable (permissions)"
}
return
}
@@ -118,12 +118,14 @@ proc ::platform::shell::RUN {shell code} {
} res]
file delete $c
- file delete $e
if {$code} {
- return -code error "Shell \"$shell\" is not executable"
+ append res \n[read [set chan [open $e r]]][close $chan]
+ file delete $e
+ return -code error "Shell \"$shell\" is not executable ($res)"
}
+ file delete $e
return $res
}
@@ -219,4 +221,4 @@ proc ::platform::shell::DIR {} {
# ### ### ### ######### ######### #########
## Ready
-package provide platform::shell 1.1.1
+package provide platform::shell 1.1.2
sta kaikista "; // "Here is a list of all " if (!extractAll) result+="dokumentoiduista "; // "documented "; result+="tiedosto jäsenistä linkitettynä "; // "file members with links to " if (extractAll) result+="kunkin jäsenen tiedosto dokumentaatioon:"; // "the file documentation for each member:" else result+="tiedostoon johon ne kuuluvat:"; // "the files they belong to:" return result; } QCString trHeaderFilesDescription() // This is an introduction to the page with the list of all header files { return "Täällä on kaikki header tiedostot jotka muodostavat API:n:"; } // "Here are the header files that make up the API:" QCString trExamplesDescription() // This is an introduction to the page with the list of all examples { return "Täällä on lista kaikista esimerkeistä:"; } // "Here is a list of all examples:" QCString trRelatedPagesDescription() // This is an introduction to the page with the list of related pages { return "Täällä on lista kaikista liittyvistä dokumentaatiosivuista:"; } // "Here is a list of all related documentation pages:" QCString trModulesDescription() // This is an introduction to the page with the list of class/file groups { return "Täällä on lista kaikista moduleista:"; } // "Here is a list of all modules:" QCString trNoDescriptionAvailable() // This sentences is used in the annotated class/file lists if no brief // description is given. { return "Selitettä ei ole saatavilla"; } // "No description available" // index titles (the project name is prepended for these) QCString trDocumentation() // This is used in HTML as the title of index.html. { return "Dokumentaatio"; } // "Documentation" QCString trModuleIndex() // This is used in LaTeX as the title of the chapter with the // index of all groups. { return "Moduli Indeksi"; } // "Module Index" QCString trHierarchicalIndex() // This is used in LaTeX as the title of the chapter with the // class hierarchy. { return "Hierarkinen Indeksi"; } // "Hierarchical Index" QCString trCompoundIndex() // This is used in LaTeX as the title of the chapter with the // annotated compound index { return "Koosteiden Indeksi"; } // "Compound Index" QCString trFileIndex() // This is used in LaTeX as the title of the chapter with the // list of all files. { return "Tiedosto Indeksi"; } // "File Index" QCString trModuleDocumentation() // This is used in LaTeX as the title of the chapter containing // the documentation of all groups. { return "Moduli Dokumentaatio"; } // "Module Documentation" QCString trClassDocumentation() // This is used in LaTeX as the title of the chapter containing // the documentation of all classes, structs and unions. { return "Luokka Dokumentaatio"; } // "Class Documentation" QCString trFileDocumentation() // This is used in LaTeX as the title of the chapter containing // the documentation of all files. { return "Tiedosto Dokumentaatio"; } // "File Documentation" QCString trExampleDocumentation() // This is used in LaTeX as the title of the chapter containing // the documentation of all examples. { return "Esimerkkien Dokumentaatio"; } // "Example Documentation" QCString trPageDocumentation() // This is used in LaTeX as the title of the chapter containing // the documentation of all related pages. { return "Sivujen Dokumentaatio"; } // "Page Documentation" QCString trReferenceManual() // This is used in LaTeX as the title of the document { return "Käsikirja"; } // "Reference Manual" QCString trDefines() // This is used in the documentation of a file as a header before the // list of defines { return "Määrittelyt"; } // "Defines" QCString trFuncProtos() // This is used in the documentation of a file as a header before the // list of function prototypes { return "Funktioiden Prototyypit"; } // "Function Prototypes" QCString trTypedefs() // This is used in the documentation of a file as a header before the // list of typedefs { return "Tyyppimäärittelyt"; } // "Typedefs" QCString trEnumerations() // This is used in the documentation of a file as a header before the // list of enumerations { return "Enumeraatiot"; } // "Enumerations" QCString trFunctions() // This is used in the documentation of a file as a header before the // list of (global) functions { return "Funktiot"; } // "Functions" QCString trVariables() // This is used in the documentation of a file as a header before the // list of (global) variables { return "Muuttujat"; } // "Variables" QCString trEnumerationValues() // This is used in the documentation of a file as a header before the // list of (global) variables { return "Enumeraation arvot"; } // "Enumeration values" QCString trAuthor() // This is used in man pages as the author section. { return "Tekijä"; } // "Author" QCString trDefineDocumentation() // This is used in the documentation of a file before the list of // documentation blocks for defines { return "Määritysten dokumentointi"; } // "Define Documentation" QCString trFunctionPrototypeDocumentation() // This is used in the documentation of a file/namespace before the list // of documentation blocks for function prototypes { return "Funktio Prototyyppien Dokumentaatio"; } // "Function Prototype Documentation" QCString trTypedefDocumentation() // This is used in the documentation of a file/namespace before the list // of documentation blocks for typedefs { return "Tyyppimääritysten Dokumentaatio"; } // "Typedef Documentation" QCString trEnumerationTypeDocumentation() // This is used in the documentation of a file/namespace before the list // of documentation blocks for enumeration types { return "Enumeraatio Tyyppien Dokumentaatio"; } // "Enumeration Type Documentation" QCString trFunctionDocumentation() // This is used in the documentation of a file/namespace before the list // of documentation blocks for functions { return "Funktioiden Dokumentaatio"; } // "Function Documentation" QCString trVariableDocumentation() // This is used in the documentation of a file/namespace before the list // of documentation blocks for variables { return "Muuttujien Dokumentaatio"; } // "Variable Documentation" QCString trCompounds() // This is used in the documentation of a file/namespace/group before // the list of links to documented compounds { return "Koosteet"; } // "Compounds" QCString trFiles() // This is used in the documentation of a group before the list of // links to documented files { return "Tiedostot"; } // "Files" QCString trGeneratedAt(const char *date,const char *projName) { // funktio on hiukan vaikea kääntää prepositioihin sidotun rakenteen vuoksi. QCString result=(QCString)"Generoitu "+date; // "Generated at " if (projName) result+=(QCString)" projektille "+projName; // " for " result+=(QCString)" tekijä: "; // " by" return result; } QCString trWrittenBy() { return "kirjoittanut"; // "written by" } QCString trClassDiagram(const char *clName) // this text is put before a class diagram { return (QCString)clName+":n Luokkakaavio"; // "Class diagram for " } QCString trForInternalUseOnly() // this text is generated when the \internal command is used. { return "Vain sisäiseen käyttöön."; } // "For internal use only." QCString trReimplementedForInternalReasons() // this text is generated when the \reimp command is used. { return "Uudelleen toteutettu sisäisistä syistä; API ei ole muuttunut."; } // "Reimplemented for internal reasons; the API is not affected." QCString trWarning() // this text is generated when the \warning command is used. { return "Varoitus"; } // "Warning" // this text is generated when the \bug command is used. QCString trBugsAndLimitations() { return "Virheet ja rajoitukset"; } // "Bugs and limitations" QCString trVersion() // this text is generated when the \version command is used. { return "Versio"; } // "Version" QCString trDate() // this text is generated when the \date command is used. { return "Päiväys"; } // "Date" QCString trAuthors() // this text is generated when the \author command is used. { return "Tekijä(t)"; } // "Author(s)" QCString trReturns() // this text is generated when the \return command is used. { return "Palauttaa"; } // "Returns" QCString trSeeAlso() // this text is generated when the \sa command is used. { return "Katso myös"; } // "See also" QCString trParameters() // this text is generated when the \param command is used. { return "Parametrit"; } // "Parameters" QCString trExceptions() // this text is generated when the \exception command is used. { return "Poikkeukset"; } // "Exceptions" QCString trGeneratedBy() // this text is used in the title page of a LaTeX document. { return "Generoinut"; } // "Generated by" ////////////////////////////////////////////////////////////////////////// // new since 0.49-990307 ////////////////////////////////////////////////////////////////////////// QCString trNamespaceList() // used as the title of page containing all the index of all namespaces. { return "Nimiavaruus Lista"; } // "Namespace List" QCString trNamespaceListDescription(bool extractAll) // used as an introduction to the namespace list { QCString result="Täällä on lista kaikista "; // "Here is a list of all " if (!extractAll) result+="dokumentoiduista "; // "Here is a list of all " result+="nimiavaruuksista lyhyen selitteen kera:"; // "namespaces with brief descriptions:" return result; } QCString trFriends() // used in the class documentation as a header before the list of all // friends of a class { return "Ystävät"; } // "Friends" ////////////////////////////////////////////////////////////////////////// // new since 0.49-990405 ////////////////////////////////////////////////////////////////////////// QCString trRelatedFunctionDocumentation() // used in the class documentation as a header before the list of all // related classes { return "Ystävät ja niihin Liittyvien Funktioiden Dokumentaatio"; } // "Friends And Related Function Documentation" ////////////////////////////////////////////////////////////////////////// // new since 0.49-990425 ////////////////////////////////////////////////////////////////////////// virtual QCString trCompoundReference(const char *clName, ClassDef::CompoundType compType) // used as the title of the HTML page of a class/struct/union { QCString result=(QCString)clName+" "; switch(compType) { case ClassDef::Class: result+=" Luokka"; break; // "Class" case ClassDef::Struct: result+=" Struct"; break; // "Struct" case ClassDef::Union: result+=" Union"; break; // "Union" case ClassDef::Interface: result+=" Interface"; break; // "Interface" } result+=" Referenssi"; // " Reference" return result; } virtual QCString trFileReference(const char *fileName) // used as the title of the HTML page of a file { QCString result=fileName; result+=" Tiedosto Referenssi"; // " File Reference" return result; } virtual QCString trNamespaceReference(const char *namespaceName) // used as the title of the HTML page of a namespace { QCString result=namespaceName; result+=" Nimiavaruus Referenssi"; // " Namespace Reference" return result; } // these are for the member sections of a class, struct or union virtual QCString trPublicMembers() { return "Julkiset Jäsenet"; } // "Public Members" virtual QCString trPublicSlots() { return "Julkiset Slotit"; } // "Public Slots" virtual QCString trSignals() { return "Signaalit"; } // "Signals" virtual QCString trStaticPublicMembers() { return "Staattiset Julkiset Jäsenet"; } // "Static Public Members" virtual QCString trProtectedMembers() { return "Suojatut Jäsenet"; } // "Protected Members" virtual QCString trProtectedSlots() { return "Suojatut Slotit"; } // "Protected Slots" virtual QCString trStaticProtectedMembers() { return "Staattiset Suojatut Jäsenet"; } // "Static Protected Members" virtual QCString trPrivateMembers() { return "Yksityiset Jäsenet"; } // "Private Members" virtual QCString trPrivateSlots() { return "Yksityiset Slotit"; } // "Private Slots" virtual QCString trStaticPrivateMembers() { return "Staattiset Yksityiset Jäsenet"; } // "Static Private Members" // end of member sections virtual QCString trWriteList(int numEntries) { // this function is used to produce a comma-separated list of items. // use generateMarker(i) to indicate where item i should be put. QCString result; int i; // the inherits list contain `numEntries' classes for (i=0;i<numEntries;i++) { // use generateMarker to generate placeholders for the class links! result+=generateMarker(i); // generate marker for entry i in the list // (order is left to right) if (i!=numEntries-1) // not the last entry, so we need a separator { if (i<numEntries-2) // not the fore last entry result+=", "; else // the fore last entry result+=" ja "; // ", and " } } return result; } virtual QCString trInheritsList(int numEntries) // used in class documentation to produce a list of base classes, // if class diagrams are disabled. { return "Perijät "+trWriteList(numEntries)+"."; // "Inherits " } virtual QCString trInheritedByList(int numEntries) // used in class documentation to produce a list of super classes, // if class diagrams are disabled. { return "Periytyy "+trWriteList(numEntries)+"."; // "Inherited by " } virtual QCString trReimplementedFromList(int numEntries) // used in member documentation blocks to produce a list of // members that are hidden by this one. { return "Uudelleen toteutettu "+trWriteList(numEntries)+"."; // "Reimplemented from " } virtual QCString trReimplementedInList(int numEntries) { // used in member documentation blocks to produce a list of // all member that overwrite the implementation of this member. return "Uudelleen toteutettu "+trWriteList(numEntries)+"."; // "Reimplemented in " } virtual QCString trNamespaceMembers() // This is put above each page as a link to all members of namespaces. { return "Nimiavaruuden jäsenet"; } // "Namespace Members" virtual QCString trNamespaceMemberDescription(bool extractAll) // This is an introduction to the page with all namespace members { QCString result="Täällä on lista kaikista "; // "Here is a list of all " if (!extractAll) result+="dokumentoiduista "; // "documented " result+="nimiavaruuden jäsenistä linkitettynä "; // "namespace members with links to " if (extractAll) result+="nimiavaruuden dokumentaatioon johon ne kuuluvat:"; // "the namespace documentation for each member:"; else result+="nimiavaruuteen johon ne kuuluvat:"; // "the namespaces they belong to:" return result; } virtual QCString trNamespaceIndex() // This is used in LaTeX as the title of the chapter with the // index of all namespaces. { return "Nimiavaruuden Indeksi"; } // "Namespace Index" virtual QCString trNamespaceDocumentation() // This is used in LaTeX as the title of the chapter containing // the documentation of all namespaces. { return "Nimiavaruuden Dokumentaatio"; } // "Namespace Documentation" }; #endif