Ignore:
Timestamp:
Jul 13, 2018 6:30:16 AM (23 months ago)
Author:
meeh <meeh@…>
Branches:
master
Children:
818e70d
Parents:
21b3864
Message:

Fixed a load of issues related to my "sync" approach, and Mac OSX's "async" API.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • launchers/macosx/build.sbt

    r21b3864 r6d0f80f  
    2222unmanagedBase in Compile := baseDirectory.value / ".." / ".." / "pkg-temp" / "lib"
    2323
     24
    2425// Unmanaged classpath will be available at compile time
    2526unmanagedClasspath in Compile ++= Seq(
    26   baseDirectory.value / ".." / ".." / "pkg-temp" / "lib" / "*.jar"
     27    baseDirectory.value / ".." / ".." / "pkg-temp" / "lib" / "*.jar"
    2728)
    2829
    2930assemblyOption in assembly := (assemblyOption in assembly).value.copy(includeScala = false, includeDependency = false)
    3031
     32assemblyExcludedJars in assembly := {
     33    val cp = (fullClasspath in assembly).value
     34    cp filter { c => jarsForCopy.toList.contains(c.data.getName) }
     35}
    3136
    32 assemblyJarName in assembly := s"launcher.jar"
     37/*
    3338
    34 assemblyExcludedJars in assembly := {
    35   val cp = (fullClasspath in assembly).value
    36   cp filter { c => jarsForCopy.toList.contains(c.data.getName) }
    37 }
     39assemblyJarName in assembly := s"package.jar"
    3840
    3941// TODO: MEEH: Add assemblyExcludedJars and load the router from own jar files, to handle upgrades better.
     
    105107
    106108}
     109*/
Note: See TracChangeset for help on using the changeset viewer.