Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(260)

Issue 11882012: Convert all project to use common.mk (Closed)

Created:
7 years, 11 months ago by noelallen1
Modified:
7 years, 11 months ago
Reviewers:
binji
CC:
chromium-reviews, pam+watch_chromium.org
Visibility:
Public.

Description

Convert all project to use common.mk The current Makefiles are extremely large and complex. This change puts the complexity into common.mk, nacl.mk and host.mk so that Makefile pretty much becomes a list of sources and targets. BUG=169044 R=binji@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=177356

Patch Set 1 #

Patch Set 2 : Support LIBS #

Patch Set 3 : Fix WIN path dir, add ppapi_cpp #

Patch Set 4 : Fix NaCl Mount Win #

Patch Set 5 : Disable Windows NaCl Mounts #

Patch Set 6 : Split C and C++ compile #

Patch Set 7 : Convert libs to Makefile #

Patch Set 8 : Fixed linux #

Patch Set 9 : Support WIN #

Patch Set 10 : Add/Remove MK files #

Patch Set 11 : Fix missing common.mk path #

Total comments: 30

Patch Set 12 : Remove extra search paths #

Patch Set 13 : Nits and Fix #

Patch Set 14 : Fix mounts test #

Patch Set 15 : WIN Defines, IGNORE_DEPS #

Patch Set 16 : Fix mkdir remove extra import #

Patch Set 17 : Merge #

