Changeset 975d8a0 for launchers


Ignore:
Timestamp:
May 1, 2018 3:21:04 AM (2 years ago)
Author:
meeh <meeh@…>
Branches:
master
Children:
6b0a102c
Parents:
2d15f8e1
Message:

Cleaned up in SBT build file. Sorted assignments, task definitions and such.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • launchers/macosx/build.sbt

    r2d15f8e1 r975d8a0  
    2121)
    2222
    23 // Pointing the resources directory to the "installer" directory
    24 resourceDirectory in Compile := baseDirectory.value / ".." / ".." / "installer" / "resources"
    2523lazy val resDir = new File("./../installer/resources")
    2624lazy val i2pBuildDir = new File("./../build")
    2725lazy val warsForCopy = i2pBuildDir.list.filter { f => f.endsWith(".war") }
    2826lazy val jarsForCopy = i2pBuildDir.list.filter { f => f.endsWith(".jar") }
     27
     28
     29
     30
     31// Pointing the resources directory to the "installer" directory
     32resourceDirectory in Compile := baseDirectory.value / ".." / ".." / "installer" / "resources"
     33
     34// Unmanaged classpath will be available at compile time
     35unmanagedClasspath in Compile ++= Seq(
     36  baseDirectory.value / ".." / ".." / "build" / "*.jar",
     37  baseDirectory.value / ".." / ".." / "router" / "java" / "src"
     38)
     39
     40// Please note the difference between browserbundle, this has
     41// the "in Compile" which limit it's scope to that.
     42//unmanagedBase in Compile := baseDirectory.value / ".." / ".." / "build"
     43
     44libraryDependencies ++= Seq(
     45  "net.i2p" % "router" % i2pVersion % Compile
     46)
     47
     48
     49//assemblyOption in assembly := (assemblyOption in assembly).value.copy(prependShellScript = Some(defaultShellScript))
     50
     51assemblyJarName in assembly := s"${name.value}-${version.value}"
     52
     53
     54// TODO: MEEH: Add assemblyExcludedJars and load the router from own jar files, to handle upgrades better.
     55// In fact, most likely the bundle never would need an update except for the router jars/wars.
    2956
    3057convertToICNSTask := {
     
    3764  val paths = Map[String,File](
    3865    "execBundlePath" -> new File(bundleBuildPath, "I2P.app/Contents/MacOS"),
    39      "resBundlePath" -> new File(bundleBuildPath, "I2P.app/Contents/Resources"),
    40      "i2pbaseBunldePath" -> new File(bundleBuildPath, "I2P.app/Contents/Resources/i2pbase"),
     66    "resBundlePath" -> new File(bundleBuildPath, "I2P.app/Contents/Resources"),
     67    "i2pbaseBunldePath" -> new File(bundleBuildPath, "I2P.app/Contents/Resources/i2pbase"),
    4168    "i2pJarsBunldePath" -> new File(bundleBuildPath, "I2P.app/Contents/Resources/i2pbase/lib"),
    42      "webappsBunldePath" -> new File(bundleBuildPath, "I2P.app/Contents/Resources/i2pbase/webapps")
     69    "webappsBunldePath" -> new File(bundleBuildPath, "I2P.app/Contents/Resources/i2pbase/webapps")
    4370  )
    4471  paths.map { case (s,p) => p.mkdirs() }
     
    6188  warsForCopy.map { j => IO.copyFile( new File(i2pBuildDir, j), new File(paths.get("i2pJarsBunldePath").get, j) ) }
    6289}
    63 
    64 // Unmanaged classpath will be available at compile time
    65 unmanagedClasspath in Compile ++= Seq(
    66   baseDirectory.value / ".." / ".." / "build" / "*.jar",
    67   baseDirectory.value / ".." / ".." / "router" / "java" / "src"
    68 )
    69 
    70 // Please note the difference between browserbundle, this has
    71 // the "in Compile" which limit it's scope to that.
    72 //unmanagedBase in Compile := baseDirectory.value / ".." / ".." / "build"
    73 
    74 libraryDependencies ++= Seq(
    75   "net.i2p" % "router" % i2pVersion % Compile
    76 )
    77 
    78 
    79 //assemblyOption in assembly := (assemblyOption in assembly).value.copy(prependShellScript = Some(defaultShellScript))
    80 
    81 assemblyJarName in assembly := s"${name.value}-${version.value}"
Note: See TracChangeset for help on using the changeset viewer.