additions and revisions to Sailfish version

platforms/sailfish/desktop-icon-example/readme.md

@@ -0,0 +1,13 @@
+Example desktop icon for cl-repl
+--------------------------------
+
+On the device:
+
+- after compiling (and stripping) it, put `cl-repl` executable in `/usr/bin/`
+- copy files under `usr` in `/usr`:
+```
+$ devel-su cp -r usr/* /usr/
+```
+The icon is just a generic Sailfish icon named `lqml.png`.
+
+The `cl-repl.desktop` file is an edited copy of `qt-runner.desktop`.

platforms/sailfish/desktop-icon-example/usr/share/applications/cl-repl.desktop

@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+X-Nemo-Single-Instance=no
+X-Nemo-Application-Type=no-invoker
+Icon=lqml
+Exec=qt-runner cl-repl
+Name=cl-repl
+
+X-Desktop-File-Install-Version=0.26
+
+[X-Sailjail]
+Sandboxing=Disabled

platforms/sailfish/download-rpms.lisp

@@ -75,6 +75,9 @@
    "qqc2-breeze-style-5.27.4+git1-1.2.8.jolla.~A.rpm" ; armv7hl
    "qqc2-breeze-style-5.27.4+git1-1.2.7.jolla.~A.rpm" ; aarch64
    "qt-runner-0.4.0-1.6.1.jolla.~A.rpm"))
+
+(defun cc (&rest args)
+  (apply 'concatenate 'string args))
  
 (defun run ()
   (let ((to-dir (format nil "rpms/~A/" *arch*))
@@ -86,11 +89,10 @@
              (url (format nil *url* *arch* (if noarch "noarch" *arch*)))
              (rpm (if noarch
                       file
-                      (format nil file *arch*))))
-        (unless (probe-file (concatenate 'string to-dir rpm))
-          (let ((s (ext:run-program "wget" (list (concatenate 'string url rpm)
-                                                 "-P"
-                                                 (if devel to-dir-devel to-dir)))))
+                      (format nil file *arch*)))
+             (to-dir* (if devel to-dir-devel to-dir)))
+        (unless (probe-file (cc to-dir* rpm))
+          (let ((s (ext:run-program "wget" (list (cc url rpm) "-P" to-dir*))))
             (loop :for line = (read-line s nil nil)
                   :while line :do (princ line) (terpri)
                   :finally (close s))))))))

platforms/sailfish/qt5.15-rpm-installation.md

@@ -8,7 +8,7 @@ being tedious (I'm not a SailfishOS expert and have very limited experience).
 To download all rpms (on desktop Linux), set architecture (default: `armv7hl`)
 in file `download-rpms.lisp` and run it in ECL:
 ```
-ecl -shell download-rpms.lisp ; will download to 'rpms/<arch>/'
+$ ecl -shell download-rpms.lisp # will download to 'rpms/<arch>/'
 ```
 
 
@@ -37,14 +37,14 @@ Repeat until above `install.sh` is successful.
 
 First ensure that `pkgconfig` is already installed:
 ```
-devel-su zypper install pkgconfig
+$ devel-su zypper install pkgconfig
 ```
 All `*-devel` packages must be extracted and copied manually, because they all
 have missing `pkgconfig(...)` dependencies (which we won't need anyway).
 
 To do the above, just run the following scipt:
 ```
-cd ../<arch>-devel/
-./extract-and-copy.sh
+$ cd ../<arch>-devel/
+$ ./extract-and-copy.sh
 ```
 Now you should be able to compile lqml, using this qmake: `/opt/qt5/bin/qmake`.

readme-sailfish.md

@@ -15,14 +15,14 @@ little tedious. Anyway I got it to work as described here.
 
 After connecting your Sailfish device via USB, open 2 console tabs on Linux:
 
-### tab 1: shell
+### Tab 1: shell
 ```
 ssh -L4005:127.0.0.1:4005 defaultuser@192.168.2.15`
 ```
 You need to manually do `source ~/.bashrc` for e.g. your personal aliases to
 work.
 
-### tab 2: file access
+### Tab 2: file access
 ```
 mkdir ~/phone
 sshfs defaultuser@192.168.2.15: ~/phone
@@ -54,6 +54,11 @@ For your final apps, just compile them in `build/`, rename `app` accordingly
 and copy it under e.g. `/usr/local/bin/`. Since the executables contain all
 resources, nothing else needs to be installed.
 
+If you want to run a compiled but not installed app, you need to pass the path:
+```
+qt-runner ./my-app
+```
+
 
 Developing with Slime directly on device
 ----------------------------------------
@@ -71,6 +76,14 @@ Emacs and connect:
 ```
 
 
+Desktop icon
+------------
+
+For the desktop icon see example for `cl-repl` in
+[readme](platforms/sailfish/desktop-icon-example/readme.md) and files in
+`platforms/sailfish/desktop-icon-example`.
+
+
 Tips
 ----