kirbylife
/
harbour-muchkin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes to various things

master
Tobi Sim 2015-03-08 18:38:02 +01:00
parent 7d7dcfcba9
commit 234ad9d52a
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -8,6 +8,7 @@ arch:=noarch
rpmname:=$(Appname)-$(arch).rpm
jolla_usb_ip:=192.168.2.15
jolla_wifi_ip:=Jolla
jolla_ip:=$(jolla_usb_ip)
all: clean build-tmp rpm-virt rpm-jolla
@ -30,23 +31,23 @@ build-tmp:
install -m 755 ./dat/$(Appname).sh $(temp)/usr/bin/$(Appname)
rpm-virt:
cd $(temp);fpm -f -s dir -t rpm $(dependencies) -p $(CURDIR)/$(rpmname) -n $(Appname) -a $(arch) --prefix / *
cd $(temp);fpm -f -s dir -t rpm $(dependencies) -p $(temp)/$(rpmname) -n $(Appname) -a $(arch) --prefix / *
rpm-jolla:
cd $(temp);fpm -f -s dir -t rpm $(dependencies) -p $(CURDIR)/$(rpmname) -n $(Appname) -a $(arch) --prefix / *
cd $(temp);fpm -f -s dir -t rpm $(dependencies) -p $(temp)/$(rpmname) -n $(Appname) -a $(arch) --prefix / *
send-virt:
cat ./$(rpmname) | ssh -p2223 -i $(sdkpath)/vmshare/ssh/private_keys/SailfishOS_Emulator/root root@localhost cat ">>" /tmp/$(rpmname) "&&" pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname)
cat $(temp)/$(rpmname) | ssh -p2223 -i $(sdkpath)/vmshare/ssh/private_keys/SailfishOS_Emulator/root root@localhost cat ">>" /tmp/$(rpmname) "&&" pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname)
send-jolla-wifi:
cat ./$(rpmname) | ssh root@$(jolla_wifi_ip) cat ">>" /tmp/$(rpmname) "&&" pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname)
cat $(temp)/$(rpmname) | ssh root@$(jolla_wifi_ip) cat ">>" /tmp/$(rpmname) "&&" pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname)
send-jolla-ap: jolla_wifi_ip:=192.168.1.1
send-jolla-ap:
cat ./$(rpmname) | ssh root@$(jolla_wifi_ip) cat ">>" /tmp/$(rpmname) "&&" pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname)
cat $(temp)/$(rpmname) | ssh root@$(jolla_wifi_ip) cat ">>" /tmp/$(rpmname) "&&" pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname)
send-jolla:
cat ./$(rpmname) | ssh root@$(jolla_usb_ip) cat ">>" /tmp/$(rpmname) "&&" pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname)
cat $(temp)/$(rpmname) | ssh root@$(jolla_usb_ip) cat ">>" /tmp/$(rpmname) "&&" pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname)
clean:
rm -rf $(temp)

2
README.md
View File

@ -17,7 +17,7 @@ use these make commands to build/install your app for testing:
builds your package, and installs it on your Sailfish Emulator on localhost:2223, considering your Sailfish-SDK is installed at ~/SailfishOS
`make make-jolla-wifi`
`make make-jolla-wifi [jolla_wifi_ip=jolla]`
builds your package, and installs it on your jolla phone, considering your development PC is authorized for root ssh login on the phone and it is found in your dns-space as "jolla"

2
dat/sailfish-python.sh
View File

@ -1,4 +1,4 @@
#!/bin/bash
sailfish-qml sailfish-scanner
sailfish-qml sailfish-python

2
renamep.py
View File

@ -22,7 +22,7 @@ def replaceInFile(oldname,newname,filename):
makefile.write(re.sub(oldname,newname,maketxt))
makefile.close()
for filename in ["./Makefile","./dat/"+newname+".desktop"]:
for filename in ["./Makefile","./dat/"+newname+".desktop","./dat/"+newname+".sh"]:
replaceInFile(oldname,newname,filename)