Merge remote-tracking branch 'upstream/master'

ibobalo · ibobalo · commit 5fdbbd64a0d4 · 2015-11-24T10:56:10.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -11,4 +11,7 @@
 .optional-deps
 
 *.pyc
-*.pyo
+*.pyo
+.packages
+python_for_android.egg-info
+src
diff --git a/doc/source/quickstart.rst b/doc/source/quickstart.rst
@@ -10,7 +10,7 @@ options available.
 .. warning:: These instructions are quite preliminary. The
              installation and use process will become more standard in
              the near future.
-             
+
 
 Installation
 ------------
@@ -20,18 +20,18 @@ The easiest way to install is with pip. You need to have setuptools installed, t
   pip install git+https://github.com/kivy/python-for-android.git
 
 This should install python-for-android (though you may need to run as root or add --user).
-  
+
 You could also install python-for-android manually, either via git::
 
   git clone https://github.com/kivy/python-for-android.git
   cd python-for-android
-  
+
 Or by direct download::
 
   wget https://github.com/kivy/python-for-android/archive/master.zip
   unzip revamp.zip
   cd python-for-android-revamp
-  
+
 Then in both cases run ``python setup.py install``.
 
 Dependencies
@@ -58,13 +58,13 @@ install most of these with::
     sudo dpkg --add-architecture i386
     sudo apt-get update
     sudo apt-get install -y build-essential ccache git zlib1g-dev python2.7 python2.7-dev libncurses5:i386 libstdc++6:i386 zlib1g:i386 openjdk-7-jdk unzip ant
-    
+
 When installing the Android SDK and NDK, note the filepaths where they
 may be found, and the version of the NDK installed. You may need to
 set environment variables pointing to these later.
 
 .. _basic_use:
-  
+
 Basic use
 ---------
 
@@ -84,7 +84,7 @@ Android SDK and NDK, then:
 - Set the ``ANDROIDSDK`` env var to the ``/path/to/the/sdk``
 - Set the ``ANDROIDNDK`` env var to the ``/path/to/the/ndk``
 - Set the ``ANDROIDAPI`` to the targeted API version (or leave it
-  unset to use the default of ``14``). 
+  unset to use the default of ``14``).
 - Set the ``ANDROIDNDKVER`` env var to the version of the NDK
   downloaded, e.g. the current NDK is ``r10e`` (or leave it unset to
   use the default of ``r9``.
@@ -97,41 +97,41 @@ To create a basic distribution, run .e.g::
 
      python-for-android create --dist_name=testproject --bootstrap=pygame \
          --requirements=sdl,python2
-     
+
 This will compile the distribution, which will take a few minutes, but
 will keep you informed about its progress. The arguments relate to the
 properties of the created distribution; the dist_name is an (optional)
 unique identifier, and the requirements is a list of any pure Python
 pypi modules, or dependencies with recipes available, that your app
 depends on. The full list of builtin internal recipes can be seen with
 ``python-for-android recipes``.
-     
+
 .. note:: Compiled dists are not located in the same place as with old
           python-for-android, but instead in an OS-dependent
           location. The build process will print this location when it
           finishes, but you no longer need to navigate there manually
           (see below).
-         
+
 To build an APK, use the ``apk`` command::
 
     python-for-android apk --private /path/to/your/app --package=org.example.packagename \
         --name="Your app name" --version=0.1
-    
+
 The arguments to ``apk`` can be anything accepted by the old
 python-for-android build.py; the above is a minimal set to create a
 basic app. You can see the list with ``python-for-android apk help``.
 
 A new feature of python-for-android is that you can do all of this with just one command::
 
     python-for-android apk --private /path/to/your/app \
-        --package=org.example.packagename --name="Your app name" --version=0.5 
+        --package=org.example.packagename --name="Your app name" --version=0.5
         --bootstrap=pygame --requirements=sdl,python2 --dist_name=testproject
-  
+
 This combines the previous ``apk`` command with the arguments to
 ``create``, and works in exactly the same way; if no internal
 distribution exists with these requirements then one is first built,
 before being used to package the APK. When the command is run again,
-the build step is skipped and the previous dist re-used. 
+the build step is skipped and the previous dist re-used.
 
 Using this method you don't have to worry about whether a dist exists,
 though it is recommended to use a different ``dist_name`` for each
@@ -183,9 +183,9 @@ order; setting any of these variables overrides all the later ones:
   python-for-android automatically checks the default buildozer
   download directory. This is intended to make testing
   python-for-android easy.
-  
+
 If none of these is set, python-for-android will raise an error and exit.
-  
+
 The Android API to target
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -209,7 +209,7 @@ several ways. Each choice overrides all the later ones:
 - The ``--android_api`` argument to any python-for-android command.
 - The ``ANDROIDAPI`` environment variables.
 - If neither of the above, the default target is used (currently 14).
-  
+
 python-for-android checks if the target you select is available, and
 gives an error if not, so it's easy to test if you passed this
 variable correctly.
@@ -250,3 +250,15 @@ and means that you probably do *not* have to manually set this.
 If ``RELEASE.TXT`` exists but you manually set a different version,
 python-for-android will warn you about it, but will assume you are
 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:
+
+    --dist_name my_example
+    --android_api 19
+    --requirements kivy,openssl
diff --git a/pythonforandroid/recipes/python2/__init__.py b/pythonforandroid/recipes/python2/__init__.py
@@ -33,6 +33,7 @@ def prebuild_armeabi(self):
         self.apply_patch(join('patches', 'fix-remove-corefoundation.patch'))
         self.apply_patch(join('patches', 'fix-dynamic-lookup.patch'))
         self.apply_patch(join('patches', 'fix-dlfcn.patch'))
+        self.apply_patch(join('patches', 'parsetuple.patch'))
         # self.apply_patch(join('patches', 'ctypes-find-library.patch'))
         self.apply_patch(join('patches', 'ctypes-find-library-updated.patch'))
 
diff --git a/pythonforandroid/recipes/python2/patches/parsetuple.patch b/pythonforandroid/recipes/python2/patches/parsetuple.patch
@@ -0,0 +1,11 @@
+--- Python-2.7.2/configure.orig	2015-06-24 17:47:39.181473779 +0200
++++ Python-2.7.2/configure	2015-06-24 17:48:31.646173137 +0200
+@@ -5731,7 +5731,7 @@
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc supports ParseTuple __format__" >&5
+ $as_echo_n "checking whether gcc supports ParseTuple __format__... " >&6; }
+   save_CFLAGS=$CFLAGS
+-  CFLAGS="$CFLAGS -Werror"
++  CFLAGS="$CFLAGS -Werror -Wformat"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
diff --git a/pythonforandroid/toolchain.py b/pythonforandroid/toolchain.py
@@ -25,6 +25,7 @@
 import imp
 import contextlib
 import logging
