Skip to content
Snippets Groups Projects
Commit c7361d38 authored by juergen's avatar juergen
Browse files

fixing install issues

git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@1878 5a81b35b-ba03-0410-adc8-b2c5c5119f08
parent 7c1ef3bd
No related branches found
No related tags found
No related merge requests found
......@@ -31,7 +31,7 @@ set(INIT_SCRIPTS
init_cl.py
init_iplt.py
)
copy_if_different("./" "${STAGE_DIR}/lib/openstructure"
copy_if_different("./" "${STAGE_DIR}/${LIB_DIR}/openstructure"
"${INIT_SCRIPTS}" "python init scripts" ost_scripts)
install(FILES ${INIT_SCRIPTS} DESTINATION "${LIB_DIR}/openstructure")
......
......@@ -26,6 +26,6 @@ set BIN_DIR=%~dp0
echo Starting DNG in %BIN_DIR%
set DNG_ROOT=%BIN_DIR%\..
set PATH=%BIN_DIR%;%DNG_ROOT%\lib\Release;%DNG_ROOT%\lib;%DNG_ROOT%\bin\Release;%PATH%
REM type %DNG_ROOT%\lib\openstructure\init.py | %BIN_DIR%@BUILD_TYPE@\gosty.exe ost %*
type "%DNG_ROOT%\lib\openstructure\init.py" | "%BIN_DIR%Release\gosty.exe" ost %*
set PATH=%BIN_DIR%;%DNG_ROOT%\@LIBDIR@\Release;%DNG_ROOT%\@LIBDIR@;%DNG_ROOT%\bin\Release;%PATH%
REM type %DNG_ROOT%\@LIBDIR@\openstructure\init.py | %BIN_DIR%@BUILD_TYPE@\gosty.exe ost %*
type "%DNG_ROOT%\@LIBDIR@\openstructure\init.py" | "%BIN_DIR%Release\gosty.exe" ost %*
......@@ -30,4 +30,4 @@ export PATH=$BIN_DIR:$PATH
#export PYTHONHOME=$DNG_ROOT
#export QT_PLUGIN_PATH=$BIN_DIR/plugins
cat "$DNG_ROOT/lib/openstructure/init.py" | gosty ost $@
\ No newline at end of file
cat "$DNG_ROOT/@LIBDIR@/openstructure/init.py" | gosty ost $@
\ No newline at end of file
......@@ -26,5 +26,5 @@ set BIN_DIR=%~dp0
echo %BIN_DIR%
set DNG_ROOT=%BIN_DIR%\..
set PATH=%BIN_DIR%;%DNG_ROOT%\lib\Release;%DNG_ROOT%\lib;%DNG_ROOT%\bin\Release;%PATH%
type "%DNG_ROOT%\lib\openstructure\init_iplt.py" | "%BIN_DIR%Release\gosty.exe" ost %*
set PATH=%BIN_DIR%;%DNG_ROOT%\@LIBDIR@\Release;%DNG_ROOT%\@LIBDIR@;%DNG_ROOT%\bin\Release;%PATH%
type "%DNG_ROOT%\@LIBDIR@\openstructure\init_iplt.py" | "%BIN_DIR%Release\gosty.exe" ost %*
......@@ -35,4 +35,4 @@ export PATH=$BIN_DIR:$PATH
# line. If the HERE documnt is fed directly into gosty, the backtrace shows the
# full command in case of a segfault which is very confusing and not helpful
# at all
cat $DNG_ROOT/lib/openstructure/init_img.py| gosty img $@
cat $DNG_ROOT/@LIBDIR@/openstructure/init_img.py| gosty img $@
......@@ -4,7 +4,7 @@ if platform.machine()=='x86_64':
else:
sys.path.insert(0,os.getenv('DNG_ROOT')+'/lib/openstructure')
from ost import io, mol, seq, gfx, conop
from ost import io, mol, seq, gfx, conop, geom
import ost
try:
from ost import img
......
......@@ -26,7 +26,7 @@ set SCRIPT_NAME=%0%
set BIN_DIR=%~dp0
set DNG_ROOT=%BIN_DIR%\..
set PATH=%BIN_DIR%;%DNG_ROOT%\lib\Release;%DNG_ROOT%\lib;%DNG_ROOT%\bin\Release;%PATH%
set PATH=%BIN_DIR%;%DNG_ROOT%\@LIBDIR@\Release;%DNG_ROOT%\@LIBDIR@;%DNG_ROOT%\bin\Release;%PATH%
REM retrieve absolute path to python executable
set pyexec=%BIN_DIR%\python.exe
......@@ -50,6 +50,6 @@ if "%1" == "" (
echo passing commandline options %opts% to ost
)
call "%pyexec%" %interact_% "%DNG_ROOT%\lib\openstructure\init_cl.py" %opts%
call "%pyexec%" %interact_% "%DNG_ROOT%\@LIBDIR@\openstructure\init_cl.py" %opts%
......@@ -26,8 +26,8 @@ SCRIPT_NAME=$0
BIN_DIR=`dirname "$SCRIPT_NAME"`
export DNG_ROOT="$BIN_DIR/.."
export PATH=$PATH:"$BIN_DIR"
export DYLD_FRAMEWORK_PATH="$BIN_DIR/../lib:${DYLD_FRAMEWORK_PATH}"
export DYLD_LIBRARY_PATH="$BIN_DIR/../lib:${DYLD_LIBRARY_PATH}"
export DYLD_FRAMEWORK_PATH="$BIN_DIR/../@LIBDIR@:${DYLD_FRAMEWORK_PATH}"
export DYLD_LIBRARY_PATH="$BIN_DIR/../@LIBDIR@:${DYLD_LIBRARY_PATH}"
# set ld_library_path and pythonhome for bundle (commented except in linux bundles)
#export LD_LIBRARY_PATH=$DNG_ROOT/@LIBDIR@:$LD_LIBRARY_PATH
......@@ -70,7 +70,7 @@ else
fi
# finally pass control to python instance
IFS="#"
exec $pyexec $interactive "$DNG_ROOT/lib/openstructure/init_cl.py" $opts
exec $pyexec $interactive "$DNG_ROOT/@LIBDIR@/openstructure/init_cl.py" $opts
IFS=$' \t\n'
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment