UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-18 16:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into omega-hotfix

Browse Source
This commit is contained in:
Quentin Guidée
2020-03-21 11:42:39 +01:00
parent ea796d9b51 5f5636fe4d
commit 06905c70e4
4 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/targets.all.mak
View File

@@ -54,8 +54,8 @@ all_official:
$(Q) cp output/release/simulator/web/epsilon.official.js.mem output/all_official/epsilon.python.js.mem $(Q) cp output/release/simulator/web/epsilon.official.js.mem output/all_official/epsilon.python.js.mem
$(Q) echo "BUILD_FIRMWARE SIMULATOR ANDROID" $(Q) echo "BUILD_FIRMWARE SIMULATOR ANDROID"
$(Q) $(MAKE) PLATFORM=simulator TARGET=android clean $(Q) $(MAKE) PLATFORM=simulator TARGET=android clean
$(Q) $(MAKE) PLATFORM=simulator TARGET=android epsilon.official.apk $(Q) $(MAKE) PLATFORM=simulator TARGET=android epsilon.official.signed.apk
$(Q) cp output/release/simulator/android/app/outputs/apk/release/android-release-unsigned.apk output/all_official/epsilon.apk $(Q) cp output/release/simulator/android/app/outputs/apk/codesigned/android-codesigned.apk output/all_official/epsilon.official.apk
$(Q) echo "BUILD_FIRMWARE SIMULATOR IOS" $(Q) echo "BUILD_FIRMWARE SIMULATOR IOS"
$(Q) $(MAKE) PLATFORM=simulator TARGET=ios clean $(Q) $(MAKE) PLATFORM=simulator TARGET=ios clean
$(Q) $(MAKE) PLATFORM=simulator TARGET=ios IOS_PROVISIONNING_PROFILE=$(IOS_MOBILE_PROVISION) output/release/simulator/ios/app/epsilon.official.ipa $(Q) $(MAKE) PLATFORM=simulator TARGET=ios IOS_PROVISIONNING_PROFILE=$(IOS_MOBILE_PROVISION) output/release/simulator/ios/app/epsilon.official.ipa

13
ion/src/simulator/android/Makefile
View File

@@ -68,14 +68,13 @@ $(eval $(call rule_for_gradle,assembleRelease,.official.))
DEFAULT = epsilon.apk DEFAULT = epsilon.apk
.PHONY: epsilon%apk .PHONY: epsilon%signed.apk
ifdef ANDROID_SIGNING_STORE_FILE epsilon%signed.apk: gradle_assembleCodesigned_%
epsilon%apk: gradle_assembleCodesigned_% $(warning This is a signed build.)
else
epsilon%apk: gradle_assembleRelease_%
$(warning Building without code signing. Define ANDROID_SIGNING_STORE_FILE, ANDROID_SIGNING_STORE_PASSWORD, ANDROID_SIGNING_KEY_ALIAS and ANDROID_SIGNING_KEY_PASSWORD for a signed build.)
endif
.PHONY: epsilon%apk
epsilon%apk: gradle_assembleRelease_%
$(warning Building without code signing. Build epsilon$*signed.apk to generate a signed version.)
.PHONY: epsilon_run .PHONY: epsilon_run
epsilon_run: gradle_installDebug epsilon_run: gradle_installDebug

18
ion/src/simulator/android/build.gradle
View File

@@ -1,5 +1,15 @@
def BUILD_DIR = '../../../../'+System.getenv('BUILD_DIR')+'/app' def BUILD_DIR = '../../../../'+System.getenv('BUILD_DIR')+'/app'
def projectVariable(name) {
/* This function retrieves a variable from the environment and falls back
* to the Gradle projects's properties (e.g. ~/.gradle/gradle.properties) */
return System.getenv('ANDROID_'+name) ?: project.findProperty('EPSILON_'+name)
}
def fileIfPath(path) {
return path ? new File(path) : null
}
buildscript { buildscript {
repositories { repositories {
jcenter() jcenter()
@@ -33,10 +43,10 @@ android {
} }
signingConfigs { signingConfigs {
environment { environment {
storeFile System.getenv('ANDROID_SIGNING_STORE_FILE') ? new File(System.getenv('RELEASE_STORE_FILE')) : null storeFile fileIfPath(projectVariable('SIGNING_STORE_FILE'))
storePassword System.getenv('ANDROID_SIGNING_STORE_PASSWORD') storePassword projectVariable('SIGNING_STORE_PASSWORD')
keyAlias System.getenv('ANDROID_SIGNING_KEY_ALIAS') keyAlias projectVariable('SIGNING_KEY_ALIAS')
keyPassword System.getenv('ANDROID_SIGNING_KEY_PASSWORD') keyPassword projectVariable('SIGNING_KEY_PASSWORD')
} }
} }
buildTypes { buildTypes {

4
ion/src/simulator/ios/Makefile
View File

@@ -87,10 +87,10 @@ simulator_app_deps += $(call simulator_app_resource,$(1), \
launch.storyboardc \ launch.storyboardc \
) )
$(BUILD_DIR)/app/epsilon%ipa: $(subst ..,.,$(call simulator_app_deps,Epsilon$*)) $(BUILD_DIR)/app/epsilon%ipa: $$(subst ..,.,$$(call simulator_app_deps,Epsilon$$*))
ifdef IOS_PROVISIONNING_PROFILE ifdef IOS_PROVISIONNING_PROFILE
$(call rule_label,SIGN) $(call rule_label,SIGN)
$(Q) codesign --force --entitlements $(BUILD_DIR)/app/entitlements.plist --sign "Apple Distribution: NumWorks" $(BUILD_DIR)/app/Payload/Epsilon.app $(Q) codesign --force --entitlements $(BUILD_DIR)/app/entitlements.plist --sign "Apple Distribution: NumWorks" $(BUILD_DIR)/app/Payload/Epsilon$*app
endif endif
$(call rule_label,ZIP) $(call rule_label,ZIP)
$(Q) cd $(dir $@) ; zip -qr9 $(notdir $@) Payload $(Q) cd $(dir $@) ; zip -qr9 $(notdir $@) Payload