February 2013 - tor-commits - lists.torproject.org

[ooni-probe/master] Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe
by art＠torproject.org 01 Feb '13

01 Feb '13

commit 6a542ccfc7d4507219398b088fa9dc56a292c874 Merge: 4ab90f8 e8fdc80 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Feb 1 16:28:03 2013 +0100 Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe * 'master' of ssh://git-rw.torproject.org/ooni-probe: Fix #7936, minor typo in dnsspoof docs. docs/source/tests/dnsspoof.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[ooni-probe/master] Strictly require Twisted 12.2.0.
by art＠torproject.org 01 Feb '13

01 Feb '13

commit c26379c2abc4884e46d9f6217f96932f73c82807 Author: Arturo Filastò <art(a)fuffa.org> Date: Tue Jan 8 21:00:48 2013 +0100 Strictly require Twisted 12.2.0. This is a temporary fix for issue #28 The problem arises from the fact that we are overriding a private method (_WrappingProtocol that has been removed in 12.3.0). The proper way to fix this would be to get rid of the hack and use a HTTP Connection Pool. --- requirements.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/requirements.txt b/requirements.txt index 633dbe5..2b8aabf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ PyYAML>=3.10 Pygments>=1.5 -Twisted>=12.1.0 +Twisted==12.2.0 argparse>=1.2.1 distribute>=0.6.24 dnspython>=1.10.0

1 0

[ooni-probe/master] Add ability to specify the Tor data directory from the config file
by art＠torproject.org 01 Feb '13

01 Feb '13

commit aec3e8b37c65d551a2dfa113b5fea4758aef471b Author: Arturo Filastò <art(a)fuffa.org> Date: Tue Jan 8 21:00:31 2013 +0100 Add ability to specify the Tor data directory from the config file --- ooni/runner.py | 6 ++++++ ooniprobe.conf.sample | 4 ++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/ooni/runner.py b/ooni/runner.py index b9deedc..1a7e629 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -528,6 +528,12 @@ def startTor(): tor_config.SocksPort = socks_port config.tor.socks_port = socks_port + if config.tor.data_dir: + if not os.path.exists(config.tor.data_dir): + log.msg("%s does not exist. Creating it." % config.tor.data_dir) + os.makedirs(config.tor.data_dir) + tor_config.DataDirectory = os.path.expanduser(config.tor.data_dir) + tor_config.save() log.debug("Setting control port as %s" % tor_config.ControlPort) diff --git a/ooniprobe.conf.sample b/ooniprobe.conf.sample index ed77dfe..a2f1c5b 100644 --- a/ooniprobe.conf.sample +++ b/ooniprobe.conf.sample @@ -35,4 +35,8 @@ tor: #control_port: 9051 # Specify the absolute path to the Tor bridges to use for testing bridges: bridges.list + # Specify path of the tor datadirectory. + # This should be set to something to avoid having Tor download each time + # the descriptors and consensus data. + data_dir: ~/.tor/

1 0

[metrics-web/master] Remove remains of hourly relay flags graph.
by karsten＠torproject.org 01 Feb '13

01 Feb '13