Unified diffs Side-by-side diffs Delta from patch set Stats (+1529 lines, -318 lines) Patch
M native_client_sdk/src/build_tools/build_examples.py View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 2 chunks +9 lines, -2 lines 0 comments Download
M native_client_sdk/src/build_tools/build_sdk.py View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 3 chunks +10 lines, -3 lines 0 comments Download
M native_client_sdk/src/build_tools/generate_make.py View 1 2 3 4 5 1 chunk +1 line, -1 line 0 comments Download
M native_client_sdk/src/examples/Makefile View 1 2 3 4 5 6 7 2 chunks +8 lines, -0 lines 0 comments Download
A + native_client_sdk/src/examples/debugging/Makefile View 1 2 3 4 5 6 4 chunks +27 lines, -7 lines 0 comments Download
M native_client_sdk/src/examples/debugging/example.dsc View 1 2 3 4 5 6 7 8 9 10 11 2 chunks +12 lines, -3 lines 0 comments Download
M native_client_sdk/src/examples/debugging/hello_world.c View 1 2 3 4 5 2 chunks +3 lines, -2 lines 0 comments Download
A + native_client_sdk/src/examples/dlopen/Makefile View 1 2 3 4 5 6 7 8 9 10 11 12 4 chunks +22 lines, -8 lines 0 comments Download
M native_client_sdk/src/examples/dlopen/example.dsc View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +4 lines, -1 line 0 comments Download
A + native_client_sdk/src/examples/file_histogram/Makefile View 1 2 3 4 5 6 4 chunks +16 lines, -6 lines 0 comments Download
M native_client_sdk/src/examples/file_histogram/example.dsc View 1 2 3 4 5 6 7 8 9 10 11 2 chunks +5 lines, -2 lines 0 comments Download
A + native_client_sdk/src/examples/file_io/Makefile View 1 2 3 4 5 6 4 chunks +16 lines, -6 lines 0 comments Download
M native_client_sdk/src/examples/file_io/example.dsc View 1 2 3 4 5 6 1 chunk +4 lines, -1 line 0 comments Download
A + native_client_sdk/src/examples/gamepad/Makefile View 1 2 3 4 5 6 4 chunks +16 lines, -6 lines 0 comments Download
M native_client_sdk/src/examples/gamepad/example.dsc View 1 2 3 4 5 6 1 chunk +3 lines, -0 lines 0 comments Download
A + native_client_sdk/src/examples/geturl/Makefile View 1 2 3 4 5 6 4 chunks +16 lines, -7 lines 0 comments Download
M native_client_sdk/src/examples/geturl/example.dsc View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +5 lines, -1 line 0 comments Download
A + native_client_sdk/src/examples/hello_nacl_mounts/Makefile View 1 2 3 4 5 6 4 chunks +16 lines, -6 lines 0 comments Download
M native_client_sdk/src/examples/hello_nacl_mounts/example.dsc View 1 2 3 4 5 6 1 chunk +3 lines, -2 lines 0 comments Download
M native_client_sdk/src/examples/hello_world/Makefile View 1 2 3 4 5 6 2 chunks +13 lines, -3 lines 0 comments Download
M native_client_sdk/src/examples/hello_world/example.dsc View 1 2 3 4 5 6 7 8 9 10 11 2 chunks +0 lines, -6 lines 0 comments Download
M native_client_sdk/src/examples/hello_world_gles/Makefile View 1 2 3 4 5 6 7 2 chunks +13 lines, -3 lines 0 comments Download
M native_client_sdk/src/examples/hello_world_gles/example.dsc View 1 2 3 4 5 6 7 8 9 10 11 2 chunks +0 lines, -6 lines 0 comments Download
M native_client_sdk/src/examples/hello_world_interactive/Makefile View 1 2 3 4 5 6 7 8 9 10 11 12 3 chunks +15 lines, -4 lines 0 comments Download
M native_client_sdk/src/examples/hello_world_interactive/example.dsc View 1 2 3 4 5 6 7 8 9 10 11 2 chunks +0 lines, -6 lines 0 comments Download
M native_client_sdk/src/examples/hello_world_stdio/Makefile View 1 2 3 4 5 6 2 chunks +13 lines, -3 lines 0 comments Download
M native_client_sdk/src/examples/hello_world_stdio/example.dsc View 1 2 3 4 5 6 7 8 9 10 11 2 chunks +1 line, -7 lines 0 comments Download
A + native_client_sdk/src/examples/input_events/Makefile View 1 2 3 4 5 6 4 chunks +16 lines, -6 lines 0 comments Download
M native_client_sdk/src/examples/input_events/example.dsc View 1 2 3 4 5 6 2 chunks +5 lines, -2 lines 0 comments Download
A + native_client_sdk/src/examples/load_progress/Makefile View 1 2 3 4 5 6 7 4 chunks +16 lines, -7 lines 0 comments Download
M native_client_sdk/src/examples/load_progress/example.dsc View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +5 lines, -2 lines 0 comments Download
A + native_client_sdk/src/examples/mouselock/Makefile View 1 2 3 4 5 6 4 chunks +16 lines, -6 lines 0 comments Download
M native_client_sdk/src/examples/mouselock/example.dsc View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +3 lines, -1 line 0 comments Download
A + native_client_sdk/src/examples/pi_generator/Makefile View 1 2 3 4 5 6 7 8 9 10 4 chunks +16 lines, -6 lines 0 comments Download
M native_client_sdk/src/examples/pi_generator/example.dsc View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +4 lines, -1 line 0 comments Download
A + native_client_sdk/src/examples/sine_synth/Makefile View 1 2 3 4 5 6 7 8 9 10 4 chunks +16 lines, -6 lines 0 comments Download
M native_client_sdk/src/examples/sine_synth/example.dsc View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +4 lines, -1 line 0 comments Download
A + native_client_sdk/src/examples/websocket/Makefile View 1 2 3 4 5 6 4 chunks +16 lines, -6 lines 0 comments Download
M native_client_sdk/src/examples/websocket/example.dsc View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +4 lines, -1 line 0 comments Download
A native_client_sdk/src/libraries/gmock/Makefile View 1 2 3 4 5 6 7 8 9 10 11 12 1 chunk +54 lines, -0 lines 0 comments Download
M native_client_sdk/src/libraries/gmock/library.dsc View 1 2 3 4 5 6 2 chunks +4 lines, -0 lines 0 comments Download
A native_client_sdk/src/libraries/gtest/Makefile View 1 2 3 4 5 6 7 8 9 10 11 12 1 chunk +57 lines, -0 lines 0 comments Download
M native_client_sdk/src/libraries/gtest/library.dsc View 1 2 3 4 5 6 1 chunk +3 lines, -0 lines 0 comments Download
A native_client_sdk/src/libraries/gtest_ppapi/Makefile View 1 2 3 4 5 6 7 8 9 10 11 12 1 chunk +54 lines, -0 lines 0 comments Download
M native_client_sdk/src/libraries/gtest_ppapi/library.dsc View 1 2 3 4 5 6 1 chunk +3 lines, -0 lines 0 comments Download
A native_client_sdk/src/libraries/nacl_mounts/Makefile View 1 2 3 4 5 6 7 8 9 10 11 12 1 chunk +57 lines, -0 lines 0 comments Download
M native_client_sdk/src/libraries/nacl_mounts/kernel_wrap.h View 1 2 3 4 5 6 1 chunk +1 line, -0 lines 0 comments Download
M native_client_sdk/src/libraries/nacl_mounts/library.dsc View 1 2 3 4 5 6 2 chunks +3 lines, -1 line 0 comments Download
M native_client_sdk/src/libraries/nacl_mounts/mount_node_html5fs.cc View 1 chunk +1 line, -1 line 0 comments Download
M native_client_sdk/src/libraries/nacl_mounts/nacl_mounts.h View 1 2 3 4 5 6 2 chunks +3 lines, -1 line 0 comments Download
A + native_client_sdk/src/libraries/nacl_mounts_test/Makefile View 1 2 3 4 5 6 7 8 9 10 11 12 13 3 chunks +32 lines, -17 lines 0 comments Download
M native_client_sdk/src/libraries/nacl_mounts_test/example.dsc View 1 2 3 4 5 6 1 chunk +1 line, -0 lines 0 comments Download
A native_client_sdk/src/libraries/ppapi_cpp/Makefile View 1 2 3 4 5 6 7 8 9 10 11 12 1 chunk +65 lines, -0 lines 0 comments Download
M native_client_sdk/src/libraries/ppapi_cpp/library.dsc View 1 2 3 4 5 6 7 8 9 10 11 2 chunks +5 lines, -1 line 0 comments Download
A native_client_sdk/src/libraries/ppapi_gles2/Makefile View 1 2 3 4 5 6 7 8 9 10 11 12 1 chunk +56 lines, -0 lines 0 comments Download
M native_client_sdk/src/libraries/ppapi_gles2/library.dsc View 1 2 3 4 5 6 7 8 9 10 11 2 chunks +7 lines, -1 line 0 comments Download
A native_client_sdk/src/libraries/ppapi_main/Makefile View 1 2 3 4 5 6 7 8 9 10 11 12 1 chunk +52 lines, -0 lines 0 comments Download
M native_client_sdk/src/libraries/ppapi_main/library.dsc View 1 2 3 4 5 6 2 chunks +4 lines, -1 line 0 comments Download
M native_client_sdk/src/libraries/ppapi_main/ppapi_instance.cc View 1 2 3 1 chunk +1 line, -0 lines 0 comments Download
M native_client_sdk/src/tools/common.mk View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 11 chunks +93 lines, -148 lines 0 comments Download
A native_client_sdk/src/tools/host_gcc.mk View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 1 chunk +137 lines, -0 lines 0 comments Download
A native_client_sdk/src/tools/host_vc.mk View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 1 chunk +130 lines, -0 lines 0 comments Download
A native_client_sdk/src/tools/nacl_gcc.mk View 1 2 3 4 5 6 7 8 9 10 11 12 13 1 chunk +202 lines, -0 lines 0 comments Download
A native_client_sdk/src/tools/nacl_llvm.mk View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 1 chunk +132 lines, -0 lines 0 comments Download

