zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
meeh
2018-07-13 06:30:16 +00:00
parent 21b3864dfd
commit 6d0f80fa1e
14 changed files with 498 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
launchers/macosx/build.sbt
View File

@@ -21,21 +21,23 @@ resourceDirectory in Compile := baseDirectory.value / ".." / ".." / "installer"
// Unmanaged base will be included in a fat jar
unmanagedBase in Compile := baseDirectory.value / ".." / ".." / "pkg-temp" / "lib"
// Unmanaged classpath will be available at compile time
unmanagedClasspath in Compile ++= Seq(
baseDirectory.value / ".." / ".." / "pkg-temp" / "lib" / "*.jar"
baseDirectory.value / ".." / ".." / "pkg-temp" / "lib" / "*.jar"
)
assemblyOption in assembly := (assemblyOption in assembly).value.copy(includeScala = false, includeDependency = false)
assemblyJarName in assembly := s"launcher.jar"
assemblyExcludedJars in assembly := {
val cp = (fullClasspath in assembly).value
cp filter { c => jarsForCopy.toList.contains(c.data.getName) }
val cp = (fullClasspath in assembly).value
cp filter { c => jarsForCopy.toList.contains(c.data.getName) }
}
/*
assemblyJarName in assembly := s"package.jar"
// TODO: MEEH: Add assemblyExcludedJars and load the router from own jar files, to handle upgrades better.
// In fact, most likely the bundle never would need an update except for the router jars/wars.
@@ -104,3 +106,4 @@ buildAppBundleTask := {
println(s"Zip placed into bundle :)")
}
*/