commit 124a4d91f0b7ac649db16a85e44d8e29c5dd179b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Feb 1 12:40:29 2013 +0100 Remove remains of hourly relay flags graph. Hourly relay flags graphs were disabled seven weeks ago as part of #7652. Remove the remaining, now unused code. --- db/tordir.sql | 45 --------- rserve/csv.R | 14 --- rserve/graphs.R | 98 +++++++------------- .../ernie/web/graphs/GraphParameterChecker.java | 20 ---- .../ernie/web/graphs/RObjectGenerator.java | 3 +- 5 files changed, 36 insertions(+), 144 deletions(-) diff --git a/db/tordir.sql b/db/tordir.sql index 3749774..571a324 100644 --- a/db/tordir.sql +++ b/db/tordir.sql @@ -157,17 +157,6 @@ CREATE TABLE network_size ( CONSTRAINT network_size_pkey PRIMARY KEY(date) ); --- TABLE network_size_hour -CREATE TABLE network_size_hour ( - validafter TIMESTAMP WITHOUT TIME ZONE NOT NULL, - avg_running INTEGER NOT NULL, - avg_exit INTEGER NOT NULL, - avg_guard INTEGER NOT NULL, - avg_fast INTEGER NOT NULL, - avg_stable INTEGER NOT NULL, - CONSTRAINT network_size_hour_pkey PRIMARY KEY(validafter) -); - -- TABLE relay_countries CREATE TABLE relay_countries ( date DATE NOT NULL, @@ -436,38 +425,6 @@ CREATE OR REPLACE FUNCTION refresh_network_size() RETURNS INTEGER AS $$ END; $$ LANGUAGE plpgsql; --- FUNCTION refresh_network_size_hour() -CREATE OR REPLACE FUNCTION refresh_network_size_hour() RETURNS INTEGER AS $$ - DECLARE - min_date TIMESTAMP WITHOUT TIME ZONE; - max_date TIMESTAMP WITHOUT TIME ZONE; - BEGIN - - min_date := (SELECT MIN(date) FROM updates); - max_date := (SELECT MAX(date) + 1 FROM updates); - - DELETE FROM network_size_hour - WHERE DATE(validafter) IN (SELECT date FROM updates); - - EXECUTE ' - INSERT INTO network_size_hour - (validafter, avg_running, avg_exit, avg_guard, avg_fast, avg_stable) - SELECT validafter, COUNT(*) AS avg_running, - COUNT(NULLIF(isexit, FALSE)) AS avg_exit, - COUNT(NULLIF(isguard, FALSE)) AS avg_guard, - COUNT(NULLIF(isfast, FALSE)) AS avg_fast, - COUNT(NULLIF(isstable, FALSE)) AS avg_stable - FROM statusentry - WHERE isrunning = TRUE - AND validafter >= ''' || min_date || ''' - AND validafter < ''' || max_date || ''' - AND DATE(validafter) IN (SELECT date FROM updates) - GROUP BY validafter'; - - RETURN 1; - END; -$$ LANGUAGE plpgsql; - -- FUNCTION refresh_relay_countries() CREATE OR REPLACE FUNCTION refresh_relay_countries() RETURNS INTEGER AS $$ DECLARE @@ -953,8 +910,6 @@ CREATE OR REPLACE FUNCTION refresh_all() RETURNS INTEGER AS $$ PERFORM refresh_relay_statuses_per_day(); RAISE NOTICE '% Refreshing network size.', timeofday(); PERFORM refresh_network_size(); - RAISE NOTICE '% Refreshing hourly network size.', timeofday(); - PERFORM refresh_network_size_hour(); RAISE NOTICE '% Refreshing relays by country.', timeofday(); PERFORM refresh_relay_countries(); RAISE NOTICE '% Refreshing relay platforms.', timeofday(); diff --git a/rserve/csv.R b/rserve/csv.R index d7917e0..f8c21b1 100644 --- a/rserve/csv.R +++ b/rserve/csv.R @@ -135,20 +135,6 @@ export_relayflags <- function(path) { write.csv(relayflags, path, quote = FALSE, row.names = FALSE) } -export_relayflags_hour <- function(path) { - drv <- dbDriver("PostgreSQL") - con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) - q <- paste("SELECT validafter, avg_running AS running,", - "avg_exit AS exit, avg_guard AS guard, avg_fast AS fast,", - "avg_stable AS stable FROM network_size_hour", - "WHERE DATE(validafter) < current_date - 1 ORDER BY validafter") - rs <- dbSendQuery(con, q) - relayflags <- fetch(rs, n = -1) - dbDisconnect(con) - dbUnloadDriver(drv) - write.csv(relayflags, path, quote = FALSE, row.names = FALSE) -} - export_direct_users <- function(path) { drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) diff --git a/rserve/graphs.R b/rserve/graphs.R index 07de07f..22225be 100644 --- a/rserve/graphs.R +++ b/rserve/graphs.R @@ -591,76 +591,48 @@ plot_dirbytes <- function(start, end, path) { ggsave(filename = path, width = 8, height = 5, dpi = 72) } -plot_relayflags <- function(start, end, flags, granularity, path) { +plot_relayflags <- function(start, end, flags, path) { end <- min(end, as.character(Sys.Date() - 2)) drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) - if (granularity == 'day') { - columns <- paste("avg_", tolower(flags), sep = "", collapse = ", ") - q <- paste("SELECT date, ", columns, " FROM network_size ", - "WHERE date >= '", start, "' AND date <= '", end, "'", sep = "") - rs <- dbSendQuery(con, q) - networksize <- fetch(rs, n = -1) - dbDisconnect(con) - dbUnloadDriver(drv) - networksize <- melt(networksize, id = "date") + columns <- paste("avg_", tolower(flags), sep = "", collapse = ", ") + q <- paste("SELECT date, ", columns, " FROM network_size ", + "WHERE date >= '", start, "' AND date <= '", end, "'", sep = "") + rs <- dbSendQuery(con, q) + networksize <- fetch(rs, n = -1) + dbDisconnect(con) + dbUnloadDriver(drv) + networksize <- melt(networksize, id = "date") + networksize <- rbind(data.frame( + date = as.Date(end) + 1, + variable = paste("avg_", c("running", "exit", "guard", "fast", + "stable"), sep = ""), + value = NA), networksize) + dates <- seq(from = as.Date(start, "%Y-%m-%d"), + to = as.Date(end, "%Y-%m-%d"), by="1 day") + missing <- setdiff(dates, networksize$date) + if (length(missing) > 0) networksize <- rbind(data.frame( - date = as.Date(end) + 1, + date = as.Date(rep(missing, 5), origin = "1970-01-01"), variable = paste("avg_", c("running", "exit", "guard", "fast", "stable"), sep = ""), - value = NA), networksize) - dates <- seq(from = as.Date(start, "%Y-%m-%d"), - to = as.Date(end, "%Y-%m-%d"), by="1 day") - missing <- setdiff(dates, networksize$date) - if (length(missing) > 0) - networksize <- rbind(data.frame( - date = as.Date(rep(missing, 5), origin = "1970-01-01"), - variable = paste("avg_", c("running", "exit", "guard", "fast", - "stable"), sep = ""), - value = rep(NA, length(missing) * 5)), networksize) - date_breaks <- date_breaks( - as.numeric(max(as.Date(end, "%Y-%m-%d")) - - min(as.Date(networksize$date, "%Y-%m-%d")))) - ggplot(networksize, aes(x = as.Date(date, "%Y-%m-%d"), y = value, - colour = as.factor(variable))) + geom_line(size = 1) + - scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), + value = rep(NA, length(missing) * 5)), networksize) + date_breaks <- date_breaks( + as.numeric(max(as.Date(end, "%Y-%m-%d")) - + min(as.Date(networksize$date, "%Y-%m-%d")))) + ggplot(networksize, aes(x = as.Date(date, "%Y-%m-%d"), y = value, + colour = as.factor(variable))) + geom_line(size = 1) + + scale_x_date(name = paste("\nThe Tor Project - ", + "https://metrics.torproject.org/", sep = ""), format = date_breaks$format, major = date_breaks$major, - minor = date_breaks$minor, limits = as.Date(c(start, end))) + - scale_y_continuous(name = "", limits = c(0, max(networksize$value, - na.rm = TRUE))) + - scale_colour_manual(name = "Relay flags", values = c("#E69F00", - "#56B4E9", "#009E73", "#000000", "#0072B2"), - breaks = paste("avg_", tolower(flags), sep = ""), - labels = flags) + - opts(title = "Number of relays with relay flags assigned\n") - } else { - columns <- paste("avg_", tolower(flags), sep = "", collapse = ", ") - q <- paste("SELECT validafter, ", columns, " FROM network_size_hour ", - "WHERE DATE(validafter) >= '", start, - "' AND DATE(validafter) <= '", end, "'", sep = "") - rs <- dbSendQuery(con, q) - networksize <- fetch(rs, n = -1) - dbDisconnect(con) - dbUnloadDriver(drv) - networksize <- melt(networksize, id = "validafter") - networksize <- rbind(data.frame( - validafter = as.POSIXct(rep(paste(end, "23:59:00"), 5)), - variable = paste("avg_", c("running", "exit", "guard", "fast", - "stable"), sep = ""), - value = rep(NA, 5)), networksize) - ggplot(networksize, aes(x = as.POSIXct(validafter), y = value, - colour = variable)) + geom_line(size = 1) + - scale_x_datetime(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = "")) + - scale_y_continuous(name = "", limits = c(0, max(networksize$value, - na.rm = TRUE))) + - scale_colour_manual(name = "Relay flags", values = c("#E69F00", - "#56B4E9", "#009E73", "#000000", "#0072B2"), - breaks = paste("avg_", tolower(flags), sep = ""), - labels = flags) + - opts(title = "Number of relays with relay flags assigned\n") - } + minor = date_breaks$minor, limits = as.Date(c(start, end))) + + scale_y_continuous(name = "", limits = c(0, max(networksize$value, + na.rm = TRUE))) + + scale_colour_manual(name = "Relay flags", values = c("#E69F00", + "#56B4E9", "#009E73", "#000000", "#0072B2"), + breaks = paste("avg_", tolower(flags), sep = ""), + labels = flags) + + opts(title = "Number of relays with relay flags assigned\n") ggsave(filename = path, width = 8, height = 5, dpi = 72) } diff --git a/src/org/torproject/ernie/web/graphs/GraphParameterChecker.java b/src/org/torproject/ernie/web/graphs/GraphParameterChecker.java index c22a845..a47538e 100644 --- a/src/org/torproject/ernie/web/graphs/GraphParameterChecker.java +++ b/src/org/torproject/ernie/web/graphs/GraphParameterChecker.java @@ -50,7 +50,6 @@ public class GraphParameterChecker { this.knownParameterValues = new HashMap<String, String>(); this.knownParameterValues.put("flag", "Running,Exit,Guard,Fast,Stable"); - this.knownParameterValues.put("granularity", "day"); StringBuilder sb = new StringBuilder("all"); for (String[] country : Countries.getInstance().getCountryList()) { sb.append("," + country[0]); @@ -148,25 +147,6 @@ public class GraphParameterChecker { recognizedGraphParameters.put("flag", flagParameters); } - /* Parse granularity, which can be 1 day or 1 hour, if supported by - * the graph type. The default is 1 day. */ - if (supportedGraphParameters.contains("granularity")) { - String[] granularityParameter = (String[]) requestParameters.get( - "granularity"); - List<String> knownGranularities = Arrays.asList( - this.knownParameterValues.get("granularity").split(",")); - if (granularityParameter != null) { - if (granularityParameter.length != 1 || - granularityParameter[0] == null || - !knownGranularities.contains(granularityParameter[0])) { - return null; - } - } else { - granularityParameter = new String[] { "day" }; - } - recognizedGraphParameters.put("granularity", granularityParameter); - } - /* Parse country codes if supported by the graph type. If no countries * are passed, use country code "all" (all countries) as default. */ if (supportedGraphParameters.contains("country")) { diff --git a/src/org/torproject/ernie/web/graphs/RObjectGenerator.java b/src/org/torproject/ernie/web/graphs/RObjectGenerator.java index c4eb801..6ed77f2 100644 --- a/src/org/torproject/ernie/web/graphs/RObjectGenerator.java +++ b/src/org/torproject/ernie/web/graphs/RObjectGenerator.java @@ -87,8 +87,7 @@ public class RObjectGenerator implements ServletContextListener { this.availableGraphs.put("cloudbridges", "start,end,filename"); this.availableGraphs.put("relaycountries", "start,end,country,filename"); - this.availableGraphs.put("relayflags", "start,end,flag,granularity," - + "filename"); + this.availableGraphs.put("relayflags", "start,end,flag,filename"); this.availableGraphs.put("versions", "start,end,filename"); this.availableGraphs.put("platforms", "start,end,filename"); this.availableGraphs.put("bandwidth", "start,end,filename");

