Merge with develop

--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-02-29 09:33:00 +01:00
commit f23c05c848

View file

@ -7,8 +7,8 @@ then
fi fi
# determine directory where all files reside # determine directory where all files reside
CONTENTSPATH=$(dirname $ROOTPATH) CONTENTSPATH=$(dirname "$ROOTPATH")
MACOSPATH=$(dirname $RYZOM_CLIENT) MACOSPATH=$(dirname "$RYZOM_CLIENT")
SIGNPATH=$CONTENTSPATH/_CodeSignature SIGNPATH=$CONTENTSPATH/_CodeSignature
# all files of original Bundle are in the same directory # all files of original Bundle are in the same directory
@ -19,20 +19,26 @@ SIGNPATH=$CONTENTSPATH/_CodeSignature
# PkgInfo usually doesn't change so don't copy it # PkgInfo usually doesn't change so don't copy it
# Info.plist contains updated version # Info.plist contains updated version
cp -p $ROOTPATH/Info.plist $CONTENTSPATH cp -p "$ROOTPATH/Info.plist" "$CONTENTSPATH"
cp -p $ROOTPATH/CodeResources $SIGNPATH cp -p "$ROOTPATH/CodeResources" "$SIGNPATH"
# executable flag for all executables # executable flag for all executables
chmod +x $ROOTPATH/Ryzom chmod +x "$ROOTPATH/Ryzom"
chmod +x $ROOTPATH/CrashReport chmod +x "$ROOTPATH/CrashReport"
chmod +x $ROOTPATH/RyzomClientPatcher chmod +x "$ROOTPATH/RyzomClientPatcher"
chmod +x $ROOTPATH/RyzomConfiguration chmod +x "$ROOTPATH/RyzomConfiguration"
# remove previous executables
rm -f "$MACOSPATH/Ryzom"
rm -f "$MACOSPATH/CrashReport"
rm -f "$MACOSPATH/RyzomClientPatcher"
rm -f "$MACOSPATH/RyzomConfiguration"
# copy all binaries in MacOS directory # copy all binaries in MacOS directory
cp -p $ROOTPATH/Ryzom $MACOSPATH cp -p "$ROOTPATH/Ryzom" "$MACOSPATH"
cp -p $ROOTPATH/CrashReport $MACOSPATH cp -p "$ROOTPATH/CrashReport" "$MACOSPATH"
cp -p $ROOTPATH/RyzomClientPatcher $MACOSPATH cp -p "$ROOTPATH/RyzomClientPatcher" "$MACOSPATH"
cp -p $ROOTPATH/RyzomConfiguration $MACOSPATH cp -p "$ROOTPATH/RyzomConfiguration" "$MACOSPATH"
exit 0 exit 0