r22979 - gnucash/trunk/packaging/win32 - Win32: build 2.5 tagged releases from git instead of svn

[Geert Janssens]

Author: gjanssens
Date: 2013-05-15 09:24:25 -0400 (Wed, 15 May 2013)
New Revision: 22979
Trac: http://svn.gnucash.org/trac/changeset/22979

Modified:
   gnucash/trunk/packaging/win32/build_tags.sh
   gnucash/trunk/packaging/win32/build_tags_git.sh
   gnucash/trunk/packaging/win32/daily_build.bat
Log:
Win32: build 2.5 tagged releases from git instead of svn

Modified: gnucash/trunk/packaging/win32/build_tags.sh
===================================================================
--- gnucash/trunk/packaging/win32/build_tags.sh	2013-05-15 11:12:58 UTC (rev 22978)
+++ gnucash/trunk/packaging/win32/build_tags.sh	2013-05-15 13:24:25 UTC (rev 22979)
@@ -56,6 +56,17 @@
 for tag_rev in $tags ; do
   tag=${tag_rev#*/}
   tag=${tag%/*}
+  
+  # From 2.5 and up, tags are built from git
+  tag_major=${tag%%.*}
+  tag_tmp=${tag#*.}
+  tag_minor=${tag_tmp%%.*}
+  major_minor=$(( $tag_major*100 + $tag_minor ))
+  if (( $major_minor >= 205 ))
+  then
+     continue
+  fi
+  
   tagbasedir=/c/soft/gnucash-${tag}
   tagdir=${tagbasedir}/gnucash
   rm -fr $tagbasedir

Modified: gnucash/trunk/packaging/win32/build_tags_git.sh
===================================================================
--- gnucash/trunk/packaging/win32/build_tags_git.sh	2013-05-15 11:12:58 UTC (rev 22978)
+++ gnucash/trunk/packaging/win32/build_tags_git.sh	2013-05-15 13:24:25 UTC (rev 22979)
@@ -68,6 +68,17 @@
 for tag_rev in $tags ; do
   tag=${tag_rev#*/}
   tag=${tag%/*}
+  
+  # Git builds are only supported from 2.5 up
+  tag_major=${tag%%.*}
+  tag_tmp=${tag#*.}
+  tag_minor=${tag_tmp%%.*}
+  major_minor=$(( $tag_major*100 + $tag_minor ))
+  if (( $major_minor < 205 ))
+  then
+     continue
+  fi
+  
   tagbasedir=/c/soft/gnucash-${tag}
   tagdir=${tagbasedir}/gnucash
   rm -fr $tagbasedir

Modified: gnucash/trunk/packaging/win32/daily_build.bat
===================================================================
--- gnucash/trunk/packaging/win32/daily_build.bat	2013-05-15 11:12:58 UTC (rev 22978)
+++ gnucash/trunk/packaging/win32/daily_build.bat	2013-05-15 13:24:25 UTC (rev 22979)
@@ -1,12 +1,14 @@
-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\gnucash\repos\packaging\win32\
-
-rem Development build (daily)
-c:\msys\1.0\bin\sh.exe --login c:\soft\gnucash\repos\packaging\win32\daily_build_git.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)
+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\gnucash\repos\packaging\win32\
+
+rem Development build (daily)
+c:\msys\1.0\bin\sh.exe --login c:\soft\gnucash\repos\packaging\win32\daily_build_git.sh
+rem Tags build for 2.4 and older (daily -- only tags that weren't built yet)
+c:\msys\1.0\bin\sh.exe --login c:\soft\packaging\build_tags.sh
+rem Tags build for 2.5 and newer (daily -- only tags that weren't built yet)
+c:\msys\1.0\bin\sh.exe --login c:\soft\packaging\build_tags_git.sh
+rem 2.4 branch build (weekly)
 c:\msys\1.0\bin\sh.exe --login c:\soft-2.4\packaging\weekly_build.sh
\ No newline at end of file