From c87a0874293ec559048ef7926ba77952b9c54b96 Mon Sep 17 00:00:00 2001 From: ahocevar Date: Mon, 7 Nov 2011 23:13:40 +0100 Subject: [PATCH] updating update script to use git url for trunk --- tools/update_dev_dir.sh | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/tools/update_dev_dir.sh b/tools/update_dev_dir.sh index 7637c4e64c..743bfc8f15 100755 --- a/tools/update_dev_dir.sh +++ b/tools/update_dev_dir.sh @@ -4,14 +4,17 @@ # Get current 'Last Changed Rev' -REV=`svn info http://svn.openlayers.org/ | grep 'Revision' | awk '{print $2}'` +GITREV=`svn info https://github.com/openlayers/openlayers/ | grep 'Revision' | awk '{print $2}'` +SVNREV=`svn info http://svn.openlayers.org/ | grep 'Revision' | awk '{print $2}'` # Get the last svn rev +touch /tmp/ol_git_rev touch /tmp/ol_svn_rev -OLD_REV="o`cat /tmp/ol_svn_rev`" +OLD_GITREV="o`cat /tmp/ol_git_rev`" +OLD_SVNREV="o`cat /tmp/ol_svn_rev`" # If they're not equal, do some work. -if [ ! o$REV = $OLD_REV ]; then +if [ ! o$GITREV = $OLD_GITREV ]; then svn revert -R /osgeo/openlayers/docs/dev svn up /osgeo/openlayers/docs/dev @@ -37,10 +40,14 @@ if [ ! o$REV = $OLD_REV ]; then sed -i -e 's!../lib/OpenLayers.js!../OpenLayers.js!' examples/*.html naturaldocs -i /osgeo/openlayers/docs/dev/lib -o HTML /osgeo/openlayers/dev/apidocs -p /osgeo/openlayers/docs/dev/apidoc_config -s Default OL >/dev/null naturaldocs -i /osgeo/openlayers/docs/dev/lib -o HTML /osgeo/openlayers/dev/docs -p /osgeo/openlayers/docs/dev/doc_config -s Default OL >/dev/null - - svn up /osgeo/openlayers/dev/sandbox/ # Record the revision - echo -n $REV > /tmp/ol_svn_rev + echo -n $GITREV > /tmp/ol_git_rev +fi +if [ ! o$SVNREV = $OLD_SVNREV ]; then + svn up /osgeo/openlayers/dev/sandbox/ + svn up /osgeo/openlayers/dev/addins/ + # Record the revision + echo -n $SVNREV > /tmp/ol_svn_rev fi svn up /osgeo/openlayers/documentation-checkout