Changeset d4dd0ea for launchers

Timestamp:

Jun 30, 2018 1:11:17 PM (2 years ago)

Author:

meeh <meeh@…>

Branches:

master

Children:

3b34581

Parents:

0b01cc5

Message:

Adjustments in Scala code to adopt to work with the Obj-C++ code.

Location:

launchers

Files:

• build.sbt (modified) (1 diff)
• macosx/Info.plist (deleted)
• macosx/build.sbt (modified) (3 diffs)
• macosx/src/main/scala/net/i2p/launchers/osx/LauncherAppMain.scala (modified) (1 diff)
• macosx/src/main/scala/net/i2p/launchers/osx/MacOSXRouterLauncher.scala (modified) (1 diff)

launchers/build.sbt

@@ -41 +41 @@
   .settings(
     commonSettings,
-    name         := "MacI2PLauncher",
+    name         := "RouterPack.jar",
     mainClass in assembly := Some("net.i2p.launchers.osx.LauncherAppMain")
   ).dependsOn(common)

launchers/macosx/build.sbt

@@ -2 +2 @@
 import java.util.zip._
 
-lazy val i2pVersion = "0.9.34"
+lazy val i2pVersion = "0.9.35"
 
 lazy val cleanAllTask = taskKey[Unit]("Clean up and remove the OSX bundle")
@@ -25 +25 @@
 lazy val jarsForCopy = new File(i2pBuildDir, "lib").list.filter { f => f.endsWith(".jar") }
 
-
+// TODO: Meeh: To be removed - logic is moved to obj-cpp
 def defaultOSXLauncherShellScript(javaOpts: Seq[String] = Seq.empty): Seq[String] = {
   val javaOptsString = javaOpts.map(_ + " ").mkString
@@ -139 +139 @@
   launcherBinary.map { l => IO.copyFile( new File(l.toString), new File(paths.get("execBundlePath").get, "I2P") ) }
 
-
-  val plistFile = new File("./macosx/Info.plist")
-  if (plistFile.exists()) {
-    println(s"Adding Info.plist...")
-    IO.copyFile(plistFile, new File(bundleBuildPath, "I2P.app/Contents/Info.plist"))
-  }
-
   val zipFilePath = Some(buildDeployZipTask.value)
 

launchers/macosx/src/main/scala/net/i2p/launchers/osx/LauncherAppMain.scala

@@ -88 +88 @@
     }
 
-    //Await.result(routerProcess, 5000 millis)
-
   } finally {
     System.out.println("Exit?")

launchers/macosx/src/main/scala/net/i2p/launchers/osx/MacOSXRouterLauncher.scala

@@ -17 +17 @@
   */
 object MacOSXRouterLauncher extends RouterLauncher {
-
-  def pid(p: Process): Long = {
-    val procField = p.getClass.getDeclaredField("p")
-    procField.synchronized {
-      procField.setAccessible(true)
-      val proc = procField.get(p)
-      try {
-        proc match {
-          case unixProc
-            if unixProc.getClass.getName == "java.lang.UNIXProcess" => {
-            val pidField = unixProc.getClass.getDeclaredField("pid")
-            pidField.synchronized {
-              pidField.setAccessible(true)
-              try {
-                pidField.getLong(unixProc)
-              } finally {
-                pidField.setAccessible(false)
-              }
-            }
-          }
-          case procImpl:java.lang.Process => {
-            val f: Field = p.getClass().getDeclaredField("p")
-            val f2: Field = f.get(p).getClass.getDeclaredField("pid")
-            try {
-              f.setAccessible(true)
-              f2.setAccessible(true)
-              val pid = f2.getLong(p)
-              pid
-            } finally {
-              f2.setAccessible(false)
-              f.setAccessible(false)
-            }
-          }
-          // If someone wants to add support for Windows processes,
-          // this would be the right place to do it:
-          case _ => throw new RuntimeException(
-            "Cannot get PID of a " + proc.getClass.getName)
-        }
-      } finally {
-        procField.setAccessible(false)
-      }
-    }
-  }
-
 
   // ??? equals "throw not implemented" IIRC - it compiles at least :)