Skip to content

Commit

Permalink
Drop Sailfish OS specific QML source code mangling
Browse files Browse the repository at this point in the history
When modRana was to be launched by the sailfish-qml utility,
various requirements had to be met:
- all qml files in /usr/share/harbour-modrana/qml
- no UC imports, relative imports had to be done instead
- move the UC backend to the modRana QML source code folder
  and sailfish-qml could not manipulate QML import path
  in the past
- main QML file had to be named harbour-modrana.qml
- sailfish-qml also set PWD to /home/nemo, complicating
  Python module imports

Thankfully, we now have our very own shiny native launcher and
can finally throw this pile of hacks that was needed before overboard.

The native launcher:
- does not care about where the QML files are and how the main QML file is called
- natively supports UC and sets import path to the current backend
- sets proper PYTHONPATH
- is cloudscale

Yay! :D
  • Loading branch information
M4rtinK committed Mar 18, 2019
1 parent f3f5666 commit c0cf872
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 75 deletions.
8 changes: 2 additions & 6 deletions Makefile
Expand Up @@ -53,13 +53,12 @@ rsync:
# cleanup the source tree
$(RSYNC) -ar --exclude-from $(EXCLUDEFILE) $(SOURCEDIR)/ $(BUILDDIR)

rsync-sailfish: sailfish-qml-mangle
rsync-sailfish:
# cleanup the source tree for a Sailfish OS package
$(RSYNC) -ar --exclude-from $(EXCLUDESAILFISH) $(SOURCEDIR)/ $(BUILDDIR)

rsync-harbour: sailfish-qml-mangle
rsync-harbour:
# first mark modrana.py as not executable as Harbour RPM validator does not like that
# for some reason (not like you could not just run it with python3 modrana.py...)
chmod -x $(SOURCEDIR)/modrana.py
# also mark the startup scripts as not executable to make the Harbour RPM validator happy
chmod -x $(SOURCEDIR)/run/*
Expand All @@ -72,9 +71,6 @@ clean:
rm -rf $(SOURCEDIR)
rm -rf $(BUILDDIR)

sailfish-qml-mangle:
bash packaging/sailfish/sailfish_qml_mangle.sh $(SOURCEDIR)

bytecode-python2:
-python2 -m compileall $(BUILDDIR)

Expand Down
2 changes: 1 addition & 1 deletion packaging/sailfish/harbour-modrana.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Application
Name=modRana
Exec=sailfish-qml harbour-modrana
Exec=harbour-modrana
Icon=harbour-modrana
X-Nemo-Application-Type=silica-qt5
68 changes: 0 additions & 68 deletions packaging/sailfish/sailfish_qml_mangle.sh

This file was deleted.

0 comments on commit c0cf872

Please sign in to comment.