summaryrefslogtreecommitdiff
path: root/src/library/scala/sys/process/Process.scala
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2011-09-17 15:59:16 +0000
committermichelou <michelou@epfl.ch>2011-09-17 15:59:16 +0000
commitfa0f48a5dffacf5622d1d82ec12ef0c1930354bd (patch)
treeee60ef4787fa33d8544bebaf1778206676758628 /src/library/scala/sys/process/Process.scala
parenta3ce6c471a445716a19d7402414ffda50f1d8e80 (diff)
downloadscala-fa0f48a5dffacf5622d1d82ec12ef0c1930354bd.tar.gz
scala-fa0f48a5dffacf5622d1d82ec12ef0c1930354bd.tar.bz2
scala-fa0f48a5dffacf5622d1d82ec12ef0c1930354bd.zip
fixed svn props, did some cleanup
Diffstat (limited to 'src/library/scala/sys/process/Process.scala')
-rw-r--r--src/library/scala/sys/process/Process.scala4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/library/scala/sys/process/Process.scala b/src/library/scala/sys/process/Process.scala
index db10ff9c1d..ff02b38fd3 100644
--- a/src/library/scala/sys/process/Process.scala
+++ b/src/library/scala/sys/process/Process.scala
@@ -132,7 +132,9 @@ trait ProcessCreation {
* apply(<x> {dxPath.absolutePath} --dex --output={classesDexPath.absolutePath} {classesMinJarPath.absolutePath}</x>)
* }}}
*/
+ /*@XML*/
def apply(command: scala.xml.Elem): ProcessBuilder = apply(command.text.trim)
+ /*XML@*/
/** Create a [[scala.sys.process.ProcessBuilder]] from a `Boolean`. This can be
* to force an exit value.
@@ -205,7 +207,9 @@ trait ProcessImplicits {
implicit def urlToProcess(url: URL): URLBuilder = apply(url)
/** Implicitly convert a [[scala.xml.Elem]] into a [[scala.sys.process.ProcessBuilder]] */
+ /*@XML*/
implicit def xmlToProcess(command: scala.xml.Elem): ProcessBuilder = apply(command)
+ /*XML@*/
/** Implicitly convert a `String` into a [[scala.sys.process.ProcessBuilder]] */
implicit def stringToProcess(command: String): ProcessBuilder = apply(command)