From 752a0cf178cc4cca4b486463315558ae1d057d4f Mon Sep 17 00:00:00 2001 From: tracer-ysyx Date: Sat, 6 Jan 2024 00:48:34 +0800 Subject: [PATCH] =?UTF-8?q?>=20configure(npc)=20=20ysyx=5F22040000=20?= =?UTF-8?q?=E6=9D=8E=E5=BF=83=E6=9D=A8=20=20Linux=20calcite=206.1.69=20#1-?= =?UTF-8?q?NixOS=20SMP=20PREEMPT=5FDYNAMIC=20Wed=20Dec=2020=2016:00:29=20U?= =?UTF-8?q?TC=202023=20x86=5F64=20GNU/Linux=20=20=2000:48:34=20=20up=201?= =?UTF-8?q?=20day=20=209:35,=20=202=20users,=20=20load=20average:=201.32,?= =?UTF-8?q?=200.95,=200.63?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- git_commit.sh | 5 ++--- npc/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) 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}/../ )