Merge pull request kivy#510 from kivy/arch_support

inclement · inclement · commit 40f00901b5c3 · 2015-12-05T22:39:37.000Z
Arch support
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ Broad goals of the revamp project include:
 - (WIP) Support python3 (recipe exists but crashes on android)
 - (WIP) Support some kind of binary distribution, including on windows (semi-implemented, just needs finishing)
 - ✓ Be a standalone Pypi module (not on pypi yet but setup.py works)
-- Support multiple architectures
+- ✓ Support multiple architectures (full multiarch builds not complete, but arm and x86 with different config both work now)
 
 We are currently working to stabilise all parts of the toolchain and
 add more features. Support for pygame-based APKs is almost feature
diff --git a/doc/source/commands.rst b/doc/source/commands.rst
@@ -70,6 +70,11 @@ supply those that you need.
 ``--force_build BOOL``
   Whether the distribution must be compiled from scratch.
 
+``--arch``
+  The architecture to build for. Currently only one architecture can be 
+  targeted at a time, and a given distribution can only include one architecture.
+
+
 .. note:: These options are preliminary. Others will include toggles
           for allowing downloads, and setting additional directories
           from which to load user dists.
diff --git a/doc/source/quickstart.rst b/doc/source/quickstart.rst
@@ -254,10 +254,10 @@ correct and try to continue the build.
 Configuration file
 ~~~~~~~~~~~~~~~~~~
 
-python-for-android look on the current directory if there is a `.p4a`
-configuration file. If it found it, it adds all the lines as options
-to the command line. For example, you can put the options you would
-always write such as:
+python-for-android checks in the current directory for a configuration
+file named ``.p4a``. If found, it adds all the lines as options to the
+command line. For example, you can add the options you would always
+include such as:
 
     --dist_name my_example
     --android_api 19
diff --git a/pythonforandroid/bootstraps/empty/__init__.py b/pythonforandroid/bootstraps/empty/__init__.py
@@ -1,4 +1,4 @@
-from pythonforandroid.toolchain import Bootstrap, shprint, current_directory, info, warning, ArchAndroid, logger, info_main, which
+from pythonforandroid.toolchain import Bootstrap, shprint, current_directory, info, warning, ArchARM, logger, info_main, which
 from os.path import join, exists
 from os import walk
 import glob
diff --git a/pythonforandroid/bootstraps/pygame/__init__.py b/pythonforandroid/bootstraps/pygame/__init__.py
@@ -1,4 +1,4 @@
-from pythonforandroid.toolchain import Bootstrap, shprint, current_directory, info, warning, ArchAndroid, info_main
+from pythonforandroid.toolchain import Bootstrap, shprint, current_directory, info, warning, ArchARM, info_main
 from os.path import join, exists
 from os import walk
 import glob
@@ -19,8 +19,10 @@ def run_distribute(self):
         #                 self.name)
         src_path = join(self.bootstrap_dir, 'build')
 
-        # AND: Hardcoding armeabi - naughty!
-        arch = ArchAndroid(self.ctx)
+        arch = self.ctx.archs[0]
+        if len(self.ctx.archs) > 1:
+            raise ValueError('built for more than one arch, but bootstrap cannot handle that yet')
+        info('Bootstrap running with arch {}'.format(arch))
 
         with current_directory(self.dist_dir):
 
@@ -58,7 +60,7 @@ def run_distribute(self):
             shprint(sh.mkdir, '-p', join('private', 'include', 'python2.7'))
             
             # AND: Copylibs stuff should go here
-            shprint(sh.mv, join('libs', 'armeabi', 'libpymodules.so'), 'private/')
+            shprint(sh.mv, join('libs', arch.arch, 'libpymodules.so'), 'private/')
             shprint(sh.cp, join('python-install', 'include' , 'python2.7', 'pyconfig.h'), join('private', 'include', 'python2.7/'))
 
             info('Removing some unwanted files')
