procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed conflicts

This commit is contained in:
John Preston 2015-09-24 21:47:20 +03:00
parent bef993e2fb a8e2dbee68
commit 5808c4bc02
2 changed files with 77 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
Telegram/Build.sh Normal file → Executable file
View File

@ -35,14 +35,19 @@ elif [ "$BuildTarget" == "mac" ]; then
UpdateFile="tmacupd$AppVersion" UpdateFile="tmacupd$AppVersion"
SetupFile="tsetup.$AppVersionStrFull.dmg" SetupFile="tsetup.$AppVersionStrFull.dmg"
ReleasePath="./../Mac/Release" ReleasePath="./../Mac/Release"
BinaryName="Telegram"
elif [ "$BuildTarget" == "mac32" ]; then elif [ "$BuildTarget" == "mac32" ]; then
echo "Building version $AppVersionStrFull for OS X 10.6 and 10.7.." echo "Building version $AppVersionStrFull for OS X 10.6 and 10.7.."
UpdateFile="tmac32upd$AppVersion" UpdateFile="tmac32upd$AppVersion"
SetupFile="tsetup32.$AppVersionStrFull.dmg" SetupFile="tsetup32.$AppVersionStrFull.dmg"
ReleasePath="./../Mac/Release" ReleasePath="./../Mac/Release"
BinaryName="Telegram"
elif [ "$BuildTarget" == "macstore" ]; then elif [ "$BuildTarget" == "macstore" ]; then
echo "Building version $AppVersionStrFull for Mac App Store.." echo "Building version $AppVersionStrFull for Mac App Store.."
ReleasePath="./../Mac/Release" ReleasePath="./../Mac/Release"
BinaryName="Telegram Desktop"
DropboxPath="./../../../Dropbox/Telegram/deploy/$AppVersionStrMajor"
DropboxDeployPath="$DropboxPath/$AppVersionStrFull"
else else
echo "Invalid target!" echo "Invalid target!"
exit 1 exit 1
@ -99,52 +104,61 @@ if [ "$BuildTarget" == "linux" ] || [ "$BuildTarget" == "linux32" ]; then
cd $DeployPath && tar -cJvf $SetupFile Telegram/ && cd ./../../../../../Telegram cd $DeployPath && tar -cJvf $SetupFile Telegram/ && cd ./../../../../../Telegram
fi fi
if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ]; then if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarget" == "macstore" ]; then
if [ ! -d "$ReleasePath/Telegram.app" ]; then if [ ! -d "$ReleasePath/$BinaryName.app" ]; then
echo "Telegram.app not found!" echo "$BinaryName.app not found!"
exit 1 exit 1
fi fi
if [ ! -d "$ReleasePath/Telegram.app.dSYM" ]; then if [ ! -d "$ReleasePath/$BinaryName.app.dSYM" ]; then
echo "Telegram.app.dSYM not found!" echo "$BinaryName.app.dSYM not found!"
exit 1 exit 1
fi fi
AppUUID=`dwarfdump -u "$ReleasePath/Telegram.app/Contents/MacOS/Telegram" | awk -F " " '{print $2}'` AppUUID=`dwarfdump -u "$ReleasePath/$BinaryName.app/Contents/MacOS/$BinaryName" | awk -F " " '{print $2}'`
DsymUUID=`dwarfdump -u "$ReleasePath/Telegram.app.dSYM" | awk -F " " '{print $2}'` DsymUUID=`dwarfdump -u "$ReleasePath/$BinaryName.app.dSYM" | awk -F " " '{print $2}'`
if [ "$AppUUID" != "$DsymUUID" ]; then if [ "$AppUUID" != "$DsymUUID" ]; then
echo "UUID of binary '$AppUUID' and dSYM '$DsymUUID' differ!" echo "UUID of binary '$AppUUID' and dSYM '$DsymUUID' differ!"
exit 1 exit 1
fi fi
if [ ! -f "$ReleasePath/Telegram.app/Contents/Resources/Icon.icns" ]; then if [ ! -f "$ReleasePath/$BinaryName.app/Contents/Resources/Icon.icns" ]; then
echo "Icon.icns not found in Resources!" echo "Icon.icns not found in Resources!"
exit 1 exit 1
fi fi
if [ ! -f "$ReleasePath/Telegram.app/Contents/MacOS/Telegram" ]; then if [ ! -f "$ReleasePath/$BinaryName.app/Contents/MacOS/$BinaryName" ]; then
echo "Telegram not found in MacOS!" echo "$BinaryName not found in MacOS!"
exit 1 exit 1
fi fi
if [ ! -f "$ReleasePath/Telegram.app/Contents/Frameworks/Updater" ]; then if [ ! -d "$ReleasePath/$BinaryName.app/Contents/_CodeSignature" ]; then
echo "Updater not found in Frameworks!" echo "$BinaryName signature not found!"
exit 1 exit 1
fi fi
if [ ! -d "$ReleasePath/Telegram.app/Contents/_CodeSignature" ]; then if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ]; then
echo "Telegram signature not found!" if [ ! -f "$ReleasePath/$BinaryName.app/Contents/Frameworks/Updater" ]; then
exit 1 echo "Updater not found in Frameworks!"
exit 1
fi
elif [ "$BuildTarget" == "macstore" ]; then
if [ ! -f "$ReleasePath/$BinaryName.pkg" ]; then
echo "$BinaryName.pkg not found!"
exit 1
fi
fi fi
cd $ReleasePath if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ]; then
temppath=`hdiutil attach -readwrite tsetup.dmg | awk -F "\t" 'END {print $3}'` cd $ReleasePath
cp -R ./Telegram.app "$temppath/" temppath=`hdiutil attach -readwrite tsetup.dmg | awk -F "\t" 'END {print $3}'`
bless --folder "$temppath/" --openfolder "$temppath/" cp -R "./$BinaryName.app" "$temppath/"
hdiutil detach "$temppath" bless --folder "$temppath/" --openfolder "$temppath/"
hdiutil convert tsetup.dmg -format UDZO -imagekey zlib-level=9 -ov -o $SetupFile hdiutil detach "$temppath"
cd ./../../Telegram hdiutil convert tsetup.dmg -format UDZO -imagekey zlib-level=9 -ov -o $SetupFile
cd $ReleasePath && ./Packer.app/Contents/MacOS/Packer -path Telegram.app -version $AppVersion $DevParam && cd ./../../Telegram cd ./../../Telegram
cd $ReleasePath && ./Packer.app/Contents/MacOS/Packer -path "$BinaryName.app" -version $AppVersion $DevParam && cd ./../../Telegram
fi
if [ ! -d "$ReleasePath/deploy" ]; then if [ ! -d "$ReleasePath/deploy" ]; then
mkdir "$ReleasePath/deploy" mkdir "$ReleasePath/deploy"
@ -154,31 +168,44 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ]; then
mkdir "$ReleasePath/deploy/$AppVersionStrMajor" mkdir "$ReleasePath/deploy/$AppVersionStrMajor"
fi fi
echo "Copying Telegram.app and $UpdateFile to deploy/$AppVersionStrMajor/$AppVersionStr.."; if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ]; then
mkdir "$DeployPath" echo "Copying $BinaryName.app and $UpdateFile to deploy/$AppVersionStrMajor/$AppVersionStr..";
mkdir "$DeployPath/Telegram" mkdir "$DeployPath"
cp -r $ReleasePath/Telegram.app $DeployPath/Telegram/ mkdir "$DeployPath/Telegram"
mv $ReleasePath/Telegram.app.dSYM $DeployPath/ cp -r "$ReleasePath/$BinaryName.app" $DeployPath/Telegram/
rm $ReleasePath/Telegram.app/Contents/MacOS/Telegram mv "$ReleasePath/$BinaryName.app.dSYM" $DeployPath/
rm $ReleasePath/Telegram.app/Contents/Frameworks/Updater rm "$ReleasePath/$BinaryName.app/Contents/MacOS/$BinaryName"
rm -rf $ReleasePath/Telegram.app/Contents/_CodeSignature rm "$ReleasePath/$BinaryName.app/Contents/Frameworks/Updater"
mv $ReleasePath/$UpdateFile $DeployPath/ rm -rf "$ReleasePath/$BinaryName.app/Contents/_CodeSignature"
mv $ReleasePath/$SetupFile $DeployPath/ mv $ReleasePath/$UpdateFile $DeployPath/
mv $ReleasePath/$SetupFile $DeployPath/
if [ "$BuildTarget" == "mac32" ]; then if [ "$BuildTarget" == "mac32" ]; then
ReleaseToPath="./../../../TBuild/tother/tmac32" ReleaseToPath="./../../../TBuild/tother/tmac32"
DeployToPath="$ReleaseToPath/$AppVersionStrMajor/$AppVersionStrFull" DeployToPath="$ReleaseToPath/$AppVersionStrMajor/$AppVersionStrFull"
if [ ! -d "$ReleaseToPath/$AppVersionStrMajor" ]; then if [ ! -d "$ReleaseToPath/$AppVersionStrMajor" ]; then
mkdir "$ReleaseToPath/$AppVersionStrMajor" mkdir "$ReleaseToPath/$AppVersionStrMajor"
fi
if [ ! -d "$DeployToPath" ]; then
mkdir "$DeployToPath"
fi
cp -v $DeployPath/$UpdateFile $DeployToPath/
cp -v $DeployPath/$SetupFile $DeployToPath/
cp -rv $DeployPath/$BinaryName.app.dSYM $DeployToPath/
fi fi
elif [ "$BuildTarget" == "macstore" ]; then
echo "Copying $BinaryName.app to deploy/$AppVersionStrMajor/$AppVersionStr..";
mkdir "$DeployPath"
cp -r "$ReleasePath/$BinaryName.app" $DeployPath/
mv "$ReleasePath/$BinaryName.pkg" $DeployPath/
mv "$ReleasePath/$BinaryName.app.dSYM" $DeployPath/
rm "$ReleasePath/$BinaryName.app/Contents/MacOS/$BinaryName"
rm -rf "$ReleasePath/$BinaryName.app/Contents/_CodeSignature"
if [ ! -d "$DeployToPath" ]; then cp -v "$DeployPath/$BinaryName.app" "$DropboxDeployPath/"
mkdir "$DeployToPath" cp -rv "$DeployPath/$BinaryName.app.dSYM" "$DropboxDeployPath/"
fi
cp -v $DeployPath/$UpdateFile $DeployToPath/
cp -v $DeployPath/$SetupFile $DeployToPath/
cp -rv $DeployPath/Telegram.app.dSYM $DeployToPath/
fi fi
fi fi

