AaronFiore/electrum
1
0
Fork 0
Code Activity

fix paths in buildozer/makefile

Browse Source
This commit is contained in:
ThomasV
2018-07-13 14:45:08 +02:00
parent 1cc1c8a051
commit 77940148fa
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
electrum/gui/kivy/Makefile
View File

@@ -8,25 +8,25 @@ theming:
$(PYTHON) -m kivy.atlas theming/light 1024 theming/light/*.png $(PYTHON) -m kivy.atlas theming/light 1024 theming/light/*.png
prepare: prepare:
# running pre build setup # running pre build setup
@cp tools/buildozer.spec ../../buildozer.spec @cp tools/buildozer.spec ../../../buildozer.spec
# copy electrum to main.py # copy electrum to main.py
@cp ../../../run_electrum ../../main.py @cp ../../../run_electrum ../../../main.py
@-if [ ! -d "../../.buildozer" ];then \ @-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;\ 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;\ rm -rf ./.buildozer/android/platform/python-for-android/dist;\
fi fi
apk: apk:
@make prepare @make prepare
@-cd ../..; buildozer android debug deploy run @-cd ../../..; buildozer android debug deploy run
@make clean @make clean
release: release:
@make prepare @make prepare
@-cd ../..; buildozer android release @-cd ../../..; buildozer android release
@make clean @make clean
clean: clean:
# Cleaning up # Cleaning up
# rename main.py to electrum # rename main.py to electrum
@-rm ../../main.py @-rm ../../../main.py
# remove buildozer.spec # remove buildozer.spec
@-rm ../../buildozer.spec @-rm ../../../buildozer.spec

8
electrum/gui/kivy/tools/buildozer.spec
View File

@@ -19,13 +19,13 @@ source.include_exts = py,png,jpg,kv,atlas,ttf,txt,gif,pem,mo,vs,fs,json
source.exclude_exts = spec source.exclude_exts = spec
# (list) List of directory to exclude (let empty to not exclude anything) # (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 # (list) List of exclusions using pattern matching
source.exclude_patterns = Makefile,setup* source.exclude_patterns = Makefile,setup*
# (str) Application versioning (method 1) # (str) Application versioning (method 1)
version.regex = APK_VERSION = '(.*)' 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) # (str) Application versioning (method 2)
#version = 1.9.8 #version = 1.9.8
@@ -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 # (list) List of Java files to add to the android project (can be java or a
# directory containing the files) # 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 android.gradle_dependencies = me.dm7.barcodescanner:zxing:1.9.8
@@ -105,7 +105,7 @@ android.add_activities = org.electrum.qr.SimpleScannerActivity
#android.ouya.icon.filename = %(source.dir)s/data/ouya_icon.png #android.ouya.icon.filename = %(source.dir)s/data/ouya_icon.png
# (str) XML file to include as an intent filters in <activity> tag # (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 # (str) launchMode to set for the main activity
android.manifest.launch_mode = singleTask android.manifest.launch_mode = singleTask