diff --git a/packaging/win32/daily_build.bat b/packaging/win32/daily_build.bat index cd73e76bfa..0afca3a1c6 100644 --- a/packaging/win32/daily_build.bat +++ b/packaging/win32/daily_build.bat @@ -3,5 +3,10 @@ rem It simply calls the actual MSYS Shell script to perform rem the daily build and then the tag builds. cd c:\soft\packaging + +rem Development build (daily) c:\msys\1.0\bin\sh.exe --login c:\soft\packaging\daily_build.sh +rem Tags build (daily -- only tags that weren't built yet) c:\msys\1.0\bin\sh.exe --login c:\soft\packaging\build_tags.sh +rem 2.4 branch build (weekly) +c:\msys\1.0\bin\sh.exe --login c:\soft\packaging\daily_build.sh c:\soft-2.4\packaging \ No newline at end of file diff --git a/packaging/win32/weekly_build.bat b/packaging/win32/weekly_build.bat deleted file mode 100644 index 6ca3e7155b..0000000000 --- a/packaging/win32/weekly_build.bat +++ /dev/null @@ -1,6 +0,0 @@ -rem This is the Windows Batch Script for the daily builds. -rem It simply calls the actual MSYS Shell script to perform -rem the daily build and then the tag builds. - -cd c:\soft-2.4\packaging -c:\msys\1.0\bin\sh.exe --login c:\soft-2.4\packaging\daily_build.sh diff --git a/packaging/win32/weekly_build.sh b/packaging/win32/weekly_build.sh new file mode 100644 index 0000000000..af28c482c5 --- /dev/null +++ b/packaging/win32/weekly_build.sh @@ -0,0 +1,23 @@ +#!/bin/sh +# +# Note: for this script to work, you need to make sure bash can +# find svn on your system. If it's not in the default +# Windows path, you will have to add it yourself, for +# example like this: +# - create a file /etc/profile.d/svn.sh +# - add this line: export PATH=/c/soft/svn/bin:$PATH +# (Use the real path to your svn installation, obviously) + +set -e + +# Only run this script on Monday night (first day of the week) +if [ `date +%u` != 2 ] ; then exit ; fi + +function qpushd() { pushd "$@" >/dev/null; } +function qpopd() { popd >/dev/null; } +function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; } + +qpushd "$(dirname $(unix_path "$0"))" +svn update +./build_package.sh +qpopd