jacob.eva/openCom-Companion
1
0
Fork 0
mirror of https://github.com/liberatedsystems/openCom-Companion.git synced 2024-11-22 05:20:36 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix issues with environment not being activated

Browse Source
This commit is contained in:
jacob.eva 2024-08-08 15:15:58 +01:00
parent 2468f2174a
commit 2914026379
No known key found for this signature in database
GPG Key ID: 0B92E083BBCCAA1E
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sbapp/Makefile
View File

@ -1,6 +1,6 @@
all: prepare debug all: prepare debug
prepare: activate cleanrns getrns prepare: cleanrns getrns
clean: clean:
@echo Cleaning... @echo Cleaning...
@ -11,13 +11,10 @@ clean:
-(rm ./bin -r) -(rm ./bin -r)
cleanlibs: cleanlibs:
buildozer android clean . venv/bin/activate; buildozer android clean
cleanall: clean cleanlibs cleanall: clean cleanlibs
activate:
(. venv/bin/activate)
pacthfiles: patchsdl injectxml pacthfiles: patchsdl injectxml
patchsdl: patchsdl:
@ -42,7 +39,7 @@ injectxml:
cp patches/p4a_build.py .buildozer/android/platform/build-arm64-v8a_armeabi-v7a/dists/sideband/build.py cp patches/p4a_build.py .buildozer/android/platform/build-arm64-v8a_armeabi-v7a/dists/sideband/build.py
debug: debug:
buildozer android debug . venv/bin/activate; buildozer android debug
prebake: prebake:
ifneq (,$(wildcard .buildozer/android/platform/build-arm64-v8a_armeabi-v7a/dists/sideband/src/main/res/xml/device_filter.xml)) ifneq (,$(wildcard .buildozer/android/platform/build-arm64-v8a_armeabi-v7a/dists/sideband/src/main/res/xml/device_filter.xml))
@ -50,7 +47,7 @@ ifneq (,$(wildcard .buildozer/android/platform/build-arm64-v8a_armeabi-v7a/dists
else else
@(echo Prebaking build before patching files...) @(echo Prebaking build before patching files...)
@(sleep 2) @(sleep 2)
-(buildozer android release) -(. venv/bin/activate; buildozer android release)
@(echo Prebake finished, applying patches and rebuilding...) @(echo Prebake finished, applying patches and rebuilding...)
@(sleep 2) @(sleep 2)
endif endif
@ -72,7 +69,7 @@ fetchshare:
cp ../../dist_archive/Reticulum\ Manual.epub ./share/mirrors/Reticulum_Manual.epub cp ../../dist_archive/Reticulum\ Manual.epub ./share/mirrors/Reticulum_Manual.epub
release: release:
buildozer android release . venv/bin/activate; buildozer android release
postbuild: postbuild:
$(MAKE) cleanrns $(MAKE) cleanrns