Messages

Total messages: 3 (0 generated)
noelallen1
ptal Win try bot currently down, will verify first.
7 years, 11 months ago (2013-01-16 21:58:52 UTC) #1
binji
lgtm, mostly comment fixes. https://codereview.chromium.org/11882012/diff/14082/native_client_sdk/src/build_tools/build_examples.py File native_client_sdk/src/build_tools/build_examples.py (right): https://codereview.chromium.org/11882012/diff/14082/native_client_sdk/src/build_tools/build_examples.py#newcode22 native_client_sdk/src/build_tools/build_examples.py:22: help='Only\'t copy the files, don\'t ...
7 years, 11 months ago (2013-01-16 22:46:54 UTC) #2
noelallen1
7 years, 11 months ago (2013-01-16 23:21:10 UTC) #3
https://codereview.chromium.org/11882012/diff/14082/native_client_sdk/src/bui...
File native_client_sdk/src/build_tools/build_examples.py (right):

https://codereview.chromium.org/11882012/diff/14082/native_client_sdk/src/bui...
native_client_sdk/src/build_tools/build_examples.py:22: help='Only\'t copy the
files, don\'t build.',
On 2013/01/16 22:46:55, binji wrote:
> nit: s/Only\'t/Only/

Done.

https://codereview.chromium.org/11882012/diff/14082/native_client_sdk/src/bui...
native_client_sdk/src/build_tools/build_examples.py:55: src_path =
os.path.join(buildbot_common.SDK_SRC_DIR, 'tools', '*.mk')
On 2013/01/16 22:46:55, binji wrote:
> could run build_sdk.BuildStepCopyBuildHelpers instead...?

Done.

https://codereview.chromium.org/11882012/diff/14082/native_client_sdk/src/exa...
File native_client_sdk/src/examples/debugging/example.dsc (right):

https://codereview.chromium.org/11882012/diff/14082/native_client_sdk/src/exa...
native_client_sdk/src/examples/debugging/example.dsc:36: 'handler.py'
On 2013/01/16 22:46:55, binji wrote:
> nit: remove tab

Done.

https://codereview.chromium.org/11882012/diff/14082/native_client_sdk/src/exa...
File native_client_sdk/src/examples/dlopen/Makefile (right):

https://codereview.chromium.org/11882012/diff/14082/native_client_sdk/src/exa...
native_client_sdk/src/examples/dlopen/Makefile:15: # By default we will build a
Debug configuration using the GCC newlib toolcahin
On 2013/01/16 22:46:55, binji wrote:
> nit: default uses glibc, not newlib

