Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added ability to load Android build sources from file. #50481

Merged
merged 1 commit into from
Jul 15, 2021

Conversation

reduz
Copy link
Member

@reduz reduz commented Jul 15, 2021

  • If not present, the dialog asks to load build sources from a file.
  • The export templates check now also verifies that build sources are installed and skips the template check.

This makes Android development easier.

Bugsquad edit: Fixes #36728.

* If not present, the dialog asks to load build sources from a file.
* The export templates check now also verifies that build sources are installed and skips the template check.

This makes Android development easier.
@reduz reduz requested a review from a team as a code owner July 15, 2021 13:14
@reduz reduz changed the title Addes ability to load Android build sources from file. Added ability to load Android build sources from file. Jul 15, 2021
@BastiaanOlij BastiaanOlij added this to the 4.0 milestone Jul 15, 2021
@BastiaanOlij
Copy link
Contributor

Will this extract the zip file and copy the templates into the android folder each time you export? Or will it only do so if the android folder isn't yet there?

I can foresee people forgetting to clear out the android folder after they build a new custom build and not realize they export with the version that was there before.

@reduz
Copy link
Member Author

reduz commented Jul 15, 2021

@BastiaanOlij this is more of an advanced use case when you use your own sources file. You can't unzip over existing directory.

Copy link
Contributor

@m4gr3d m4gr3d left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@akien-mga akien-mga merged commit 296b713 into godotengine:master Jul 15, 2021
@akien-mga
Copy link
Member

Thanks!

@akien-mga akien-mga added the cherrypick:3.x Considered for cherry-picking into a future 3.x release label Jul 15, 2021
@akien-mga
Copy link
Member

Cherry-picked for 3.4.

@akien-mga akien-mga removed the cherrypick:3.x Considered for cherry-picking into a future 3.x release label Jul 20, 2021
@m4gr3d m4gr3d added the cherrypick:3.x Considered for cherry-picking into a future 3.x release label Aug 13, 2021
@akien-mga
Copy link
Member

@m4gr3d This has been cherry-picked already :)
Screenshot_20210813_095423

@akien-mga
Copy link
Member

akien-mga commented Nov 15, 2021

So this doesn't seem to work so well UX wise, as the custom export templates manager is only shown when the official custom source template is not available. So it works well if you're using 4.0.dev or 3.5.beta with no official templates installed, but if you want to use a custom source template that you built for 3.4.stable, you can't access this dialog:

case FILE_INSTALL_ANDROID_SOURCE: {
	  if (p_confirmed) {
		  export_template_manager->install_android_template();
	  } else {
		  if (DirAccess::exists("res://android/build")) {
			  remove_android_build_template->popup_centered_minsize();
		  } else if (export_template_manager->can_install_android_template()) {
			  install_android_build_template->popup_centered_minsize();
		  } else {
			  custom_build_manage_templates->popup_centered_minsize();
		  }
	  }
} break;

IMO install_android_build_template should be removed, and custom_build_manage_templates should be used all the time, and provide options to install the official source template is available, or select a custom file.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Android export: Add setting for custom source ZIP for custom builds
4 participants