From 2f1103ffc20489eb7c4b85cb332c4ae9641bc788 Mon Sep 17 00:00:00 2001 From: Jon Ashburn Date: Tue, 17 Mar 2015 17:54:58 -0600 Subject: [PATCH] Revert "misc: Explicitly run python for generated code" This reverts commit 10e987d610d43b37556df9b12349f9ffc8cb30c4. --- icd/nulldrv/CMakeLists.txt | 2 +- layers/CMakeLists.txt | 10 ++++----- loader/CMakeLists.txt | 4 ++-- .../glv_extensions/glvreplay_xgl/CMakeLists.txt | 14 ++++++------- .../src/glv_extensions/glvtrace_xgl/CMakeLists.txt | 24 +++++++++++----------- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/icd/nulldrv/CMakeLists.txt b/icd/nulldrv/CMakeLists.txt index cd5f0ab..b11840b 100644 --- a/icd/nulldrv/CMakeLists.txt +++ b/icd/nulldrv/CMakeLists.txt @@ -3,7 +3,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DXGL_PROTOTYPES") add_custom_command(OUTPUT nulldrv_gpa.c - COMMAND python ${PROJECT_SOURCE_DIR}/xgl-generate.py icd-get-proc-addr > nulldrv_gpa.c + COMMAND ${PROJECT_SOURCE_DIR}/xgl-generate.py icd-get-proc-addr > nulldrv_gpa.c DEPENDS ${PROJECT_SOURCE_DIR}/xgl-generate.py ${PROJECT_SOURCE_DIR}/xgl.py) set(sources diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt index 23e0064..7ad4c17 100644 --- a/layers/CMakeLists.txt +++ b/layers/CMakeLists.txt @@ -2,14 +2,14 @@ cmake_minimum_required (VERSION 2.8.11) macro(run_xgl_helper subcmd) add_custom_command(OUTPUT ${ARGN} - COMMAND python ${PROJECT_SOURCE_DIR}/xgl_helper.py --${subcmd} ${PROJECT_SOURCE_DIR}/include/xgl.h --abs_out_dir ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${PROJECT_SOURCE_DIR}/xgl_helper.py --${subcmd} ${PROJECT_SOURCE_DIR}/include/xgl.h --abs_out_dir ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${PROJECT_SOURCE_DIR}/xgl_helper.py ${PROJECT_SOURCE_DIR}/include/xgl.h ) endmacro() macro(run_xgl_layer_generate subcmd output) add_custom_command(OUTPUT ${output} - COMMAND python ${PROJECT_SOURCE_DIR}/xgl-layer-generate.py ${subcmd} ${PROJECT_SOURCE_DIR}/include/xgl.h > ${output} + COMMAND ${PROJECT_SOURCE_DIR}/xgl-layer-generate.py ${subcmd} ${PROJECT_SOURCE_DIR}/include/xgl.h > ${output} DEPENDS ${PROJECT_SOURCE_DIR}/xgl-layer-generate.py ${PROJECT_SOURCE_DIR}/include/xgl.h ${PROJECT_SOURCE_DIR}/xgl.py ) endmacro() @@ -17,7 +17,7 @@ endmacro() if (WIN32) macro(add_xgl_layer target) add_custom_command(OUTPUT XGLLayer${target}.def - COMMAND python ${PROJECT_SOURCE_DIR}/xgl-win-def-file-generate.py ${target} > XGLLayer${target}.def + COMMAND ${PROJECT_SOURCE_DIR}/xgl-win-def-file-generate.py ${target} > XGLLayer${target}.def DEPENDS ${PROJECT_SOURCE_DIR}/xgl-win-def-file-generate.py ) add_library(XGLLayer${target} SHARED ${ARGN} XGLLayer${target}.def) @@ -52,11 +52,11 @@ if (NOT WIN32) endif() add_custom_command(OUTPUT xgl_dispatch_table_helper.h - COMMAND python ${PROJECT_SOURCE_DIR}/xgl-generate.py dispatch-table-ops layer > xgl_dispatch_table_helper.h + COMMAND ${PROJECT_SOURCE_DIR}/xgl-generate.py dispatch-table-ops layer > xgl_dispatch_table_helper.h DEPENDS ${PROJECT_SOURCE_DIR}/xgl-generate.py ${PROJECT_SOURCE_DIR}/xgl.py) add_custom_command(OUTPUT xgl_generic_intercept_proc_helper.h - COMMAND python ${PROJECT_SOURCE_DIR}/xgl-generate.py layer-intercept-proc > xgl_generic_intercept_proc_helper.h + COMMAND ${PROJECT_SOURCE_DIR}/xgl-generate.py layer-intercept-proc > xgl_generic_intercept_proc_helper.h DEPENDS ${PROJECT_SOURCE_DIR}/xgl-generate.py ${PROJECT_SOURCE_DIR}/xgl.py) run_xgl_helper(gen_enum_string_helper xgl_enum_string_helper.h) diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt index ce192e0..697d030 100644 --- a/loader/CMakeLists.txt +++ b/loader/CMakeLists.txt @@ -1,10 +1,10 @@ add_custom_command(OUTPUT dispatch.c - COMMAND python ${PROJECT_SOURCE_DIR}/xgl-generate.py loader-entrypoints > dispatch.c + COMMAND ${PROJECT_SOURCE_DIR}/xgl-generate.py loader-entrypoints > dispatch.c DEPENDS ${PROJECT_SOURCE_DIR}/xgl-generate.py ${PROJECT_SOURCE_DIR}/xgl.py ${PROJECT_SOURCE_DIR}/include/xglIcd.h) add_custom_command(OUTPUT table_ops.h - COMMAND python ${PROJECT_SOURCE_DIR}/xgl-generate.py dispatch-table-ops loader > table_ops.h + COMMAND ${PROJECT_SOURCE_DIR}/xgl-generate.py dispatch-table-ops loader > table_ops.h DEPENDS ${PROJECT_SOURCE_DIR}/xgl-generate.py ${PROJECT_SOURCE_DIR}/xgl.py) include_directories( diff --git a/tools/glave/src/glv_extensions/glvreplay_xgl/CMakeLists.txt b/tools/glave/src/glv_extensions/glvreplay_xgl/CMakeLists.txt index 36f0179..6551f4c 100644 --- a/tools/glave/src/glv_extensions/glvreplay_xgl/CMakeLists.txt +++ b/tools/glave/src/glv_extensions/glvreplay_xgl/CMakeLists.txt @@ -9,13 +9,13 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR} ${SRC_DIR}/../../../include ${SR # This file is shared between replayer and tracer and are generated to each dir. Should generate them to common area add_custom_command(OUTPUT glvtrace_xgl_packet_id.h xgl_enum_string_helper.h glvtrace_xgl_xgl_structs.h glvtrace_xgl_xglwsix11ext_structs.h glvtrace_xgl_xgldbg_structs.h glvreplay_xgl_replay.h glvreplay_xgl_replay.cpp - COMMAND python ${SRC_DIR}/../../../glave-generate.py glave-packet-id > glvtrace_xgl_packet_id.h - COMMAND python ${SRC_DIR}/../../../glave-generate.py glave-core-structs > glvtrace_xgl_xgl_structs.h - COMMAND python ${SRC_DIR}/../../../glave-generate.py glave-wsi-trace-structs > glvtrace_xgl_xglwsix11ext_structs.h - COMMAND python ${SRC_DIR}/../../../glave-generate.py glave-dbg-trace-structs > glvtrace_xgl_xgldbg_structs.h - COMMAND python ${SRC_DIR}/../../../glave-generate.py glave-replay-h > glvreplay_xgl_replay.h - COMMAND python ${SRC_DIR}/../../../glave-generate.py glave-replay-c > glvreplay_xgl_replay.cpp - COMMAND python ${SRC_DIR}/../../../xgl_helper.py --gen_enum_string_helper ${SRC_DIR}/../../../include/xgl.h --abs_out_dir ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${SRC_DIR}/../../../glave-generate.py glave-packet-id > glvtrace_xgl_packet_id.h + COMMAND ${SRC_DIR}/../../../glave-generate.py glave-core-structs > glvtrace_xgl_xgl_structs.h + COMMAND ${SRC_DIR}/../../../glave-generate.py glave-wsi-trace-structs > glvtrace_xgl_xglwsix11ext_structs.h + COMMAND ${SRC_DIR}/../../../glave-generate.py glave-dbg-trace-structs > glvtrace_xgl_xgldbg_structs.h + COMMAND ${SRC_DIR}/../../../glave-generate.py glave-replay-h > glvreplay_xgl_replay.h + COMMAND ${SRC_DIR}/../../../glave-generate.py glave-replay-c > glvreplay_xgl_replay.cpp + COMMAND ${SRC_DIR}/../../../xgl_helper.py --gen_enum_string_helper ${SRC_DIR}/../../../include/xgl.h --abs_out_dir ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${SRC_DIR}/../../../glave-generate.py ${SRC_DIR}/../../../xgl_helper.py) diff --git a/tools/glave/src/glv_extensions/glvtrace_xgl/CMakeLists.txt b/tools/glave/src/glv_extensions/glvtrace_xgl/CMakeLists.txt index 139d315..777630e 100644 --- a/tools/glave/src/glv_extensions/glvtrace_xgl/CMakeLists.txt +++ b/tools/glave/src/glv_extensions/glvtrace_xgl/CMakeLists.txt @@ -8,18 +8,18 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/../../..) include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${SRC_DIR}/../../../include) add_custom_command(OUTPUT glvtrace_xgl_xgl.h glvtrace_xgl_xgl.c glvtrace_xgl_packet_id.h glvtrace_xgl_xgl_structs.h glvtrace_xgl_xglwsix11ext.h glvtrace_xgl_xglwsix11ext.c glvtrace_xgl_xglwsix11ext_structs.h glvtrace_xgl_xgldbg.h glvtrace_xgl_xgldbg.c glvtrace_xgl_xgldbg_structs.h xgl_struct_size_helper.h xgl_enum_string_helper.h - COMMAND python ${SRC_DIR}/../../../glave-generate.py glave-trace-h > glvtrace_xgl_xgl.h - COMMAND python ${SRC_DIR}/../../../glave-generate.py glave-trace-c > glvtrace_xgl_xgl.c - COMMAND python ${SRC_DIR}/../../../glave-generate.py glave-packet-id > glvtrace_xgl_packet_id.h - COMMAND python ${SRC_DIR}/../../../glave-generate.py glave-core-structs > glvtrace_xgl_xgl_structs.h - COMMAND python ${SRC_DIR}/../../../glave-generate.py glave-wsi-trace-h > glvtrace_xgl_xglwsix11ext.h - COMMAND python ${SRC_DIR}/../../../glave-generate.py glave-wsi-trace-c > glvtrace_xgl_xglwsix11ext.c - COMMAND python ${SRC_DIR}/../../../glave-generate.py glave-wsi-trace-structs > glvtrace_xgl_xglwsix11ext_structs.h - COMMAND python ${SRC_DIR}/../../../glave-generate.py glave-dbg-trace-h > glvtrace_xgl_xgldbg.h - COMMAND python ${SRC_DIR}/../../../glave-generate.py glave-dbg-trace-c > glvtrace_xgl_xgldbg.c - COMMAND python ${SRC_DIR}/../../../glave-generate.py glave-dbg-trace-structs > glvtrace_xgl_xgldbg_structs.h - COMMAND python ${SRC_DIR}/../../../xgl_helper.py --gen_struct_wrappers ${SRC_DIR}/../../../include/xgl.h --abs_out_dir ${CMAKE_CURRENT_BINARY_DIR} - COMMAND python ${SRC_DIR}/../../../xgl_helper.py --gen_enum_string_helper ${SRC_DIR}/../../../include/xgl.h --abs_out_dir ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${SRC_DIR}/../../../glave-generate.py glave-trace-h > glvtrace_xgl_xgl.h + COMMAND ${SRC_DIR}/../../../glave-generate.py glave-trace-c > glvtrace_xgl_xgl.c + COMMAND ${SRC_DIR}/../../../glave-generate.py glave-packet-id > glvtrace_xgl_packet_id.h + COMMAND ${SRC_DIR}/../../../glave-generate.py glave-core-structs > glvtrace_xgl_xgl_structs.h + COMMAND ${SRC_DIR}/../../../glave-generate.py glave-wsi-trace-h > glvtrace_xgl_xglwsix11ext.h + COMMAND ${SRC_DIR}/../../../glave-generate.py glave-wsi-trace-c > glvtrace_xgl_xglwsix11ext.c + COMMAND ${SRC_DIR}/../../../glave-generate.py glave-wsi-trace-structs > glvtrace_xgl_xglwsix11ext_structs.h + COMMAND ${SRC_DIR}/../../../glave-generate.py glave-dbg-trace-h > glvtrace_xgl_xgldbg.h + COMMAND ${SRC_DIR}/../../../glave-generate.py glave-dbg-trace-c > glvtrace_xgl_xgldbg.c + COMMAND ${SRC_DIR}/../../../glave-generate.py glave-dbg-trace-structs > glvtrace_xgl_xgldbg_structs.h + COMMAND ${SRC_DIR}/../../../xgl_helper.py --gen_struct_wrappers ${SRC_DIR}/../../../include/xgl.h --abs_out_dir ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${SRC_DIR}/../../../xgl_helper.py --gen_enum_string_helper ${SRC_DIR}/../../../include/xgl.h --abs_out_dir ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${SRC_DIR}/../../../xgl_helper.py ${SRC_DIR}/../../../glave-generate.py) -- 2.7.4