Browse code

bump tbb versions to 2.2.34-2

Erinn Clark authored on12/11/2011 02:10:14
Showing3 changed files
... ...
@@ -10,9 +10,9 @@
10 10
 # 4. make
11 11
 # 5. ./publish
12 12
 
13
-export TORGIT=/home/runa/tordev/tor/.git
14
-export STABLETAG=tor-0.2.2.33
15
-export DEVTAG=tor-0.2.3.5-alpha
13
+export TORGIT=/Users/erinn/src/tor.git/.git
14
+export STABLETAG=tor-0.2.2.24-alpha
15
+export DEVTAG=tor-0.2.2.24-alpha
16 16
 
17 17
 WMLBASE=.
18 18
 SUBDIRS=docs eff projects press about download getinvolved donate torbutton
... ...
@@ -27,27 +27,27 @@
27 27
 <define-tag version-osx-ppc-stable whitespace=delete>0.2.2.34</define-tag>
28 28
 <define-tag version-osx-ppc-alpha whitespace=delete>0.2.3.6-alpha</define-tag>
29 29
 
30
-<define-tag version-torbrowserbundle whitespace=delete>2.2.34-1</define-tag>
30
+<define-tag version-torbrowserbundle whitespace=delete>2.2.34-2</define-tag>
31 31
 <define-tag version-torbrowser-tor whitespace=delete>0.2.2.34</define-tag>
32
-<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.14-stable, zlib-1.2.5, openssl-1.0.0e</define-tag>
33
-<define-tag version-torbrowser-firefox whitespace=delete>7.0.1</define-tag>
32
+<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.15-stable, zlib-1.2.5, openssl-1.0.0e</define-tag>
33
+<define-tag version-torbrowser-firefox whitespace=delete>8.0</define-tag>
34 34
 <define-tag version-torbrowser-torbutton whitespace=delete>1.4.4.1</define-tag>
35 35
 <define-tag version-torbrowser-pidgin whitespace=delete>2.7.5</define-tag>
36 36
 <define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag>
37 37
 <define-tag version-torbrowser-vidalia whitespace=delete>0.2.15</define-tag>
38 38
 <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag>
39 39
 
40
-<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.34-1</define-tag>
41
-<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.34-1</define-tag>
40
+<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.34-2</define-tag>
41
+<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.34-2</define-tag>
42 42
 <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.34</define-tag>
43
-<define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.14, zlib-1.2.5, openssl-1.0.0e</define-tag>
44
-<define-tag version-gnu-torbrowser-firefox whitespace=delete>7.0.1</define-tag>
43
+<define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.15-stable, zlib-1.2.5, openssl-1.0.0e</define-tag>
44
+<define-tag version-gnu-torbrowser-firefox whitespace=delete>8.0</define-tag>
45 45
 <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.4.4.1</define-tag>
46 46
 <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.15</define-tag>
47 47
 
48
-<define-tag version-torbrowserbundleosx whitespace=delete>2.2.34-1</define-tag>
48
+<define-tag version-torbrowserbundleosx whitespace=delete>2.2.34-2</define-tag>
49 49
 <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.34</define-tag>
50
-<define-tag version-osx-torbrowser-firefox whitespace=delete>7.0.1</define-tag>
50
+<define-tag version-osx-torbrowser-firefox whitespace=delete>8.0</define-tag>
51 51
 <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.4.1</define-tag>
52 52
 <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.15</define-tag>
53 53
 
... ...
@@ -1,16 +1,13 @@
1 1
 #!/bin/sh
2 2
 set -e # stop if we encounter an error
3 3
 
4
-make clean # clean cruft
5
-
6
-svn update # get changes
7
-
8
-make -j3 # abuse the cores
4
+svn update
5
+make -j3
9 6
 
10 7
 # don't copy over stuff with permissions that make it useless
11 8
 chmod -R a+r *
12
-rsync --exclude .svn --exclude .deps --exclude svn --exclude dist --exclude releases --exclude torbutton-current.xpi --exclude project -Prvz --delete . vescum.torproject.org:/srv/www-master.torproject.org/htdocs
9
+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
13 10
 
14 11
 echo "Forcing mirror update"
15
-ssh vescum.torproject.org '/home/mirroradm/bin/trigger-mirrors'
16
-ssh vescum.torproject.org chmod g+w -R /srv/www-master.torproject.org/htdocs
12
+ssh vescum '/home/mirroradm/bin/trigger-mirrors'
13
+ssh vescum chmod g+w -R /srv/www-master.torproject.org/htdocs