Changeset f6c8e44 for launchers/macosx/src

Timestamp:

May 1, 2018 11:15:11 AM (3 years ago)

Author:

meeh <meeh@…>

Branches:

master

Children:

c326bb7

Parents:

345e741

Message:

Jar deployment, SBT hacking, and more related to launcher code.
Some refactoring, bugfixing, and self awareness of launcher jar.

File:

• launchers/macosx/src/main/scala/net/i2p/MacOSXRouterLauncherApp.scala (modified) (3 diffs)

launchers/macosx/src/main/scala/net/i2p/MacOSXRouterLauncherApp.scala

@@ -1 +1 @@
 package net.i2p
 
-import net.i2p.router.Router
+import java.io.File
+
+import collection.JavaConverters._
 import net.i2p.launchers.{OSXDefaults, OSXDeployment}
-import java.io.File
 
 /**
@@ -35 +36 @@
 object MacOSXRouterLauncherApp extends App {
 
-  val i2pBaseDir = new File(OSXDefaults.getOSXBaseDirectory)
+  val i2pBaseDir = OSXDefaults.getOSXBaseDirectory
+
 
   new OSXDeployment()
@@ -42 +44 @@
   System.setProperty("user.dir", i2pBaseDir.getAbsolutePath)
 
-  Router.main(args)
+  val i2pJarDir = new File(i2pBaseDir.getAbsolutePath, "lib")
+  i2pJarDir.list().toList.map { jar => {
+    val jarFile = new File(i2pJarDir, jar)
+    println(s"Loading jar: ${jarFile.toURI.toURL} => ${MacOSXRouterLauncher.addJarToClassPath(jarFile.toURI.toURL)}")
+
+  } }
+
+  MacOSXRouterLauncher.runRouter(args)
+  //net.i2p.Router.main(args)
 }