10
Telegram/Deploy.sh Normal file → Executable file
View File

@ -116,11 +116,11 @@ if [ "$BuildTarget" == "linux" ] || [ "$BuildTarget" == "linux32" ] || [ "$Build
mv -v "$WinDeployPath" "$DropboxPath/" mv -v "$WinDeployPath" "$DropboxPath/"
cp -v "$DeployPath/$UpdateFile" "$DropboxDeployPath" cp -v "$DeployPath/$UpdateFile" "$DropboxDeployPath/"
cp -v "$DeployPath/$SetupFile" "$DropboxDeployPath" cp -v "$DeployPath/$SetupFile" "$DropboxDeployPath/"
cp -rv "$DeployPath/Telegram.app.dSYM" "$DropboxDeployPath" cp -rv "$DeployPath/Telegram.app.dSYM" "$DropboxDeployPath/"
cp -v "$Mac32DeployPath/$Mac32UpdateFile" "$DropboxDeployPath" cp -v "$Mac32DeployPath/$Mac32UpdateFile" "$DropboxDeployPath/"
cp -v "$Mac32DeployPath/$Mac32SetupFile" "$DropboxDeployPath" cp -v "$Mac32DeployPath/$Mac32SetupFile" "$DropboxDeployPath/"
cp -rv "$DeployPath/Telegram.app.dSYM" "$DropboxDeployPath/Telegram32.app.dSYM" cp -rv "$DeployPath/Telegram.app.dSYM" "$DropboxDeployPath/Telegram32.app.dSYM"
fi fi
fi fi