|
291 | 291 | 'sources': [
|
292 | 292 | 'tools/msvs/genfiles/node_perfctr_provider.rc',
|
293 | 293 | ],
|
294 |
| - }] |
| 294 | + }], |
295 | 295 | ],
|
296 | 296 | }],
|
297 | 297 | ],
|
|
308 | 308 | 'product_name': '<(node_core_target_name)-win',
|
309 | 309 | }],
|
310 | 310 | ],
|
311 |
| - }, |
| 311 | + }, # node_core_target_name |
312 | 312 | {
|
313 | 313 | 'target_name': '<(node_lib_target_name)',
|
314 | 314 | 'type': '<(node_intermediate_lib_type)',
|
315 | 315 | 'product_name': '<(node_core_target_name)',
|
316 |
| - |
317 |
| - 'dependencies': [ |
318 |
| - 'node_js2c#host', |
319 |
| - ], |
320 |
| - |
321 | 316 | 'includes': [
|
322 | 317 | 'node.gypi'
|
323 | 318 | ],
|
|
463 | 458 | '<@(library_files)',
|
464 | 459 | # node.gyp is added to the project by default.
|
465 | 460 | 'common.gypi',
|
466 |
| - '<(SHARED_INTERMEDIATE_DIR)/node_javascript.cc', |
467 | 461 | ],
|
468 | 462 |
|
469 | 463 | 'variables': {
|
|
610 | 604 | 'src/tls_wrap.h'
|
611 | 605 | ],
|
612 | 606 | }],
|
613 |
| - ], |
614 |
| - }, |
615 |
| - { |
616 |
| - 'target_name': 'mkssldef', |
617 |
| - 'type': 'none', |
618 |
| - # TODO(bnoordhuis) Make all platforms export the same list of symbols. |
619 |
| - # Teach mkssldef.py to generate linker maps that UNIX linkers understand. |
620 |
| - 'conditions': [ |
621 | 607 | [ 'use_openssl_def==1', {
|
| 608 | + # TODO(bnoordhuis) Make all platforms export the same list of symbols. |
| 609 | + # Teach mkssldef.py to generate linker maps that UNIX linkers understand. |
622 | 610 | 'variables': {
|
623 | 611 | 'mkssldef_flags': [
|
624 | 612 | # Categories to export.
|
|
648 | 636 | 'deps/openssl/openssl/util/libssl.num',
|
649 | 637 | ],
|
650 | 638 | 'outputs': ['<(SHARED_INTERMEDIATE_DIR)/openssl.def'],
|
| 639 | + 'process_outputs_as_sources': 1, |
651 | 640 | 'action': [
|
652 | 641 | 'python',
|
653 | 642 | 'tools/mkssldef.py',
|
|
660 | 649 | ],
|
661 | 650 | }],
|
662 | 651 | ],
|
663 |
| - }, |
664 |
| - # generate ETW header and resource files |
| 652 | + 'actions': [ |
| 653 | + { |
| 654 | + 'action_name': 'node_js2c', |
| 655 | + 'process_outputs_as_sources': 1, |
| 656 | + 'inputs': [ |
| 657 | + '<@(library_files)', |
| 658 | + 'tools/check_macros.py' |
| 659 | + ], |
| 660 | + 'outputs': [ |
| 661 | + '<(SHARED_INTERMEDIATE_DIR)/node_javascript.cc', |
| 662 | + ], |
| 663 | + 'conditions': [ |
| 664 | + [ 'node_use_dtrace=="false" and node_use_etw=="false"', { |
| 665 | + 'inputs': [ 'src/notrace_macros.py' ] |
| 666 | + }], |
| 667 | + [ 'node_use_perfctr=="false"', { |
| 668 | + 'inputs': [ 'src/noperfctr_macros.py' ] |
| 669 | + }], |
| 670 | + [ 'node_debug_lib=="false"', { |
| 671 | + 'inputs': [ 'tools/nodcheck_macros.py' ] |
| 672 | + }], |
| 673 | + [ 'node_debug_lib=="true"', { |
| 674 | + 'inputs': [ 'tools/dcheck_macros.py' ] |
| 675 | + }] |
| 676 | + ], |
| 677 | + 'action': [ |
| 678 | + 'python', 'tools/js2c.py', |
| 679 | + '<@(_outputs)', |
| 680 | + '<@(_inputs)', 'config.gypi', |
| 681 | + ], |
| 682 | + }, |
| 683 | + ], |
| 684 | + }, # node_lib_target_name |
665 | 685 | {
|
| 686 | + # generate ETW header and resource files |
666 | 687 | 'target_name': 'node_etw',
|
667 | 688 | 'type': 'none',
|
668 | 689 | 'conditions': [
|
|
681 | 702 | ]
|
682 | 703 | } ]
|
683 | 704 | ]
|
684 |
| - }, |
685 |
| - # generate perf counter header and resource files |
| 705 | + }, # node_etw |
686 | 706 | {
|
| 707 | + # generate perf counter header and resource files |
687 | 708 | 'target_name': 'node_perfctr',
|
688 | 709 | 'type': 'none',
|
689 | 710 | 'conditions': [
|
|
705 | 726 | ],
|
706 | 727 | } ]
|
707 | 728 | ]
|
708 |
| - }, |
709 |
| - { |
710 |
| - 'target_name': 'node_js2c', |
711 |
| - 'type': 'none', |
712 |
| - 'toolsets': ['host'], |
713 |
| - 'actions': [ |
714 |
| - { |
715 |
| - 'action_name': 'node_js2c', |
716 |
| - 'process_outputs_as_sources': 1, |
717 |
| - 'inputs': [ |
718 |
| - '<@(library_files)', |
719 |
| - './config.gypi', |
720 |
| - 'tools/check_macros.py' |
721 |
| - ], |
722 |
| - 'outputs': [ |
723 |
| - '<(SHARED_INTERMEDIATE_DIR)/node_javascript.cc', |
724 |
| - ], |
725 |
| - 'conditions': [ |
726 |
| - [ 'node_use_dtrace=="false" and node_use_etw=="false"', { |
727 |
| - 'inputs': [ 'src/notrace_macros.py' ] |
728 |
| - }], |
729 |
| - [ 'node_use_perfctr=="false"', { |
730 |
| - 'inputs': [ 'src/noperfctr_macros.py' ] |
731 |
| - }], |
732 |
| - [ 'node_debug_lib=="false"', { |
733 |
| - 'inputs': [ 'tools/nodcheck_macros.py' ] |
734 |
| - }], |
735 |
| - [ 'node_debug_lib=="true"', { |
736 |
| - 'inputs': [ 'tools/dcheck_macros.py' ] |
737 |
| - }] |
738 |
| - ], |
739 |
| - 'action': [ |
740 |
| - 'python', |
741 |
| - 'tools/js2c.py', |
742 |
| - '<@(_outputs)', |
743 |
| - '<@(_inputs)', |
744 |
| - ], |
745 |
| - }, |
746 |
| - ], |
747 |
| - }, # end node_js2c |
| 729 | + }, # node_perfctr |
748 | 730 | {
|
749 | 731 | 'target_name': 'node_dtrace_header',
|
750 | 732 | 'type': 'none',
|
|
772 | 754 | ]
|
773 | 755 | } ],
|
774 | 756 | ]
|
775 |
| - }, |
| 757 | + }, # node_dtrace_header |
776 | 758 | {
|
777 | 759 | 'target_name': 'node_dtrace_provider',
|
778 | 760 | 'type': 'none',
|
|
807 | 789 | ],
|
808 | 790 | }],
|
809 | 791 | ]
|
810 |
| - }, |
| 792 | + }, # node_dtrace_provider |
811 | 793 | {
|
812 | 794 | 'target_name': 'node_dtrace_ustack',
|
813 | 795 | 'type': 'none',
|
|
855 | 837 | ]
|
856 | 838 | } ],
|
857 | 839 | ]
|
858 |
| - }, |
| 840 | + }, # node_dtrace_ustack |
859 | 841 | {
|
860 | 842 | 'target_name': 'specialize_node_d',
|
861 | 843 | 'type': 'none',
|
|
881 | 863 | ],
|
882 | 864 | } ],
|
883 | 865 | ]
|
884 |
| - }, |
| 866 | + }, # specialize_node_d |
885 | 867 | {
|
886 | 868 | # When using shared lib to build executable in Windows, in order to avoid
|
887 | 869 | # filename collision, the executable name is node-win.exe. Need to rename
|
|
909 | 891 | ],
|
910 | 892 | } ],
|
911 | 893 | ]
|
912 |
| - }, |
| 894 | + }, # rename_node_bin_win |
913 | 895 | {
|
914 | 896 | 'target_name': 'cctest',
|
915 | 897 | 'type': 'executable',
|
|
918 | 900 | '<(node_lib_target_name)',
|
919 | 901 | 'rename_node_bin_win',
|
920 | 902 | 'deps/gtest/gtest.gyp:gtest',
|
921 |
| - 'node_js2c#host', |
922 | 903 | 'node_dtrace_header',
|
923 | 904 | 'node_dtrace_ustack',
|
924 | 905 | 'node_dtrace_provider',
|
|
979 | 960 | 'type': 'none',
|
980 | 961 | }],
|
981 | 962 | ],
|
982 |
| - } |
| 963 | + }, # cctest |
983 | 964 | ], # end targets
|
984 | 965 |
|
985 | 966 | 'conditions': [
|
|
0 commit comments