diff options
author | Paul Phillips <paulp@improving.org> | 2012-03-27 15:41:24 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-03-27 15:41:24 -0700 |
commit | 3e40fb5d94a4d185c93861b9caf86ac92a04ef2a (patch) | |
tree | 258ebd67e1fed5ad619432314e6d9737d0eae99c | |
parent | 61c36b59907a7824628ced70ccaed2f9cf4a5a56 (diff) | |
parent | b5a88e089284338a5fb8c2557494b4253869eee9 (diff) | |
download | scala-3e40fb5d94a4d185c93861b9caf86ac92a04ef2a.tar.gz scala-3e40fb5d94a4d185c93861b9caf86ac92a04ef2a.tar.bz2 scala-3e40fb5d94a4d185c93861b9caf86ac92a04ef2a.zip |
Merge remote-tracking branch 'jsuereth/remove-sbaz-update-man' into develop
-rw-r--r-- | src/build/pack.xml | 108 | ||||
-rw-r--r-- | src/compiler/scala/tools/ant/ScalaBazaar.scala | 316 | ||||
-rw-r--r-- | src/compiler/scala/tools/ant/ScalaTool.scala | 3 | ||||
-rw-r--r-- | src/compiler/scala/tools/ant/antlib.xml | 6 | ||||
-rw-r--r-- | src/manual/scala/man1/fsc.scala | 5 | ||||
-rw-r--r-- | src/manual/scala/man1/sbaz.scala | 209 | ||||
-rw-r--r-- | src/manual/scala/man1/scala.scala | 1 | ||||
-rw-r--r-- | src/manual/scala/man1/scalac.scala | 5 | ||||
-rw-r--r-- | src/manual/scala/man1/scaladoc.scala | 1 | ||||
-rw-r--r-- | src/manual/scala/man1/scalap.scala | 1 | ||||
-rw-r--r-- | src/manual/scala/tools/docutil/resources/index.html | 17 |
11 files changed, 11 insertions, 661 deletions
diff --git a/src/build/pack.xml b/src/build/pack.xml index 723fd1d25d..3bd4d7a199 100644 --- a/src/build/pack.xml +++ b/src/build/pack.xml @@ -3,14 +3,13 @@ <project name="sabbus-pack"> <description> - SuperSabbus extension for packaging a distribution to Sbaz or other distribution methods. THIS FILE IS NOT STAND-ALONE AND SHOULD ONLY BE USED THROUGH ENTRY POINTS IN SUPERSABBUS. + SuperSabbus extension for packaging a distribution. THIS FILE IS NOT STAND-ALONE AND SHOULD ONLY BE USED THROUGH ENTRY POINTS IN SUPERSABBUS. </description> <!-- =========================================================================== PROPERTIES ============================================================================ --> - <property name="sbaz.universe" value="http://www.scala-lang.org/downloads/packages"/> <property file="${basedir}/build.number.maven"/> <!-- the maven stuff requires version.major, version.minor and version.patch properties. the "get-scala-revision" script only returns "version.number" --> @@ -112,109 +111,6 @@ MAIN DISTRIBUTION PACKAGING </target> <target name="pack-archives.done" depends="pack-archives.src, pack-archives.latest.win, pack-archives.latest.unix"/> - -<!-- =========================================================================== -MAIN DISTRIBUTION SBAZ -============================================================================ --> - - <target name="pack-sbaz.start"> - <mkdir dir="${dists.dir}/sbaz"/> - </target> - - <target name="pack-sbaz.lib" depends="pack-sbaz.start"> - <sbaz - file="${dists.dir}/sbaz/scala-library-${version.number}.sbp" - adfile="${dists.dir}/sbaz/scala-library-${version.number}.advert" - name="scala-library" - version="${version.number}" - desc="The Scala library. This is the minimal requirement to run any Scala program." - link="${sbaz.universe}/scala-library-${version.number}.sbp"> - <libset dir="${dist.dir}/lib" includes="scala-library.jar,scala-dbc.jar,scala-swing.jar,scala-actors.jar"/> - <srcset dir="${dist.dir}/src" includes="scala-library-src.jar,scala-dbc-src.jar,scala-swing-src.jar,scala-actors-src.jar"/> - <looseset destination="doc"> - <fileset dir="${dist.dir}/doc" includes="LICENSE,README"/> - </looseset> - </sbaz> - </target> - - <target name="pack-sbaz.comp" depends="pack-sbaz.lib"> - <sbaz - file="${dists.dir}/sbaz/scala-devel-${version.number}.sbp" - adfile="${dists.dir}/sbaz/scala-devel-${version.number}.advert" - name="scala-devel" - version="${version.number}" - desc="The Scala developer tools. This contains everything that is required to write, test and document new Scala programs." - depends="scala-library" - link="${sbaz.universe}/scala-devel-${version.number}.sbp"> - <binset - dir="${dist.dir}/bin" - includes="scala,scala.bat,scalac,scalac.bat,scaladoc,scaladoc.bat,fsc,fsc.bat"/> - <libset dir="${dist.dir}/lib" includes="scala-compiler.jar,jline.jar"/> - <miscset dir="${dist.dir}/misc/scala-devel" - includes="plugins/continuations.jar"/> - <manset dir="${dist.dir}/man" includes="**"/> - <srcset dir="${dist.dir}/src" includes="scala-compiler-src.jar"/> - </sbaz> - </target> - - <target name="pack-sbaz.test" depends="pack-sbaz.comp"> - <sbaz - file="${dists.dir}/sbaz/scala-test-${version.number}.sbp" - adfile="${dists.dir}/sbaz/scala-test-${version.number}.advert" - name="scala-test" - version="${version.number}" - desc="The Scala test package contains everything needed to test Scala." - link="${sbaz.universe}/scala-test-${version.number}.sbp"> - <binset dir="${basedir}/test" - includes="clitest,diff/diff.*,diff/lib*.dll,partest,partest.bat"/> - <miscset dir="${basedir}/test" - includes="files/**/*.args,files/**/*.check,files/**/*.dll,files/**/*.jar,files/**/*.java,files/**/*.scala,files/**/*.flags,files/cli/**/*.check.*,files/jvm/*.so,files/shootout/*.javaopts,files/shootout/*.runner,files/shootout/*.txt,files/specialized/*.txt,files/**/*.test" - excludes="files/presentation"/> - <!-- <srcset dir="${dist.dir}/src" includes="scala-partest-src.jar"/> --> - <libset dir="${dist.dir}/lib" includes="scala-partest.jar"/> - <libset dir="${lib.dir}" includes="scalacheck.jar"/> - </sbaz> - </target> - - <target name="pack-sbaz.scalap" depends="pack-sbaz.test"> - <sbaz - file="${dists.dir}/sbaz/scalap-${version.number}.sbp" - adfile="${dists.dir}/sbaz/scalap-${version.number}.advert" - name="scalap" - version="${version.number}" - desc="The scalap package contains the Scala classfile decoder." - link="${sbaz.universe}/scalap-${version.number}.sbp"> - <binset dir="${dist.dir}/bin" - includes="scalap,scalap.bat"/> - <libset dir="${dist.dir}/lib" includes="scalap.jar"/> - </sbaz> - </target> - - <target name="pack-sbaz.doc" depends="pack-sbaz.scalap"> - <sbaz - file="${dists.dir}/sbaz/scala-devel-docs-${version.number}.sbp" - adfile="${dists.dir}/sbaz/scala-devel-docs-${version.number}.advert" - name="scala-devel-docs" - version="${version.number}" - desc="The Scala developer documentation. This contains all developer documentation." - link="${sbaz.universe}/scala-devel-docs-${version.number}.sbp"> - <docset dir="${dist.dir}/doc/scala-devel-docs"/> - </sbaz> - </target> - - <target name="pack-sbaz.all" depends="pack-sbaz.doc"> - <sbaz - file="${dists.dir}/sbaz/${dist.name}.sbp" - adfile="${dists.dir}/sbaz/${dist.name}.advert" - name="scala" - version="${version.number}" - desc="The base Scala package that contains everything needed to start using Scala." - depends="scala-library,scala-devel" - link="${sbaz.universe}/${dist.name}.sbp"/> - </target> - - - <target name="pack-sbaz.done" depends="pack-sbaz.all"/> <target name="pack-maven.start"> <mkdir dir="${dists.dir}/maven/${version.number}"/> @@ -342,7 +238,7 @@ MAIN DISTRIBUTION SBAZ MISCELLANEOUS ============================================================================ --> - <target name="pack-all.done" depends="pack-archives.done, pack-sbaz.done, pack-maven.done"/> + <target name="pack-all.done" depends="pack-archives.done, pack-maven.done"/> <!-- =========================================================================== MISCELLANEOUS diff --git a/src/compiler/scala/tools/ant/ScalaBazaar.scala b/src/compiler/scala/tools/ant/ScalaBazaar.scala deleted file mode 100644 index fa44715c7f..0000000000 --- a/src/compiler/scala/tools/ant/ScalaBazaar.scala +++ /dev/null @@ -1,316 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala Ant Tasks ** -** / __/ __// _ | / / / _ | (c) 2005-2011, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -\* */ - -package scala.tools -package ant - -import scala.collection.DefaultMap -import scala.collection.{ mutable, immutable } - -import java.io.{File, FileInputStream, FileOutputStream, FileWriter, StringReader} -import java.util.zip.{ZipOutputStream, ZipEntry} - -import org.apache.tools.ant.{Project, Task} -import org.apache.tools.ant.types.{FileSet, Path} -import org.apache.tools.ant.util.FileUtils - -/** A set of files that can be installed at any relative location */ -class LooseFileSet { - var destination: Option[String] = None - def setDestination(dest: String) = { - destination = Some(dest) - } - - var fileset: Option[FileSet] = None - def addConfiguredFileSet(fs: FileSet) = { - fileset = Some(fs) - } -} - -/** An Ant task that generates a Scala Bazaars package (sbp file) along - * with an advertisement of that package. - * - * This task can take the following parameters as attributes: - * - `file` (mandatory), - * - `adfile`, - * - `name` (mandatory), - * - `version` (mandatory), - * - `depends`, - * - `description`, - * - `link`. - * - * @author Gilles Dubochet, Stephane Micheloud - */ -class ScalaBazaar extends Task with ScalaTask { - - /** The unique Ant file utilities instance to use in this task. */ - private val fileUtils = FileUtils.getFileUtils() - -/******************************************************************************\ -** Ant user-properties ** -\******************************************************************************/ - - /** The path to the archive file. */ - private var file: Option[File] = None - /** The optional path to the advertisement file. */ - private var adfile: Option[File] = None - /** The name of the package. */ - private var name: Option[String] = None - /** The version number of the package. */ - private var version: Option[String] = None - /** An (optional) list of names of the packages it depends of. */ - private var depends: List[String] = Nil - /** An (optional) description of this package. */ - private var desc: Option[String] = None - /** An (optional) URL link pointing to the location of the package */ - private var link: Option[String] = None - - /** The sets of files to include in the package */ - private object fileSetsMap extends DefaultMap[String, List[FileSet]] { - private var content = new mutable.HashMap[String, List[FileSet]]() - def get(key: String): Option[List[FileSet]] = content.get(key) - override def size: Int = content.size - def update(key: String, value: FileSet) { - if (content.contains(key) && content(key) != Nil) - content.update(key, value :: content(key)) - else content.update(key, List(value)) - } - def fileSets = content.toList - def iterator = content.iterator - } - -/******************************************************************************\ -** Internal properties ** -\******************************************************************************/ - - -/******************************************************************************\ -** Properties setters ** -\******************************************************************************/ - - /** Sets the file attribute. Used by [[http://ant.apache.org Ant]]. - * @param input The value of `file`. - */ - def setFile(input: File) { file = Some(input) } - - /** Sets the advertisement file attribute. Used by [[http://ant.apache.org Ant]]. - * @param input The value of `adfile`. - */ - def setAdfile(input: File) { adfile = Some(input) } - - /** Sets the name attribute of this package. Used by [[http://ant.apache.org Ant]]. - * @param input The value of `name`. - */ - def setName(input: String) { name = Some(input) } - - /** Sets the version attribute of this package. Used by [[http://ant.apache.org Ant]]. - * @param input The value of `version`. - */ - def setVersion(input: String) { version = Some(input) } - - /** Sets the depends attribute. Used by [[http://ant.apache.org Ant]]. - * @param input The value for `depends`. - */ - def setDepends(input: String) = { - depends = (input split ",").toList.flatMap { s: String => - val st = s.trim() - (if (st != "") List(st) else Nil) - } - } - - /** Sets the description attribute of this package. Used by [[http://ant.apache.org Ant]]. - * @param input The value of `description`. - */ - def setDesc(input: String) { desc = Some(input) } - - /** Sets the link attribute of this package. Used by [[http://ant.apache.org Ant]]. - * @param input The value of `link`. - */ - def setLink(input: String) { link = Some(input) } - - def addConfiguredLibset(input: FileSet) = - fileSetsMap.update("lib", input) - - def addConfiguredBinset(input: FileSet) = - fileSetsMap.update("bin", input) - - def addConfiguredSrcset(input: FileSet) = - fileSetsMap.update("src", input) - - def addConfiguredManset(input: FileSet) = - fileSetsMap.update("man", input) - - def addConfiguredDocset(input: FileSet) = - fileSetsMap.update("doc/" + getName, input) - - def addConfiguredMiscset(input: FileSet) = - fileSetsMap.update("misc/" + getName, input) - - def addConfiguredLooseset(set: LooseFileSet) = { - (set.destination, set.fileset) match { - case (None, _) => - buildError("destination not specified for a loose file set") - - case (_, None) => - buildError("no files specified for a loose file set") - - case (Some(dest), Some(fileset)) => - fileSetsMap.update(dest, fileset) - } - } - -/******************************************************************************\ -** Properties getters ** -\******************************************************************************/ - - /** Gets the value of the file attribute in a Scala-friendly form. - * @return The file as a file. - */ - private def getName: String = - if (name.isEmpty) buildError("Name attribute must be defined first.") - else name.get - - /** Gets the value of the file attribute in a Scala-friendly form. - * @return The file as a file. - */ - private def getFile: File = - if (file.isEmpty) buildError("Member 'file' is empty.") - else getProject resolveFile file.get.toString - - /** Gets the value of the adfile attribute in a Scala-friendly form. - * @return The adfile as a file. - */ - private def getAdfile: File = - if (adfile.isEmpty) buildError("Member 'adfile' is empty.") - else getProject resolveFile adfile.get.toString - -/******************************************************************************\ -** Compilation and support methods ** -\******************************************************************************/ - - /** Transforms a string name into a file relative to the provided base - * directory. - * @param base A file pointing to the location relative to which the name - * will be resolved. - * @param name A relative or absolute path to the file as a string. - * @return A file created from the name and the base file. - */ - private def nameToFile(base: File)(name: String): File = - existing(fileUtils.resolveFile(base, name)) - - /** Transforms a string name into a file relative to the build advertDoc - * directory. - * @param name A relative or absolute path to the file as a string. - * @return A file created from the name. - */ - private def nameToFile(name: String): File = - existing(getProject resolveFile name) - - /** Tests if a file exists and prints a warning in case it doesn't. - * Always returns the file, even if it doesn't exist. - * @param file A file to test for existance. - * @return The same file. - */ - private def existing(file: File): File = { - if (!file.exists) - log("Element '" + file.toString + "' does not exist.", Project.MSG_WARN) - file - } - - private def writeFile(file: File, content: String) { - if (file.exists && !file.canWrite) - buildError("File " + file + " is not writable") - else { - val writer = new FileWriter(file, false) - writer write content - writer.close() - } - } - -/******************************************************************************\ -** The big execute method ** -\******************************************************************************/ - - /** Performs the compilation. */ - override def execute() { - // Tests if all mandatory attributes are set and valid. - if (file.isEmpty) buildError("Attribute 'file' is not set.") - if (name.isEmpty) buildError("Attribute 'name' is not set.") - if (version.isEmpty) buildError("Attribute 'version' is not set.") - - val pack = { - <package> - <name>{name.get}</name> - <version>{version.get}</version>{ - if (!depends.isEmpty) - <depends>{ - for (depend <- depends) yield - <name>{depend}</name> - }</depends> - else Nil - }{ - if (!desc.isEmpty) - <description>{desc.get}</description> - else Nil - } - </package> - } - - log("Creating package '" + name.get + "'") - - // Creates the advert file - val advert = { - <availablePackage> - {pack} - {link match { - case None => <link>INSERT LINK HERE</link> - case Some(str) => <link>{str}</link> - }} - </availablePackage> - } - - if (!adfile.isEmpty) - writeFile(getAdfile, advert.toString) - - // Checks for new files and creates the ZIP - - val zipContent = - for { - (folder, fileSets) <- fileSetsMap.fileSets - fileSet <- fileSets - file <- fileSet.getDirectoryScanner(getProject).getIncludedFiles.toList - } yield Triple(folder, fileSet.getDir(getProject), file) - val zip = new ZipOutputStream(new FileOutputStream(file.get, false)) - if (!zipContent.isEmpty) { - for (Triple(destFolder, srcFolder, file) <- zipContent) { - log(file, Project.MSG_DEBUG) - zip putNextEntry new ZipEntry(destFolder + "/" + file) - val input = new FileInputStream(nameToFile(srcFolder)(file)) - val buf = new Array[Byte](10240) - var n = input.read(buf, 0, buf.length) - while (n >= 0) { - zip.write (buf, 0, n) - n = input.read(buf, 0, buf.length) - } - zip.closeEntry() - input.close() - } - } else log("Archive contains no files.", Project.MSG_VERBOSE) - zip putNextEntry new ZipEntry("meta/description") - val packInput = new StringReader(pack.toString) - var byte = packInput.read() - while (byte != -1) { - zip.write (byte) - byte = packInput.read() - } - zip.closeEntry() - packInput.close() - zip.close() - } - -} diff --git a/src/compiler/scala/tools/ant/ScalaTool.scala b/src/compiler/scala/tools/ant/ScalaTool.scala index 35e26bd9f5..3fdbcd1140 100644 --- a/src/compiler/scala/tools/ant/ScalaTool.scala +++ b/src/compiler/scala/tools/ant/ScalaTool.scala @@ -125,8 +125,7 @@ class ScalaTool extends ScalaMatchingTask { * Adds an Ant Path reference to the tool's classpath. * Note that all entries in the path must exist either relative to the project * basedir or with an absolute path to a file in the filesystem. As a result, - * this is not a mechanism for setting the classpath for more general use scripts, - * such as those distributed within sbaz distribution packages. + * this is not a mechanism for setting the classpath for more general use scripts. */ def setClassPathRef(input: Reference) { val tmpPath = emptyPath diff --git a/src/compiler/scala/tools/ant/antlib.xml b/src/compiler/scala/tools/ant/antlib.xml index bbdf1fc9db..78159e6d10 100644 --- a/src/compiler/scala/tools/ant/antlib.xml +++ b/src/compiler/scala/tools/ant/antlib.xml @@ -1,6 +1,4 @@ <antlib> - <!--<taskdef name="scala" - classname="scala.tools.ant.Scala"/>--> <taskdef name="classloadVerify" classname="scala.tools.ant.ClassloadVerify"/> <taskdef name="fsc" @@ -9,16 +7,12 @@ classname="scala.tools.ant.Scalac"/> <taskdef name="scalascript" classname="scala.tools.ant.ScalaTool"/> - <taskdef name="sbaz" - classname="scala.tools.ant.ScalaBazaar"/> <taskdef name="scaladoc" classname="scala.tools.ant.Scaladoc"/> <taskdef name="scalatool" classname="scala.tools.ant.ScalaTool"/> <taskdef name="same" classname="scala.tools.ant.Same"/> - <!--<taskdef name="scalatest" - classname="scala.tools.ant.ScalaDoc"/>--> <taskdef name="pack200" classname="scala.tools.ant.Pack200Task"/> </antlib> diff --git a/src/manual/scala/man1/fsc.scala b/src/manual/scala/man1/fsc.scala index 1f82cdf0ce..2aafe7d82c 100644 --- a/src/manual/scala/man1/fsc.scala +++ b/src/manual/scala/man1/fsc.scala @@ -141,7 +141,6 @@ object fsc extends Command { val seeAlso = Section("SEE ALSO", - Link(Bold("sbaz") & "(1)", "sbaz.html") & ", " & Link(Bold("scala") & "(1)", "scala.html") & ", " & Link(Bold("scalac") & "(1)", "scalac.html") & ", " & Link(Bold("scaladoc") & "(1)", "scaladoc.html") & ", " & @@ -149,9 +148,9 @@ object fsc extends Command { def manpage = new Document { title = command - date = "January 2007" + date = "March 2012" author = "Lex Spoon" - version = "0.4" + version = "0.5" sections = List( name, synopsis, diff --git a/src/manual/scala/man1/sbaz.scala b/src/manual/scala/man1/sbaz.scala deleted file mode 100644 index 2e12330408..0000000000 --- a/src/manual/scala/man1/sbaz.scala +++ /dev/null @@ -1,209 +0,0 @@ -/* NSC -- new Scala compiler - * Copyright 2005-2011 LAMP/EPFL - * @author Stephane Micheloud - */ - -package scala.man1 - -/** - * @author Stephane Micheloud - * @version 1.0 - */ -object sbaz extends Command { - import _root_.scala.tools.docutil.ManPage._ - - protected val cn = new Error().getStackTrace()(0).getClassName() - - val name = Section("NAME", - - MBold(command) & " " & NDash & " Scala package sharing tool for the " & - Link("Scala 2", "http://scala-lang.org/") & " language") - - val synopsis = Section("SYNOPSIS", - - CmdLine(" [ " & Argument("global_options") & " ] " & Argument("command") & - " [ " & Argument("command_options") & " ]")) - - val parameters = Section("PARAMETERS", - - DefinitionList( - Definition( - Mono(Argument("global_options")), - "Command line options. See " & Link(Bold("OPTIONS"), "#options") & - " below."), - Definition( - Mono(Argument("command")), - "Internal " & MBold(command) & " command."), - Definition( - Mono(Argument("command_options")), - MBold(command) & " command options."))) - - val description = Section("DESCRIPTION", - - "The " & MBold(command) & " tool is a system used by Scala enthusiasts " & - "to share computer files with each other. In particular, it makes it " & - "easy to share libraries and applications.") - - val options = Section("OPTIONS", - - "The " & MBold(command) & " tool has a set of standard options that are " & - "supported on the current development environment and will be supported " & - "in future releases.", - - Section("Global Options", - DefinitionList( - Definition( - CmdOption("d", Argument("dir")), - "Operate on dir as the local managed directory."), - Definition( - CmdOption("n") & "| " & CmdOptionLong("dryrun"), - "Do not actually do anything. Only print out what " + - "tool would normally do with the following arguments."), - Definition( - CmdOption("v") & "| " & CmdOptionLong("verbose"), - "Output messages about what the " & MBold(command) & " tool is doing"), - Definition( - CmdOption("version"), - "Display the version information"), - - Definition( - CmdOptionLong("univ", Argument("name")), - "Operate on the named remote universe, selected from those " & - "in the local managed directory's universe. Affects "& - "the "&MBold("share")&" and "&MBold("retract")&" commands."), - - Definition( - CmdOptionLong("univ-url", Argument("url")), - "Operate on the universe at the specified URL. Affects "& - "the "&MBold("share")&" and "&MBold("retract")&" commands."))), - - Section("Available Commands", - DefinitionList( - Definition( - MBold("available"), - "List the available packages for installation; only display the " + - "three most recent versions of each package."), - Definition( - MBold("available") & " " & CmdOption("a"), - "List the available packages for installation; display all shared " + - "versions of each package."), - Definition( - MBold("compact"), - "Clear the download cache to save space."), - Definition( - MBold("help"), - "Display a help message."), - Definition( - MBold("install"), - "Install a package."), - Definition( - MBold("installed"), - "List the packages that are installed."), - Definition( - MBold("keycreate"), - "Request that a new key be created."), - Definition( - MBold("keyforget"), - "Forget the specified key."), - Definition( - MBold("keyknown"), - "List all known keys."), - Definition( - MBold("keyremember"), - "Remember the specified key for future use."), - Definition( - MBold("keyremoteknown"), - "List all keys known to the bazaar server."), - Definition( - MBold("keyrevoke"), - "Request that a specified key be revoked."), - Definition( - MBold("pack") & " " & Argument("name") & " " & Argument("directory") & - " [ " & Argument("options") & " ]", - "Create an sbaz package and, if a link base is specified, "& - "an advertisement file. The package file is named " & - Mono("name-version.sbp") & ". The advertisement file is named " & - Mono("name-version.advert") & ". The URL is the advertisement " & - "file is the URL base with the package filename appended."), - Definition( - MBold("remove"), - "Remove a package."), - Definition( - MBold("retract"), - "Retract a previously shared package."), - Definition( - MBold("setuniverse"), - "Set the universe for a directory."), - Definition( - MBold("setup"), - "Initialize a directory to be managed."), - Definition( - MBold("share") & " " & Argument("filename"), - "Share a package advertisement on a bazaar."), - Definition( - MBold("share") & " " & CmdOption("i", Argument("descriptor")), - "The package advertisement is usually specified in a file, " & - "but it may also be specified on the command line with the " & - CmdOption("i") & " option."), - Definition( - MBold("share") & " " & CmdOptionLong("template"), - "If " & CmdOptionLong("template") & " is specified, then instead " & - "of uploading a description, the command prints out a template " & - "of a package advertisement."), - Definition( - MBold("show"), - "Show information about one package."), - Definition( - MBold("update"), - "Update the list of available packages."), - Definition( - MBold("upgrade"), - "Upgrade all possible packages.")))) - - val examples = Section("EXAMPLES", - - DefinitionList( - Definition( - "Update the list of available packages.", - CmdLine(MBold("update"))), - Definition( - "Upload package description for " & Mono("scala-devel-2.5.1") & - " to the universe", - CmdLine(MBold("share") & " scala-devel-2.5.1.advert")))) - - val exitStatus = Section("EXIT STATUS", - - MBold(command) & " returns a zero exist status if it succeeds to process " & - "the specified input files. Non zero is returned in case of failure.") - - override val authors = Section("AUTHOR", - - "Written by Lex Spoon.") - - val seeAlso = Section("SEE ALSO", - - Link(Bold("fsc") & "(1)", "fsc.html") & ", " & - Link(Bold("scala") & "(1)", "scala.html") & ", " & - Link(Bold("scalac") & "(1)", "scalac.html") & ", " & - Link(Bold("scaladoc") & "(1)", "scaladoc.html") & ", " & - Link(Bold("scalap") & "(1)", "scalap.html")) - - def manpage = new Document { - title = command - date = "August 2006" - author = "Stephane Micheloud" - version = "0.3" - sections = List( - name, - synopsis, - parameters, - description, - options, - examples, - exitStatus, - authors, - bugs, - copyright, - seeAlso) - } -} diff --git a/src/manual/scala/man1/scala.scala b/src/manual/scala/man1/scala.scala index 368453f3a9..8daab84d3e 100644 --- a/src/manual/scala/man1/scala.scala +++ b/src/manual/scala/man1/scala.scala @@ -250,7 +250,6 @@ object scala extends Command { val seeAlso = Section("SEE ALSO", Link(Bold("fsc") & "(1)", "fsc.html") & ", " & - Link(Bold("sbaz") & "(1)", "sbaz.html") & ", " & Link(Bold("scalac") & "(1)", "scalac.html") & ", " & Link(Bold("scaladoc") & "(1)", "scaladoc.html") & ", " & Link(Bold("scalap") & "(1)", "scalap.html")) diff --git a/src/manual/scala/man1/scalac.scala b/src/manual/scala/man1/scalac.scala index b84510ee16..49324ffa83 100644 --- a/src/manual/scala/man1/scalac.scala +++ b/src/manual/scala/man1/scalac.scala @@ -174,6 +174,8 @@ object scalac extends Command { Definition( Mono(Bold("@") & Argument("file")), "A text file containing compiler arguments (options and source files)") + + // TODO - Add macros an dsuch here. ) ), @@ -424,14 +426,13 @@ object scalac extends Command { val seeAlso = Section("SEE ALSO", Link(Bold("fsc") & "(1)", "fsc.html") & ", " & - Link(Bold("sbaz") & "(1)", "sbaz.html") & ", " & Link(Bold("scala") & "(1)", "scala.html") & ", " & Link(Bold("scaladoc") & "(1)", "scaladoc.html") & ", " & Link(Bold("scalap") & "(1)", "scalap.html")) def manpage = new Document { title = command - date = "September 2011" + date = "March 2012" author = "Stephane Micheloud" version = "1.0" sections = List( diff --git a/src/manual/scala/man1/scaladoc.scala b/src/manual/scala/man1/scaladoc.scala index a6832be4b0..193c77fc51 100644 --- a/src/manual/scala/man1/scaladoc.scala +++ b/src/manual/scala/man1/scaladoc.scala @@ -137,7 +137,6 @@ object scaladoc extends Command { val seeAlso = Section("SEE ALSO", Link(Bold("fsc") & "(1)", "fsc.html") & ", " & - Link(Bold("sbaz") & "(1)", "sbaz.html") & ", " & Link(Bold("scala") & "(1)", "scala.html") & ", " & Link(Bold("scalac") & "(1)", "scalac.html") & ", " & Link(Bold("scalap") & "(1)", "scalap.html")) diff --git a/src/manual/scala/man1/scalap.scala b/src/manual/scala/man1/scalap.scala index cc9b312dac..88fc91957f 100644 --- a/src/manual/scala/man1/scalap.scala +++ b/src/manual/scala/man1/scalap.scala @@ -86,7 +86,6 @@ object scalap extends Command { val seeAlso = Section("SEE ALSO", Link(Bold("fsc") & "(1)", "fsc.html") & ", " & - Link(Bold("sbaz") & "(1)", "sbaz.html") & ", " & Link(Bold("scala") & "(1)", "scala.html") & ", " & Link(Bold("scalac") & "(1)", "scalac.html") & ", " & Link(Bold("scaladoc") & "(1)", "scaladoc.html")) diff --git a/src/manual/scala/tools/docutil/resources/index.html b/src/manual/scala/tools/docutil/resources/index.html index 4e5130aa3d..d1f3bd81f4 100644 --- a/src/manual/scala/tools/docutil/resources/index.html +++ b/src/manual/scala/tools/docutil/resources/index.html @@ -44,8 +44,8 @@ <ul class="ContentList"> <li> - <a href="#basic"><b class="SansSerif">Basic Tools</b></a> (<code>sbaz</code>, - <code>fsc</code>, <code>scala</code>, <code>scalac</code>, <code>scaladoc</code>, + <a href="#basic"><b class="SansSerif">Basic Tools</b></a> (<code>fsc</code>, + <code>scala</code>, <code>scalac</code>, <code>scaladoc</code>, <code>scalap</code>) </li> </ul> @@ -133,17 +133,6 @@ </tr> <tr> <td width="13%" valign="top"> - <span class="tool">sbaz</span> - </td> - <td width="70%" valign="top"> - The Scala sharing tool. - </td> - <td width="17%" valign="top" class="links"> - [<a href="sbaz.html">Solaris, Linux and Windows</a>] - </td> - </tr> - <tr> - <td width="13%" valign="top"> <span class="tool">scala</span> </td> <td width="70%" valign="top"> @@ -191,7 +180,7 @@ <hr/> <div style="font-size:x-small;"> - Copyright (c) 2002-2011 <a href="http://www.epfl.ch/">EPFL</a>, + Copyright (c) 2002-2012 <a href="http://www.epfl.ch/">EPFL</a>, Lausanne, unless specified otherwise.<br/> All rights reserved. </div> |