Done.

https://codereview.chromium.org/11882012/diff/14082/native_client_sdk/src/lib...
File native_client_sdk/src/libraries/gmock/Makefile (right):

https://codereview.chromium.org/11882012/diff/14082/native_client_sdk/src/lib...
native_client_sdk/src/libraries/gmock/Makefile:38: TARGET=gtest
On 2013/01/16 22:46:55, binji wrote:
> gmock

Done.

https://codereview.chromium.org/11882012/diff/14082/native_client_sdk/src/lib...
File native_client_sdk/src/libraries/gtest/Makefile (right):

https://codereview.chromium.org/11882012/diff/14082/native_client_sdk/src/lib...
native_client_sdk/src/libraries/gtest/Makefile:56: # Use the link macro for this
target on the list of sources.
On 2013/01/16 22:46:55, binji wrote:
> nit: lib macro

Done.

https://codereview.chromium.org/11882012/diff/14082/native_client_sdk/src/lib...
File native_client_sdk/src/libraries/ppapi_cpp/Makefile (right):

https://codereview.chromium.org/11882012/diff/14082/native_client_sdk/src/lib...
native_client_sdk/src/libraries/ppapi_cpp/Makefile:35: # The base name of the
final NEXE, also the name of the NMF file containing
On 2013/01/16 22:46:55, binji wrote:
> nit: s/NEXE/library/

Done.

https://codereview.chromium.org/11882012/diff/14082/native_client_sdk/src/too...
File native_client_sdk/src/tools/common.mk (right):

https://codereview.chromium.org/11882012/diff/14082/native_client_sdk/src/too...
native_client_sdk/src/tools/common.mk:96: # If no targets are specified on the
command-line, the first target listed in
On 2013/01/16 22:46:55, binji wrote:
> this comment is wrong

Done.

https://codereview.chromium.org/11882012/diff/14082/native_client_sdk/src/too...
File native_client_sdk/src/tools/host_gcc.mk (right):

https://codereview.chromium.org/11882012/diff/14082/native_client_sdk/src/too...
native_client_sdk/src/tools/host_gcc.mk:65: define ARCHIVE_RULE
On 2013/01/16 22:46:55, binji wrote:
> why do you need a separate macro? Can't this all live in LIB_RULE below?

Done.

https://codereview.chromium.org/11882012/diff/14082/native_client_sdk/src/too...
native_client_sdk/src/tools/host_gcc.mk:107: $(call
LINER_RULE,$(OUTDIR)/$(1)$(HOST_EXT),$(foreach src,$(2),$(OUTDIR)/$(basename
$(src)).o),$(3),$(4),$(LIB_PATHS),$(5))
On 2013/01/16 22:46:55, binji wrote:
> LINKER_RULE

Done.

https://codereview.chromium.org/11882012/diff/14082/native_client_sdk/src/too...
File native_client_sdk/src/tools/host_vc.mk (right):

https://codereview.chromium.org/11882012/diff/14082/native_client_sdk/src/too...
native_client_sdk/src/tools/host_vc.mk:109: $(call
LINER_RULE,$(OUTDIR)/$(1)$(HOST_EXT),$(foreach src,$(2),$(OUTDIR)/$(basename
$(src)).o),$(3),$(4),$(LIB_PATHS),$(6))
On 2013/01/16 22:46:55, binji wrote:
> LINKER_RULE

Done.

https://codereview.chromium.org/11882012/diff/14082/native_client_sdk/src/too...
File native_client_sdk/src/tools/nacl_llvm.mk (right):

https://codereview.chromium.org/11882012/diff/14082/native_client_sdk/src/too...
native_client_sdk/src/tools/nacl_llvm.mk:1: # Copyright (c) 2012 The Chromium
Authors. All rights reserved.
On 2013/01/16 22:46:55, binji wrote:
> maybe should be called nacl_pnacl instead...?

I'll do rename as a seperate CL to make it cleaner.

https://codereview.chromium.org/11882012/diff/14082/native_client_sdk/src/too...
native_client_sdk/src/tools/nacl_llvm.mk:17: # only supports the Debug
configuration for simplicity.
On 2013/01/16 22:46:55, binji wrote:
> comment is wrong

Done.

https://codereview.chromium.org/11882012/diff/14082/native_client_sdk/src/too...
native_client_sdk/src/tools/nacl_llvm.mk:28: # We use the C++ compiler for
everything and then use the -Wl,-as-needed flag
On 2013/01/16 22:46:55, binji wrote:
> comment is wrong

Done.

Powered by Google App Engine
This is Rietveld 408576698