Permalink
Browse files

Moved scaladoc sources into separate directory.

This change is not externally visible. It moves the scaladoc
sources into src/scaladoc and adds an ant target for building
them. The compilation products are still packaged into
scala-compiler.jar as before, but with a small change to
build.xml a separate jar can be created instead.
  • Loading branch information...
1 parent 9094822 commit c6ca941ccc017a8869f4def717cfeb640f965077 @paulp paulp committed with adriaanm Mar 6, 2013
Showing with 55 additions and 5 deletions.
  1. +51 −1 build.xml
  2. 0 src/{compiler → scaladoc}/scala/tools/ant/Scaladoc.scala
  3. 0 src/{compiler → scaladoc}/scala/tools/nsc/ScalaDoc.scala
  4. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/DocFactory.scala
  5. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/DocParser.scala
  6. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/Index.scala
  7. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/ScaladocGlobal.scala
  8. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/Settings.scala
  9. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/Uncompilable.scala
  10. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/Universe.scala
  11. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/base/CommentFactoryBase.scala
  12. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/base/LinkTo.scala
  13. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/base/MemberLookupBase.scala
  14. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/base/comment/Body.scala
  15. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/base/comment/Comment.scala
  16. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/doclet/Generator.scala
  17. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/doclet/Indexer.scala
  18. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/doclet/Universer.scala
  19. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/html/Doclet.scala
  20. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/html/HtmlFactory.scala
  21. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/html/HtmlPage.scala
  22. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/html/Page.scala
  23. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/html/SyntaxHigh.scala
  24. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/html/page/Index.scala
  25. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/html/page/IndexScript.scala
  26. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/html/page/ReferenceIndex.scala
  27. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/html/page/Source.scala
  28. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/html/page/Template.scala
  29. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/html/page/diagram/DiagramGenerator.scala
  30. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/html/page/diagram/DiagramStats.scala
  31. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/html/page/diagram/DotDiagramGenerator.scala
  32. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/html/page/diagram/DotRunner.scala
  33. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/arrow-down.png
  34. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/arrow-right.png
  35. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/class.png
  36. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/class_big.png
  37. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/class_diagram.png
  38. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/class_to_object_big.png
  39. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/constructorsbg.gif
  40. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/conversionbg.gif
  41. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/defbg-blue.gif
  42. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/defbg-green.gif
  43. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/diagrams.css
  44. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/diagrams.js
  45. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/filter_box_left.png
  46. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/filter_box_left.psd
  47. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/filter_box_left2.gif
  48. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/filter_box_right.png
  49. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/filter_box_right.psd
  50. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/filterbg.gif
  51. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/filterboxbarbg.gif
  52. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/filterboxbarbg.png
  53. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/filterboxbg.gif
  54. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/fullcommenttopbg.gif
  55. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/index.css
  56. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/index.js
  57. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/jquery-ui.js
  58. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/jquery.js
  59. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/jquery.layout.js
  60. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/modernizr.custom.js
  61. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/navigation-li-a.png
  62. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/navigation-li.png
  63. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/object.png
  64. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/object_big.png
  65. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/object_diagram.png
  66. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/object_to_class_big.png
  67. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/object_to_trait_big.png
  68. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/object_to_type_big.png
  69. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/ownderbg2.gif
  70. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/ownerbg.gif
  71. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/ownerbg2.gif
  72. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/package.png
  73. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/package_big.png
  74. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/packagesbg.gif
  75. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/raphael-min.js
  76. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/ref-index.css
  77. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/remove.png
  78. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/remove.psd
  79. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/scheduler.js
  80. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/selected-implicits.png
  81. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/selected-right-implicits.png
  82. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/selected-right.png
  83. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/selected.png
  84. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/selected2-right.png
  85. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/selected2.png
  86. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/signaturebg.gif
  87. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/signaturebg2.gif
  88. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/template.css
  89. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/template.js
  90. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/tools.tooltip.js
  91. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/trait.png
  92. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/trait_big.png
  93. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/trait_diagram.png
  94. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/trait_to_object_big.png
  95. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/type.png
  96. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/type_big.png
  97. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/type_diagram.png
  98. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/type_tags.ai
  99. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/type_to_object_big.png
  100. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/typebg.gif
  101. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/unselected.png
  102. BIN src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/valuemembersbg.gif
  103. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/html/resource/lib/versions.txt
  104. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/model/CommentFactory.scala
  105. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/model/Entity.scala
  106. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/model/IndexModelFactory.scala
  107. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/model/MemberLookup.scala
  108. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/model/ModelFactory.scala
  109. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/model/ModelFactoryImplicitSupport.scala
  110. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/model/ModelFactoryTypeSupport.scala
  111. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/model/TreeEntity.scala
  112. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/model/TreeFactory.scala
  113. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/model/TypeEntity.scala
  114. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/model/ValueArgument.scala
  115. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/model/Visibility.scala
  116. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/model/diagram/Diagram.scala
  117. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/model/diagram/DiagramDirectiveParser.scala
  118. 0 src/{compiler → scaladoc}/scala/tools/nsc/doc/model/diagram/DiagramFactory.scala
  119. 0 src/{partest → scaladoc}/scala/tools/partest/ScaladocModelTest.scala
  120. 0 test/{files → scaladoc}/run/t5527.check
  121. 0 test/{files → scaladoc}/run/t5527.scala
  122. +1 −1 test/scaladoc/scalacheck/IndexScriptTest.scala
  123. +3 −3 test/scaladoc/scalacheck/IndexTest.scala
