[tor-commits] r25455: {website} update version numbers for corrected tbbs on windows and osx (in website/trunk: . include)

[Erinn Clark]

Author: erinn
Date: 2012-02-19 12:44:32 +0000 (Sun, 19 Feb 2012)
New Revision: 25455

Modified:
   website/trunk/Makefile
   website/trunk/include/versions.wmi
   website/trunk/publish
Log:
update version numbers for corrected tbbs on windows and osx 64-bit

Modified: website/trunk/Makefile
===================================================================
--- website/trunk/Makefile	2012-02-18 22:48:58 UTC (rev 25454)
+++ website/trunk/Makefile	2012-02-19 12:44:32 UTC (rev 25455)
@@ -11,7 +11,7 @@
 # 5. ./publish
 
 export STABLETAG=tor-0.2.2.35
-export DEVTAG=tor-0.2.3.12-alpha
+export DEVTAG=tor-0.2.3.11-alpha
 
 WMLBASE=.
 SUBDIRS=docs eff projects press about download getinvolved donate torbutton

Modified: website/trunk/include/versions.wmi
===================================================================
--- website/trunk/include/versions.wmi	2012-02-18 22:48:58 UTC (rev 25454)
+++ website/trunk/include/versions.wmi	2012-02-19 12:44:32 UTC (rev 25455)
@@ -27,7 +27,7 @@
 <define-tag version-osx-ppc-stable whitespace=delete>0.2.2.35</define-tag>
 <define-tag version-osx-ppc-alpha whitespace=delete>0.2.3.12-alpha</define-tag>
 
-<define-tag version-torbrowserbundle whitespace=delete>2.2.35-7</define-tag>
+<define-tag version-torbrowserbundle whitespace=delete>2.2.35-7.1</define-tag>
 <define-tag version-torbrowser-tor whitespace=delete>0.2.2.35</define-tag>
 <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.17-stable, zlib-1.2.6, openssl-1.0.0g</define-tag>
 <define-tag version-torbrowser-firefox whitespace=delete>10.0.2</define-tag>
@@ -46,7 +46,7 @@
 <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.17</define-tag>
 
 <define-tag version-torbrowserbundleosx32 whitespace=delete>2.2.35-7</define-tag>
-<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.35-7</define-tag>
+<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.35-7.1</define-tag>
 <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.35</define-tag>
 <define-tag version-osx-torbrowser-firefox whitespace=delete>10.0.2</define-tag>
 <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.5.1</define-tag>

Modified: website/trunk/publish
===================================================================
--- website/trunk/publish	2012-02-18 22:48:58 UTC (rev 25454)
+++ website/trunk/publish	2012-02-19 12:44:32 UTC (rev 25455)
@@ -1,41 +1,17 @@
 #!/bin/sh
 set -e # stop if we encounter an error
 
-# pull the latest changes
-if [ -e .svn ] ; then
-	svn update
-elif [ -e .git ] ; then
-	git svn rebase
-else
-	echo 2>&1 "Cannot figure out which version control thing you're using.  Skipping update"
-fi
+make clean # clean cruft
 
-# clean up the working directory
-make clean
+svn update # get changes
 
-# actually build the site
-make -j3
+make -j3 # abuse the cores
 
 # don't copy over stuff with permissions that make it useless
+#chmod a+r * -R
 chmod -R a+r *
-rsync \
-	--exclude .DS_Store \
-	--exclude .svn \
-	--exclude .git \
-	--exclude '.*.sw[po]' \
-	--exclude .deps \
-	--exclude svn \
-	--exclude dist \
-	--exclude releases \
-	--exclude torbutton-current.xpi \
-	--exclude project \
-	-Prvz --delete . www-master.torproject.org:/srv/www-master.torproject.org/htdocs
+rsync --exclude .svn --exclude .deps --exclude svn --exclude dist --exclude releases --exclude torbutton-current.xpi --exclude project -Prvz --delete . vescum:/srv/www-master.torproject.org/htdocs
 
 echo "Forcing mirror update"
-ssh www-master.torproject.org '
-	(
-	 find /srv/www-master.torproject.org/htdocs ! -perm -444 -print0 | xargs -0 --no-run-if-empty chmod -v a+r ||
-	 ( echo >&2 "There are unreadable files in /srv/www-master.torproject.org/htdocs, not triggering mirror run."; exit 1)
-	) &&
-	echo "Triggering mirror run" &&
-	/home/mirroradm/bin/trigger-mirrors'
+ssh vescum '/home/mirroradm/bin/trigger-mirrors'
+ssh vescum chmod g+w -R /srv/www-master.torproject.org/htdocs