From 5a39f9f679e034e236e12bf121795bb948126e8b Mon Sep 17 00:00:00 2001
From: Michael Peter Christen <mc@yacy.net>
Date: Sat, 26 Dec 2015 22:25:08 +0100
Subject: stub to use a new app launcher for mac

---
 addon/YaCy.app/Contents/Info.plist                 |  71 ++++++++++++---------
 addon/YaCy.app/Contents/MacOS/JavaAppLauncher      | Bin 0 -> 18604 bytes
 addon/YaCy.app/Contents/MacOS/JavaApplicationStub  |  16 -----
 .../Resources/en.lproj/Localizable.strings         |   3 +
 4 files changed, 43 insertions(+), 47 deletions(-)
 create mode 100755 addon/YaCy.app/Contents/MacOS/JavaAppLauncher
 delete mode 100755 addon/YaCy.app/Contents/MacOS/JavaApplicationStub
 create mode 100644 addon/YaCy.app/Contents/Resources/en.lproj/Localizable.strings

(limited to 'addon')

diff --git a/addon/YaCy.app/Contents/Info.plist b/addon/YaCy.app/Contents/Info.plist
index 8bb1c681e..2d46c21f2 100644
--- a/addon/YaCy.app/Contents/Info.plist
+++ b/addon/YaCy.app/Contents/Info.plist
@@ -1,34 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
 <dict>
-	<key>CFBundleName</key>
-	<string>YaCy</string>
-	<key>CFBundleDisplayName</key>
-	<string>YaCy</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.82</string>
-    <key>CFBundleGetInfoString</key>
-    <string>Peer-to-Peer Search Engine</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>GPL-2.0</string>
-	<key>CFBundleIdentifier</key>
-	<string>net.yacy.yacy</string>
-	<key>CFBundleVersion</key>
-	<string>1.82</string>
-	<key>CFBundleAllowMixedLocalizations</key>
-	<string>true</string>
-	<key>CFBundleExecutable</key>
-	<string>JavaApplicationStub</string><!-- relative to Contents/MacOS -->
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleIconFile</key>
-	<string>YaCy_2013_Icon.icns</string><!-- relative to Contents/Resources -->
+<key>CFBundleName</key>
+<string>YaCy</string>
+<key>CFBundleDisplayName</key>
+<string>YaCy</string>
+<key>CFBundleShortVersionString</key>
+<string>1.82</string>
+<key>CFBundleGetInfoString</key>
+<string>Peer-to-Peer Search Engine</string>
+<key>NSHumanReadableCopyright</key>
+<string>GPL-2.0</string>
+<key>CFBundleIdentifier</key>
+<string>net.yacy.yacy</string>
+<key>CFBundleVersion</key>
+<string>1.82</string>
+<key>CFBundleAllowMixedLocalizations</key>
+<string>true</string>
+<key>CFBundleExecutable</key>
+<string>JavaAppLauncher</string>
+<key>CFBundleDevelopmentRegion</key>
+<string>English</string>
+<key>CFBundlePackageType</key>
+<string>APPL</string>
+<key>CFBundleSignature</key>
+<string>????</string>
+<key>CFBundleInfoDictionaryVersion</key>
+<string>6.0</string>
+<key>CFBundleIconFile</key>
+<string>YaCy_2013_Icon.icns</string>
+<key>JVMMainClassName</key>
+<string>net.yacy.yacy</string>
+<key>JVMOptions</key>
+<array>
+</array>
+<key>JVMArguments</key>
+<array>
+</array>
+
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/addon/YaCy.app/Contents/MacOS/JavaAppLauncher b/addon/YaCy.app/Contents/MacOS/JavaAppLauncher
new file mode 100755
index 000000000..7bddebea2
Binary files /dev/null and b/addon/YaCy.app/Contents/MacOS/JavaAppLauncher differ
diff --git a/addon/YaCy.app/Contents/MacOS/JavaApplicationStub b/addon/YaCy.app/Contents/MacOS/JavaApplicationStub
deleted file mode 100755
index 9f0dd6333..000000000
--- a/addon/YaCy.app/Contents/MacOS/JavaApplicationStub
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-PRG=$0
-while [ -h "$PRG" ]; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '^.*-> \(.*\)$' 2>/dev/null`
-    if expr "$link" : '^/' 2> /dev/null >/dev/null; then
-        PRG="$link"
-    else
-        PRG="`dirname "$PRG"`/$link"
-    fi
-done
-PROGDIR=`dirname "$PRG"`
-cd "$PROGDIR"/../../
-echo `pwd`
-cd Contents/Resources/Java
-./startYACY.sh -gui Library/YaCy
diff --git a/addon/YaCy.app/Contents/Resources/en.lproj/Localizable.strings b/addon/YaCy.app/Contents/Resources/en.lproj/Localizable.strings
new file mode 100644
index 000000000..0d306aaaf
--- /dev/null
+++ b/addon/YaCy.app/Contents/Resources/en.lproj/Localizable.strings
@@ -0,0 +1,3 @@
+"JRELoadError" = "Unable to load Java Runtime Environment.";
+"MainClassNameRequired" = "Main class name is required.";
+"JavaDirectoryNotFound" = "Unable to enumerate Java directory contents.";
-- 
cgit v1.2.3