haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OSX install script fixes.

This commit is contained in:
unknown 2014-05-29 20:35:49 +02:00 committed by jean-pierre charras
parent 70ce6d2825
commit 764c18bde1
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -451,7 +451,7 @@ if( KICAD_BUILD_STATIC OR KICAD_BUILD_DYNAMIC )
if( KICAD_BUILD_DYNAMIC AND APPLE ) if( KICAD_BUILD_DYNAMIC AND APPLE )
add_custom_target( osx_fix_bundles ALL DEPENDS cvpcb eeschema gerbview kicad pcbnew bitmap2component pcb_calculator pl_editor) add_custom_target( osx_fix_bundles ALL DEPENDS cvpcb eeschema gerbview kicad pcbnew bitmap2component pcb_calculator pl_editor)
add_custom_command(TARGET osx_fix_bundles POST_BUILD COMMAND scripts/osx_fixbundle.sh COMMENT "Migrating dylibs to bundles") add_custom_command(TARGET osx_fix_bundles POST_BUILD COMMAND ${PROJECT_SOURCE_DIR}/scripts/osx_fixbundle.sh ${PROJECT_SOURCE_DIR} COMMENT "Migrating dylibs to bundles")
endif() endif()
endif( KICAD_BUILD_STATIC OR KICAD_BUILD_DYNAMIC) endif( KICAD_BUILD_STATIC OR KICAD_BUILD_DYNAMIC)

9
scripts/osx_fixbundle.sh
View File

@ -20,8 +20,9 @@ function fixbundle() {
exec="$1" exec="$1"
bzroot="$2" bzroot="$2"
execpath="$3" execpath="$3"
binary="$4"
LIBRARIES="`otool -L ${execpath}${exec}.app/Contents/MacOS/${exec} | cut -d' ' -f1`" LIBRARIES="`otool -L ${binary} | cut -d' ' -f1`"
for library in $LIBRARIES; do for library in $LIBRARIES; do
@ -35,7 +36,7 @@ function fixbundle() {
resolvelink "$library" "`dirname $library`" "${execpath}/${exec}.app/Contents/Frameworks" resolvelink "$library" "`dirname $library`" "${execpath}/${exec}.app/Contents/Frameworks"
fi fi
fi fi
install_name_tool -change $library @executable_path/../Frameworks/`basename $library` ${execpath}${exec}.app/Contents/MacOS/${exec} install_name_tool -change $library @executable_path/../Frameworks/`basename $library` ${binary}
fi fi
done done
@ -122,5 +123,7 @@ for executable in $EXECUTABLES;
do do
myexecpath="`dirname ${executable}`/" myexecpath="`dirname ${executable}`/"
myexec="`basename ${executable}|sed -e 's/\.app//'`" myexec="`basename ${executable}|sed -e 's/\.app//'`"
fixbundle "${myexec}" "`pwd`" "${myexecpath}"
fixbundle "${myexec}" "$1" "${myexecpath}" "${myexecpath}${myexec}.app/Contents/MacOS/${myexec}"
fixbundle "${myexec}" "$1" "${myexecpath}" "${myexecpath}${myexec}.app/Contents/MacOS/_${myexec}.kiface"
done done