Skip to content

Commit bf9077c

Browse files
authored
openequella#555 Create a scripting api javadoc zip (openequella#597)
* openequella#555 Create a scripting api javadoc zip * Log before the zip
1 parent 870e3fe commit bf9077c

File tree

7 files changed

+6092
-6059
lines changed

7 files changed

+6092
-6059
lines changed

.travis.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ before_install:
1212
install:
1313
- git fetch --unshallow
1414
script:
15-
- sbt headerCheck test installerZip writeLanguagePack
15+
- sbt headerCheck test installerZip writeLanguagePack writeScriptingJavadoc
1616
after_success:
1717
- aws s3 --region us-east-1 cp Source/Server/equellaserver/target/tle-upgrade*.zip s3://edalexdev/equella_artifacts/$TRAVIS_BRANCH/$TRAVIS_BUILD_NUMBER/
1818
- aws s3 --region us-east-1 cp Installer/target/equella-installer*.zip s3://edalexdev/equella_artifacts/$TRAVIS_BRANCH/$TRAVIS_BUILD_NUMBER/
1919
- aws s3 --region us-east-1 cp target/reference-language-pack.zip s3://edalexdev/equella_artifacts/$TRAVIS_BRANCH/$TRAVIS_BUILD_NUMBER/
20+
- aws s3 --region us-east-1 cp target/scriptingapi-javadoc-*.zip s3://edalexdev/equella_artifacts/$TRAVIS_BRANCH/$TRAVIS_BUILD_NUMBER/
2021
- aws s3 --region us-east-1 rm --recursive s3://edalexdev/equella_artifacts/$TRAVIS_BRANCH/latest/
2122
- aws s3 --region us-east-1 cp --recursive s3://edalexdev/equella_artifacts/$TRAVIS_BRANCH/$TRAVIS_BUILD_NUMBER/ s3://edalexdev/equella_artifacts/$TRAVIS_BRANCH/latest/
2223
env:

Source/Plugins/Core/com.equella.core/build.sbt

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import Path.rebase
22
import Path.flat
33

4-
import scala.io.Source
54
import _root_.io.circe.parser._
65

76
langStrings := {

Source/Plugins/Core/com.equella.core/plugin-jpf.xml

+6,052-6,052
Large diffs are not rendered by default.

Source/Plugins/Core/com.equella.core/src/com/tle/core/userscript/scriptobject/UserScriptObject.java Source/Plugins/Core/com.equella.core/src/com/tle/core/userscript/scriptobject/UserScriptObjectImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
@Bind
3333
@Singleton
34-
public class UserScriptObject implements UserScriptObjectContributor
34+
public class UserScriptObjectImpl implements UserScriptObjectContributor
3535
{
3636
@Inject
3737
private UserScriptsDao userScriptDao;

build.sbt

+35-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
12
import java.util.Properties
23

3-
import complete.DefaultParsers._
44
import com.typesafe.sbt.license.LicenseReport
5-
6-
import scala.collection.JavaConverters._
75
import sbt.io.Using
6+
import Path.rebase
7+
import scala.collection.JavaConverters._
88

99
lazy val learningedge_config = project in file("Dev/learningedge-config")
1010

@@ -130,6 +130,9 @@ val pluginAndLibs = Def.task {
130130
}
131131

132132
mergeJPF := {
133+
134+
import complete.DefaultParsers._
135+
133136
val adminConsole = false
134137
val args = spaceDelimited("<arg>").parsed
135138
val _allPluginDirs = pluginAndLibs.all(ScopeFilter(inAggregates(allPlugins, includeRoot = false))).value
@@ -145,3 +148,32 @@ mergeJPF := {
145148
PluginRefactor.mergePlugins(allPluginDirs, basePlugin, newPlugin, args.tail, adminConsole = adminConsole)
146149
}
147150
}
151+
152+
writeScriptingJavadoc := {
153+
val javadocDir = (doc in Compile).value
154+
val ver = version.value
155+
val outZip = target.value / s"scriptingapi-javadoc-$ver.zip"
156+
sLog.value.info(s"Writing ${outZip.absolutePath}")
157+
IO.zip((javadocDir ** "*").pair(rebase(javadocDir, "")), outZip)
158+
outZip
159+
}
160+
161+
162+
val userBeans : FileFilter = ("GroupBean.java" || "UserBean.java" || "RoleBean.java") &&
163+
new SimpleFileFilter(_.getParentFile.getName == "valuebean")
164+
165+
// Globs came from the original ant scripts
166+
167+
def javadocSources(base: File): PathFinder = {
168+
(base / "src") ** ("package-info.java" || "*ScriptType.java"
169+
|| "*ScriptObject.java" || userBeans)
170+
}
171+
172+
aggregate in (Compile, doc) := false
173+
sources in (Compile, doc) := {
174+
(javadocSources((baseDirectory in LocalProject("com_equella_base")).value)
175+
+++ javadocSources((baseDirectory in LocalProject("com_equella_core")).value))
176+
.get
177+
}
178+
javacOptions in (Compile, doc) := Seq()
179+

buildspec.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ phases:
1111
- setupBuild
1212
build:
1313
commands:
14-
- sbt -no-colors -Dconfig.file=${HOME}/build.conf test installerZip writeLanguagePack
14+
- sbt -no-colors -Dconfig.file=${HOME}/build.conf test installerZip writeLanguagePack writeScriptingJavadoc
1515
post_build:
1616
commands:
1717
- publishBuild

project/CommonSettings.scala

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ object CommonSettings extends AutoPlugin {
2020
lazy val writeSourceZip = taskKey[File]("Write out a zip containing all sources")
2121
lazy val langStrings = taskKey[Seq[LangStrings]]("Fully qualified language strings")
2222
lazy val writeLanguagePack = taskKey[File]("Write the default language pack")
23+
lazy val writeScriptingJavadoc = taskKey[File]("Write the scripting javadoc")
2324
lazy val mergeJPF = inputKey[Unit]("Merge all")
2425
lazy val buildJS = taskKey[Seq[File]]("Build JS resources")
2526

0 commit comments

Comments
 (0)