View
@@ -1268,7 +1268,55 @@ QUICK BUILD (QUICK)
<stopwatch name="quick.partest.timer" action="total"/>
</target>
- <target name="quick.pre-bin" depends="quick.partest">
+ <target name="quick.pre-scaladoc" depends="quick.partest">
+ <uptodate property="quick.scaladoc.available" targetfile="${build-quick.dir}/scaladoc.complete">
+ <srcfiles dir="${src.dir}/scaladoc" />
+ </uptodate>
+ </target>
+
+ <target name="quick.scaladoc" depends="quick.pre-scaladoc" unless="quick.scaladoc.available">
+ <mkdir dir="${build-quick.dir}/classes/scaladoc"/>
+ <scalacfork
+ destdir="${build-quick.dir}/classes/scaladoc"
+ compilerpathref="quick.classpath"
+ params="${scalac.args.quick}"
+ srcdir="${src.dir}/scaladoc"
+ jvmargs="${scalacfork.jvmargs}">
+ <include name="**/*.scala"/>
+ <compilationpath>
+ <pathelement location="${build-quick.dir}/classes/library"/>
+ <pathelement location="${build-quick.dir}/classes/reflect"/>
+ <pathelement location="${build-quick.dir}/classes/compiler"/>
+ <pathelement location="${build-quick.dir}/classes/scalap"/>
+ <pathelement location="${build-quick.dir}/classes/partest"/>
+ <pathelement location="${build-quick.dir}/classes/scaladoc"/>
+ <pathelement location="${ant.jar}"/>
+ <path refid="forkjoin.classpath"/>
+ <pathelement location="${scalacheck.jar}"/>
+ </compilationpath>
+ </scalacfork>
+ <propertyfile file="${build-quick.dir}/classes/scaladoc/scaladoc.properties">
+ <entry key="version.number" value="${scaladoc.version.number}"/>
+ <entry key="copyright.string" value="${copyright.string}"/>
+ </propertyfile>
+ <copy todir="${build-quick.dir}/classes/scaladoc">
+ <fileset dir="${src.dir}/scaladoc">
+ <include name="**/*.tmpl"/>
+ <include name="**/*.xml"/>
+ <include name="**/*.js"/>
+ <include name="**/*.css"/>
+ <include name="**/*.html"/>
+ <include name="**/*.properties"/>
+ <include name="**/*.swf"/>
+ <include name="**/*.png"/>
+ <include name="**/*.gif"/>
+ <include name="**/*.txt"/>
+ </fileset>
+ </copy>
+ <touch file="${build-quick.dir}/scaladoc.complete" verbose="no"/>
+ </target>
+
+ <target name="quick.pre-bin" depends="quick.scaladoc">
<condition property="quick.bin.available">
<isset property="quick.comp.available"/>
</condition>
@@ -1407,6 +1455,7 @@ PACKED QUICK BUILD (PACK)
<mkdir dir="${build-pack.dir}/lib"/>
<jar destfile="${build-pack.dir}/lib/scala-compiler.jar" manifest="${build-pack.dir}/META-INF/MANIFEST.MF">
<fileset dir="${build-quick.dir}/classes/compiler"/>
+ <fileset dir="${build-quick.dir}/classes/scaladoc"/>
<fileset dir="${build-asm.dir}/classes"/>
</jar>
<copy file="${jline.jar}" toDir="${build-pack.dir}/lib"/>
@@ -1912,6 +1961,7 @@ SBT Compiler Interface
jvmargs="${scalacfork.jvmargs}">
<include name="**/*.scala"/>
<compilationpath>
+ <pathelement location="${build-quick.dir}/classes/scaladoc"/>
<pathelement location="${build-quick.dir}/classes/library"/>
<pathelement location="${build-quick.dir}/classes/reflect"/>
<pathelement location="${build-quick.dir}/classes/compiler"/>
File renamed without changes.
File renamed without changes.
@@ -35,7 +35,7 @@ object Test extends Properties("IndexScript") {
}
property("allPackages") = {
- createIndexScript("src/compiler/scala/tools/nsc/doc/html/page/Index.scala") match {
+ createIndexScript("src/scaladoc/scala/tools/nsc/doc/html/page/Index.scala") match {
case Some(index) =>
index.allPackages.map(_.toString) == List(
"scala",
@@ -56,23 +56,23 @@ object Test extends Properties("Index") {
}
property("path") = {
- createIndex("src/compiler/scala/tools/nsc/doc/html/page/Index.scala") match {
+ createIndex("src/scaladoc/scala/tools/nsc/doc/html/page/Index.scala") match {
case Some(index) =>
index.path == List("index.html")
case None => false
}
}
property("title") = {
- createIndex("src/compiler/scala/tools/nsc/doc/html/page/Index.scala") match {
+ createIndex("src/scaladoc/scala/tools/nsc/doc/html/page/Index.scala") match {
case Some(index) =>
index.title == ""
case None => false
}
}
property("browser contants a script element") = {
- createIndex("src/compiler/scala/tools/nsc/doc/html/page/Index.scala") match {
+ createIndex("src/scaladoc/scala/tools/nsc/doc/html/page/Index.scala") match {
case Some(index) =>
(index.browser \ "script").size == 1

0 comments on commit c6ca941

Please sign in to comment.