1 0

[metrics-web/master] Add @type bridge-extra-info 1.2 to annotations.
by karsten＠torproject.org 01 Feb '13

01 Feb '13

commit e8c06def5cd2461a005481797e1b2b9014276136 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Feb 1 11:46:41 2013 +0100 Add @type bridge-extra-info 1.2 to annotations. --- web/WEB-INF/formats.jsp | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/web/WEB-INF/formats.jsp b/web/WEB-INF/formats.jsp index 966856a..0fa7201 100644 --- a/web/WEB-INF/formats.jsp +++ b/web/WEB-INF/formats.jsp @@ -83,9 +83,11 @@ are recent: <li><tt>@type network-status-microdesc-consensus-3 1.0</tt></li> <li><tt>@type bridge-network-status 1.0</tt></li> <li><tt>@type bridge-server-descriptor 1.0</tt></li> -<li><tt>@type bridge-extra-info 1.0</tt></li> -<li><tt>@type bridge-extra-info 1.1</tt> contain sanitized - <tt>transport</tt> lines</li> +<li><tt>@type bridge-extra-info 1.0</tt></li> +<li><tt>@type bridge-extra-info 1.1</tt> contain + sanitized <tt>transport</tt> lines</li> +<li><tt>@type bridge-extra-info 1.2</tt> contain <tt>ntor-onion-key</tt> + lines</li> <li><tt>@type torperf 1.0</tt></li> <li><tt>@type bridge-pool-assignment 1.0</tt></li> <li><tt>@type tordnsel 1.0</tt></li>

