diff --git a/git_commit.sh b/git_commit.sh index 17378e7..be8b423 100755 --- a/git_commit.sh +++ b/git_commit.sh @@ -10,12 +10,11 @@ STUNAME=李心杨 TRACER=tracer-ysyx GITFLAGS="-q --author=$TRACER --no-verify --allow-empty" -YSYX_HOME=$NEMU_HOME/.. WORK_BRANCH=$(git rev-parse --abbrev-ref HEAD) -WORK_INDEX=$YSYX_HOME/.git/index.${WORK_BRANCH} +WORK_INDEX=.git/index.${WORK_BRANCH} TRACER_BRANCH=$TRACER -LOCK_DIR=$YSYX_HOME/.git/ +LOCK_DIR=.git/ git_soft_checkout () { git checkout --detach -q && git reset --soft $1 -q -- && git checkout $1 -q -- ; diff --git a/npc/CMakeLists.txt b/npc/CMakeLists.txt index 9cdce96..1dec0fe 100644 --- a/npc/CMakeLists.txt +++ b/npc/CMakeLists.txt @@ -80,11 +80,11 @@ add_test(NAME V${TOPMODULE} COMMAND V${TOPMODULE}) add_custom_command( TARGET V${TOPMODULE}_nvboard COMMAND ${CMAKE_SOURCE_DIR}/../git_commit.sh "Build V${TOPMODULE}_nvboard" - WORKING_DIRECTORY ../ + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../ ) add_custom_command( TARGET V${TOPMODULE} COMMAND ${CMAKE_SOURCE_DIR}/../git_commit.sh "Build V${TOPMODULE}" - WORKING_DIRECTORY ../ + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../ )