Attachment #864599 for bug #903916

View | Details | Raw Unified | Return to bug 903916
Collapse All | Expand All




      '<@(node_builtin_shareable_builtins)',
    ],
    'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)',
    'node_mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot_u<(EXECUTABLE_SUFFIX)',
    'node_js2c_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_js2c<(EXECUTABLE_SUFFIX)',
    'conditions': [
      ['GENERATOR == "ninja"', {

              ],
            }, {
              'actions': [
                {
                  'action_name': 'run_pax_mksnapshot',
                  'inputs': [
                    '<(node_mksnapshot_exec)',
                  ],
                  'outputs': [
                    '<(node_mksnapshot_u_exec)',
                  ],
                  'action': [
                    'bash',
                    '-c',
                    'mv <(node_mksnapshot_exec) <(node_mksnapshot_u_exec) && paxmark.sh m <(node_mksnapshot_u_exec)',
                  ],
                },
                {
                  'action_name': 'node_mksnapshot',
                  'process_outputs_as_sources': 1,
                  'inputs': [
                    '<(node_mksnapshot_u_exec)',
                  ],
                  'outputs': [
                    '<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc',




    'v8_vector_stores%': 0,
    'v8_embed_script%': "",
    'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)',
    'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)',
    'v8_os_page_size%': 0,
    'generate_bytecode_output_root': '<(SHARED_INTERMEDIATE_DIR)/generate-bytecode-output-root',
    'generate_bytecode_builtins_list_output': '<(generate_bytecode_output_root)/builtins-generated/bytecodes-builtins-list.h',

      ],
    },  # bytecode_builtins_list_generator
    {
      'target_name': 'mksnapshot_u',
      'type': 'executable',
      'dependencies': [
        'v8_base_without_compiler',

          ],
        }],
      ],
    },  # mksnapshot_u
    {
      'target_name': 'mksnapshot',
      'type': 'none',
      'dependencies': ['mksnapshot_u'],
      'actions': [
        {
          'action_name': 'paxmark_mksnapshot',
          'inputs': [
            '<(mksnapshot_u_exec)',
          ],
          'outputs': [
            '<(mksnapshot_exec)',
          ],
          'action': [
            'bash',
            '-c',
            'cp <(mksnapshot_u_exec) <(mksnapshot_exec) && paxmark.sh m <(mksnapshot_exec)'
          ],
        },
      ],
    },  # mksnapshot
    {
      'target_name': 'torque',
- 

Return to bug 903916

Lines 54-59 Link Here

(-)a/node.gyp (-1 / +16 lines)
54	'<@(node_builtin_shareable_builtins)',	54	'<@(node_builtin_shareable_builtins)',
55	],	55	],
56	'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)',	56	'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)',
		57	'node_mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot_u<(EXECUTABLE_SUFFIX)',
57	'node_js2c_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_js2c<(EXECUTABLE_SUFFIX)',	58	'node_js2c_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_js2c<(EXECUTABLE_SUFFIX)',
58	'conditions': [	59	'conditions': [
59	['GENERATOR == "ninja"', {	60	['GENERATOR == "ninja"', {
Lines 337-347 Link Here
337	],	338	],
338	}, {	339	}, {
339	'actions': [	340	'actions': [
		341	{
		342	'action_name': 'run_pax_mksnapshot',
		343	'inputs': [
		344	'<(node_mksnapshot_exec)',
		345	],
		346	'outputs': [
		347	'<(node_mksnapshot_u_exec)',
		348	],
		349	'action': [
		350	'bash',
		351	'-c',
		352	'mv <(node_mksnapshot_exec) <(node_mksnapshot_u_exec) && paxmark.sh m <(node_mksnapshot_u_exec)',
		353	],
		354	},
340	{	355	{
341	'action_name': 'node_mksnapshot',	356	'action_name': 'node_mksnapshot',
342	'process_outputs_as_sources': 1,	357	'process_outputs_as_sources': 1,
343	'inputs': [	358	'inputs': [
344	'<(node_mksnapshot_exec)',	359	'<(node_mksnapshot_u_exec)',
345	],	360	],
346	'outputs': [	361	'outputs': [
347	'<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc',	362	'<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc',

Lines 9-14 Link Here

(-)a/tools/v8_gypfiles/v8.gyp (-2 / +23 lines)
9	'v8_vector_stores%': 0,	9	'v8_vector_stores%': 0,
10	'v8_embed_script%': "",	10	'v8_embed_script%': "",
11	'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)',	11	'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)',
		12	'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)',
12	'v8_os_page_size%': 0,	13	'v8_os_page_size%': 0,
13	'generate_bytecode_output_root': '<(SHARED_INTERMEDIATE_DIR)/generate-bytecode-output-root',	14	'generate_bytecode_output_root': '<(SHARED_INTERMEDIATE_DIR)/generate-bytecode-output-root',
14	'generate_bytecode_builtins_list_output': '<(generate_bytecode_output_root)/builtins-generated/bytecodes-builtins-list.h',	15	'generate_bytecode_builtins_list_output': '<(generate_bytecode_output_root)/builtins-generated/bytecodes-builtins-list.h',
Lines 1419-1425 Link Here
1419	],	1420	],
1420	}, # bytecode_builtins_list_generator	1421	}, # bytecode_builtins_list_generator
1421	{	1422	{
1422	'target_name': 'mksnapshot',	1423	'target_name': 'mksnapshot_u',
1423	'type': 'executable',	1424	'type': 'executable',
1424	'dependencies': [	1425	'dependencies': [
1425	'v8_base_without_compiler',	1426	'v8_base_without_compiler',
Lines 1446-1451 Link Here
1446	],	1447	],
1447	}],	1448	}],
1448	],	1449	],
		1450	}, # mksnapshot_u
		1451	{
		1452	'target_name': 'mksnapshot',
		1453	'type': 'none',
		1454	'dependencies': ['mksnapshot_u'],
		1455	'actions': [
		1456	{
		1457	'action_name': 'paxmark_mksnapshot',
		1458	'inputs': [
		1459	'<(mksnapshot_u_exec)',
		1460	],
		1461	'outputs': [
		1462	'<(mksnapshot_exec)',
		1463	],
		1464	'action': [
		1465	'bash',
		1466	'-c',
		1467	'cp <(mksnapshot_u_exec) <(mksnapshot_exec) && paxmark.sh m <(mksnapshot_exec)'
		1468	],
		1469	},
		1470	],
1449	}, # mksnapshot	1471	}, # mksnapshot
1450	{	1472	{
1451	'target_name': 'torque',	1473	'target_name': 'torque',
1452	-