tfix paths in buildozer/makefile - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 77940148fa7315172bae2cf0e7ce1d8fbb1de04b
DIR parent 1cc1c8a051f465bbbfd141eddf2f3b927e85e7df
HTML Author: ThomasV <thomasv@electrum.org>
Date: Fri, 13 Jul 2018 14:45:08 +0200
fix paths in buildozer/makefile
Diffstat:
M electrum/gui/kivy/Makefile | 14 +++++++-------
M electrum/gui/kivy/tools/buildozer.… | 8 ++++----
2 files changed, 11 insertions(+), 11 deletions(-)
---
DIR diff --git a/electrum/gui/kivy/Makefile b/electrum/gui/kivy/Makefile
t@@ -8,25 +8,25 @@ theming:
$(PYTHON) -m kivy.atlas theming/light 1024 theming/light/*.png
prepare:
# running pre build setup
- @cp tools/buildozer.spec ../../buildozer.spec
+ @cp tools/buildozer.spec ../../../buildozer.spec
# copy electrum to main.py
- @cp ../../../run_electrum ../../main.py
+ @cp ../../../run_electrum ../../../main.py
@-if [ ! -d "../../.buildozer" ];then \
- cd ../..; buildozer android debug;\
+ cd ../../..; buildozer android debug;\
cp -f electrum/gui/kivy/tools/blacklist.txt .buildozer/android/platform/python-for-android/src/blacklist.txt;\
rm -rf ./.buildozer/android/platform/python-for-android/dist;\
fi
apk:
@make prepare
- @-cd ../..; buildozer android debug deploy run
+ @-cd ../../..; buildozer android debug deploy run
@make clean
release:
@make prepare
- @-cd ../..; buildozer android release
+ @-cd ../../..; buildozer android release
@make clean
clean:
# Cleaning up
# rename main.py to electrum
- @-rm ../../main.py
+ @-rm ../../../main.py
# remove buildozer.spec
- @-rm ../../buildozer.spec
+ @-rm ../../../buildozer.spec
DIR diff --git a/electrum/gui/kivy/tools/buildozer.spec b/electrum/gui/kivy/tools/buildozer.spec
t@@ -19,13 +19,13 @@ source.include_exts = py,png,jpg,kv,atlas,ttf,txt,gif,pem,mo,vs,fs,json
source.exclude_exts = spec
# (list) List of directory to exclude (let empty to not exclude anything)
-source.exclude_dirs = bin, build, dist, contrib, gui/qt, gui/kivy/tools, gui/kivy/theming/light
+source.exclude_dirs = bin, build, dist, contrib, electrum/gui/qt, electrum/gui/kivy/tools, electrum/gui/kivy/theming/light
# (list) List of exclusions using pattern matching
source.exclude_patterns = Makefile,setup*
# (str) Application versioning (method 1)
version.regex = APK_VERSION = '(.*)'
-version.filename = %(source.dir)s/lib/version.py
+version.filename = %(source.dir)s/electrum/version.py
# (str) Application versioning (method 2)
#version = 1.9.8
t@@ -87,7 +87,7 @@ android.ndk_path = /opt/crystax-ndk-10.3.2
# (list) List of Java files to add to the android project (can be java or a
# directory containing the files)
-android.add_src = gui/kivy/data/java-classes/
+android.add_src = electrum/gui/kivy/data/java-classes/
android.gradle_dependencies = me.dm7.barcodescanner:zxing:1.9.8
t@@ -105,7 +105,7 @@ android.add_activities = org.electrum.qr.SimpleScannerActivity
#android.ouya.icon.filename = %(source.dir)s/data/ouya_icon.png
# (str) XML file to include as an intent filters in <activity> tag
-android.manifest.intent_filters = gui/kivy/tools/bitcoin_intent.xml
+android.manifest.intent_filters = electrum/gui/kivy/tools/bitcoin_intent.xml
# (str) launchMode to set for the main activity
android.manifest.launch_mode = singleTask