From 0709fdfe4e75c8fdaae9393032b8da2b5e79c038 Mon Sep 17 00:00:00 2001 From: Twobob Date: Sat, 9 Feb 2013 19:26:25 +0000 Subject: [PATCH 1/5] KUAL extensions added (since kindlepdfviewer will soon support all devices) --- extensions/kpdf/README.txt | 23 +++++++++++++++++++++++ extensions/kpdf/bin/kpdf.sh | 37 +++++++++++++++++++++++++++++++++++++ extensions/kpdf/config.xml | 12 ++++++++++++ extensions/kpdf/kpdf.sh | 37 +++++++++++++++++++++++++++++++++++++ extensions/kpdf/menu.json | 12 ++++++++++++ 5 files changed, 121 insertions(+) create mode 100644 extensions/kpdf/README.txt create mode 100755 extensions/kpdf/bin/kpdf.sh create mode 100755 extensions/kpdf/config.xml create mode 100755 extensions/kpdf/kpdf.sh create mode 100755 extensions/kpdf/menu.json diff --git a/extensions/kpdf/README.txt b/extensions/kpdf/README.txt new file mode 100644 index 000000000..d56e92cc9 --- /dev/null +++ b/extensions/kpdf/README.txt @@ -0,0 +1,23 @@ +TITLE: kindlepdfviewer + +CONTAINS: KUAL files for installation in /mnt/us/extensions/ + +REF: Main KUAL thread http://www.mobileread.com/forums/showthread.php?t=203326 + +UPSTREAM SOURCE: https://github.com/hwhw/kindlepdfviewer + +SUPPORTS: +DX Yes ( All Revisions ) +K3 Yes ( All Revisions ) +K4 Yes ( All Revisions ) +Touch (check github and threads for support information) +PW (check github and threads for support information) + +REQUIRES: KindlePDFviewer http://www.mobileread.com/forums/showthread.php?t=157047 + +ARCHIVAL LINK: http://www.mobileread.com/forums/showpost.php?p=2406316&postcount=5 + +ORIGINAL AUTHOR: Hawhill, See GIT for subsequent contributors listing + +NOTES: Touchscreen support for the Touch and PW is in progress +check github and threads for support information diff --git a/extensions/kpdf/bin/kpdf.sh b/extensions/kpdf/bin/kpdf.sh new file mode 100755 index 000000000..c1f81c700 --- /dev/null +++ b/extensions/kpdf/bin/kpdf.sh @@ -0,0 +1,37 @@ +#!/bin/sh +export LC_ALL="en_US.UTF-8" + +echo unlock > /proc/keypad +echo unlock > /proc/fiveway + +# we're always starting from our working directory +cd /mnt/us/kindlepdfviewer/ + +# bind-mount system fonts +if ! grep /mnt/us/kindlepdfviewer/fonts/host /proc/mounts; then + mount -o bind /usr/java/lib/fonts /mnt/us/kindlepdfviewer/fonts/host +fi + +# check if we are supposed to shut down the Amazon framework +if test "$1" == "--framework_stop"; then + shift 1 + /etc/init.d/framework stop +fi + +# stop cvm +killall -stop cvm + +# finally call reader +./reader.lua "$1" 2> /mnt/us/kindlepdfviewer/crash.log || cat /mnt/us/kindlepdfviewer/crash.log + +# unmount system fonts +if grep /mnt/us/kindlepdfviewer/fonts/host /proc/mounts; then + umount /mnt/us/kindlepdfviewer/fonts/host +fi + +# always try to continue cvm +killall -cont cvm || /etc/init.d/framework start + +# cleanup hanging process +killall lipc-wait-event + diff --git a/extensions/kpdf/config.xml b/extensions/kpdf/config.xml new file mode 100755 index 000000000..1d13b8853 --- /dev/null +++ b/extensions/kpdf/config.xml @@ -0,0 +1,12 @@ + + + + KPDF + 0.0 + Hawhill + helper + + + menu.json + + diff --git a/extensions/kpdf/kpdf.sh b/extensions/kpdf/kpdf.sh new file mode 100755 index 000000000..c1f81c700 --- /dev/null +++ b/extensions/kpdf/kpdf.sh @@ -0,0 +1,37 @@ +#!/bin/sh +export LC_ALL="en_US.UTF-8" + +echo unlock > /proc/keypad +echo unlock > /proc/fiveway + +# we're always starting from our working directory +cd /mnt/us/kindlepdfviewer/ + +# bind-mount system fonts +if ! grep /mnt/us/kindlepdfviewer/fonts/host /proc/mounts; then + mount -o bind /usr/java/lib/fonts /mnt/us/kindlepdfviewer/fonts/host +fi + +# check if we are supposed to shut down the Amazon framework +if test "$1" == "--framework_stop"; then + shift 1 + /etc/init.d/framework stop +fi + +# stop cvm +killall -stop cvm + +# finally call reader +./reader.lua "$1" 2> /mnt/us/kindlepdfviewer/crash.log || cat /mnt/us/kindlepdfviewer/crash.log + +# unmount system fonts +if grep /mnt/us/kindlepdfviewer/fonts/host /proc/mounts; then + umount /mnt/us/kindlepdfviewer/fonts/host +fi + +# always try to continue cvm +killall -cont cvm || /etc/init.d/framework start + +# cleanup hanging process +killall lipc-wait-event + diff --git a/extensions/kpdf/menu.json b/extensions/kpdf/menu.json new file mode 100755 index 000000000..568d489f4 --- /dev/null +++ b/extensions/kpdf/menu.json @@ -0,0 +1,12 @@ +{ + "items": [ + { + "name": "KPDF", + "priority": 0, + "items": [ + {"name": "Start in documents", "priority": 1, "action": "bin/kpdf.sh", "params": "/mnt/us/documents"}, + {"name": "Open last document", "priority": 2, "action": "bin/kpdf.sh"} + ] + } + ] +} From 623be75bbb816b11f0d82d47bdd06c34b4b1f0ce Mon Sep 17 00:00:00 2001 From: Twobob Date: Mon, 18 Feb 2013 03:53:24 +0000 Subject: [PATCH 2/5] remove unrequired scripts --- extensions/kpdf/bin/kpdf.sh | 37 ------------------------------------- extensions/kpdf/kpdf.sh | 37 ------------------------------------- 2 files changed, 74 deletions(-) delete mode 100755 extensions/kpdf/bin/kpdf.sh delete mode 100755 extensions/kpdf/kpdf.sh diff --git a/extensions/kpdf/bin/kpdf.sh b/extensions/kpdf/bin/kpdf.sh deleted file mode 100755 index c1f81c700..000000000 --- a/extensions/kpdf/bin/kpdf.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -export LC_ALL="en_US.UTF-8" - -echo unlock > /proc/keypad -echo unlock > /proc/fiveway - -# we're always starting from our working directory -cd /mnt/us/kindlepdfviewer/ - -# bind-mount system fonts -if ! grep /mnt/us/kindlepdfviewer/fonts/host /proc/mounts; then - mount -o bind /usr/java/lib/fonts /mnt/us/kindlepdfviewer/fonts/host -fi - -# check if we are supposed to shut down the Amazon framework -if test "$1" == "--framework_stop"; then - shift 1 - /etc/init.d/framework stop -fi - -# stop cvm -killall -stop cvm - -# finally call reader -./reader.lua "$1" 2> /mnt/us/kindlepdfviewer/crash.log || cat /mnt/us/kindlepdfviewer/crash.log - -# unmount system fonts -if grep /mnt/us/kindlepdfviewer/fonts/host /proc/mounts; then - umount /mnt/us/kindlepdfviewer/fonts/host -fi - -# always try to continue cvm -killall -cont cvm || /etc/init.d/framework start - -# cleanup hanging process -killall lipc-wait-event - diff --git a/extensions/kpdf/kpdf.sh b/extensions/kpdf/kpdf.sh deleted file mode 100755 index c1f81c700..000000000 --- a/extensions/kpdf/kpdf.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -export LC_ALL="en_US.UTF-8" - -echo unlock > /proc/keypad -echo unlock > /proc/fiveway - -# we're always starting from our working directory -cd /mnt/us/kindlepdfviewer/ - -# bind-mount system fonts -if ! grep /mnt/us/kindlepdfviewer/fonts/host /proc/mounts; then - mount -o bind /usr/java/lib/fonts /mnt/us/kindlepdfviewer/fonts/host -fi - -# check if we are supposed to shut down the Amazon framework -if test "$1" == "--framework_stop"; then - shift 1 - /etc/init.d/framework stop -fi - -# stop cvm -killall -stop cvm - -# finally call reader -./reader.lua "$1" 2> /mnt/us/kindlepdfviewer/crash.log || cat /mnt/us/kindlepdfviewer/crash.log - -# unmount system fonts -if grep /mnt/us/kindlepdfviewer/fonts/host /proc/mounts; then - umount /mnt/us/kindlepdfviewer/fonts/host -fi - -# always try to continue cvm -killall -cont cvm || /etc/init.d/framework start - -# cleanup hanging process -killall lipc-wait-event - From 530f5ffc30f98e92f7239b158aa789a052feb32b Mon Sep 17 00:00:00 2001 From: Twobob Date: Mon, 18 Feb 2013 03:54:16 +0000 Subject: [PATCH 3/5] update to direct referencing of scripts. SIDE-EFFECTS: this means /mnt/us/kindlepdfviewer/kpdf.sh is now the REQUIRED location as opposed to preferred. --- extensions/kpdf/config.xml | 0 extensions/kpdf/menu.json | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) mode change 100755 => 100644 extensions/kpdf/config.xml mode change 100755 => 100644 extensions/kpdf/menu.json diff --git a/extensions/kpdf/config.xml b/extensions/kpdf/config.xml old mode 100755 new mode 100644 diff --git a/extensions/kpdf/menu.json b/extensions/kpdf/menu.json old mode 100755 new mode 100644 index 568d489f4..8b7741aa3 --- a/extensions/kpdf/menu.json +++ b/extensions/kpdf/menu.json @@ -4,8 +4,8 @@ "name": "KPDF", "priority": 0, "items": [ - {"name": "Start in documents", "priority": 1, "action": "bin/kpdf.sh", "params": "/mnt/us/documents"}, - {"name": "Open last document", "priority": 2, "action": "bin/kpdf.sh"} + {"name": "Start in documents", "priority": 1, "action": "/mnt/us/kindlepdfviewer/kpdf.sh", "params": "/mnt/us/documents"}, + {"name": "Open last document", "priority": 2, "action": "/mnt/us/kindlepdfviewer/kpdf.sh"} ] } ] From 6e858a980be29fa9e0f23155caae8d07417a9d35 Mon Sep 17 00:00:00 2001 From: chrox Date: Mon, 18 Feb 2013 13:15:31 +0800 Subject: [PATCH 4/5] add extensions directory in customupdate --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5521fa640..0e69fa42a 100644 --- a/Makefile +++ b/Makefile @@ -301,6 +301,6 @@ customupdate: all cp -r git-rev resources $(INSTALL_DIR) cp -rpL frontend $(INSTALL_DIR) mkdir $(INSTALL_DIR)/fonts/host - zip -9 -r kindlepdfviewer-$(VERSION).zip $(INSTALL_DIR) launchpad/ kite/ + zip -9 -r kindlepdfviewer-$(VERSION).zip $(INSTALL_DIR) launchpad/ kite/ extensions/ rm -rf $(INSTALL_DIR) @echo "copy kindlepdfviewer-$(VERSION).zip to /mnt/us/customupdates and install with shift+shift+I" From 8d2e5128b6d0bb5cd72636abad29cd42e9faf395 Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Mon, 18 Feb 2013 18:43:12 -0500 Subject: [PATCH 5/5] remove kite in favor of KUAL --- Makefile | 2 +- kite/KPDFviewer (last file) | 3 --- kite/KPDFviewer File Manager | 3 --- 3 files changed, 1 insertion(+), 7 deletions(-) delete mode 100755 kite/KPDFviewer (last file) delete mode 100755 kite/KPDFviewer File Manager diff --git a/Makefile b/Makefile index 0e69fa42a..d0f7ac214 100644 --- a/Makefile +++ b/Makefile @@ -301,6 +301,6 @@ customupdate: all cp -r git-rev resources $(INSTALL_DIR) cp -rpL frontend $(INSTALL_DIR) mkdir $(INSTALL_DIR)/fonts/host - zip -9 -r kindlepdfviewer-$(VERSION).zip $(INSTALL_DIR) launchpad/ kite/ extensions/ + zip -9 -r kindlepdfviewer-$(VERSION).zip $(INSTALL_DIR) launchpad/ extensions/ rm -rf $(INSTALL_DIR) @echo "copy kindlepdfviewer-$(VERSION).zip to /mnt/us/customupdates and install with shift+shift+I" diff --git a/kite/KPDFviewer (last file) b/kite/KPDFviewer (last file) deleted file mode 100755 index de0c410d9..000000000 --- a/kite/KPDFviewer (last file) +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -/mnt/us/kindlepdfviewer/kpdf.sh diff --git a/kite/KPDFviewer File Manager b/kite/KPDFviewer File Manager deleted file mode 100755 index f5f935234..000000000 --- a/kite/KPDFviewer File Manager +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -/mnt/us/kindlepdfviewer/kpdf.sh /mnt/us/documents