1 0

[torbrowser/master] WIN: Add a document describing the setup of a Windows build machine.
by erinn＠torproject.org 01 Feb '13

01 Feb '13

commit 0f3d1426fd6caa912adb81c634a0c7811ff95da0 Author: Shondoit Walker <shondoit(a)gmail.com> Date: Sun Jul 22 20:19:10 2012 +0200 WIN: Add a document describing the setup of a Windows build machine. --- docs/buildmachine_setups/windows.txt | 125 ++++++++++++++++++++++++++++++++++ 1 files changed, 125 insertions(+), 0 deletions(-) diff --git a/docs/buildmachine_setups/windows.txt b/docs/buildmachine_setups/windows.txt new file mode 100644 index 0000000..dfdad57 --- /dev/null +++ b/docs/buildmachine_setups/windows.txt @@ -0,0 +1,125 @@ +*** 0. Installing Windows *** +Install Windows 7 64-bit, install all updates and service packs. +If you're running a VM, make a snapshot of this clean Windows install. + +*** 1. Installing MinGW *** +Download the latest version of MinGW from the following URI: + http://sourceforge.net/projects/mingw/files/latest/download/ + +Run the downloaded installer. The installer requires an internet connection to download data. +Since you just downloaded the installer it's fine to use the pre-packaged repository catalogues. +Accept the license agreement if you agree. +Install to the default location (C:\MinGW) +You can choose to create shortcuts in the Start Menu if you so wish. + +For the components, select the following: + C Compiler + C++ Compiler + MSYS Basic System + MinGW Developer Toolkit + +Wait until the installation sequence has finished. +Once it finished installing, you can choose to view the install log, but you don't need to so. + +Start MinGW Shell and run the following command: + mingw-get install msys-wget + +*** 2. Installing CMake *** +Download CMake from the following URI: + http://www.cmake.org/files/v2.8/cmake-2.8.8-win32-x86.exe +The latest version can be found at: + http://www.cmake.org/cmake/resources/software.html + +Run the downloaded installer. +Accept the license agreement if you agree. + +You don't need to add CMake to our system's PATH. +Change the install location to C:\MinGW\msys\1.0. +You don't need to add a shortcut in the Start Menu. +Wait until the installation sequence has finished. + +*** 3. Installing MsysGit *** +Download MsysGit from the following URI: + https://msysgit.googlecode.com/files/Git-1.7.11-preview20120710.exe +The latest version can be found at: + https://code.google.com/p/msysgit/downloads/list + +Run the downloaded installer. +Accept the license agreement if you agree. +The install location does not matter. You can keep the default. (C:\Program Files (x86)\Git) +Choose the components as desired. But do *not* choose to associate .sh files to be run with Bash. +You can choose to create shortcuts in the Start Menu if you so wish. + +If you want to use Git from inside MinGW then choose to run Git from the Windows Command Prompt +Choose the default option 'Checkout Windows-style, commit Unix-style line endings.' + +Wait until the installation sequence has finished. +Once it finished installing, you can choose to view the release notes, but you don't need to so. + +*** 4. Installing Qt *** +Download Qt 4.8.1 from the following URI: + http://releases.qt-project.org/qt4/source/qt-win-opensource-4.8.1-mingw.exe + +The latest version can be found at (use the MinGW version): + http://qt.nokia.com/downloads +But you must use the same version as specified by QT_VER in: + https://gitweb.torproject.org/torbrowser.git/blob/HEAD:/build-scripts/versi… + +Run the downloaded installer. The loading might take a while. +Accept the license agreement if you agree. +Setting file associations is not necessary for building, but might be handy for debugging. +Use the default destination folder (C:\Qt\4.8.1). +You can use the default start menu folder, but I recommend using a shorter name like 'Qt'. +When asked for the MinGW folder, use the same folder as was used during the MinGW installation (C:\MinGW) +When you click Install, it will most likely give you the following warning: + There is a problem with your MinGW installation: + The installer could not find a valid C:\MinGW\include\w32api.h + (Only versions with W32API 3.13 are supported) + Do you still want to continue? (Your installation may not work) +In this case you can ignore the warning and choose Yes, since this is a known issue. +Every other warning/error should be taken as such. +Wait until the installation sequence has finished. +You do not need to run the examples/demos nor open the documentation. + +*** 5. Installing Visual Studio *** +Download Visual Studio Express 2008 from the following URI: + http://download.microsoft.com/download/A/5/4/A54BADB6-9C3F-478D-8657-93B3FC… +The latest version can be found at: + http://www.microsoft.com/express/Windows + +Run the downloaded installer. The installer requires an internet connection to download data. +When asked if you want to Help Improve Setup you can choose not to send information about the setup. +Accept the license agreement if you agree. Displaying RSS content is not necessary. +We don't need the Silverlight runtime, nor SQL Server Express Edition. Disable these. +The install location does not matter. You can keep the default. (C:\Program Files (x86)\Microsoft Visual Studio 9.0) +Wait until the installation sequence has finished. + +*** 6. Installing Windows SDK *** +Download the Windows SDK from the following URI: + http://download.microsoft.com/download/7/A/B/7ABD2203-C472-4036-8BA0-E50552… +The latest version can be found at: + http://msdn.microsoft.com/en-us/windowsserver/bb980924.aspx + +Run the downloaded installer. The installer requires an internet connection to download data. +Accept the license agreement if you agree. +The install location does not matter. You can keep the defaults. (C:\Program Files\Microsoft SDKs\Windows\v7.0) +For the components, you can disable Documentation as well as Samples. +Wait until the installation sequence has finished. +Once it finished installing, you can choose to view the release notes, but you don't need to so. + +*** 7. Installing DirectX *** +Download the DirectX SDK from the following URI: + http://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3… +The latest version can be found at: + http://msdn.microsoft.com/en-us/directx/aa937788.aspx + +Start the downloaded installer. It might take a while before the window shows up. +Accept the license agreement if you agree. +It is not necessary to participate in the Customer Experience Improvement Program, but you may do so if you wish. +The install location does not matter. You can keep the defaults. (C:\Program Files (x86)\Microsoft DirectX SDK (June 2010)) +For the components, you can disable Documentation as well as Samples and Source Code. +Wait until the installation sequence has finished. + +*** 8. Snapshot *** +If you're running a VM, make a snapshot of this clean build environment. +

