Merge branch 'master' into recurring-activity-46

[civicrm-core.git] / tools / scripts / releaser / releaser

diff --git a/tools/scripts/releaser/releaser b/tools/scripts/releaser/releaser
index bcd57460698fd74ba83eddcd68f6dad75594aabb..08238b5a80efda23e27ef6006c8baed59a653cd9 100755 (executable)
--- a/tools/scripts/releaser/releaser
+++ b/tools/scripts/releaser/releaser
@@ -57,7 +57,7 @@ function do_mk_project() {
     fi
   done
 
-  $cmd_gitify all "$git_base_url" "$workdir/$version/export" --l10n
+  $cmd_gitify all "$git_base_url" "$workdir/$version/export" --l10n --branch "$start_point" --skip-gencode
 }
 
 #################################################
@@ -171,6 +171,11 @@ function do_update() {
   read new_ver
   if [ -n "$new_ver" ]; then
     cd $workdir/$version/export
+    # create sql upgrade file
+    tpl="CRM/Upgrade/Incremental/sql/$new_ver.mysql.tpl"
+    if [ ! -f $tpl ]; then
+      echo "{* file to handle db changes in $new_ver during upgrade *}" > $tpl
+    fi
     # escape regex special chars
     arg=`echo "$version" | sed 's:[]\[\^\$\.\*\/]:\\\\&:g'`
     for file in xml/version.xml sql/civicrm_generated.mysql; do
@@ -186,7 +191,7 @@ function do_update() {
     read input
     if [ "$input" = "y" ]; then
       set -ex
-      git add  xml/version.xml sql/civicrm_generated.mysql
+      git add  xml/version.xml sql/civicrm_generated.mysql $tpl
       git commit -m "Update version to $new_ver"
       git push origin "$start_point"
       set +x
@@ -195,7 +200,7 @@ function do_update() {
     fi
   else
     echo "No version entered. Aborting version update."
-  fi 
+  fi
 }
 
 #################################################