Made setup.cfg file work for distutils bdist_apk

inclement · inclement · commit 1ee96e70489e · 2016-07-04T00:11:23.000+01:00
diff --git a/doc/source/distutils.rst b/doc/source/distutils.rst
@@ -77,3 +77,15 @@ store them in setup.py by passing the ``options`` parameter to
 These options will be automatically included when you run ``python
 setup.py apk``. Any options passed on the command line will override
 these values.
+
+Adding p4a arguments in setup.cfg
+---------------------------------
+
+You can also provide p4a arguments in the setup.cfg file, as normal
+for distutils. The syntax is::
+
+    [apk]
+
+    argument=value
+
+    requirements=sdl2,kivy
diff --git a/pythonforandroid/bdist_apk.py b/pythonforandroid/bdist_apk.py
@@ -40,10 +40,10 @@ def finalize_options(self):
 
         setup_options = self.distribution.get_option_dict('apk')
         for (option, (source, value)) in setup_options.items():
-            if source != 'setup script':
+            if source == 'command line':
                 continue
             if not argv_contains('--' + option):
-                if value is None:
+                if value in (None, 'None'):
                     sys.argv.append('--{}'.format(option))
                 else:
                     sys.argv.append('--{}={}'.format(option, value))
@@ -77,6 +77,7 @@ def run(self):
 
         from pythonforandroid.toolchain import main
         sys.argv[1] = 'apk'
+        print('argv is', sys.argv)
         main()
 
     def prepare_build_dir(self):
