# HG changeset patch
# User wenzelm
# Date 1384201688 -3600
# Node ID f14791d4f08d67dc5e9100ec0584176394e1da6f
# Parent  d5816d83e4792056226459dc6625681d92dbbc6b
simplified App template;

diff -r d5816d83e479 -r f14791d4f08d Admin/MacOS/App3/Info.plist-part1
--- a/Admin/MacOS/App3/Info.plist-part1	Mon Nov 11 21:20:51 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-<key>CFBundleDevelopmentRegion</key>
-<string>English</string>
-<key>CFBundleExecutable</key>
-<string>JavaAppLauncher</string>
-<key>CFBundleIconFile</key>
-<string>isabelle.icns</string>
-<key>CFBundleIdentifier</key>
-<string>de.tum.in.isabelle</string>
-<key>CFBundleDisplayName</key>
-<string>{ISABELLE_NAME}</string>
-<key>CFBundleInfoDictionaryVersion</key>
-<string>6.0</string>
-<key>CFBundleName</key>
-<string>{ISABELLE_NAME}</string>
-<key>CFBundlePackageType</key>
-<string>APPL</string>
-<key>CFBundleShortVersionString</key>
-<string>1.0</string>
-<key>CFBundleSignature</key>
-<string>????</string>
-<key>CFBundleVersion</key>
-<string>1</string>
-<key>NSHumanReadableCopyright</key>
-<string></string>
-<key>LSApplicationCategoryType</key>
-<string>public.app-category.developer-tools</string>
-<key>JVMRuntime</key>
-<string>jdk</string>
-<key>JVMMainClassName</key>
-<string>isabelle.Main</string>
-<key>JVMOptions</key>
-<array>
diff -r d5816d83e479 -r f14791d4f08d Admin/MacOS/App3/Info.plist-part2
--- a/Admin/MacOS/App3/Info.plist-part2	Mon Nov 11 21:20:51 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-<string>-Disabelle.home=$APP_ROOT/Contents/Resources/{ISABELLE_NAME}</string>
-</array>
-<key>JVMArguments</key>
-<array>
-</array>
-</dict>
-</plist>
diff -r d5816d83e479 -r f14791d4f08d Admin/MacOS/App3/README
--- a/Admin/MacOS/App3/README	Mon Nov 11 21:20:51 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-Isabelle/JVM application bundle for Mac OS X
-============================================
-
-* http://java.net/projects/appbundler
-
-  see appbundler-1.0.jar
-  see com/oracle/appbundler/JavaAppLauncher
-
diff -r d5816d83e479 -r f14791d4f08d Admin/MacOS/App3/Resources/en.lproj/Localizable.strings
--- a/Admin/MacOS/App3/Resources/en.lproj/Localizable.strings	Mon Nov 11 21:20:51 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-"JRELoadError" = "Unable to load Java Runtime Environment.";
-"MainClassNameRequired" = "Main class name is required.";
-"JavaDirectoryNotFound" = "Unable to enumerate Java directory contents.";
diff -r d5816d83e479 -r f14791d4f08d Admin/MacOS/Info.plist-part1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Admin/MacOS/Info.plist-part1	Mon Nov 11 21:28:08 2013 +0100
@@ -0,0 +1,36 @@
+<?xml version="1.0" ?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+<key>CFBundleDevelopmentRegion</key>
+<string>English</string>
+<key>CFBundleExecutable</key>
+<string>JavaAppLauncher</string>
+<key>CFBundleIconFile</key>
+<string>isabelle.icns</string>
+<key>CFBundleIdentifier</key>
+<string>de.tum.in.isabelle</string>
+<key>CFBundleDisplayName</key>
+<string>{ISABELLE_NAME}</string>
+<key>CFBundleInfoDictionaryVersion</key>
+<string>6.0</string>
+<key>CFBundleName</key>
+<string>{ISABELLE_NAME}</string>
+<key>CFBundlePackageType</key>
+<string>APPL</string>
+<key>CFBundleShortVersionString</key>
+<string>1.0</string>
+<key>CFBundleSignature</key>
+<string>????</string>
+<key>CFBundleVersion</key>
+<string>1</string>
+<key>NSHumanReadableCopyright</key>
+<string></string>
+<key>LSApplicationCategoryType</key>
+<string>public.app-category.developer-tools</string>
+<key>JVMRuntime</key>
+<string>jdk</string>
+<key>JVMMainClassName</key>
+<string>isabelle.Main</string>
+<key>JVMOptions</key>
+<array>
diff -r d5816d83e479 -r f14791d4f08d Admin/MacOS/Info.plist-part2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Admin/MacOS/Info.plist-part2	Mon Nov 11 21:28:08 2013 +0100
@@ -0,0 +1,7 @@
+<string>-Disabelle.home=$APP_ROOT/Contents/Resources/{ISABELLE_NAME}</string>
+</array>
+<key>JVMArguments</key>
+<array>
+</array>
+</dict>
+</plist>
diff -r d5816d83e479 -r f14791d4f08d Admin/MacOS/README
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Admin/MacOS/README	Mon Nov 11 21:28:08 2013 +0100
@@ -0,0 +1,8 @@
+Isabelle/JVM application bundle for Mac OS X
+============================================
+
+* http://java.net/projects/appbundler
+
+  see appbundler-1.0.jar
+  see com/oracle/appbundler/JavaAppLauncher
+
diff -r d5816d83e479 -r f14791d4f08d Admin/MacOS/Resources/en.lproj/Localizable.strings
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Admin/MacOS/Resources/en.lproj/Localizable.strings	Mon Nov 11 21:28:08 2013 +0100
@@ -0,0 +1,3 @@
+"JRELoadError" = "Unable to load Java Runtime Environment.";
+"MainClassNameRequired" = "Main class name is required.";
+"JavaDirectoryNotFound" = "Unable to enumerate Java directory contents.";
diff -r d5816d83e479 -r f14791d4f08d Admin/MacOS/Resources/isabelle.icns
Binary file Admin/MacOS/Resources/isabelle.icns has changed
diff -r d5816d83e479 -r f14791d4f08d Admin/MacOS/Resources/theory.icns
Binary file Admin/MacOS/Resources/theory.icns has changed
diff -r d5816d83e479 -r f14791d4f08d Admin/MacOS/isabelle.icns
Binary file Admin/MacOS/isabelle.icns has changed
diff -r d5816d83e479 -r f14791d4f08d Admin/MacOS/theory.icns
Binary file Admin/MacOS/theory.icns has changed
diff -r d5816d83e479 -r f14791d4f08d Admin/lib/Tools/makedist_bundle
--- a/Admin/lib/Tools/makedist_bundle	Mon Nov 11 21:20:51 2013 +0100
+++ b/Admin/lib/Tools/makedist_bundle	Mon Nov 11 21:28:08 2013 +0100
@@ -258,7 +258,7 @@
       (
         cd "$TMP"
 
-        APP_TEMPLATE="$ISABELLE_HOME/Admin/MacOS/App3"
+        APP_TEMPLATE="$ISABELLE_HOME/Admin/MacOS"
         APP="${ISABELLE_NAME}.app"
 
         for NAME in Java MacOS PlugIns Resources
@@ -286,7 +286,6 @@
         done
 
         cp -R "$APP_TEMPLATE/Resources/." "$APP/Contents/Resources/."
-        cp "$APP_TEMPLATE/../isabelle.icns" "$APP/Contents/Resources/."
 
         ln -sf "../Resources/${ISABELLE_NAME}/contrib/jdk/x86_64-darwin" \
           "$APP/Contents/PlugIns/jdk"