From 68475197f4c29d52e8c18d63f31dabc55136537b Mon Sep 17 00:00:00 2001 From: TobSim Date: Mon, 27 Apr 2015 12:56:05 +0200 Subject: [PATCH] added remove/upgrade scripts, appicon --- Makefile | 58 ++++++++++++++++++++++++++++++++++++------- changelog.txt | 2 ++ dat/appicon.png | Bin 0 -> 1479 bytes dat/removeScript.sh | 5 ++++ dat/upgradeScript.sh | 5 ++++ renamep.py | 2 +- 6 files changed, 62 insertions(+), 10 deletions(-) create mode 100644 changelog.txt create mode 100644 dat/appicon.png create mode 100644 dat/removeScript.sh create mode 100644 dat/upgradeScript.sh diff --git a/Makefile b/Makefile index 20a5e96..4c51c1f 100644 --- a/Makefile +++ b/Makefile @@ -2,13 +2,14 @@ Appname:=$(shell cat appname.txt) prefix:=/usr temp:=/tmp/fpm-jolla sdkpath:=$(HOME)/SailfishOS +sourcePath:=$(shell pwd) dependencies=$(shell for file in `cat dependencies.txt`;do echo "-d "$${file};done;) arch:=armv7hl version:=0.0.1 iteration:=1 -rpmname:=$(Appname)-$(version).$(arch).rpm +rpmname:=$(Appname)-$(version)-$(iteration).$(arch).rpm ssh_user:=nemo -jolla_usb_ip:=192.168.2.15 +jolla_usb_ip:=192.168.1.15 jolla_wifi_ip:=Jolla @@ -27,7 +28,7 @@ build-tmp: mkdir -p $(temp)/usr/share/icons/hicolor/86x86/apps mkdir -p $(temp)/usr/bin cp -ar ./qml $(temp)/usr/share/$(Appname) - cp -ar ./src/*.py $(temp)/usr/share/$(Appname)/src + cp -ar ./src/* $(temp)/usr/share/$(Appname)/src cp -ar ./pyPackages/*$(arch) $(temp)/usr/share/$(Appname)/src/pyPackages cp ./dat/$(Appname).desktop $(temp)/usr/share/applications/ cp -ar ./dat/appicon.png $(temp)/usr/share/icons/hicolor/86x86/apps/$(Appname).png @@ -35,24 +36,63 @@ build-tmp: rpm-virt: arch:=i686 rpm-virt: build-tmp - cd $(temp);fpm -f -s dir -t rpm -v $(version) --iteration $(iteration) $(dependencies) -p $(temp)/$(rpmname) -n $(Appname) -a $(arch) --prefix / * + cd $(temp);fpm -f -s dir -t rpm \ + --after-install $(sourcePath)/dat/upgradeScript.sh \ + --after-upgrade $(sourcePath)/dat/upgradeScript.sh \ + --after-remove $(sourcePath)/dat/removeScript.sh \ + --rpm-changelog $(sourcePath)/changelog.txt\ + --directories "/usr/share/$(Appname)" \ + -v $(version) \ + --iteration $(iteration) \ + $(dependencies) \ + -p $(temp)/$(rpmname) \ + -n $(Appname) \ + -a $(arch) \ + --prefix / * rpm-jolla: build-tmp - cd $(temp);fpm -f -s dir -t rpm -v $(version) --iteration $(iteration) $(dependencies) -p $(temp)/$(rpmname) -n $(Appname) -a $(arch) --prefix / * + cd $(temp);fpm -f -s dir -t rpm \ + --after-install $(sourcePath)/dat/upgradeScript.sh \ + --after-upgrade $(sourcePath)/dat/upgradeScript.sh \ + --after-remove $(sourcePath)/dat/removeScript.sh \ + --rpm-changelog $(sourcePath)/changelog.txt\ + --directories "/usr/share/$(Appname)" \ + -v $(version) \ + --iteration $(iteration) \ + $(dependencies) \ + -p $(temp)/$(rpmname) \ + -n $(Appname) \ + -a $(arch) \ + --prefix / * send-virt: - cat $(temp)/$(rpmname) | ssh -i '$(sdkpath)/vmshare/ssh/private_keys/SailfishOS_Emulator/root' -p2223 $(ssh_user)@localhost cat ">>" /tmp/$(rpmname) "&&" pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname) + cat $(temp)/$(rpmname) | ssh -i '$(sdkpath)/vmshare/ssh/private_keys/SailfishOS_Emulator/nemo' -p2223 $(ssh_user)@localhost \ + cat ">" /tmp/$(rpmname) "&&" \ + pkcon install-local -y /tmp/$(rpmname) "&&" \ + rm /tmp/$(rpmname) send-jolla-wifi: - cat $(temp)/$(rpmname) | ssh $(ssh_user)@$(jolla_wifi_ip) cat ">>" /tmp/$(rpmname) "&&" pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname) + cat $(temp)/$(rpmname) | ssh $(ssh_user)@$(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 $(temp)/$(rpmname) | ssh $(ssh_user)@$(jolla_wifi_ip) cat ">>" /tmp/$(rpmname) "&&" pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname) + cat $(temp)/$(rpmname) | ssh $(ssh_user)@$(jolla_wifi_ip) \ + cat ">" /tmp/$(rpmname) "&&" \ + pkcon install-local -y /tmp/$(rpmname) "&&" \ + rm /tmp/$(rpmname) send-jolla-usb: - cat $(temp)/$(rpmname) | ssh $(ssh_user)@$(jolla_usb_ip) cat ">>" /tmp/$(rpmname) "&&" pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname) + cat $(temp)/$(rpmname) | ssh $(ssh_user)@$(jolla_usb_ip) \ + cat ">" /tmp/$(rpmname) "&&" \ + pkcon install-local -y /tmp/$(rpmname) "&&" \ + rm /tmp/$(rpmname) +send-only-virt: + cat $(temp)/$(rpmname) | ssh -i '$(sdkpath)/vmshare/ssh/private_keys/SailfishOS_Emulator/nemo' -p2223 $(ssh_user)@localhost \ + cat ">" /tmp/$(rpmname) clean: rm -rf $(temp) diff --git a/changelog.txt b/changelog.txt new file mode 100644 index 0000000..a13daa5 --- /dev/null +++ b/changelog.txt @@ -0,0 +1,2 @@ +*Mon Apr 27 2015 Tobi Sim 0.0.1-1 +-initial commit diff --git a/dat/appicon.png b/dat/appicon.png new file mode 100644 index 0000000000000000000000000000000000000000..951dbb08a56703205ab0ca5101645e5ba7828ac4 GIT binary patch literal 1479 zcmV;&1vvVNP)WFU8GbZ8()Nlj2>E@cM*00k>aL_t(|+U=c9XkA4V z$N%SjBu#2ltd@!dQM(fgZJ;79rJHsox^Yp8uDZ~Q!G#Npx>1OmE{Z4!Ds{ z0)%rjB2MoSQDacIz*V(@nJdFMA_7a&L?0#roYa^dHD0PjaqmVIVAtj|&CJ(B`p?K- zc3lALu3W(wfaBufT~`gasHb@LZldqPMN9*jOJTSNb`vi#Gn<-K8^BR!UQBhkyLJ-= z{okHwXa({BW{252ZLGN9x_4Ef*fRjW%|OcmS6ovnCo@nr+_LXf4zk0{{ZaCzrvA2! zi!QAUcxSvi2B6Q(T*gB;j$Nls=~l&a!w!{*4v1Vq-&Yc5WGuKU`QpN2N6vz``b9*Y z3aFQTRn7o5G{cY7!l)@lzb`7H1uLj`i?Thb0v7E)tkLfa3LRY=sJ)7()JX}j)Yg_p zzduqy-D3mwhNkI94OnX1gl50bDWE=T1NEl?rDrvKN>^O78riUa%%I=zDRj-)K>dC| z>1QU6TC$MU2&|M0`u(=XL#hpRVL;)Px(b^BEY&$~*zebTLj7bw;V&*S<)HwJIu6w6 z_bCm%R2S;|0}5AMuTc5|Y_poGdf|%i+jSMcF`)3S&t+d%fF(U0k5G5jRs2GM(nBHE z)9V73?%QiQ@lip2sIKB;1xlX_y-C3Yu+FT>5!9#ZDn3-8^wlQ!^j87aoi#avdaSPE zCq%AMR{BRQ2PI^{(%-vXCX<|oRg&MhU84A}m`ai?erUX~C^-m3`k6YK} zpd{fQMEkC3Kz-UteGbdDSmBCx{i*@=l(RZLrs!gVx(vP9o6|~tlzt3=OA_=>!>X!^ zFL}&|UTq4lsP`L9sBJF|5X%3C{|tUes0*4>6b<@0R_oP$H-vhDQjNxgh}N)qaL&g= z1QG2LIa2L*>Fm=Ly4wKm`37sWoFVqak~qioxtAxsdBX3Gu6rv%K8w^v>imjl>(#yP6%3PzPR*j(y|3pm zj3Qa@cMXAU^qdq0vR)9;EmWLDaU2J4|I)?KivavV084!Uqb8Dj_@NBWQg6}*>LaoA zwH4Iw+@HA}1@Iz(HTnCc-sFx?!{L7zo6Fjx2UZ5m%=2Pu{HX(<`aFOik>&sHVW~H{ zU3LufGjpop|4xkkqL=_L-`b6tz5lLbYm57tx%(HKf2+t+FTmkGfaG04nR_@g^$)}k z=6