1 0

[torbrowser/maint-2.4] Merge branch 'maint-2.3' into maint-2.4
by erinn＠torproject.org 01 Feb '13

01 Feb '13

commit 8d24c7ce32f791cc935ead466f54b1410fe0fa2d Merge: a609a4d 0f3d142 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Feb 1 09:43:41 2013 +0100 Merge branch 'maint-2.3' into maint-2.4 docs/buildmachine_setups/windows.txt | 125 ++++++++++++++++++++++++++++++++++ 1 files changed, 125 insertions(+), 0 deletions(-)

1 0

[torbrowser/master] Merge branch 'maint-2.3' into maint-2.4
by erinn＠torproject.org 01 Feb '13

01 Feb '13

commit 8d24c7ce32f791cc935ead466f54b1410fe0fa2d Merge: a609a4d 0f3d142 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Feb 1 09:43:41 2013 +0100 Merge branch 'maint-2.3' into maint-2.4 docs/buildmachine_setups/windows.txt | 125 ++++++++++++++++++++++++++++++++++ 1 files changed, 125 insertions(+), 0 deletions(-)

1 0

[torbrowser/maint-2.3] WIN: Add a document describing the setup of a Windows build machine.
by erinn＠torproject.org 01 Feb '13

01 Feb '13

commit 0f3d1426fd6caa912adb81c634a0c7811ff95da0 Author: Shondoit Walker <shondoit(a)gmail.com> Date: Sun Jul 22 20:19:10 2012 +0200 WIN: Add a document describing the setup of a Windows build machine. --- docs/buildmachine_setups/windows.txt | 125 ++++++++++++++++++++++++++++++++++ 1 files changed, 125 insertions(+), 0 deletions(-) diff --git a/docs/buildmachine_setups/windows.txt b/docs/buildmachine_setups/windows.txt new file mode 100644 index 0000000..dfdad57 --- /dev/null +++ b/docs/buildmachine_setups/windows.txt @@ -0,0 +1,125 @@ +*** 0. Installing Windows *** +Install Windows 7 64-bit, install all updates and service packs. +If you're running a VM, make a snapshot of this clean Windows install. + +*** 1. Installing MinGW *** +Download the latest version of MinGW from the following URI: + http://sourceforge.net/projects/mingw/files/latest/download/ + +Run the downloaded installer. The installer requires an internet connection to download data. +Since you just downloaded the installer it's fine to use the pre-packaged repository catalogues. +Accept the license agreement if you agree. +Install to the default location (C:\MinGW) +You can choose to create shortcuts in the Start Menu if you so wish. + +For the components, select the following: + C Compiler + C++ Compiler + MSYS Basic System + MinGW Developer Toolkit + +Wait until the installation sequence has finished. +Once it finished installing, you can choose to view the install log, but you don't need to so. + +Start MinGW Shell and run the following command: + mingw-get install msys-wget + +*** 2. Installing CMake *** +Download CMake from the following URI: + http://www.cmake.org/files/v2.8/cmake-2.8.8-win32-x86.exe +The latest version can be found at: + http://www.cmake.org/cmake/resources/software.html + +Run the downloaded installer. +Accept the license agreement if you agree. + +You don't need to add CMake to our system's PATH. +Change the install location to C:\MinGW\msys\1.0. +You don't need to add a shortcut in the Start Menu. +Wait until the installation sequence has finished. + +*** 3. Installing MsysGit *** +Download MsysGit from the following URI: + https://msysgit.googlecode.com/files/Git-1.7.11-preview20120710.exe +The latest version can be found at: + https://code.google.com/p/msysgit/downloads/list + +Run the downloaded installer. +Accept the license agreement if you agree. +The install location does not matter. You can keep the default. (C:\Program Files (x86)\Git) +Choose the components as desired. But do *not* choose to associate .sh files to be run with Bash. +You can choose to create shortcuts in the Start Menu if you so wish. + +If you want to use Git from inside MinGW then choose to run Git from the Windows Command Prompt +Choose the default option 'Checkout Windows-style, commit Unix-style line endings.' + +Wait until the installation sequence has finished. +Once it finished installing, you can choose to view the release notes, but you don't need to so. + +*** 4. Installing Qt *** +Download Qt 4.8.1 from the following URI: + http://releases.qt-project.org/qt4/source/qt-win-opensource-4.8.1-mingw.exe + +The latest version can be found at (use the MinGW version): + http://qt.nokia.com/downloads +But you must use the same version as specified by QT_VER in: + https://gitweb.torproject.org/torbrowser.git/blob/HEAD:/build-scripts/versi… + +Run the downloaded installer. The loading might take a while. +Accept the license agreement if you agree. +Setting file associations is not necessary for building, but might be handy for debugging. +Use the default destination folder (C:\Qt\4.8.1). +You can use the default start menu folder, but I recommend using a shorter name like 'Qt'. +When asked for the MinGW folder, use the same folder as was used during the MinGW installation (C:\MinGW) +When you click Install, it will most likely give you the following warning: + There is a problem with your MinGW installation: + The installer could not find a valid C:\MinGW\include\w32api.h + (Only versions with W32API 3.13 are supported) + Do you still want to continue? (Your installation may not work) +In this case you can ignore the warning and choose Yes, since this is a known issue. +Every other warning/error should be taken as such. +Wait until the installation sequence has finished. +You do not need to run the examples/demos nor open the documentation. + +*** 5. Installing Visual Studio *** +Download Visual Studio Express 2008 from the following URI: + http://download.microsoft.com/download/A/5/4/A54BADB6-9C3F-478D-8657-93B3FC… +The latest version can be found at: + http://www.microsoft.com/express/Windows + +Run the downloaded installer. The installer requires an internet connection to download data. +When asked if you want to Help Improve Setup you can choose not to send information about the setup. +Accept the license agreement if you agree. Displaying RSS content is not necessary. +We don't need the Silverlight runtime, nor SQL Server Express Edition. Disable these. +The install location does not matter. You can keep the default. (C:\Program Files (x86)\Microsoft Visual Studio 9.0) +Wait until the installation sequence has finished. + +*** 6. Installing Windows SDK *** +Download the Windows SDK from the following URI: + http://download.microsoft.com/download/7/A/B/7ABD2203-C472-4036-8BA0-E50552… +The latest version can be found at: + http://msdn.microsoft.com/en-us/windowsserver/bb980924.aspx + +Run the downloaded installer. The installer requires an internet connection to download data. +Accept the license agreement if you agree. +The install location does not matter. You can keep the defaults. (C:\Program Files\Microsoft SDKs\Windows\v7.0) +For the components, you can disable Documentation as well as Samples. +Wait until the installation sequence has finished. +Once it finished installing, you can choose to view the release notes, but you don't need to so. + +*** 7. Installing DirectX *** +Download the DirectX SDK from the following URI: + http://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3… +The latest version can be found at: + http://msdn.microsoft.com/en-us/directx/aa937788.aspx + +Start the downloaded installer. It might take a while before the window shows up. +Accept the license agreement if you agree. +It is not necessary to participate in the Customer Experience Improvement Program, but you may do so if you wish. +The install location does not matter. You can keep the defaults. (C:\Program Files (x86)\Microsoft DirectX SDK (June 2010)) +For the components, you can disable Documentation as well as Samples and Source Code. +Wait until the installation sequence has finished. + +*** 8. Snapshot *** +If you're running a VM, make a snapshot of this clean build environment. +

