Skip to content

Commit 992898b

Browse files
committed
migrate comments
1 parent 98ff77d commit 992898b

File tree

11 files changed

+27
-27
lines changed

11 files changed

+27
-27
lines changed

src/main/scala/com/typesafe/sbt/packager/archetypes/JavaAppPackaging.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ object JavaAppPackaging extends AutoPlugin {
4848
// Here we record the classpath as it's added to the mappings separately, so
4949
// we can use its order to generate the bash/bat scripts.
5050
scriptClasspathOrdering := Nil,
51-
// Note: This is sometimes on the classpath via dependencyClasspath in Runtime.
51+
// Note: This is sometimes on the classpath via Runtime / dependencyClasspath.
5252
// We need to figure out why sometimes the Attributed[File] is correctly configured
5353
// and sometimes not.
5454
scriptClasspathOrdering += {

src/main/scala/com/typesafe/sbt/packager/archetypes/JavaServerApplication.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ object JavaServerAppPackaging extends AutoPlugin {
209209
* @param name
210210
* of the etc-default config file
211211
* @param tmpDir
212-
* to store the resulting file in (e.g. target in Universal)
212+
* to store the resulting file in (e.g. Universal / target)
213213
* @param source
214214
* of etc-default script
215215
* @param replacements

src/main/scala/com/typesafe/sbt/packager/archetypes/MaintainerScriptHelper.scala

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ trait MaintainerScriptHelper {
1616
* @example
1717
* {{{
1818
* import DebianConstants._
19-
* maintainerScripts in Debian := maintainerScriptsFromDirectory(
19+
* Debian / maintainerScripts := maintainerScriptsFromDirectory(
2020
* sourceDirectory.value / DebianSource / DebianMaintainerScripts, Seq(Preinst, Postinst, Prerm, Postrm)
2121
* )
2222
* }}}
@@ -43,29 +43,29 @@ trait MaintainerScriptHelper {
4343
* Adding content from a string
4444
* {{{
4545
* import RpmConstants._
46-
* maintainerScripts in Rpm := maintainerScriptsAppend((maintainerScripts in Rpm).value)(
46+
* Rpm / maintainerScripts := maintainerScriptsAppend((Rpm / maintainerScripts).value)(
4747
* Pretrans -> "echo 'hello, world'",
48-
* Post -> "echo 'installing " + (packageName in Rpm).value + "'"
48+
* Post -> "echo 'installing " + (Rpm / packageName).value + "'"
4949
* )
5050
* }}}
5151
*
5252
* @example
5353
* Adding content from a string and use script replacements
5454
* {{{
5555
* import DebianConstants._
56-
* maintainerScripts in Rpm := maintainerScriptsAppend(
57-
* (maintainerScripts in Debian).value,
58-
* (linuxScriptReplacements in Debian).value
56+
* Rpm / maintainerScripts := maintainerScriptsAppend(
57+
* (Debian / maintainerScripts).value,
58+
* (Debian / linuxScriptReplacements).value
5959
* )(
6060
* Preinst -> "echo 'hello, world'",
61-
* Postinst -> s"echo 'installing ${(packageName in Debian).value}'"
61+
* Postinst -> s"echo 'installing ${(Debian packageName).value}'"
6262
* )
6363
* }}}
6464
*
6565
* @param current
6666
* maintainer scripts
6767
* @param replacements
68-
* (e.g. (linuxScriptReplacements in Debian).value)
68+
* (e.g. (Debian / linuxScriptReplacements).value)
6969
* @param scripts
7070
* scriptName -> scriptContent pairs
7171
* @return
@@ -90,7 +90,7 @@ trait MaintainerScriptHelper {
9090
* Adding content from a string
9191
* {{{
9292
* import RpmConstants._
93-
* maintainerScripts in Rpm := maintainerScriptsAppendFromFile((maintainerScripts in Rpm).value)(
93+
* Rpm / maintainerScripts := maintainerScriptsAppendFromFile((Rpm / maintainerScripts).value)(
9494
* Pretrans -> (sourceDirectory.value / "rpm" / "pretrans"),
9595
* Post -> (sourceDirectory.value / "rpm" / "posttrans")
9696
* )

src/main/scala/com/typesafe/sbt/packager/archetypes/scripts/ApplicationIniGenerator.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ trait ApplicationIniGenerator {
3535
// TODO: merge JVM options into the existing application.ini?
3636
log.warn("--------!!! JVM Options are defined twice !!!-----------")
3737
log.warn(
38-
"application.ini is already present in output package. Will be overridden by 'javaOptions in Universal'"
38+
"application.ini is already present in output package. Will be overridden by 'Universal / javaOptions'"
3939
)
4040
false
4141

src/main/scala/com/typesafe/sbt/packager/archetypes/scripts/StartScriptMainClassConfig.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ object StartScriptMainClassConfig {
4040

4141
/**
4242
* @param mainClass
43-
* optional main class, e.g. from (mainClass in Compile).value
43+
* optional main class, e.g. from (Compile / mainClass).value
4444
* @param discoveredMainClasses
45-
* all discovered main classes, e.g. from (discoveredMainClasses in Compile).value
45+
* all discovered main classes, e.g. from (Compile / discoveredMainClasses).value
4646
* @return
4747
* A start script configuration
4848
*/

src/main/scala/com/typesafe/sbt/packager/archetypes/systemloader/package.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ package object systemloader {
6767
): Seq[LinuxPackageMapping] = {
6868
val name = scriptName.getOrElse(
6969
sys.error(
70-
"""No linuxStartScriptName defined. Add `linuxStartScriptName in <PackageFormat> := Some("name.service")"""
70+
"""No linuxStartScriptName defined. Add `<PackageFormat> / linuxStartScriptName := Some("name.service")"""
7171
)
7272
)
7373
val path = location + "/" + name

src/main/scala/com/typesafe/sbt/packager/debian/JDebPackaging.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ object JDebPackaging extends AutoPlugin with DebianPluginLike {
4848
val data = debianPackageMetadata.value
4949
val size = debianPackageInstallSize.value
5050
if (data.info.description == null || data.info.description.isEmpty)
51-
sys.error("""packageDescription in Debian cannot be empty. Use
52-
packageDescription in Debian := "My package Description"""")
51+
sys.error("""Debian / packageDescription cannot be empty. Use
52+
Debian / packageDescription := "My package Description"""")
5353
val cfile = target.value / Names.DebianMaintainerScripts / Names.Control
5454
IO.write(cfile, data.makeContent(size), java.nio.charset.Charset.defaultCharset)
5555
cfile

src/main/scala/com/typesafe/sbt/packager/docker/DockerPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@ object DockerPlugin extends AutoPlugin {
625625
}
626626

627627
/**
628-
* uses the `mappings in Universal` to generate the `Docker / mappings`.
628+
* uses the `Universal / mappings` to generate the `Docker / mappings`.
629629
*/
630630
def mapGenericFilesToDocker: Seq[Setting[_]] = {
631631
def renameDests(from: Seq[(File, String)], dest: String) =

src/main/scala/com/typesafe/sbt/packager/jdkpackager/JDKPackagerAntHelper.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,9 @@ object JDKPackagerAntHelper {
184184

185185
if (antTaskLib.isEmpty)
186186
sys.error(
187-
"Please set key `antPackagerTasks in JDKPackager` to `ant-javafx.jar` path, " +
187+
"Please set key `JDKPackager / antPackagerTasks` to `ant-javafx.jar` path, " +
188188
"which should be found in the `lib` directory of the Oracle JDK 8 installation. For example (Windows):\n" +
189-
"""(antPackagerTasks in JDKPackager) := Some(file("C:\\Program Files\\Java\\jdk1.8.0_45\\lib\\ant-javafx.jar"))"""
189+
"""(JDKPackager / antPackagerTasks) := Some(file("C:\\Program Files\\Java\\jdk1.8.0_45\\lib\\ant-javafx.jar"))"""
190190
)
191191

192192
val taskClassPath = antTaskLib.get +: antExtraClasspath

src/main/scala/com/typesafe/sbt/packager/rpm/RpmMetadata.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,14 +152,14 @@ case class RpmSpec(
152152
// format: off
153153
val emptyValidators =
154154
Seq(
155-
ensureOr(meta.name, "`name in Rpm` is empty. Please provide one.", isNonEmpty),
156-
ensureOr(meta.version, "`version in Rpm` is empty. Please provide a valid version for the rpm SPEC.", isNonEmpty),
155+
ensureOr(meta.name, "`Rpm / name` is empty. Please provide one.", isNonEmpty),
156+
ensureOr(meta.version, "`Rpm / version` is empty. Please provide a valid version for the rpm SPEC.", isNonEmpty),
157157
ensureOr(meta.release, "`rpmRelease` is empty. Please provide a valid release number for the rpm SPEC.", isNonEmpty),
158-
ensureOr(meta.arch, "`packageArchitecture in Rpm` is empty. Please provide a valid architecture for the rpm SPEC.", isNonEmpty),
158+
ensureOr(meta.arch, "`Rpm / packageArchitecture` is empty. Please provide a valid architecture for the rpm SPEC.", isNonEmpty),
159159
ensureOr(meta.vendor, "`rpmVendor` is empty. Please provide a valid vendor for the rpm SPEC.", isNonEmpty),
160160
ensureOr(meta.os, "`rpmOs` is empty. Please provide a valid os value for the rpm SPEC.", isNonEmpty),
161-
ensureOr(meta.summary, "`packageSummary in Rpm` is empty. Please provide a valid summary for the rpm SPEC.", isNonEmpty),
162-
ensureOr(meta.description, "`packageDescription in Rpm` is empty. Please provide a valid description for the rpm SPEC.", isNonEmpty)
161+
ensureOr(meta.summary, "`Rpm / packageSummary` is empty. Please provide a valid summary for the rpm SPEC.", isNonEmpty),
162+
ensureOr(meta.description, "`Rpm / packageDescription` is empty. Please provide a valid description for the rpm SPEC.", isNonEmpty)
163163
)
164164
// format: on
165165
// TODO - Continue validating after this point?

0 commit comments

Comments
 (0)