DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Update makeRelease.sh

Browse Source 
Reverting to working state
This commit is contained in:
Asher Dawes
2018-06-16 20:48:07 -07:00
committed by GitHub
parent 2a842910fe
commit 8549044a3f
1 changed files with 6 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
makeRelease.sh
View File

@@ -13,9 +13,6 @@ do
echo "copying $DYLIBS to $KMD_DIR" echo "copying $DYLIBS to $KMD_DIR"
# copy the dylibs to the srcdir # copy the dylibs to the srcdir
for dylib in $DYLIBS; do cp -rf $dylib $KMD_DIR; done for dylib in $DYLIBS; do cp -rf $dylib $KMD_DIR; done
#DYLIBS=`otool -L $KMD_DIR/$binary | grep "/usr/lib" | awk -F' ' '{ print $1 }'`
# copy the other dylibs to the srcdir
#for dylib in $DYLIBS; do cp -rf $dylib $KMD_DIR; alllibs+=($dylib); done
done done
libraries=("libgcc_s.1.dylib" "libgomp.1.dylib" "libidn2.0.dylib" "libstdc++.6.dylib") libraries=("libgcc_s.1.dylib" "libgomp.1.dylib" "libidn2.0.dylib" "libstdc++.6.dylib")
@@ -29,15 +26,11 @@ do
echo "copying $DYLIBS to $KMD_DIR" echo "copying $DYLIBS to $KMD_DIR"
# copy the dylibs to the srcdir # copy the dylibs to the srcdir
for dylib in $DYLIBS; do cp -rf $dylib $KMD_DIR; alllibs+=($dylib); done for dylib in $DYLIBS; do cp -rf $dylib $KMD_DIR; alllibs+=($dylib); done
#DYLIBS=`otool -L $KMD_DIR/$binary | grep "/usr/lib" | awk -F' ' '{ print $1 }'`
# copy the other dylibs to the srcdir
#for dylib in $DYLIBS; do cp -rf $dylib $KMD_DIR; alllibs+=($dylib); newlibs+=(`basename $dylib`); done
done done
indirectlibraries=("libintl.8.dylib" "libunistring.2.dylib") indirectlibraries=("libintl.8.dylib" "libunistring.2.dylib")
newlibs=() for binary in "${indirectlibraries[@]}";
for binary in "${indirectlibraries[@]}"
do do
# Need to undo this for the dylibs when we are done # Need to undo this for the dylibs when we are done
chmod 755 src/$binary chmod 755 src/$binary
@@ -45,50 +38,20 @@ do
DYLIBS=`otool -L $KMD_DIR/$binary | grep "/usr/local" | awk -F' ' '{ print $1 }'` DYLIBS=`otool -L $KMD_DIR/$binary | grep "/usr/local" | awk -F' ' '{ print $1 }'`
echo "copying indirect $DYLIBS to $KMD_DIR" echo "copying indirect $DYLIBS to $KMD_DIR"
# copy the dylibs to the dest dir # copy the dylibs to the dest dir
for dylib in $DYLIBS; do cp -rf $dylib $KMD_DIR; alllibs+=($dylib); done for dylib in $DYLIBS; do cp -rf $dylib $KMD_DIR; alllibs+=(i$dylib); done
#DYLIBS=`otool -L $KMD_DIR/$binary | grep "/usr/lib" | awk -F' ' '{ print $1 }'`
# copy the other dylibs to the srcdir
#for dylib in $DYLIBS; do cp -rf $dylib $KMD_DIR; alllibs+=($dylib); newlibs+=(`basename $dylib`); done
done
# now process all the new libs we found indirectly
for binary in "${newlibs[@]}";
do
# Need to undo this for the dylibs when we are done
chmod 755 src/$binary
# find the dylibs to copy for komodod
DYLIBS=`otool -L $KMD_DIR/$binary | grep "/usr/local" | awk -F' ' '{ print $1 }'`
echo "copying indirect $DYLIBS to $KMD_DIR"
# copy the dylibs to the dest dir
for dylib in $DYLIBS; do cp -rf $dylib $KMD_DIR; alllibs+=($dylib); done
#DYLIBS=`otool -L $KMD_DIR/$binary | grep "/usr/lib" | awk -F' ' '{ print $1 }'`
# copy the other dylibs to the srcdir
#for dylib in $DYLIBS; do cp -rf $dylib $KMD_DIR; alllibs+=($dylib); done
done done
for binary in "${binaries[@]}"; for binary in "${binaries[@]}";
do do
# modify komododi or komodo-cli to point to dylibs # modify komodod to point to dylibs
echo "modifying $binary to use local libraries" echo "modifying $binary to use local libraries"
i=0
for dylib in "${alllibs[@]}" for dylib in "${alllibs[@]}"
do do
let i=i+1
echo "Next lib is $dylib " echo "Next lib is $dylib "
install_name_tool -change $dylib @executable_path/`basename $dylib` $KMD_DIR/$binary install_name_tool -change $dylib @executable_path/`basename $dylib` $KMD_DIR/$binary
done done
chmod +x $KMD_DIR/$binary chmod +x $KMD_DIR/$binary
done done
libs=("${libraries[@]}" "${indirectlibraries[@]}" "${newlibs[@]}")
for binary in "${libs[@]}";
do
# modify dylibs to point to dylibs
echo "modifying $binary to use local libraries"
for dylib in "${alllibs[@]}"
do
echo "Next lib is $dylib "
chmod 755 $KMD_DIR/$binary
install_name_tool -change $dylib @executable_path/`basename $dylib` $KMD_DIR/$binary
done
chmod +x $KMD_DIR/$binary
done