Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed hard coded install location in generated artifacts #139

Open
wants to merge 2 commits into
base: patch_sysplugs_vanilla
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmake/ETISSPlugin.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ MACRO(ETISSPlugin ProjName)
INSTALL(CODE
"FILE(APPEND
\"${CMAKE_INSTALL_PREFIX}/lib/plugins/list.txt\"
\"${ProjName},\${CMAKE_INSTALL_PREFIX}/lib/plugins,${ProjName}\\n\"
\"${ProjName},./lib/plugins,${ProjName}\\n\"
)"
)

# mimicing installation in build tree as well
file(APPEND ${ETISS_BINARY_DIR}/lib/plugins/list.txt
file(APPEND ./lib/plugins/list.txt
"${ProjName},${ETISS_BINARY_DIR}/lib/plugins,${ProjName}\n")
ENDMACRO()

Expand Down
6 changes: 3 additions & 3 deletions src/bare_etiss_processor/run_helper.sh.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -e
# Config

ETISS_DIR=@ETISS_DIR@
ETISS_BIN_DIR=$(dirname -- "$(readlink -f -- "$0")")

# Clear tmp file
DYN_INI=$(mktemp /tmp/etiss_dynamic_XXXXXXXXXX.ini)
Expand Down Expand Up @@ -30,7 +30,7 @@ TARGETSW_PATH_ELF=$1
TARGET_ELFFILE=$(basename -- "$TARGETSW_PATH_ELF")
TARGET_ELFDIR=$(dirname -- "$TARGETSW_PATH_ELF")

VP_EXE="${ETISS_DIR}/bin/bare_etiss_processor"
VP_EXE="${ETISS_BIN_DIR}/bare_etiss_processor"


CMD_OPTIONS=""
Expand Down Expand Up @@ -100,7 +100,7 @@ echo -e "simple_mem_system.memseg_origin_01=0x00080000" >> $DYN_INI
echo -e "simple_mem_system.memseg_length_01=0x00080000" >> $DYN_INI

# Call
ARGS="-i${ETISS_DIR}/examples/base.ini -i${DYN_INI} ${CMD_OPTIONS}"
ARGS="-i${ETISS_BIN_DIR}/../examples/base.ini -i${DYN_INI} ${CMD_OPTIONS}"

if [ "${USE_TGDB}" -eq 1 ]; then
if [ "${DO_NOT_ATTACH}" -eq 0 ]; then
Expand Down