Eberhard Graether
4fa1e22035
Added cmake build instructions for app, lib and test. Included Qt via environment variable QT_DIR. Included CxxTest via environment variable CXX_TEST_DIR. Added scripts for setup, syncing master and publishing features. Added dlls for QT on Windows.
70 lines
1.3 KiB
Bash
Executable File
70 lines
1.3 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
ABORT="\033[31mAbort:\033[00m"
|
|
ALERT="\033[31mAlert:\033[00m"
|
|
SUCCESS="\033[32mSuccess:\033[00m"
|
|
INFO="\033[33mInfo:\033[00m"
|
|
|
|
BRANCH_NAME=$(git symbolic-ref -q --short HEAD)
|
|
|
|
# check if on branch
|
|
if [ -z $BRANCH_NAME ]
|
|
then
|
|
echo $ABORT "You are not on any branch."
|
|
exit 1
|
|
fi
|
|
|
|
# switch to master
|
|
echo $INFO "Switching to master"
|
|
|
|
git checkout -q master
|
|
|
|
if [ $? != 0 ]
|
|
then
|
|
echo $ABORT "Switching to master failed."
|
|
exit 1
|
|
fi
|
|
|
|
# check clean index
|
|
echo $INFO "Checking index"
|
|
|
|
if [[ -n $(git diff HEAD) ]]
|
|
then
|
|
echo $ABORT "You have uncommited changes on master."
|
|
git checkout -q "$BRANCH_NAME"
|
|
exit 1
|
|
fi
|
|
|
|
# fetch remote changes
|
|
echo $INFO "Fetching changes"
|
|
|
|
git fetch -q origin master
|
|
|
|
if [ $? != 0 ]
|
|
then
|
|
echo $ABORT "Fetching from origin master failed."
|
|
git checkout -q "$BRANCH_NAME"
|
|
exit 1
|
|
fi
|
|
|
|
if [[ -z $(git diff origin/master) ]]
|
|
then
|
|
echo $SUCCESS "Your master is already up-to-date."
|
|
git checkout -q "$BRANCH_NAME"
|
|
exit 0
|
|
fi
|
|
|
|
# rebase master to origin/master
|
|
git rebase -q origin/master
|
|
|
|
if [ $? != 0 ]
|
|
then
|
|
echo $ALERT "Rebasing on master caused conflicts. This should never happen. Follow the instructions above to resolve them then use 'git push origin master' to update the remote."
|
|
exit 1
|
|
fi
|
|
|
|
git checkout -q "$BRANCH_NAME"
|
|
|
|
echo $SUCCESS "Updated master"
|
|
exit 0
|