diff --git a/pythonforandroid/bootstraps/pygame/build/jni/application/Android.mk b/pythonforandroid/bootstraps/pygame/build/jni/application/Android.mk
@@ -18,7 +18,7 @@ LOCAL_CFLAGS := $(foreach D, $(APP_SUBDIRS), -I$(LOCAL_PATH)/$(D)) \
 				-I$(LOCAL_PATH)/../jpeg \
 				-I$(LOCAL_PATH)/../intl \
 				-I$(LOCAL_PATH)/.. \
-                -I$(LOCAL_PATH)/../../../../other_builds/python2/armeabi/python2/python-install/include/python2.7
+                -I$(LOCAL_PATH)/../../../../other_builds/python2/$(ARCH)/python2/python-install/include/python2.7
 				# -I$(LOCAL_PATH)/../../../../python-install/include/python2.7
 				# -I$(LOCAL_PATH)/../../../build/python-install/include/python2.7
 
@@ -39,7 +39,8 @@ LOCAL_STATIC_LIBRARIES := jpeg png
 LOCAL_LDLIBS := -lpython2.7 -lGLESv1_CM -ldl -llog -lz
 
 # AND: Another hardcoded path that should be templated
-LOCAL_LDFLAGS += -L$(LOCAL_PATH)/../../../../other_builds/python2/armeabi/python2/python-install/lib $(APPLICATION_ADDITIONAL_LDFLAGS)
+# AND: NOT TEMPALTED! We can use $ARCH
+LOCAL_LDFLAGS += -L$(LOCAL_PATH)/../../../../other_builds/python2/$(ARCH)/python2/python-install/lib $(APPLICATION_ADDITIONAL_LDFLAGS)
 
 LIBS_WITH_LONG_SYMBOLS := $(strip $(shell \
 	for f in $(LOCAL_PATH)/../../libs/$ARCH/*.so ; do \
diff --git a/pythonforandroid/bootstraps/sdl2/__init__.py b/pythonforandroid/bootstraps/sdl2/__init__.py
@@ -1,4 +1,4 @@
-from pythonforandroid.toolchain import Bootstrap, shprint, current_directory, info, warning, ArchAndroid, info_main
+from pythonforandroid.toolchain import Bootstrap, shprint, current_directory, info, warning, ArchARM, info_main
 from os.path import join, exists
 from os import walk
 import glob
@@ -20,8 +20,10 @@ def run_distribute(self):
             with open('local.properties', 'w') as fileh:
                 fileh.write('sdk.dir={}'.format(self.ctx.sdk_dir))
 
-        # AND: Hardcoding armeabi - naughty!
-        arch = ArchAndroid(self.ctx)
+        arch = self.ctx.archs[0]
+        if len(self.ctx.archs) > 1:
+            raise ValueError('built for more than one arch, but bootstrap cannot handle that yet')
+        info('Bootstrap running with arch {}'.format(arch))
 
         with current_directory(self.dist_dir):
             info('Copying python distribution')
@@ -32,7 +34,6 @@ def run_distribute(self):
                 shprint(sh.mkdir, 'assets')
             
             hostpython = sh.Command(self.ctx.hostpython)
-            # AND: This *doesn't* need to be in arm env?
             shprint(hostpython, '-OO', '-m', 'compileall',
                     self.ctx.get_python_install_dir(),
                     _tail=10, _filterout="^Listing", _critical=True)
@@ -50,8 +51,8 @@ def run_distribute(self):
             shprint(sh.mkdir, '-p', join('private', 'include', 'python2.7'))
             
             # AND: Copylibs stuff should go here
-            if exists(join('libs', 'armeabi', 'libpymodules.so')):
-                shprint(sh.mv, join('libs', 'armeabi', 'libpymodules.so'), 'private/')
+            if exists(join('libs', arch.arch, 'libpymodules.so')):
+                shprint(sh.mv, join('libs', arch.arch, 'libpymodules.so'), 'private/')
             shprint(sh.cp, join('python-install', 'include' , 'python2.7', 'pyconfig.h'), join('private', 'include', 'python2.7/'))
 
             info('Removing some unwanted files')
diff --git a/pythonforandroid/bootstraps/sdl2/build/jni/Application.mk b/pythonforandroid/bootstraps/sdl2/build/jni/Application.mk
@@ -4,4 +4,4 @@
 # APP_STL := stlport_static 
 
 # APP_ABI := armeabi armeabi-v7a x86
-APP_ABI := armeabi
+APP_ABI := $(ARCH)
diff --git a/pythonforandroid/bootstraps/sdl2/build/jni/src/Android.mk b/pythonforandroid/bootstraps/sdl2/build/jni/src/Android.mk
@@ -12,12 +12,12 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(SDL_PATH)/include
 LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c \
 	start.c
 
-LOCAL_CFLAGS += -I$(LOCAL_PATH)/../../../../other_builds/python2/armeabi/python2/python-install/include/python2.7
+LOCAL_CFLAGS += -I$(LOCAL_PATH)/../../../../other_builds/python2/$(ARCH)/python2/python-install/include/python2.7
 
 LOCAL_SHARED_LIBRARIES := SDL2
 
 LOCAL_LDLIBS := -lGLESv1_CM -lGLESv2 -llog -lpython2.7
 
-LOCAL_LDFLAGS += -L$(LOCAL_PATH)/../../../../other_builds/python2/armeabi/python2/python-install/lib $(APPLICATION_ADDITIONAL_LDFLAGS)
+LOCAL_LDFLAGS += -L$(LOCAL_PATH)/../../../../other_builds/python2/$(ARCH)/python2/python-install/lib $(APPLICATION_ADDITIONAL_LDFLAGS)
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/pythonforandroid/bootstraps/sdl2python3/__init__.py b/pythonforandroid/bootstraps/sdl2python3/__init__.py
@@ -1,4 +1,4 @@
-from pythonforandroid.toolchain import Bootstrap, shprint, current_directory, info, warning, ArchAndroid, info_main
+from pythonforandroid.toolchain import Bootstrap, shprint, current_directory, info, warning, ArchARM, info_main
 from os.path import join, exists
 from os import walk
 import glob
@@ -23,7 +23,7 @@ def run_distribute(self):
                 fileh.write('sdk.dir={}'.format(self.ctx.sdk_dir))
 
         # AND: Hardcoding armeabi - naughty!
-        arch = ArchAndroid(self.ctx)
+        arch = ArchARM(self.ctx)
 
         with current_directory(self.dist_dir):
             info('Copying python distribution')
diff --git a/pythonforandroid/recipes/android/__init__.py b/pythonforandroid/recipes/android/__init__.py
@@ -1,5 +1,5 @@
 
-from pythonforandroid.toolchain import CythonRecipe, shprint, ensure_dir, current_directory, ArchAndroid, IncludedFilesBehaviour
+from pythonforandroid.toolchain import CythonRecipe, shprint, ensure_dir, current_directory, ArchARM, IncludedFilesBehaviour
 import sh
 from os.path import exists, join
 
diff --git a/pythonforandroid/recipes/freetype/__init__.py b/pythonforandroid/recipes/freetype/__init__.py
@@ -1,5 +1,5 @@
 
-from pythonforandroid.toolchain import Recipe, shprint, get_directory, current_directory, ArchAndroid
+from pythonforandroid.toolchain import Recipe, shprint, get_directory, current_directory, ArchARM
 from os.path import exists, join, realpath
 from os import uname
 import glob
@@ -12,8 +12,8 @@ class FreetypeRecipe(Recipe):
 
     depends = ['harfbuzz']
 
-    def should_build(self):
-        if exists(join(self.get_build_dir('armeabi'), 'objs', '.libs', 'libfreetype.so')):
+    def should_build(self, arch):
+        if exists(join(self.get_build_dir(arch.arch), 'objs', '.libs', 'libfreetype.so')):
             return False
         return True
 
diff --git a/pythonforandroid/recipes/harfbuzz/__init__.py b/pythonforandroid/recipes/harfbuzz/__init__.py
@@ -1,5 +1,5 @@
 
-from pythonforandroid.toolchain import Recipe, shprint, get_directory, current_directory, ArchAndroid
+from pythonforandroid.toolchain import Recipe, shprint, get_directory, current_directory, ArchARM
 from os.path import exists, join, realpath
 from os import uname
 import glob
@@ -10,8 +10,8 @@ class HarfbuzzRecipe(Recipe):
     version = '0.9.40'
     url = 'http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-{version}.tar.bz2'
 
-    def should_build(self):
-        if exists(join(self.get_build_dir('armeabi'), 'src', '.libs', 'libharfbuzz.so')):
+    def should_build(self, arch):
+        if exists(join(self.get_build_dir(arch.arch), 'src', '.libs', 'libharfbuzz.so')):
             return False
         return True
 
diff --git a/pythonforandroid/recipes/hostpython2/__init__.py b/pythonforandroid/recipes/hostpython2/__init__.py
@@ -12,24 +12,27 @@ class Hostpython2Recipe(Recipe):
 
     conflicts = ['hostpython3']
 
-    def prebuild_armeabi(self):
+    def get_build_container_dir(self, arch=None):
+        choices = self.check_recipe_choices()
+        dir_name = '-'.join([self.name] + choices)
+        return join(self.ctx.build_dir, 'other_builds', dir_name, 'desktop')
+
+    def get_build_dir(self, arch=None):
+        return join(self.get_build_container_dir(), self.name)
+
+    def prebuild_arch(self, arch):
         # Override hostpython Setup?
         shprint(sh.cp, join(self.get_recipe_dir(), 'Setup'),
-                join(self.get_build_dir('armeabi'), 'Modules', 'Setup'))
-
-    def build_armeabi(self):
-        # AND: Should use an i386 recipe system
-        warning('Running hostpython build. Arch is armeabi! '
-                'This is naughty, need to fix the Arch system!')
+                join(self.get_build_dir(), 'Modules', 'Setup'))
 
-        # AND: Fix armeabi again
-        with current_directory(self.get_build_dir('armeabi')):
+    def build_arch(self, arch):
+        with current_directory(self.get_build_dir()):
 
             if exists('hostpython'):
                 info('hostpython already exists, skipping build')
-                self.ctx.hostpython = join(self.get_build_dir('armeabi'),
+                self.ctx.hostpython = join(self.get_build_dir(),
                                            'hostpython')
-                self.ctx.hostpgen = join(self.get_build_dir('armeabi'),
+                self.ctx.hostpgen = join(self.get_build_dir(),
                                            'hostpgen')
                 return
             
@@ -49,8 +52,8 @@ def build_armeabi(self):
                         'hostpython build! Exiting.')
                 exit(1)
 
-        self.ctx.hostpython = join(self.get_build_dir('armeabi'), 'hostpython')
-        self.ctx.hostpgen = join(self.get_build_dir('armeabi'), 'hostpgen')
+        self.ctx.hostpython = join(self.get_build_dir(), 'hostpython')
+        self.ctx.hostpgen = join(self.get_build_dir(), 'hostpgen')
 
 
 recipe = Hostpython2Recipe()
diff --git a/pythonforandroid/recipes/kivy/__init__.py b/pythonforandroid/recipes/kivy/__init__.py
@@ -1,5 +1,5 @@
 
-from pythonforandroid.toolchain import CythonRecipe, shprint, current_directory, ArchAndroid
+from pythonforandroid.toolchain import CythonRecipe, shprint, current_directory, ArchARM
 from os.path import exists, join
 import sh
 import glob
diff --git a/pythonforandroid/recipes/kivysdl2python3/__init__.py b/pythonforandroid/recipes/kivysdl2python3/__init__.py
@@ -1,5 +1,5 @@
 
-from pythonforandroid.toolchain import CythonRecipe, shprint, current_directory, ArchAndroid
+from pythonforandroid.toolchain import CythonRecipe, shprint, current_directory, ArchARM
 from os.path import exists, join
 import sh
 import glob
@@ -35,7 +35,7 @@ def get_recipe_env(self, arch):
         return env
         
     # def build_armeabi(self):
-    #     env = ArchAndroid(self.ctx).get_env()
+    #     env = ArchARM(self.ctx).get_env()
 
     #     env['LDFLAGS'] = env['LDFLAGS'] + ' -L{}'.format(self.ctx.libs_dir)
     #     env['LDSHARED'] = env['LIBLINK']
diff --git a/pythonforandroid/recipes/numpy/__init__.py b/pythonforandroid/recipes/numpy/__init__.py
@@ -20,10 +20,10 @@ def prebuild_arch(self, arch):
             print('numpy already patched, skipping')
             return
 
-        self.apply_patch('patches/fix-numpy.patch')
-        self.apply_patch('patches/prevent_libs_check.patch')
-        self.apply_patch('patches/ar.patch')
-        self.apply_patch('patches/lib.patch')
+        self.apply_patch('patches/fix-numpy.patch', arch.arch)
+        self.apply_patch('patches/prevent_libs_check.patch', arch.arch)
+        self.apply_patch('patches/ar.patch', arch.arch)
+        self.apply_patch('patches/lib.patch', arch.arch)
 
         # AND: Fix this warning!
         warning('Numpy is built assuming the archiver name is '
diff --git a/pythonforandroid/recipes/openssl/__init__.py b/pythonforandroid/recipes/openssl/__init__.py
@@ -8,8 +8,8 @@ class OpenSSLRecipe(Recipe):
     version = '1.0.2e'
     url = 'https://www.openssl.org/source/openssl-{version}.tar.gz'
 
-    def should_build(self):
-        return not exists(join(self.get_build_dir('armeabi'), 'libssl.a'))
+    def should_build(self, arch):
+        return not exists(join(self.get_build_dir(arch.arch), 'libssl.a'))
 
     def build_arch(self, arch):
         env = self.get_recipe_env(arch)
diff --git a/pythonforandroid/recipes/pygame/__init__.py b/pythonforandroid/recipes/pygame/__init__.py
@@ -1,5 +1,5 @@
 
-from pythonforandroid.toolchain import Recipe, shprint, ArchAndroid, current_directory, debug, info, ensure_dir
+from pythonforandroid.toolchain import Recipe, shprint, ArchARM, current_directory, debug, info, ensure_dir
 from os.path import exists, join
 import sh
 import glob
@@ -26,21 +26,20 @@ def get_recipe_env(self, arch):
         ensure_dir(liblink_path)
         return env
 
-    def prebuild_armeabi(self):
-        if exists(join(self.get_build_container_dir('armeabi'), '.patched')):
+    def prebuild_arch(self, arch):
+        if exists(join(self.get_build_container_dir(arch.arch), '.patched')):
             info('Pygame already patched, skipping.')
             return
         shprint(sh.cp, join(self.get_recipe_dir(), 'Setup'),
-                join(self.get_build_dir('armeabi'), 'Setup'))
-        self.apply_patch(join('patches', 'fix-surface-access.patch'))
-        self.apply_patch(join('patches', 'fix-array-surface.patch'))
-        self.apply_patch(join('patches', 'fix-sdl-spam-log.patch'))
-        shprint(sh.touch, join(self.get_build_container_dir('armeabi'), '.patched'))
+                join(self.get_build_dir(arch.arch), 'Setup'))
+        self.apply_patch(join('patches', 'fix-surface-access.patch'), arch.arch)
+        self.apply_patch(join('patches', 'fix-array-surface.patch'), arch.arch)
+        self.apply_patch(join('patches', 'fix-sdl-spam-log.patch'), arch.arch)
+        shprint(sh.touch, join(self.get_build_container_dir(arch.arch), '.patched'))
         
-    def build_armeabi(self):
+    def build_arch(self, arch):
         # AND: I'm going to ignore any extra pythonrecipe or cythonrecipe behaviour for now
         
-        arch = ArchAndroid(self.ctx)
         env = self.get_recipe_env(arch)
         
         env['CFLAGS'] = env['CFLAGS'] + ' -I{jni_path}/png -I{jni_path}/jpeg'.format(
@@ -57,7 +56,7 @@ def build_armeabi(self):
 
         env['LDSHARED'] = join(self.ctx.root_dir, 'tools', 'liblink')
 
-        with current_directory(self.get_build_dir('armeabi')):
+        with current_directory(self.get_build_dir(arch.arch)):
             info('hostpython is ' + self.ctx.hostpython)
             hostpython = sh.Command(self.ctx.hostpython)
             shprint(hostpython, 'setup.py', 'install', '-O2', _env=env,
diff --git a/pythonforandroid/recipes/pyjnius/__init__.py b/pythonforandroid/recipes/pyjnius/__init__.py
@@ -1,5 +1,5 @@
 
-from pythonforandroid.toolchain import CythonRecipe, shprint, ArchAndroid, current_directory, info
+from pythonforandroid.toolchain import CythonRecipe, shprint, ArchARM, current_directory, info
 import sh
 import glob
 from os.path import join, exists
@@ -18,7 +18,7 @@ def prebuild_arch(self, arch):
             if exists(join(build_dir, '.patched')):
                 print('pyjniussdl2 already pathed, skipping')
                 return
-            self.apply_patch('sdl2_jnienv_getter.patch')
+            self.apply_patch('sdl2_jnienv_getter.patch', arch.arch)
             shprint(sh.touch, join(build_dir, '.patched'))
 
     def postbuild_arch(self, arch):
diff --git a/pythonforandroid/recipes/pyopenssl/__init__.py b/pythonforandroid/recipes/pyopenssl/__init__.py
@@ -22,7 +22,7 @@ def prebuild_arch(self, arch):
         if exists(join(build_dir, '.patched')):
             print('pyOpenSSL already patched, skipping')
             return
-        self.apply_patch('fix-dlfcn.patch')
+        self.apply_patch('fix-dlfcn.patch', arch.arch)
         shprint(sh.touch, join(build_dir, '.patched'))
 
     def get_recipe_env(self, arch):
diff --git a/pythonforandroid/recipes/pysdl2/__init__.py b/pythonforandroid/recipes/pysdl2/__init__.py
@@ -1,5 +1,5 @@
 
-from pythonforandroid.toolchain import PythonRecipe, shprint, current_directory, ArchAndroid
+from pythonforandroid.toolchain import PythonRecipe, shprint, current_directory, ArchARM
 from os.path import exists, join
 import sh
 import glob
diff --git a/pythonforandroid/recipes/python2/__init__.py b/pythonforandroid/recipes/python2/__init__.py
diff --git a/pythonforandroid/recipes/python3/__init__.py b/pythonforandroid/recipes/python3/__init__.py
diff --git a/pythonforandroid/recipes/sdl/__init__.py b/pythonforandroid/recipes/sdl/__init__.py
diff --git a/pythonforandroid/recipes/sdl2/__init__.py b/pythonforandroid/recipes/sdl2/__init__.py
diff --git a/pythonforandroid/recipes/sdl2_image/__init__.py b/pythonforandroid/recipes/sdl2_image/__init__.py
diff --git a/pythonforandroid/recipes/sdl2_image/disable_jpg.patch b/pythonforandroid/recipes/sdl2_image/disable_jpg.patch
diff --git a/pythonforandroid/recipes/sdl2_mixer/__init__.py b/pythonforandroid/recipes/sdl2_mixer/__init__.py
diff --git a/pythonforandroid/recipes/sdl2python3/__init__.py b/pythonforandroid/recipes/sdl2python3/__init__.py
diff --git a/pythonforandroid/recipes/vispy/__init__.py b/pythonforandroid/recipes/vispy/__init__.py
diff --git a/pythonforandroid/toolchain.py b/pythonforandroid/toolchain.py

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from pythonforandroid.toolchain import Bootstrap, shprint, current_directory, info, warning, ArchAndroid, logger, info_main, which`
	`1`	`+from pythonforandroid.toolchain import Bootstrap, shprint, current_directory, info, warning, ArchARM, logger, info_main, which`
`2`	`2`	`from os.path import join, exists`
`3`	`3`	`from os import walk`
`4`	`4`	`import glob`