Refactor the python system_impl module.

mojo/public/python/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//third_party/cython/rules.gni")
 
 group("python") {
   deps = [
     ":base",
     ":bindings",
     ":system",
     ":system_impl",
   ]
 }
 
 # GYP version: mojo.gyp:mojo_python_system
 python_binary_module("system") {
   python_base_module = "mojo"
   sources = [
     "mojo/c_core.pxd",
+    "mojo/c_environment_common.pxd",
     "mojo/system.pyx",
   ]
-  configs = [ "../build/config:mojo_sdk" ]

[qsr, 2014/12/10 15:38:57]

You need to keep those.

[etiennej, 2014/12/11 09:52:52]

Done.

   deps = [
     ":base",
     "../c/environment",
     "../c/system:for_shared_library",
     "../cpp/environment:standalone",
     "../cpp/system",
     "../cpp/utility",
     "../cpp/bindings:callback",
   ]
 }
 
+python_binary_module_sources("system_src") {

[qsr, 2014/12/10 15:38:57]

why are the dependencies different for this one and for system? If you can
remove dependency here, you can probably remove those for system.

Once this is the case, you might want to have those files and dependencies in
variables, and using those for both targets. And maybe, rework with the gni so
that you can not have any sources at all, and just depend on the source module
in the binary module.

Also, maybe rename system_src to system_embedded

[etiennej, 2014/12/11 09:52:52]

Done.

+  sources = [
+    "mojo/c_core.pxd",
+    "mojo/c_environment_common.pxd",
+    "mojo/system.pyx",
+  ]
+  deps = [
+    ":base",
+    "../c/system:for_shared_library",
+    "../cpp/system",
+    "../cpp/utility",
+    "../cpp/bindings:callback",
+  ]
+}
+
 python_binary_module("system_impl") {
   python_base_module = "mojo"
   sources = [
     "mojo/c_core.pxd",
     "mojo/c_environment.pxd",
     "mojo/system_impl.pyx",
   ]
   additional_sources = [
     "src/python_system_helper.cc",
     "src/python_system_helper.h",
   ]
-  configs = [ "../build/config:mojo_sdk" ]
   deps = [
     ":base",
+    ":python_common",
     "../c/environment",
     "../c/system:for_shared_library",
     "../cpp/environment:standalone",
     "../cpp/system",
     "../cpp/utility",
     "../cpp/bindings:callback",
   ]
 }
 
+source_set("python_common") {
+  sources = [
+    "src/common.h",
+    "src/common.cc",
+  ]
+  deps = [
+    "../c/environment:environment",
+    "../cpp/bindings:callback",
+    "../cpp/environment:environment",
+    "../cpp/system:system",
+    "../cpp/utility",
+  ]
+  include_dirs = [ "/usr/include/python2.7" ]

[qsr, 2014/12/10 15:38:57]

That's incorrect. You need to work with the rules.gni in cython, and use some
configuration from this so that this could work on other platform than linux or
with distribution that have python at some other place.

[etiennej, 2014/12/11 09:52:52]

Done.

+}
+
 copy("base") {
   sources = [
     "mojo/__init__.py",
   ]
   outputs = [
     "$root_out_dir/python/mojo/{{source_file_part}}",
   ]
 }
 
 # GYP version: mojo.gyp:mojo_python_bindings
 copy("bindings") {
   sources = [
     "mojo/bindings/__init__.py",
     "mojo/bindings/descriptor.py",
     "mojo/bindings/messaging.py",
     "mojo/bindings/promise.py",
     "mojo/bindings/reflection.py",
     "mojo/bindings/serialization.py",
   ]
   outputs = [
     "$root_out_dir/python/mojo/bindings/{{source_file_part}}",
   ]
   deps = [
     ":base",
     ":system",
   ]
 }