/simpletypesystem/trunk

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/simpletypesystem/trunk

« back to all changes in this revision

Viewing changes to build.sh

  • Committer: Gustav Hartvigsson
  • Date: 2016-02-01 20:45:30 UTC
  • mto: This revision was merged to the branch mainline in revision 126.
  • Revision ID: gustav.hartvigsson@gmail.com-20160201204530-v0pgchjqz8yroixf
* Added merge-trunk command to ./build.sh

  The "exe" command does not seem to propagate the returncodes?

Show diffs side-by-side

added added

removed removed

Lines of Context:
build.sh
11
11
show_usage () {
12
12
  echo ""
13
13
  echo "Set up the building of libssts and clean up too."
 
14
  echo "  This is not ment as a replacment for bazaar or for cmake, just a"
 
15
  echo "  \"kick-start\" for new developers... and makes branching easier."
 
16
  echo ""
14
17
  echo "  ./build.sh clean      -  Clean up the project and build files."
15
18
  echo "             cl"
16
19
  echo ""
35
38
  echo "             mt             merge from trunk. If the merge went smoothly"
36
39
  echo "                            it will procide to commit the merge with"
37
40
  echo "                            message \"* Merged trunk.\""
 
41
  echo ""
 
42
  echo " ./build.sh propose-merge - Propese merge of current branch."
 
43
  echo "            pm"
38
44
}
39
45
 
40
46
do_build () {
84
90
    exe cd ..
85
91
    PARENT_WD=$(pwd)
86
92
    exe bzr branch $CURRENT_WD $PARENT_WD/$NEW_BRANCH_NAME
87
 
    if [[ $? ]]
 
93
    if [[ -z $? ]]
88
94
    then
89
95
      echo ""
90
96
      echo "Something went wrong when trying to branch..."
103
109
do_merge_trunk () {
104
110
  exe bzr commit
105
111
  exe bzr merge lp:simpletypesystem
106
 
  if [[ $? ]]
 
112
  if [[ -z $? ]]
107
113
  then
108
114
    echo "Something went wrong with the merge! Plese solve these problems"
109
115
    echo "before you procide to commit again!"
112
118
  fi
113
119
}
114
120
 
 
121
do_propose_merge () {
 
122
  exe bzr propose-merge
 
123
}
 
124
 
115
125
case ${ARGV[0]} in
116
126
     "help"|"-h") show_usage ;;
117
127
     "clean"|"cl") do_clean ;;