Browse code

update version numbers for corrected tbbs on windows and osx 64-bit

Erinn Clark authored on19/02/2012 13:44:32
Showing3 changed files
... ...
@@ -11,7 +11,7 @@
11 11
 # 5. ./publish
12 12
 
13 13
 export STABLETAG=tor-0.2.2.35
14
-export DEVTAG=tor-0.2.3.12-alpha
14
+export DEVTAG=tor-0.2.3.11-alpha
15 15
 
16 16
 WMLBASE=.
17 17
 SUBDIRS=docs eff projects press about download getinvolved donate torbutton
... ...
@@ -27,7 +27,7 @@
27 27
 <define-tag version-osx-ppc-stable whitespace=delete>0.2.2.35</define-tag>
28 28
 <define-tag version-osx-ppc-alpha whitespace=delete>0.2.3.12-alpha</define-tag>
29 29
 
30
-<define-tag version-torbrowserbundle whitespace=delete>2.2.35-7</define-tag>
30
+<define-tag version-torbrowserbundle whitespace=delete>2.2.35-7.1</define-tag>
31 31
 <define-tag version-torbrowser-tor whitespace=delete>0.2.2.35</define-tag>
32 32
 <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.17-stable, zlib-1.2.6, openssl-1.0.0g</define-tag>
33 33
 <define-tag version-torbrowser-firefox whitespace=delete>10.0.2</define-tag>
... ...
@@ -46,7 +46,7 @@
46 46
 <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.17</define-tag>
47 47
 
48 48
 <define-tag version-torbrowserbundleosx32 whitespace=delete>2.2.35-7</define-tag>
49
-<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.35-7</define-tag>
49
+<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.35-7.1</define-tag>
50 50
 <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.35</define-tag>
51 51
 <define-tag version-osx-torbrowser-firefox whitespace=delete>10.0.2</define-tag>
52 52
 <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.5.1</define-tag>
... ...
@@ -1,41 +1,17 @@
1 1
 #!/bin/sh
2 2
 set -e # stop if we encounter an error
3 3
 
4
-# pull the latest changes
5
-if [ -e .svn ] ; then
6
-	svn update
7
-elif [ -e .git ] ; then
8
-	git svn rebase
9
-else
10
-	echo 2>&1 "Cannot figure out which version control thing you're using.  Skipping update"
11
-fi
4
+make clean # clean cruft
12 5
 
13
-# clean up the working directory
14
-make clean
6
+svn update # get changes
15 7
 
16
-# actually build the site
17
-make -j3
8
+make -j3 # abuse the cores
18 9
 
19 10
 # don't copy over stuff with permissions that make it useless
11
+#chmod a+r * -R
20 12
 chmod -R a+r *
21
-rsync \
22
-	--exclude .DS_Store \
23
-	--exclude .svn \
24
-	--exclude .git \
25
-	--exclude '.*.sw[po]' \
26
-	--exclude .deps \
27
-	--exclude svn \
28
-	--exclude dist \
29
-	--exclude releases \
30
-	--exclude torbutton-current.xpi \
31
-	--exclude project \
32
-	-Prvz --delete . www-master.torproject.org:/srv/www-master.torproject.org/htdocs
13
+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
33 14
 
34 15
 echo "Forcing mirror update"
35
-ssh www-master.torproject.org '
36
-	(
37
-	 find /srv/www-master.torproject.org/htdocs ! -perm -444 -print0 | xargs -0 --no-run-if-empty chmod -v a+r ||
38
-	 ( echo >&2 "There are unreadable files in /srv/www-master.torproject.org/htdocs, not triggering mirror run."; exit 1)
39
-	) &&
40
-	echo "Triggering mirror run" &&
41
-	/home/mirroradm/bin/trigger-mirrors'
16
+ssh vescum '/home/mirroradm/bin/trigger-mirrors'
17
+ssh vescum chmod g+w -R /srv/www-master.torproject.org/htdocs