+import shlex
 from copy import deepcopy
 from functools import wraps
 from datetime import datetime
@@ -43,7 +44,16 @@
 import argparse
 from appdirs import user_data_dir
 import sh
-from colorama import Style, Fore
+if sys.stdout.isatty():
+    from colorama import Style, Fore
+else:
+    from collections import defaultdict
+    class colorama_shim(object):
+        def __init__(self):
+            self._dict = defaultdict(str)
+        def __getattr__(self, key):
+            return self._dict[key]
+    Style = Fore = colorama_shim()
 
 user_dir = dirname(realpath(os.path.curdir))
 toolchain_dir = dirname(__file__)
@@ -71,7 +81,7 @@ def format(self, record):
                                     # handler and reset the level
     logger.setLevel(logging.INFO)
     logger.touched = True
-    ch = logging.StreamHandler(stdout)
+    ch = logging.StreamHandler(stdout) if sys.stdout.isatty() else logging.NullHandler()
     formatter = LevelDifferentiatingFormatter('%(message)s')
     ch.setFormatter(formatter)
     logger.addHandler(ch)
@@ -2583,23 +2593,27 @@ def __init__(self):
                 description="Tool for managing the Android / Python toolchain",
                 usage="""toolchain <command> [<args>]
 
-Currently available commands:
-create    Build an android project with all recipes
-
 Available commands:
-Not yet confirmed
+adb           Runs adb binary from the detected SDK dir
+apk           Create an APK using the given distribution
+bootstraps    List all the bootstraps available to build with.
+build_status  Informations about the current build
+create        Build an android project with all recipes
+clean_all     Delete all build components
+clean_builds  Delete all build caches
+clean_dists   Delete all compiled distributions
+clean_download_cache Delete any downloaded recipe packages
+clean_recipe_build   Delete the build files of a recipe
+distributions List all distributions
+export_dist   Copies a created dist to an output directory
+logcat        Runs logcat from the detected SDK dir
+print_context_info   Prints debug informations
+recipes       List all the available recipes
+sdk_tools     Runs android binary from the detected SDK dir
+symlink_dist  Symlinks a created dist to an output directory
 
 Planned commands:
-recipes
-distributions
 build_dist
-symlink_dist
-copy_dist
-clean_all
-status
-clean_builds
-clean_download_cache
-clean_dists
 """)
         parser.add_argument("command", help="Command to run")
 
@@ -2643,6 +2657,8 @@ def __init__(self):
             type=bool, default=False)
 
 
+        self._read_configuration()
+
         args, unknown = parser.parse_known_args(sys.argv[1:])
         self.dist_args = args
 
@@ -2689,6 +2705,18 @@ def __init__(self):
     #     #     print("Architectures restricted to: {}".format(archs))
     #     build_recipes(args.recipe, ctx)
 
+    def _read_configuration(self):
+        # search for a .p4a configuration file in the current directory
+        if not exists(".p4a"):
+            return
+        info("Reading .p4a configuration")
+        with open(".p4a") as fd:
+            lines = fd.readlines()
+        lines = [shlex.split(line) for line in lines if not line.startswith("#")]
+        for line in lines:
+            for arg in line:
+                sys.argv.append(arg)
+
     @property
     def ctx(self):
         if self._ctx is None:
@@ -2710,7 +2738,7 @@ def recipes(self, args):
             print(" ".join(list(Recipe.list_recipes())))
         else:
             ctx = self.ctx
-            for name in Recipe.list_recipes():
+            for name in sorted(Recipe.list_recipes()):
                 recipe = Recipe.get_recipe(name, ctx)
                 version = str(recipe.version)
                 if args.color:
