- tor-commits - lists.torproject.org

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by sebastian＠torproject.org 25 May '12

25 May '12

commit c038e2c7170e3725ca0b83f08744d94947ee1718 Merge: b7492fc 4c3d7ca Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri May 25 14:20:28 2012 +0200 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)

1 0

[torbrowser/maint-2.2] Windows 2.2.35-13 release done, unrecommend prior versions
by sebastian＠torproject.org 25 May '12

25 May '12

commit 4c3d7caa3be38e7f12cb47042d49a9f98ca73f9e Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri May 25 14:19:47 2012 +0200 Windows 2.2.35-13 release done, unrecommend prior versions --- build-scripts/recommended-versions | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 7ce26ee..b5a5599 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,7 +1,6 @@ [ "2.2.35-12-MacOS-i386", "2.2.35-12-MacOS-x86_64", -"2.2.35-12-Windows", "2.2.35-13-Windows", "2.2.35-12-Linux-i686", "2.2.35-12-Linux-x86_64",

1 0

[torbrowser/master] Win: Make sure to call FF's build target
by sebastian＠torproject.org 25 May '12

25 May '12

commit 7aeb874443ff23ffc0254dad488f42da78678273 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri May 25 13:56:29 2012 +0200 Win: Make sure to call FF's build target --- src/current-patches/mozilla-build/start-msvc.patch | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/current-patches/mozilla-build/start-msvc.patch b/src/current-patches/mozilla-build/start-msvc.patch index 10283f2..94b31fa 100644 --- a/src/current-patches/mozilla-build/start-msvc.patch +++ b/src/current-patches/mozilla-build/start-msvc.patch @@ -17,5 +17,5 @@ +if "%1"=="" ( + start /d "%USERPROFILE%" "" "%MOZILLABUILD%"\msys\bin\bash --login -i" +) else ( -+ cd "%USERPROFILE%" && "%MOZILLABUILD%"\msys\bin\bash --login -i -c "cd "%1" && "%2" "%3" -f client.mk package" ++ cd "%USERPROFILE%" && "%MOZILLABUILD%"\msys\bin\bash --login -i -c "cd "%1" && "%2" "%3" -f client.mk build package" +)

1 0

[torbrowser/master] Prepare for upcoming release of new windows TBBs
by sebastian＠torproject.org 25 May '12

25 May '12

commit 15798049c418e6181d002638870dd5e090c58a5f Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri May 25 13:54:03 2012 +0200 Prepare for upcoming release of new windows TBBs --- build-scripts/recommended-versions | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 24bec3b..7ce26ee 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -2,6 +2,7 @@ "2.2.35-12-MacOS-i386", "2.2.35-12-MacOS-x86_64", "2.2.35-12-Windows", +"2.2.35-13-Windows", "2.2.35-12-Linux-i686", "2.2.35-12-Linux-x86_64", "2.3.12-alpha-2-MacOS-i386",

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by sebastian＠torproject.org 25 May '12

25 May '12

commit b7492fcf47a4cd4848f71552c768bb30eedef403 Merge: c0f17c1 7aeb874 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri May 25 14:10:13 2012 +0200 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions | 1 + src/current-patches/mozilla-build/start-msvc.patch | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-)

1 0

[torbrowser/maint-2.3] Prepare for upcoming release of new windows TBBs
by sebastian＠torproject.org 25 May '12

25 May '12

commit 15798049c418e6181d002638870dd5e090c58a5f Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri May 25 13:54:03 2012 +0200 Prepare for upcoming release of new windows TBBs --- build-scripts/recommended-versions | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 24bec3b..7ce26ee 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -2,6 +2,7 @@ "2.2.35-12-MacOS-i386", "2.2.35-12-MacOS-x86_64", "2.2.35-12-Windows", +"2.2.35-13-Windows", "2.2.35-12-Linux-i686", "2.2.35-12-Linux-x86_64", "2.3.12-alpha-2-MacOS-i386",

1 0

[torbrowser/maint-2.3] Win: Make sure to call FF's build target
by sebastian＠torproject.org 25 May '12

25 May '12

commit 7aeb874443ff23ffc0254dad488f42da78678273 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri May 25 13:56:29 2012 +0200 Win: Make sure to call FF's build target --- src/current-patches/mozilla-build/start-msvc.patch | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/current-patches/mozilla-build/start-msvc.patch b/src/current-patches/mozilla-build/start-msvc.patch index 10283f2..94b31fa 100644 --- a/src/current-patches/mozilla-build/start-msvc.patch +++ b/src/current-patches/mozilla-build/start-msvc.patch @@ -17,5 +17,5 @@ +if "%1"=="" ( + start /d "%USERPROFILE%" "" "%MOZILLABUILD%"\msys\bin\bash --login -i" +) else ( -+ cd "%USERPROFILE%" && "%MOZILLABUILD%"\msys\bin\bash --login -i -c "cd "%1" && "%2" "%3" -f client.mk package" ++ cd "%USERPROFILE%" && "%MOZILLABUILD%"\msys\bin\bash --login -i -c "cd "%1" && "%2" "%3" -f client.mk build package" +)

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by sebastian＠torproject.org 25 May '12

25 May '12

commit b7492fcf47a4cd4848f71552c768bb30eedef403 Merge: c0f17c1 7aeb874 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri May 25 14:10:13 2012 +0200 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions | 1 + src/current-patches/mozilla-build/start-msvc.patch | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-)

1 0

r25661: {website} Bump windows tbb version (website/trunk/include)
by Sebastian Hahn 25 May '12

25 May '12

Author: sebastian Date: 2012-05-25 12:06:31 +0000 (Fri, 25 May 2012) New Revision: 25661 Modified: website/trunk/include/versions.wmi Log: Bump windows tbb version Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-05-24 20:34:41 UTC (rev 25660) +++ website/trunk/include/versions.wmi 2012-05-25 12:06:31 UTC (rev 25661) @@ -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.15-alpha</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>2.2.35-12</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>2.2.35-13</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.19-stable, zlib-1.2.7, openssl-1.0.1c</define-tag> <define-tag version-torbrowser-firefox whitespace=delete>12.0</define-tag>

1 0

[torbrowser/maint-2.2] Win: Make sure to call FF's build target
by sebastian＠torproject.org 25 May '12

25 May '12

commit 7aeb874443ff23ffc0254dad488f42da78678273 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri May 25 13:56:29 2012 +0200 Win: Make sure to call FF's build target --- src/current-patches/mozilla-build/start-msvc.patch | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/current-patches/mozilla-build/start-msvc.patch b/src/current-patches/mozilla-build/start-msvc.patch index 10283f2..94b31fa 100644 --- a/src/current-patches/mozilla-build/start-msvc.patch +++ b/src/current-patches/mozilla-build/start-msvc.patch @@ -17,5 +17,5 @@ +if "%1"=="" ( + start /d "%USERPROFILE%" "" "%MOZILLABUILD%"\msys\bin\bash --login -i" +) else ( -+ cd "%USERPROFILE%" && "%MOZILLABUILD%"\msys\bin\bash --login -i -c "cd "%1" && "%2" "%3" -f client.mk package" ++ cd "%USERPROFILE%" && "%MOZILLABUILD%"\msys\bin\bash --login -i -c "cd "%1" && "%2" "%3" -f client.mk build package" +)

1 0