From 63c62109bbfda20180efaf6010826a19945acd5e Mon Sep 17 00:00:00 2001 From: Ryan Pessa Date: Fri, 8 Jan 2016 14:55:54 -0600 Subject: [PATCH 1/2] rename sdl2 templates --- .../{AndroidManifest.xml.tmpl => AndroidManifest.tmpl.xml} | 0 .../sdl2/build/templates/{build.xml.tmpl => build.tmpl.xml} | 0 .../sdl2/build/templates/{strings.xml.tmpl => strings.tmpl.xml} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename pythonforandroid/bootstraps/sdl2/build/templates/{AndroidManifest.xml.tmpl => AndroidManifest.tmpl.xml} (100%) rename pythonforandroid/bootstraps/sdl2/build/templates/{build.xml.tmpl => build.tmpl.xml} (100%) rename pythonforandroid/bootstraps/sdl2/build/templates/{strings.xml.tmpl => strings.tmpl.xml} (100%) diff --git a/pythonforandroid/bootstraps/sdl2/build/templates/AndroidManifest.xml.tmpl b/pythonforandroid/bootstraps/sdl2/build/templates/AndroidManifest.tmpl.xml similarity index 100% rename from pythonforandroid/bootstraps/sdl2/build/templates/AndroidManifest.xml.tmpl rename to pythonforandroid/bootstraps/sdl2/build/templates/AndroidManifest.tmpl.xml diff --git a/pythonforandroid/bootstraps/sdl2/build/templates/build.xml.tmpl b/pythonforandroid/bootstraps/sdl2/build/templates/build.tmpl.xml similarity index 100% rename from pythonforandroid/bootstraps/sdl2/build/templates/build.xml.tmpl rename to pythonforandroid/bootstraps/sdl2/build/templates/build.tmpl.xml diff --git a/pythonforandroid/bootstraps/sdl2/build/templates/strings.xml.tmpl b/pythonforandroid/bootstraps/sdl2/build/templates/strings.tmpl.xml similarity index 100% rename from pythonforandroid/bootstraps/sdl2/build/templates/strings.xml.tmpl rename to pythonforandroid/bootstraps/sdl2/build/templates/strings.tmpl.xml From 151796ea0470e39446398cdd0e550d96ece92bef Mon Sep 17 00:00:00 2001 From: Ryan Pessa Date: Fri, 8 Jan 2016 14:59:09 -0600 Subject: [PATCH 2/2] use renamed sdl2 templates --- pythonforandroid/bootstraps/sdl2/build/build.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pythonforandroid/bootstraps/sdl2/build/build.py b/pythonforandroid/bootstraps/sdl2/build/build.py index 8192606565..0e374a40f7 100755 --- a/pythonforandroid/bootstraps/sdl2/build/build.py +++ b/pythonforandroid/bootstraps/sdl2/build/build.py @@ -264,19 +264,19 @@ def make_package(args): args.numeric_version = str(version_code) render( - 'AndroidManifest.xml.tmpl', + 'AndroidManifest.tmpl.xml', 'AndroidManifest.xml', args=args, ) render( - 'build.xml.tmpl', + 'build.tmpl.xml', 'build.xml', args=args, versioned_name=versioned_name) render( - 'strings.xml.tmpl', + 'strings.tmpl.xml', 'res/values/strings.xml', args=args)