1 0

[torbrowser/maint-2.4] WIN: Add a document describing the setup of a Windows build machine.
by erinn＠torproject.org 01 Feb '13

01 Feb '13

commit 0f3d1426fd6caa912adb81c634a0c7811ff95da0 Author: Shondoit Walker <shondoit(a)gmail.com> Date: Sun Jul 22 20:19:10 2012 +0200 WIN: Add a document describing the setup of a Windows build machine. --- docs/buildmachine_setups/windows.txt | 125 ++++++++++++++++++++++++++++++++++ 1 files changed, 125 insertions(+), 0 deletions(-) diff --git a/docs/buildmachine_setups/windows.txt b/docs/buildmachine_setups/windows.txt new file mode 100644 index 0000000..dfdad57 --- /dev/null +++ b/docs/buildmachine_setups/windows.txt @@ -0,0 +1,125 @@ +*** 0. Installing Windows *** +Install Windows 7 64-bit, install all updates and service packs. +If you're running a VM, make a snapshot of this clean Windows install. + +*** 1. Installing MinGW *** +Download the latest version of MinGW from the following URI: + http://sourceforge.net/projects/mingw/files/latest/download/ + +Run the downloaded installer. The installer requires an internet connection to download data. +Since you just downloaded the installer it's fine to use the pre-packaged repository catalogues. +Accept the license agreement if you agree. +Install to the default location (C:\MinGW) +You can choose to create shortcuts in the Start Menu if you so wish. + +For the components, select the following: + C Compiler + C++ Compiler + MSYS Basic System + MinGW Developer Toolkit + +Wait until the installation sequence has finished. +Once it finished installing, you can choose to view the install log, but you don't need to so. + +Start MinGW Shell and run the following command: + mingw-get install msys-wget + +*** 2. Installing CMake *** +Download CMake from the following URI: + http://www.cmake.org/files/v2.8/cmake-2.8.8-win32-x86.exe +The latest version can be found at: + http://www.cmake.org/cmake/resources/software.html + +Run the downloaded installer. +Accept the license agreement if you agree. + +You don't need to add CMake to our system's PATH. +Change the install location to C:\MinGW\msys\1.0. +You don't need to add a shortcut in the Start Menu. +Wait until the installation sequence has finished. + +*** 3. Installing MsysGit *** +Download MsysGit from the following URI: + https://msysgit.googlecode.com/files/Git-1.7.11-preview20120710.exe +The latest version can be found at: + https://code.google.com/p/msysgit/downloads/list + +Run the downloaded installer. +Accept the license agreement if you agree. +The install location does not matter. You can keep the default. (C:\Program Files (x86)\Git) +Choose the components as desired. But do *not* choose to associate .sh files to be run with Bash. +You can choose to create shortcuts in the Start Menu if you so wish. + +If you want to use Git from inside MinGW then choose to run Git from the Windows Command Prompt +Choose the default option 'Checkout Windows-style, commit Unix-style line endings.' + +Wait until the installation sequence has finished. +Once it finished installing, you can choose to view the release notes, but you don't need to so. + +*** 4. Installing Qt *** +Download Qt 4.8.1 from the following URI: + http://releases.qt-project.org/qt4/source/qt-win-opensource-4.8.1-mingw.exe + +The latest version can be found at (use the MinGW version): + http://qt.nokia.com/downloads +But you must use the same version as specified by QT_VER in: + https://gitweb.torproject.org/torbrowser.git/blob/HEAD:/build-scripts/versi… + +Run the downloaded installer. The loading might take a while. +Accept the license agreement if you agree. +Setting file associations is not necessary for building, but might be handy for debugging. +Use the default destination folder (C:\Qt\4.8.1). +You can use the default start menu folder, but I recommend using a shorter name like 'Qt'. +When asked for the MinGW folder, use the same folder as was used during the MinGW installation (C:\MinGW) +When you click Install, it will most likely give you the following warning: + There is a problem with your MinGW installation: + The installer could not find a valid C:\MinGW\include\w32api.h + (Only versions with W32API 3.13 are supported) + Do you still want to continue? (Your installation may not work) +In this case you can ignore the warning and choose Yes, since this is a known issue. +Every other warning/error should be taken as such. +Wait until the installation sequence has finished. +You do not need to run the examples/demos nor open the documentation. + +*** 5. Installing Visual Studio *** +Download Visual Studio Express 2008 from the following URI: + http://download.microsoft.com/download/A/5/4/A54BADB6-9C3F-478D-8657-93B3FC… +The latest version can be found at: + http://www.microsoft.com/express/Windows + +Run the downloaded installer. The installer requires an internet connection to download data. +When asked if you want to Help Improve Setup you can choose not to send information about the setup. +Accept the license agreement if you agree. Displaying RSS content is not necessary. +We don't need the Silverlight runtime, nor SQL Server Express Edition. Disable these. +The install location does not matter. You can keep the default. (C:\Program Files (x86)\Microsoft Visual Studio 9.0) +Wait until the installation sequence has finished. + +*** 6. Installing Windows SDK *** +Download the Windows SDK from the following URI: + http://download.microsoft.com/download/7/A/B/7ABD2203-C472-4036-8BA0-E50552… +The latest version can be found at: + http://msdn.microsoft.com/en-us/windowsserver/bb980924.aspx + +Run the downloaded installer. The installer requires an internet connection to download data. +Accept the license agreement if you agree. +The install location does not matter. You can keep the defaults. (C:\Program Files\Microsoft SDKs\Windows\v7.0) +For the components, you can disable Documentation as well as Samples. +Wait until the installation sequence has finished. +Once it finished installing, you can choose to view the release notes, but you don't need to so. + +*** 7. Installing DirectX *** +Download the DirectX SDK from the following URI: + http://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3… +The latest version can be found at: + http://msdn.microsoft.com/en-us/directx/aa937788.aspx + +Start the downloaded installer. It might take a while before the window shows up. +Accept the license agreement if you agree. +It is not necessary to participate in the Customer Experience Improvement Program, but you may do so if you wish. +The install location does not matter. You can keep the defaults. (C:\Program Files (x86)\Microsoft DirectX SDK (June 2010)) +For the components, you can disable Documentation as well as Samples and Source Code. +Wait until the installation sequence has finished. + +*** 8. Snapshot *** +If you're running a VM, make a snapshot of this clean build environment. +

1 0