mirror of
https://github.com/samsonjs/mojo.el.git
synced 2026-04-27 15:07:42 +00:00
Changed mojo-emulator-running-p to detect when a (versioned) SDK is running on OS X. Added custom variable mojo-sdk-version
This commit is contained in:
parent
7eeff45f6f
commit
2927bcac90
2 changed files with 14 additions and 1 deletions
11
src/code.el
11
src/code.el
|
|
@ -52,6 +52,11 @@
|
||||||
("\C-c\C-c\C-t" . mojo-toggle-target))
|
("\C-c\C-c\C-t" . mojo-toggle-target))
|
||||||
:group 'mojo)
|
:group 'mojo)
|
||||||
|
|
||||||
|
(defcustom mojo-sdk-version ""
|
||||||
|
"Version of the SDK installed. Since 1.4.5, the PDK and SDK are installed
|
||||||
|
at the same time, so there is only one var for both"
|
||||||
|
:version "1.4.5.465")
|
||||||
|
|
||||||
(defcustom mojo-sdk-directory
|
(defcustom mojo-sdk-directory
|
||||||
(case system-type
|
(case system-type
|
||||||
((windows-nt) "c:/progra~1/palm/sdk")
|
((windows-nt) "c:/progra~1/palm/sdk")
|
||||||
|
|
@ -819,7 +824,11 @@ for the emulator. Deaults to \"tcp\".")
|
||||||
"Determine if the webOS emulator is running or not.
|
"Determine if the webOS emulator is running or not.
|
||||||
|
|
||||||
This command only works on Unix-like systems."
|
This command only works on Unix-like systems."
|
||||||
(= 0 (shell-command "ps x | fgrep 'Palm SDK' | fgrep -v fgrep >/dev/null 2>&1")))
|
(case system-type
|
||||||
|
((windows-nt) nil)
|
||||||
|
(darwin (= 0 (shell-command (concat "ps x | fgrep '" mojo-sdk-version "' | fgrep -v fgrep >/dev/null 2>&1"))))
|
||||||
|
(t (= 0 (shell-command "ps x | fgrep 'Palm SDK' | fgrep -v fgrep >/dev/null 2>&1")))))
|
||||||
|
|
||||||
|
|
||||||
(defun mojo-emulator-responsive-p ()
|
(defun mojo-emulator-responsive-p ()
|
||||||
"Determine if the webOS emulator is able to respond to commands yet.
|
"Determine if the webOS emulator is able to respond to commands yet.
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,10 @@ ideas. Send me a pull request on github if you hack on mojo.el.")
|
||||||
;;
|
;;
|
||||||
;; Below are customizable option list:
|
;; Below are customizable option list:
|
||||||
;;
|
;;
|
||||||
|
;; `mojo-sdk-version'
|
||||||
|
;; Version of installed SDK
|
||||||
|
;; default = 1.4.5.465
|
||||||
|
;;
|
||||||
;; `mojo-sdk-directory'
|
;; `mojo-sdk-directory'
|
||||||
;; Path to where the mojo SDK is.
|
;; Path to where the mojo SDK is.
|
||||||
;; default = (case system-type
|
;; default = (case system-type
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue