- tor-commits - lists.torproject.org

[metrics-tasks/master] Update plotting code for #6232.
by karsten＠torproject.org 15 Jul '12

15 Jul '12

commit 82d18a95d064b1e0018cb85549fb21bb46bddce1 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Jul 15 07:29:49 2012 +0200 Update plotting code for #6232. --- task-6232/plot-entropy.R | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/task-6232/plot-entropy.R b/task-6232/plot-entropy.R index 1334b88..95dbdcc 100644 --- a/task-6232/plot-entropy.R +++ b/task-6232/plot-entropy.R @@ -1,10 +1,19 @@ library(ggplot2) +library(reshape) d <- read.csv("entropy.csv", header = FALSE, - col.names = c("validafter", "entropy")) -ggplot(d, aes(x = as.POSIXct(validafter), y = entropy)) + + col.names = c("validafter", "all", "exit", "guard", "country")) +d <- aggregate( + list(all = d$all, exit = d$exit, guard = d$guard, country = d$country), + by = list(date = as.Date(d$validafter, origin = "1970-01-01 00:00:00")), + FUN = median) +d <- melt(d, "date") +ggplot(d, aes(x = date, y = value, colour = variable)) + geom_line() + -scale_x_datetime(name = "\nDate") + -scale_y_continuous(name = "Entropy\n") +scale_x_date(name = "\nDate") + +scale_y_continuous(name = "Entropy\n") + +scale_colour_hue(name = "Relays", + breaks = c("all", "exit", "guard", "country"), + labels = c("All relays", "All exits", "All guards", "All countries")) ggsave("entropy.png", width = 8, height = 6, dpi = 100)

1 0

[metrics-tasks/master] Change entropy_exit to entropy_guard and vice-versa. Thanks asn!
by karsten＠torproject.org 14 Jul '12

14 Jul '12

commit 585553ccffda77970160f01ab926c7f05824ef3f Author: Sathyanarayanan <gsathya.ceg(a)gmail.com> Date: Fri Jul 13 20:09:12 2012 +0530 Change entropy_exit to entropy_guard and vice-versa. Thanks asn! --- task-6232/pyentropy.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/task-6232/pyentropy.py b/task-6232/pyentropy.py index 650423b..ec3365f 100644 --- a/task-6232/pyentropy.py +++ b/task-6232/pyentropy.py @@ -72,12 +72,12 @@ def run(file_name): if router.is_guard: p = float(router.bandwidth) / float(totalGuardBW) if p != 0: - entropy_exit += -(p * math.log(p, 2)) + entropy_guard += -(p * math.log(p, 2)) if router.is_exit: p = float(router.bandwidth) / float(totalExitBW) if p != 0: - entropy_guard += -(p * math.log(p, 2)) + entropy_exit += -(p * math.log(p, 2)) return ",".join([valid_after, str(entropy), str(entropy_exit), str(entropy_guard)])

1 0

[metrics-tasks/master] Check diversity of a consensus in the face of a national level adversary
by karsten＠torproject.org 14 Jul '12

14 Jul '12

commit e3e89c3ea085c700a86ab971e31efc90882d7f44 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Fri Jul 13 23:24:51 2012 +0530 Check diversity of a consensus in the face of a national level adversary --- task-6232/.gitignore | 2 +- task-6232/GeoIP.dat | Bin 0 -> 1343110 bytes task-6232/pyentropy.py | 42 ++- task-6232/pygeoip/__init__.py | 647 +++++++++++++++++++++++++++++++++++++ task-6232/pygeoip/const.py | 382 ++++++++++++++++++++++ task-6232/pygeoip/six.py | 353 ++++++++++++++++++++ task-6232/pygeoip/timezone.py | 714 +++++++++++++++++++++++++++++++++++++++++ task-6232/pygeoip/util.py | 35 ++ 8 files changed, 2160 insertions(+), 15 deletions(-) diff --git a/task-6232/.gitignore b/task-6232/.gitignore index 8a0c627..0f63a8b 100644 --- a/task-6232/.gitignore +++ b/task-6232/.gitignore @@ -1,3 +1,3 @@ in/ entropy.csv - +*.pyc diff --git a/task-6232/GeoIP.dat b/task-6232/GeoIP.dat new file mode 100644 index 0000000..00510d5 Binary files /dev/null and b/task-6232/GeoIP.dat differ diff --git a/task-6232/pyentropy.py b/task-6232/pyentropy.py index ec3365f..b064339 100644 --- a/task-6232/pyentropy.py +++ b/task-6232/pyentropy.py @@ -1,15 +1,15 @@ """ Usage - python pyentropy.py <consensus-dir> <output-file> -Output - A CSV file of the format <valid-after>,<entropy for all nodes>,<entropy for exitnodes>,<entropy for guardnodes> +Output - A CSV file of the format <valid-after>,<entropy for all nodes>,<entropy for exitnodes>,<entropy for guardnodes>,<entropy for countries> rsync -arz --delete metrics.torproject.org::metrics-recent/relay-descriptors/consensuses in """ import sys import math import os -from decimal import * +import pygeoip +import getopt -RESULTS = [] KEYS = ['r','s','v','w','p','m'] class Router: @@ -19,12 +19,16 @@ class Router: self.bandwidth = None self.flags = None self.probability = None + self.ip = None + self.country = None self.is_exit = None self.is_guard = None def add(self, key, values): if key == 'r': self.nick = values[0] + self.ip = values[5] + self.country = gi.country_name_by_addr(self.ip) if key == 'w': self.bandwidth = int(values[0].split('=')[1]) if key == 's': @@ -36,7 +40,7 @@ class Router: def run(file_name): routers = [] - # parse consensus + # parse consensus with open(file_name, 'r') as f: for line in f.readlines(): key = line.split()[0] @@ -53,33 +57,41 @@ def run(file_name): router.add(key, values) totalBW, totalExitBW, totalGuardBW = 0, 0, 0 + bw_countries = {} for router in routers: totalBW += router.bandwidth if router.is_guard: totalGuardBW += router.bandwidth if router.is_exit: totalExitBW += router.bandwidth + if bw_countries.has_key(router.country): + bw_countries[router.country] += router.bandwidth + else: + bw_countries[router.country] = router.bandwidth if len(routers) <= 0: return - entropy, entropy_exit, entropy_guard = 0.0, 0.0, 0.0 + entropy, entropy_exit, entropy_guard, entropy_country = 0.0, 0.0, 0.0, 0.0 for router in routers: p = float(router.bandwidth) / float(totalBW) if p != 0: entropy += -(p * math.log(p, 2)) - if router.is_guard: p = float(router.bandwidth) / float(totalGuardBW) if p != 0: entropy_guard += -(p * math.log(p, 2)) - if router.is_exit: p = float(router.bandwidth) / float(totalExitBW) if p != 0: entropy_exit += -(p * math.log(p, 2)) - return ",".join([valid_after, str(entropy), str(entropy_exit), str(entropy_guard)]) + for country in bw_countries.iterkeys(): + p = float(bw_countries[country]) / float(totalBW) + if p != 0: + entropy_country += -(p * math.log(p, 2)) + + return ",".join([valid_after, str(entropy), str(entropy_exit), str(entropy_guard), str(entropy_country)]) def usage(): print "Usage - python pyentropy.py <consensus-dir> <output-file>" @@ -87,9 +99,11 @@ def usage(): if __name__ == "__main__": if len(sys.argv) != 3: usage() - else: - with open(sys.argv[2], 'w') as f: - for file_name in os.listdir(sys.argv[1]): - string = run(os.path.join(sys.argv[1], file_name)) - if string: - f.write("%s\n" % (string)) + sys.exit() + + gi = pygeoip.GeoIP(os.path.join(os.path.dirname(__file__), 'GeoIP.dat')) + with open(sys.argv[2], 'w') as f: + for file_name in os.listdir(sys.argv[1]): + string = run(os.path.join(sys.argv[1], file_name)) + if string: + f.write("%s\n" % (string)) diff --git a/task-6232/pygeoip/__init__.py b/task-6232/pygeoip/__init__.py new file mode 100644 index 0000000..759c9e1 --- /dev/null +++ b/task-6232/pygeoip/__init__.py @@ -0,0 +1,647 @@ +""" +Pure Python GeoIP API. The API is based off of U{MaxMind's C-based Python API<http://www.maxmind.com/app/python>}, +but the code itself is based on the U{pure PHP5 API<http://pear.php.net/package/Net_GeoIP/>} +by Jim Winstead and Hans Lellelid. + +It is mostly a drop-in replacement, except the +C{new} and C{open} methods are gone. You should instantiate the L{GeoIP} class yourself: + +C{gi = GeoIP('/path/to/GeoIP.dat', pygeoip.MEMORY_CACHE)} + +@author: Jennifer Ennis <zaylea at gmail dot com> + +@license: +Copyright(C) 2004 MaxMind LLC + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU Lesser General Public License +along with this program. If not, see <http://www.gnu.org/licenses/lgpl.txt>. +""" + +from __future__ import with_statement, absolute_import, division +import os +import math +import socket +import mmap +import gzip +import codecs +from StringIO import StringIO + +from . import const +from .util import ip2long +from .timezone import time_zone_by_country_and_region + +from . import six + +MMAP_CACHE = const.MMAP_CACHE +MEMORY_CACHE = const.MEMORY_CACHE +STANDARD = const.STANDARD + +class GeoIPError(Exception): + pass + +class GeoIPMetaclass(type): + + def __new__(cls, *args, **kwargs): + """ + Singleton method to gets an instance without reparsing the db. Unique + instances are instantiated based on the filename of the db. Flags are + ignored for this, i.e. if you initialize one with STANDARD flag (default) + and then try later to initialize with MEMORY_CACHE, it will still + return the STANDARD one. + """ + + if not hasattr(cls, '_instances'): + cls._instances = {} + + if len(args) > 0: + filename = args[0] + elif 'filename' in kwargs: + filename = kwargs['filename'] + + if not filename in cls._instances: + cls._instances[filename] = type.__new__(cls, *args, **kwargs) + + return cls._instances[filename] + +GeoIPBase = GeoIPMetaclass('GeoIPBase', (object,), {}) + +class GeoIP(GeoIPBase): + + def __init__(self, filename, flags=0): + """ + Initialize the class. + + @param filename: path to a geoip database. If MEMORY_CACHE is used, + the file can be gzipped. + @type filename: str + @param flags: flags that affect how the database is processed. + Currently the only supported flags are STANDARD (the default), + MEMORY_CACHE (preload the whole file into memory), and + MMAP_CACHE (access the file via mmap). + @type flags: int + """ + self._filename = filename + self._flags = flags + + if self._flags & const.MMAP_CACHE: + with open(filename, 'rb') as f: + self._filehandle = mmap.mmap(f.fileno(), 0, access=mmap.ACCESS_READ) + + elif self._flags & const.MEMORY_CACHE: + if filename.endswith('.gz'): + opener = gzip.open + else: + opener = open + + with opener(filename, 'rb') as f: + self._memoryBuffer = f.read() + self._filehandle = StringIO(self._memoryBuffer) + else: + self._filehandle = codecs.open(filename, 'rb','latin_1') + + self._setup_segments() + + def _setup_segments(self): + """ + Parses the database file to determine what kind of database is being used and setup + segment sizes and start points that will be used by the seek*() methods later. + """ + self._databaseType = const.COUNTRY_EDITION + self._recordLength = const.STANDARD_RECORD_LENGTH + + filepos = self._filehandle.tell() + self._filehandle.seek(-3, os.SEEK_END) + + for i in range(const.STRUCTURE_INFO_MAX_SIZE): + delim = self._filehandle.read(3) + + if delim == six.u(chr(255) * 3): + self._databaseType = ord(self._filehandle.read(1)) + + if (self._databaseType >= 106): + # backwards compatibility with databases from April 2003 and earlier + self._databaseType -= 105 + + if self._databaseType == const.REGION_EDITION_REV0: + self._databaseSegments = const.STATE_BEGIN_REV0 + + elif self._databaseType == const.REGION_EDITION_REV1: + self._databaseSegments = const.STATE_BEGIN_REV1 + + elif self._databaseType in (const.CITY_EDITION_REV0, + const.CITY_EDITION_REV1, + const.ORG_EDITION, + const.ISP_EDITION, + const.ASNUM_EDITION): + self._databaseSegments = 0 + buf = self._filehandle.read(const.SEGMENT_RECORD_LENGTH) + + for j in range(const.SEGMENT_RECORD_LENGTH): + self._databaseSegments += (ord(buf[j]) << (j * 8)) + + if self._databaseType in (const.ORG_EDITION, const.ISP_EDITION): + self._recordLength = const.ORG_RECORD_LENGTH + + break + else: + self._filehandle.seek(-4, os.SEEK_CUR) + + if self._databaseType == const.COUNTRY_EDITION: + self._databaseSegments = const.COUNTRY_BEGIN + + self._filehandle.seek(filepos, os.SEEK_SET) + + def _lookup_country_id(self, addr): + """ + Get the country index. + + This method is called by the _lookupCountryCode and _lookupCountryName + methods. It looks up the index ('id') for the country which is the key + for the code and name. + + @param addr: The IP address + @type addr: str + @return: network byte order 32-bit integer + @rtype: int + """ + + ipnum = ip2long(addr) + + if not ipnum: + raise ValueError("Invalid IP address: %s" % addr) + + if self._databaseType != const.COUNTRY_EDITION: + raise GeoIPError('Invalid database type; country_* methods expect '\ + 'Country database') + + return self._seek_country(ipnum) - const.COUNTRY_BEGIN + + def _seek_country(self, ipnum): + """ + Using the record length and appropriate start points, seek to the + country that corresponds to the converted IP address integer. + + @param ipnum: result of ip2long conversion + @type ipnum: int + @return: offset of start of record + @rtype: int + """ + offset = 0 + + for depth in range(31, -1, -1): + + if self._flags & const.MEMORY_CACHE: + startIndex = 2 * self._recordLength * offset + length = 2 * self._recordLength + endIndex = startIndex + length + buf = self._memoryBuffer[startIndex:endIndex] + else: + self._filehandle.seek(2 * self._recordLength * offset, os.SEEK_SET) + buf = self._filehandle.read(2 * self._recordLength) + + x = [0,0] + + for i in range(2): + for j in range(self._recordLength): + x[i] += ord(buf[self._recordLength * i + j]) << (j * 8) + + if ipnum & (1 << depth): + + if x[1] >= self._databaseSegments: + return x[1] + + offset = x[1] + + else: + + if x[0] >= self._databaseSegments: + return x[0] + + offset = x[0] + + + raise Exception('Error traversing database - perhaps it is corrupt?') + + def _get_org(self, ipnum): + """ + Seek and return organization (or ISP) name for converted IP addr. + @param ipnum: Converted IP address + @type ipnum: int + @return: org/isp name + @rtype: str + """ + + seek_org = self._seek_country(ipnum) + if seek_org == self._databaseSegments: + return None + + record_pointer = seek_org + (2 * self._recordLength - 1) * self._databaseSegments + + self._filehandle.seek(record_pointer, os.SEEK_SET) + + org_buf = self._filehandle.read(const.MAX_ORG_RECORD_LENGTH) + + return org_buf[:org_buf.index(chr(0))] + + def _get_region(self, ipnum): + """ + Seek and return the region info (dict containing country_code and region_name). + + @param ipnum: converted IP address + @type ipnum: int + @return: dict containing country_code and region_name + @rtype: dict + """ + country_code = '' + region = '' + + if self._databaseType == const.REGION_EDITION_REV0: + seek_country = self._seek_country(ipnum) + seek_region = seek_country - const.STATE_BEGIN_REV0 + if seek_region >= 1000: + country_code = 'US' + region = ''.join([chr((seek_region // 1000) // 26 + 65), chr((seek_region // 1000) % 26 + 65)]) + else: + country_code = const.COUNTRY_CODES[seek_region] + region = '' + elif self._databaseType == const.REGION_EDITION_REV1: + seek_country = self._seek_country(ipnum) + seek_region = seek_country - const.STATE_BEGIN_REV1 + if seek_region < const.US_OFFSET: + country_code = ''; + region = '' + elif seek_region < const.CANADA_OFFSET: + country_code = 'US' + region = ''.join([chr((seek_region - const.US_OFFSET) // 26 + 65), chr((seek_region - const.US_OFFSET) % 26 + 65)]) + elif seek_region < const.WORLD_OFFSET: + country_code = 'CA' + region = ''.join([chr((seek_region - const.CANADA_OFFSET) // 26 + 65), chr((seek_region - const.CANADA_OFFSET) % 26 + 65)]) + else: + i = (seek_region - const.WORLD_OFFSET) // const.FIPS_RANGE + if i < len(const.COUNTRY_CODES): + #country_code = const.COUNTRY_CODES[(seek_region - const.WORLD_OFFSET) // const.FIPS_RANGE] + country_code = const.COUNTRY_CODES[i] + else: + country_code = '' + region = '' + + elif self._databaseType in (const.CITY_EDITION_REV0, const.CITY_EDITION_REV1): + rec = self._get_record(ipnum) + country_code = rec['country_code'] if 'country_code' in rec else '' + region = rec['region_name'] if 'region_name' in rec else '' + + return {'country_code' : country_code, 'region_name' : region } + + def _get_record(self, ipnum): + """ + Populate location dict for converted IP. + + @param ipnum: converted IP address + @type ipnum: int + @return: dict with country_code, country_code3, country_name, + region, city, postal_code, latitude, longitude, + dma_code, metro_code, area_code, region_name, time_zone + @rtype: dict + """ + seek_country = self._seek_country(ipnum) + if seek_country == self._databaseSegments: + return None + + record_pointer = seek_country + (2 * self._recordLength - 1) * self._databaseSegments + + self._filehandle.seek(record_pointer, os.SEEK_SET) + record_buf = self._filehandle.read(const.FULL_RECORD_LENGTH) + + record = {} + + record_buf_pos = 0 + char = ord(record_buf[record_buf_pos]) + #char = record_buf[record_buf_pos] if six.PY3 else ord(record_buf[record_buf_pos]) + record['country_code'] = const.COUNTRY_CODES[char] + record['country_code3'] = const.COUNTRY_CODES3[char] + record['country_name'] = const.COUNTRY_NAMES[char] + record_buf_pos += 1 + str_length = 0 + + # get region + char = ord(record_buf[record_buf_pos+str_length]) + while (char != 0): + str_length += 1 + char = ord(record_buf[record_buf_pos+str_length]) + + if str_length > 0: + record['region_name'] = record_buf[record_buf_pos:record_buf_pos+str_length] + + record_buf_pos += str_length + 1 + str_length = 0 + + # get city + char = ord(record_buf[record_buf_pos+str_length]) + while (char != 0): + str_length += 1 + char = ord(record_buf[record_buf_pos+str_length]) + + if str_length > 0: + record['city'] = record_buf[record_buf_pos:record_buf_pos+str_length] + else: + record['city'] = '' + + record_buf_pos += str_length + 1 + str_length = 0 + + # get the postal code + char = ord(record_buf[record_buf_pos+str_length]) + while (char != 0): + str_length += 1 + char = ord(record_buf[record_buf_pos+str_length]) + + if str_length > 0: + record['postal_code'] = record_buf[record_buf_pos:record_buf_pos+str_length] + else: + record['postal_code'] = None + + record_buf_pos += str_length + 1 + str_length = 0 + + latitude = 0 + longitude = 0 + for j in range(3): + char = ord(record_buf[record_buf_pos]) + record_buf_pos += 1 + latitude += (char << (j * 8)) + + record['latitude'] = (latitude/10000.0) - 180.0 + + for j in range(3): + char = ord(record_buf[record_buf_pos]) + record_buf_pos += 1 + longitude += (char << (j * 8)) + + record['longitude'] = (longitude/10000.0) - 180.0 + + if self._databaseType == const.CITY_EDITION_REV1: + dmaarea_combo = 0 + if record['country_code'] == 'US': + for j in range(3): + char = ord(record_buf[record_buf_pos]) + record_buf_pos += 1 + dmaarea_combo += (char << (j*8)) + + record['dma_code'] = int(math.floor(dmaarea_combo/1000)) + record['area_code'] = dmaarea_combo%1000 + else: + record['dma_code'] = 0 + record['area_code'] = 0 + + if 'dma_code' in record and record['dma_code'] in const.DMA_MAP: + record['metro_code'] = const.DMA_MAP[record['dma_code']] + else: + record['metro_code'] = '' + + if 'country_code' in record: + record['time_zone'] = time_zone_by_country_and_region( + record['country_code'], record.get('region_name')) or '' + else: + record['time_zone'] = '' + + return record + + def country_code_by_addr(self, addr): + """ + Returns 2-letter country code (e.g. 'US') for specified IP address. + Use this method if you have a Country, Region, or City database. + + @param addr: IP address + @type addr: str + @return: 2-letter country code + @rtype: str + """ + try: + if self._databaseType == const.COUNTRY_EDITION: + country_id = self._lookup_country_id(addr) + return const.COUNTRY_CODES[country_id] + elif self._databaseType in (const.REGION_EDITION_REV0, const.REGION_EDITION_REV1, + const.CITY_EDITION_REV0, const.CITY_EDITION_REV1): + return self.region_by_addr(addr)['country_code'] + else: + raise GeoIPError('Invalid database type; country_* methods expect '\ + 'Country, City, or Region database') + + except ValueError: + raise GeoIPError('*_by_addr methods only accept IP addresses. Use *_by_name for hostnames. (Address: %s)' % addr) + + def country_code_by_name(self, hostname): + """ + Returns 2-letter country code (e.g. 'US') for specified hostname. + Use this method if you have a Country, Region, or City database. + + @param hostname: host name + @type hostname: str + @return: 2-letter country code + @rtype: str + """ + addr = socket.gethostbyname(hostname) + + return self.country_code_by_addr(addr) + + def country_name_by_addr(self, addr): + """ + Returns full country name for specified IP address. + Use this method if you have a Country or City database. + + @param addr: IP address + @type addr: str + @return: country name + @rtype: str + """ + try: + if self._databaseType == const.COUNTRY_EDITION: + country_id = self._lookup_country_id(addr) + return const.COUNTRY_NAMES[country_id] + elif self._databaseType in (const.CITY_EDITION_REV0, const.CITY_EDITION_REV1): + return self.record_by_addr(addr)['country_name'] + else: + raise GeoIPError('Invalid database type; country_* methods expect '\ + 'Country or City database') + except ValueError: + raise GeoIPError('*_by_addr methods only accept IP addresses. Use *_by_name for hostnames. (Address: %s)' % addr) + + def country_name_by_name(self, hostname): + """ + Returns full country name for specified hostname. + Use this method if you have a Country database. + + @param hostname: host name + @type hostname: str + @return: country name + @rtype: str + """ + addr = socket.gethostbyname(hostname) + return self.country_name_by_addr(addr) + + def org_by_addr(self, addr): + """ + Lookup the organization (or ISP) for given IP address. + Use this method if you have an Organization/ISP database. + + @param addr: IP address + @type addr: str + @return: organization or ISP name + @rtype: str + """ + try: + ipnum = ip2long(addr) + + if not ipnum: + raise ValueError("Invalid IP address: %s" % addr) + + if self._databaseType not in (const.ORG_EDITION, const.ISP_EDITION, const.ASNUM_EDITION): + raise GeoIPError('Invalid database type; org_* methods expect '\ + 'Org/ISP database') + + return self._get_org(ipnum) + except ValueError: + raise GeoIPError('*_by_addr methods only accept IP addresses. Use *_by_name for hostnames. (Address: %s)' % addr) + + def org_by_name(self, hostname): + """ + Lookup the organization (or ISP) for hostname. + Use this method if you have an Organization/ISP database. + + @param hostname: host name + @type hostname: str + @return: organization or ISP name + @rtype: str + """ + addr = socket.gethostbyname(hostname) + + return self.org_by_addr(addr) + + def record_by_addr(self, addr): + """ + Look up the record for a given IP address. + Use this method if you have a City database. + + @param addr: IP address + @type addr: str + @return: dict with country_code, country_code3, country_name, + region, city, postal_code, latitude, longitude, + dma_code, metro_code, area_code, region_name, time_zone + @rtype: dict + """ + try: + ipnum = ip2long(addr) + + if not ipnum: + raise ValueError("Invalid IP address: %s" % addr) + + if not self._databaseType in (const.CITY_EDITION_REV0, const.CITY_EDITION_REV1): + raise GeoIPError('Invalid database type; record_* methods expect City database') + + return self._get_record(ipnum) + except ValueError: + raise GeoIPError('*_by_addr methods only accept IP addresses. Use *_by_name for hostnames. (Address: %s)' % addr) + + def record_by_name(self, hostname): + """ + Look up the record for a given hostname. + Use this method if you have a City database. + + @param hostname: host name + @type hostname: str + @return: dict with country_code, country_code3, country_name, + region, city, postal_code, latitude, longitude, + dma_code, metro_code, area_code, region_name, time_zone + @rtype: dict + """ + addr = socket.gethostbyname(hostname) + + return self.record_by_addr(addr) + + def region_by_addr(self, addr): + """ + Lookup the region for given IP address. + Use this method if you have a Region database. + + @param addr: IP address + @type addr: str + @return: dict containing country_code, region, + and region_name + @rtype: dict + """ + try: + ipnum = ip2long(addr) + + if not ipnum: + raise ValueError("Invalid IP address: %s" % addr) + + if not self._databaseType in (const.REGION_EDITION_REV0, const.REGION_EDITION_REV1, + const.CITY_EDITION_REV0, const.CITY_EDITION_REV1): + raise GeoIPError('Invalid database type; region_* methods expect '\ + 'Region or City database') + + return self._get_region(ipnum) + except ValueError: + raise GeoIPError('*_by_addr methods only accept IP addresses. Use *_by_name for hostnames. (Address: %s)' % addr) + + def region_by_name(self, hostname): + """ + Lookup the region for given hostname. + Use this method if you have a Region database. + + @param hostname: host name + @type hostname: str + @return: dict containing country_code, region, + and region_name + @rtype: dict + """ + addr = socket.gethostbyname(hostname) + return self.region_by_addr(addr) + + def time_zone_by_addr(self, addr): + """ + Look up the time zone for a given IP address. + Use this method if you have a Region or City database. + + @param hostname: IP address + @type hostname: str + @return: Time zone + @rtype: str + """ + try: + ipnum = ip2long(addr) + + if not ipnum: + raise ValueError("Invalid IP address: %s" % addr) + + if not self._databaseType in (const.REGION_EDITION_REV0, const.REGION_EDITION_REV1, + const.CITY_EDITION_REV0, const.CITY_EDITION_REV1): + raise GeoIPError('Invalid database type; region_* methods expect '\ + 'Region or City database') + + return self._get_record(ipnum)['time_zone'] + except ValueError: + raise GeoIPError('*_by_addr methods only accept IP addresses. Use *_by_name for hostnames. (Address: %s)' % addr) + + def time_zone_by_name(self, hostname): + """ + Look up the time zone for a given hostname. + Use this method if you have a Region or City database. + + @param hostname: host name + @type hostname: str + @return: Time zone + @rtype: str + """ + addr = socket.gethostbyname(hostname) + return self.time_zone_by_addr(addr) diff --git a/task-6232/pygeoip/const.py b/task-6232/pygeoip/const.py new file mode 100644 index 0000000..a215226 --- /dev/null +++ b/task-6232/pygeoip/const.py @@ -0,0 +1,382 @@ +""" +Constants needed for parsing binary GeoIP databases. It is part of the pygeoip +package. + +@author: Jennifer Ennis <zaylea at gmail dot com> + +@license: +Copyright(C) 2004 MaxMind LLC + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU Lesser General Public License +along with this program. If not, see <http://www.gnu.org/licenses/lgpl.txt>. +""" + +GEOIP_STANDARD = 0 +GEOIP_MEMORY_CACHE = 1 + +DMA_MAP = { + 500 : 'Portland-Auburn, ME', + 501 : 'New York, NY', + 502 : 'Binghamton, NY', + 503 : 'Macon, GA', + 504 : 'Philadelphia, PA', + 505 : 'Detroit, MI', + 506 : 'Boston, MA', + 507 : 'Savannah, GA', + 508 : 'Pittsburgh, PA', + 509 : 'Ft Wayne, IN', + 510 : 'Cleveland, OH', + 511 : 'Washington, DC', + 512 : 'Baltimore, MD', + 513 : 'Flint, MI', + 514 : 'Buffalo, NY', + 515 : 'Cincinnati, OH', + 516 : 'Erie, PA', + 517 : 'Charlotte, NC', + 518 : 'Greensboro, NC', + 519 : 'Charleston, SC', + 520 : 'Augusta, GA', + 521 : 'Providence, RI', + 522 : 'Columbus, GA', + 523 : 'Burlington, VT', + 524 : 'Atlanta, GA', + 525 : 'Albany, GA', + 526 : 'Utica-Rome, NY', + 527 : 'Indianapolis, IN', + 528 : 'Miami, FL', + 529 : 'Louisville, KY', + 530 : 'Tallahassee, FL', + 531 : 'Tri-Cities, TN', + 532 : 'Albany-Schenectady-Troy, NY', + 533 : 'Hartford, CT', + 534 : 'Orlando, FL', + 535 : 'Columbus, OH', + 536 : 'Youngstown-Warren, OH', + 537 : 'Bangor, ME', + 538 : 'Rochester, NY', + 539 : 'Tampa, FL', + 540 : 'Traverse City-Cadillac, MI', + 541 : 'Lexington, KY', + 542 : 'Dayton, OH', + 543 : 'Springfield-Holyoke, MA', + 544 : 'Norfolk-Portsmouth, VA', + 545 : 'Greenville-New Bern-Washington, NC', + 546 : 'Columbia, SC', + 547 : 'Toledo, OH', + 548 : 'West Palm Beach, FL', + 549 : 'Watertown, NY', + 550 : 'Wilmington, NC', + 551 : 'Lansing, MI', + 552 : 'Presque Isle, ME', + 553 : 'Marquette, MI', + 554 : 'Wheeling, WV', + 555 : 'Syracuse, NY', + 556 : 'Richmond-Petersburg, VA', + 557 : 'Knoxville, TN', + 558 : 'Lima, OH', + 559 : 'Bluefield-Beckley-Oak Hill, WV', + 560 : 'Raleigh-Durham, NC', + 561 : 'Jacksonville, FL', + 563 : 'Grand Rapids, MI', + 564 : 'Charleston-Huntington, WV', + 565 : 'Elmira, NY', + 566 : 'Harrisburg-Lancaster-Lebanon-York, PA', + 567 : 'Greenville-Spartenburg, SC', + 569 : 'Harrisonburg, VA', + 570 : 'Florence-Myrtle Beach, SC', + 571 : 'Ft Myers, FL', + 573 : 'Roanoke-Lynchburg, VA', + 574 : 'Johnstown-Altoona, PA', + 575 : 'Chattanooga, TN', + 576 : 'Salisbury, MD', + 577 : 'Wilkes Barre-Scranton, PA', + 581 : 'Terre Haute, IN', + 582 : 'Lafayette, IN', + 583 : 'Alpena, MI', + 584 : 'Charlottesville, VA', + 588 : 'South Bend, IN', + 592 : 'Gainesville, FL', + 596 : 'Zanesville, OH', + 597 : 'Parkersburg, WV', + 598 : 'Clarksburg-Weston, WV', + 600 : 'Corpus Christi, TX', + 602 : 'Chicago, IL', + 603 : 'Joplin-Pittsburg, MO', + 604 : 'Columbia-Jefferson City, MO', + 605 : 'Topeka, KS', + 606 : 'Dothan, AL', + 609 : 'St Louis, MO', + 610 : 'Rockford, IL', + 611 : 'Rochester-Mason City-Austin, MN', + 612 : 'Shreveport, LA', + 613 : 'Minneapolis-St Paul, MN', + 616 : 'Kansas City, MO', + 617 : 'Milwaukee, WI', + 618 : 'Houston, TX', + 619 : 'Springfield, MO', + 620 : 'Tuscaloosa, AL', + 622 : 'New Orleans, LA', + 623 : 'Dallas-Fort Worth, TX', + 624 : 'Sioux City, IA', + 625 : 'Waco-Temple-Bryan, TX', + 626 : 'Victoria, TX', + 627 : 'Wichita Falls, TX', + 628 : 'Monroe, LA', + 630 : 'Birmingham, AL', + 631 : 'Ottumwa-Kirksville, IA', + 632 : 'Paducah, KY', + 633 : 'Odessa-Midland, TX', + 634 : 'Amarillo, TX', + 635 : 'Austin, TX', + 636 : 'Harlingen, TX', + 637 : 'Cedar Rapids-Waterloo, IA', + 638 : 'St Joseph, MO', + 639 : 'Jackson, TN', + 640 : 'Memphis, TN', + 641 : 'San Antonio, TX', + 642 : 'Lafayette, LA', + 643 : 'Lake Charles, LA', + 644 : 'Alexandria, LA', + 646 : 'Anniston, AL', + 647 : 'Greenwood-Greenville, MS', + 648 : 'Champaign-Springfield-Decatur, IL', + 649 : 'Evansville, IN', + 650 : 'Oklahoma City, OK', + 651 : 'Lubbock, TX', + 652 : 'Omaha, NE', + 656 : 'Panama City, FL', + 657 : 'Sherman, TX', + 658 : 'Green Bay-Appleton, WI', + 659 : 'Nashville, TN', + 661 : 'San Angelo, TX', + 662 : 'Abilene-Sweetwater, TX', + 669 : 'Madison, WI', + 670 : 'Ft Smith-Fay-Springfield, AR', + 671 : 'Tulsa, OK', + 673 : 'Columbus-Tupelo-West Point, MS', + 675 : 'Peoria-Bloomington, IL', + 676 : 'Duluth, MN', + 678 : 'Wichita, KS', + 679 : 'Des Moines, IA', + 682 : 'Davenport-Rock Island-Moline, IL', + 686 : 'Mobile, AL', + 687 : 'Minot-Bismarck-Dickinson, ND', + 691 : 'Huntsville, AL', + 692 : 'Beaumont-Port Author, TX', + 693 : 'Little Rock-Pine Bluff, AR', + 698 : 'Montgomery, AL', + 702 : 'La Crosse-Eau Claire, WI', + 705 : 'Wausau-Rhinelander, WI', + 709 : 'Tyler-Longview, TX', + 710 : 'Hattiesburg-Laurel, MS', + 711 : 'Meridian, MS', + 716 : 'Baton Rouge, LA', + 717 : 'Quincy, IL', + 718 : 'Jackson, MS', + 722 : 'Lincoln-Hastings, NE', + 724 : 'Fargo-Valley City, ND', + 725 : 'Sioux Falls, SD', + 734 : 'Jonesboro, AR', + 736 : 'Bowling Green, KY', + 737 : 'Mankato, MN', + 740 : 'North Platte, NE', + 743 : 'Anchorage, AK', + 744 : 'Honolulu, HI', + 745 : 'Fairbanks, AK', + 746 : 'Biloxi-Gulfport, MS', + 747 : 'Juneau, AK', + 749 : 'Laredo, TX', + 751 : 'Denver, CO', + 752 : 'Colorado Springs, CO', + 753 : 'Phoenix, AZ', + 754 : 'Butte-Bozeman, MT', + 755 : 'Great Falls, MT', + 756 : 'Billings, MT', + 757 : 'Boise, ID', + 758 : 'Idaho Falls-Pocatello, ID', + 759 : 'Cheyenne, WY', + 760 : 'Twin Falls, ID', + 762 : 'Missoula, MT', + 764 : 'Rapid City, SD', + 765 : 'El Paso, TX', + 766 : 'Helena, MT', + 767 : 'Casper-Riverton, WY', + 770 : 'Salt Lake City, UT', + 771 : 'Yuma, AZ', + 773 : 'Grand Junction, CO', + 789 : 'Tucson, AZ', + 790 : 'Albuquerque, NM', + 798 : 'Glendive, MT', + 800 : 'Bakersfield, CA', + 801 : 'Eugene, OR', + 802 : 'Eureka, CA', + 803 : 'Los Angeles, CA', + 804 : 'Palm Springs, CA', + 807 : 'San Francisco, CA', + 810 : 'Yakima-Pasco, WA', + 811 : 'Reno, NV', + 813 : 'Medford-Klamath Falls, OR', + 819 : 'Seattle-Tacoma, WA', + 820 : 'Portland, OR', + 821 : 'Bend, OR', + 825 : 'San Diego, CA', + 828 : 'Monterey-Salinas, CA', + 839 : 'Las Vegas, NV', + 855 : 'Santa Barbara, CA', + 862 : 'Sacramento, CA', + 866 : 'Fresno, CA', + 868 : 'Chico-Redding, CA', + 881 : 'Spokane, WA' + } + +COUNTRY_CODES = ( + '', 'AP', 'EU', 'AD', 'AE', 'AF', 'AG', 'AI', 'AL', 'AM', 'AN', 'AO', 'AQ', + 'AR', 'AS', 'AT', 'AU', 'AW', 'AZ', 'BA', 'BB', 'BD', 'BE', 'BF', 'BG', 'BH', + 'BI', 'BJ', 'BM', 'BN', 'BO', 'BR', 'BS', 'BT', 'BV', 'BW', 'BY', 'BZ', 'CA', + 'CC', 'CD', 'CF', 'CG', 'CH', 'CI', 'CK', 'CL', 'CM', 'CN', 'CO', 'CR', 'CU', + 'CV', 'CX', 'CY', 'CZ', 'DE', 'DJ', 'DK', 'DM', 'DO', 'DZ', 'EC', 'EE', 'EG', + 'EH', 'ER', 'ES', 'ET', 'FI', 'FJ', 'FK', 'FM', 'FO', 'FR', 'FX', 'GA', 'GB', + 'GD', 'GE', 'GF', 'GH', 'GI', 'GL', 'GM', 'GN', 'GP', 'GQ', 'GR', 'GS', 'GT', + 'GU', 'GW', 'GY', 'HK', 'HM', 'HN', 'HR', 'HT', 'HU', 'ID', 'IE', 'IL', 'IN', + 'IO', 'IQ', 'IR', 'IS', 'IT', 'JM', 'JO', 'JP', 'KE', 'KG', 'KH', 'KI', 'KM', + 'KN', 'KP', 'KR', 'KW', 'KY', 'KZ', 'LA', 'LB', 'LC', 'LI', 'LK', 'LR', 'LS', + 'LT', 'LU', 'LV', 'LY', 'MA', 'MC', 'MD', 'MG', 'MH', 'MK', 'ML', 'MM', 'MN', + 'MO', 'MP', 'MQ', 'MR', 'MS', 'MT', 'MU', 'MV', 'MW', 'MX', 'MY', 'MZ', 'NA', + 'NC', 'NE', 'NF', 'NG', 'NI', 'NL', 'NO', 'NP', 'NR', 'NU', 'NZ', 'OM', 'PA', + 'PE', 'PF', 'PG', 'PH', 'PK', 'PL', 'PM', 'PN', 'PR', 'PS', 'PT', 'PW', 'PY', + 'QA', 'RE', 'RO', 'RU', 'RW', 'SA', 'SB', 'SC', 'SD', 'SE', 'SG', 'SH', 'SI', + 'SJ', 'SK', 'SL', 'SM', 'SN', 'SO', 'SR', 'ST', 'SV', 'SY', 'SZ', 'TC', 'TD', + 'TF', 'TG', 'TH', 'TJ', 'TK', 'TM', 'TN', 'TO', 'TL', 'TR', 'TT', 'TV', 'TW', + 'TZ', 'UA', 'UG', 'UM', 'US', 'UY', 'UZ', 'VA', 'VC', 'VE', 'VG', 'VI', 'VN', + 'VU', 'WF', 'WS', 'YE', 'YT', 'RS', 'ZA', 'ZM', 'ME', 'ZW', 'A1', 'A2', 'O1', + 'AX', 'GG', 'IM', 'JE', 'BL', 'MF' + ) + +COUNTRY_CODES3 = ( + '','AP','EU','AND','ARE','AFG','ATG','AIA','ALB','ARM','ANT','AGO','AQ','ARG', + 'ASM','AUT','AUS','ABW','AZE','BIH','BRB','BGD','BEL','BFA','BGR','BHR','BDI', + 'BEN','BMU','BRN','BOL','BRA','BHS','BTN','BV','BWA','BLR','BLZ','CAN','CC', + 'COD','CAF','COG','CHE','CIV','COK','CHL','CMR','CHN','COL','CRI','CUB','CPV', + 'CX','CYP','CZE','DEU','DJI','DNK','DMA','DOM','DZA','ECU','EST','EGY','ESH', + 'ERI','ESP','ETH','FIN','FJI','FLK','FSM','FRO','FRA','FX','GAB','GBR','GRD', + 'GEO','GUF','GHA','GIB','GRL','GMB','GIN','GLP','GNQ','GRC','GS','GTM','GUM', + 'GNB','GUY','HKG','HM','HND','HRV','HTI','HUN','IDN','IRL','ISR','IND','IO', + 'IRQ','IRN','ISL','ITA','JAM','JOR','JPN','KEN','KGZ','KHM','KIR','COM','KNA', + 'PRK','KOR','KWT','CYM','KAZ','LAO','LBN','LCA','LIE','LKA','LBR','LSO','LTU', + 'LUX','LVA','LBY','MAR','MCO','MDA','MDG','MHL','MKD','MLI','MMR','MNG','MAC', + 'MNP','MTQ','MRT','MSR','MLT','MUS','MDV','MWI','MEX','MYS','MOZ','NAM','NCL', + 'NER','NFK','NGA','NIC','NLD','NOR','NPL','NRU','NIU','NZL','OMN','PAN','PER', + 'PYF','PNG','PHL','PAK','POL','SPM','PCN','PRI','PSE','PRT','PLW','PRY','QAT', + 'REU','ROU','RUS','RWA','SAU','SLB','SYC','SDN','SWE','SGP','SHN','SVN','SJM', + 'SVK','SLE','SMR','SEN','SOM','SUR','STP','SLV','SYR','SWZ','TCA','TCD','TF', + 'TGO','THA','TJK','TKL','TLS','TKM','TUN','TON','TUR','TTO','TUV','TWN','TZA', + 'UKR','UGA','UM','USA','URY','UZB','VAT','VCT','VEN','VGB','VIR','VNM','VUT', + 'WLF','WSM','YEM','YT','SRB','ZAF','ZMB','MNE','ZWE','A1','A2','O1', + 'ALA','GGY','IMN','JEY','BLM','MAF' + ) + +COUNTRY_NAMES = ( + "", "Asia/Pacific Region", "Europe", "Andorra", "United Arab Emirates", + "Afghanistan", "Antigua and Barbuda", "Anguilla", "Albania", "Armenia", + "Netherlands Antilles", "Angola", "Antarctica", "Argentina", "American Samoa", + "Austria", "Australia", "Aruba", "Azerbaijan", "Bosnia and Herzegovina", + "Barbados", "Bangladesh", "Belgium", "Burkina Faso", "Bulgaria", "Bahrain", + "Burundi", "Benin", "Bermuda", "Brunei Darussalam", "Bolivia", "Brazil", + "Bahamas", "Bhutan", "Bouvet Island", "Botswana", "Belarus", "Belize", + "Canada", "Cocos (Keeling) Islands", "Congo, The Democratic Republic of the", + "Central African Republic", "Congo", "Switzerland", "Cote D'Ivoire", "Cook Islands", + "Chile", "Cameroon", "China", "Colombia", "Costa Rica", "Cuba", "Cape Verde", + "Christmas Island", "Cyprus", "Czech Republic", "Germany", "Djibouti", + "Denmark", "Dominica", "Dominican Republic", "Algeria", "Ecuador", "Estonia", + "Egypt", "Western Sahara", "Eritrea", "Spain", "Ethiopia", "Finland", "Fiji", + "Falkland Islands (Malvinas)", "Micronesia, Federated States of", "Faroe Islands", + "France", "France, Metropolitan", "Gabon", "United Kingdom", + "Grenada", "Georgia", "French Guiana", "Ghana", "Gibraltar", "Greenland", + "Gambia", "Guinea", "Guadeloupe", "Equatorial Guinea", "Greece", + "South Georgia and the South Sandwich Islands", + "Guatemala", "Guam", "Guinea-Bissau", + "Guyana", "Hong Kong", "Heard Island and McDonald Islands", "Honduras", + "Croatia", "Haiti", "Hungary", "Indonesia", "Ireland", "Israel", "India", + "British Indian Ocean Territory", "Iraq", "Iran, Islamic Republic of", + "Iceland", "Italy", "Jamaica", "Jordan", "Japan", "Kenya", "Kyrgyzstan", + "Cambodia", "Kiribati", "Comoros", "Saint Kitts and Nevis", + "Korea, Democratic People's Republic of", + "Korea, Republic of", "Kuwait", "Cayman Islands", + "Kazakstan", "Lao People's Democratic Republic", "Lebanon", "Saint Lucia", + "Liechtenstein", "Sri Lanka", "Liberia", "Lesotho", "Lithuania", "Luxembourg", + "Latvia", "Libyan Arab Jamahiriya", "Morocco", "Monaco", "Moldova, Republic of", + "Madagascar", "Marshall Islands", "Macedonia", + "Mali", "Myanmar", "Mongolia", "Macau", "Northern Mariana Islands", + "Martinique", "Mauritania", "Montserrat", "Malta", "Mauritius", "Maldives", + "Malawi", "Mexico", "Malaysia", "Mozambique", "Namibia", "New Caledonia", + "Niger", "Norfolk Island", "Nigeria", "Nicaragua", "Netherlands", "Norway", + "Nepal", "Nauru", "Niue", "New Zealand", "Oman", "Panama", "Peru", "French Polynesia", + "Papua New Guinea", "Philippines", "Pakistan", "Poland", "Saint Pierre and Miquelon", + "Pitcairn Islands", "Puerto Rico", "Palestinian Territory", + "Portugal", "Palau", "Paraguay", "Qatar", "Reunion", "Romania", + "Russian Federation", "Rwanda", "Saudi Arabia", "Solomon Islands", + "Seychelles", "Sudan", "Sweden", "Singapore", "Saint Helena", "Slovenia", + "Svalbard and Jan Mayen", "Slovakia", "Sierra Leone", "San Marino", "Senegal", + "Somalia", "Suriname", "Sao Tome and Principe", "El Salvador", "Syrian Arab Republic", + "Swaziland", "Turks and Caicos Islands", "Chad", "French Southern Territories", + "Togo", "Thailand", "Tajikistan", "Tokelau", "Turkmenistan", + "Tunisia", "Tonga", "Timor-Leste", "Turkey", "Trinidad and Tobago", "Tuvalu", + "Taiwan", "Tanzania, United Republic of", "Ukraine", + "Uganda", "United States Minor Outlying Islands", "United States", "Uruguay", + "Uzbekistan", "Holy See (Vatican City State)", "Saint Vincent and the Grenadines", + "Venezuela", "Virgin Islands, British", "Virgin Islands, U.S.", + "Vietnam", "Vanuatu", "Wallis and Futuna", "Samoa", "Yemen", "Mayotte", + "Serbia", "South Africa", "Zambia", "Montenegro", "Zimbabwe", + "Anonymous Proxy","Satellite Provider","Other", + "Aland Islands","Guernsey","Isle of Man","Jersey","Saint Barthelemy","Saint Martin" + ) + +# storage / caching flags +STANDARD = 0 +MEMORY_CACHE = 1 +MMAP_CACHE = 8 + +# Database structure constants +COUNTRY_BEGIN = 16776960 +STATE_BEGIN_REV0 = 16700000 +STATE_BEGIN_REV1 = 16000000 + +STRUCTURE_INFO_MAX_SIZE = 20 +DATABASE_INFO_MAX_SIZE = 100 + +# Database editions +COUNTRY_EDITION = 1 +REGION_EDITION_REV0 = 7 +REGION_EDITION_REV1 = 3 +CITY_EDITION_REV0 = 6 +CITY_EDITION_REV1 = 2 +ORG_EDITION = 5 +ISP_EDITION = 4 +PROXY_EDITION = 8 +ASNUM_EDITION = 9 +NETSPEED_EDITION = 11 +COUNTRY_EDITION_V6 = 12 + +SEGMENT_RECORD_LENGTH = 3 +STANDARD_RECORD_LENGTH = 3 +ORG_RECORD_LENGTH = 4 +MAX_RECORD_LENGTH = 4 +MAX_ORG_RECORD_LENGTH = 300 +FULL_RECORD_LENGTH = 50 + +US_OFFSET = 1 +CANADA_OFFSET = 677 +WORLD_OFFSET = 1353 +FIPS_RANGE = 360 + + diff --git a/task-6232/pygeoip/six.py b/task-6232/pygeoip/six.py new file mode 100644 index 0000000..6526d76 --- /dev/null +++ b/task-6232/pygeoip/six.py @@ -0,0 +1,353 @@ +"""Utilities for writing code that runs on Python 2 and 3""" + +import operator +import sys +import types + +__author__ = "Benjamin Peterson <benjamin(a)python.org>" +__version__ = "1.1.0" + + +# True if we are running on Python 3. +PY3 = sys.version_info[0] == 3 + +if PY3: + string_types = str, + integer_types = int, + class_types = type, + text_type = str + binary_type = bytes + + MAXSIZE = sys.maxsize +else: + string_types = basestring, + integer_types = (int, long) + class_types = (type, types.ClassType) + text_type = unicode + binary_type = str + + # It's possible to have sizeof(long) != sizeof(Py_ssize_t). + class X(object): + def __len__(self): + return 1 << 31 + try: + len(X()) + except OverflowError: + # 32-bit + MAXSIZE = int((1 << 31) - 1) + else: + # 64-bit + MAXSIZE = int((1 << 63) - 1) + del X + + +def _add_doc(func, doc): + """Add documentation to a function.""" + func.__doc__ = doc + + +def _import_module(name): + """Import module, returning the module after the last dot.""" + __import__(name) + return sys.modules[name] + + +class _LazyDescr(object): + + def __init__(self, name): + self.name = name + + def __get__(self, obj, tp): + result = self._resolve() + setattr(obj, self.name, result) + # This is a bit ugly, but it avoids running this again. + delattr(tp, self.name) + return result + + +class MovedModule(_LazyDescr): + + def __init__(self, name, old, new=None): + super(MovedModule, self).__init__(name) + if PY3: + if new is None: + new = name + self.mod = new + else: + self.mod = old + + def _resolve(self): + return _import_module(self.mod) + + +class MovedAttribute(_LazyDescr): + + def __init__(self, name, old_mod, new_mod, old_attr=None, new_attr=None): + super(MovedAttribute, self).__init__(name) + if PY3: + if new_mod is None: + new_mod = name + self.mod = new_mod + if new_attr is None: + if old_attr is None: + new_attr = name + else: + new_attr = old_attr + self.attr = new_attr + else: + self.mod = old_mod + if old_attr is None: + old_attr = name + self.attr = old_attr + + def _resolve(self): + module = _import_module(self.mod) + return getattr(module, self.attr) + + + +class _MovedItems(types.ModuleType): + """Lazy loading of moved objects""" + + +_moved_attributes = [ + MovedAttribute("cStringIO", "cStringIO", "io", "StringIO"), + MovedAttribute("filter", "itertools", "builtins", "ifilter", "filter"), + MovedAttribute("map", "itertools", "builtins", "imap", "map"), + MovedAttribute("reload_module", "__builtin__", "imp", "reload"), + MovedAttribute("reduce", "__builtin__", "functools"), + MovedAttribute("StringIO", "StringIO", "io"), + MovedAttribute("xrange", "__builtin__", "builtins", "xrange", "range"), + MovedAttribute("zip", "itertools", "builtins", "izip", "zip"), + + MovedModule("builtins", "__builtin__"), + MovedModule("configparser", "ConfigParser"), + MovedModule("copyreg", "copy_reg"), + MovedModule("http_cookiejar", "cookielib", "http.cookiejar"), + MovedModule("http_cookies", "Cookie", "http.cookies"), + MovedModule("html_entities", "htmlentitydefs", "html.entities"), + MovedModule("html_parser", "HTMLParser", "html.parser"), + MovedModule("http_client", "httplib", "http.client"), + MovedModule("BaseHTTPServer", "BaseHTTPServer", "http.server"), + MovedModule("CGIHTTPServer", "CGIHTTPServer", "http.server"), + MovedModule("SimpleHTTPServer", "SimpleHTTPServer", "http.server"), + MovedModule("cPickle", "cPickle", "pickle"), + MovedModule("queue", "Queue"), + MovedModule("reprlib", "repr"), + MovedModule("socketserver", "SocketServer"), + MovedModule("tkinter", "Tkinter"), + MovedModule("tkinter_dialog", "Dialog", "tkinter.dialog"), + MovedModule("tkinter_filedialog", "FileDialog", "tkinter.filedialog"), + MovedModule("tkinter_scrolledtext", "ScrolledText", "tkinter.scrolledtext"), + MovedModule("tkinter_simpledialog", "SimpleDialog", "tkinter.simpledialog"), + MovedModule("tkinter_tix", "Tix", "tkinter.tix"), + MovedModule("tkinter_constants", "Tkconstants", "tkinter.constants"), + MovedModule("tkinter_dnd", "Tkdnd", "tkinter.dnd"), + MovedModule("tkinter_colorchooser", "tkColorChooser", + "tkinter.colorchooser"), + MovedModule("tkinter_commondialog", "tkCommonDialog", + "tkinter.commondialog"), + MovedModule("tkinter_tkfiledialog", "tkFileDialog", "tkinter.filedialog"), + MovedModule("tkinter_font", "tkFont", "tkinter.font"), + MovedModule("tkinter_messagebox", "tkMessageBox", "tkinter.messagebox"), + MovedModule("tkinter_tksimpledialog", "tkSimpleDialog", + "tkinter.simpledialog"), + MovedModule("urllib_robotparser", "robotparser", "urllib.robotparser"), + MovedModule("winreg", "_winreg"), +] +for attr in _moved_attributes: + setattr(_MovedItems, attr.name, attr) +del attr + +moves = sys.modules["six.moves"] = _MovedItems("moves") + + +def add_move(move): + """Add an item to six.moves.""" + setattr(_MovedItems, move.name, move) + + +def remove_move(name): + """Remove item from six.moves.""" + try: + delattr(_MovedItems, name) + except AttributeError: + try: + del moves.__dict__[name] + except KeyError: + raise AttributeError("no such move, %r" % (name,)) + + +if PY3: + _meth_func = "__func__" + _meth_self = "__self__" + + _func_code = "__code__" + _func_defaults = "__defaults__" + + _iterkeys = "keys" + _itervalues = "values" + _iteritems = "items" +else: + _meth_func = "im_func" + _meth_self = "im_self" + + _func_code = "func_code" + _func_defaults = "func_defaults" + + _iterkeys = "iterkeys" + _itervalues = "itervalues" + _iteritems = "iteritems" + + +if PY3: + def get_unbound_function(unbound): + return unbound + + + advance_iterator = next + + def callable(obj): + return any("__call__" in klass.__dict__ for klass in type(obj).__mro__) +else: + def get_unbound_function(unbound): + return unbound.im_func + + + def advance_iterator(it): + return it.next() + + callable = callable +_add_doc(get_unbound_function, + """Get the function out of a possibly unbound function""") + + +get_method_function = operator.attrgetter(_meth_func) +get_method_self = operator.attrgetter(_meth_self) +get_function_code = operator.attrgetter(_func_code) +get_function_defaults = operator.attrgetter(_func_defaults) + + +def iterkeys(d): + """Return an iterator over the keys of a dictionary.""" + return getattr(d, _iterkeys)() + +def itervalues(d): + """Return an iterator over the values of a dictionary.""" + return getattr(d, _itervalues)() + +def iteritems(d): + """Return an iterator over the (key, value) pairs of a dictionary.""" + return getattr(d, _iteritems)() + + +if PY3: + def b(s): + return s.encode("latin-1") + def u(s): + return s + if sys.version_info[1] <= 1: + def int2byte(i): + return bytes((i,)) + else: + # This is about 2x faster than the implementation above on 3.2+ + int2byte = operator.methodcaller("to_bytes", 1, "big") + import io + StringIO = io.StringIO + BytesIO = io.BytesIO +else: + def b(s): + return s + def u(s): + return unicode(s, "unicode_escape") + int2byte = chr + import StringIO + StringIO = BytesIO = StringIO.StringIO +_add_doc(b, """Byte literal""") +_add_doc(u, """Text literal""") + + +if PY3: + import builtins + exec_ = getattr(builtins, "exec") + + + def reraise(tp, value, tb=None): + if value.__traceback__ is not tb: + raise value.with_traceback(tb) + raise value + + + print_ = getattr(builtins, "print") + del builtins + +else: + def exec_(code, globs=None, locs=None): + """Execute code in a namespace.""" + if globs is None: + frame = sys._getframe(1) + globs = frame.f_globals + if locs is None: + locs = frame.f_locals + del frame + elif locs is None: + locs = globs + exec("""exec code in globs, locs""") + + + exec_("""def reraise(tp, value, tb=None): + raise tp, value, tb +""") + + + def print_(*args, **kwargs): + """The new-style print function.""" + fp = kwargs.pop("file", sys.stdout) + if fp is None: + return + def write(data): + if not isinstance(data, basestring): + data = str(data) + fp.write(data) + want_unicode = False + sep = kwargs.pop("sep", None) + if sep is not None: + if isinstance(sep, unicode): + want_unicode = True + elif not isinstance(sep, str): + raise TypeError("sep must be None or a string") + end = kwargs.pop("end", None) + if end is not None: + if isinstance(end, unicode): + want_unicode = True + elif not isinstance(end, str): + raise TypeError("end must be None or a string") + if kwargs: + raise TypeError("invalid keyword arguments to print()") + if not want_unicode: + for arg in args: + if isinstance(arg, unicode): + want_unicode = True + break + if want_unicode: + newline = unicode("\n") + space = unicode(" ") + else: + newline = "\n" + space = " " + if sep is None: + sep = space + if end is None: + end = newline + for i, arg in enumerate(args): + if i: + write(sep) + write(arg) + write(end) + +_add_doc(reraise, """Reraise an exception.""") + + +def with_metaclass(meta, base=object): + """Create a base class with a metaclass.""" + return meta("NewBase", (base,), {}) diff --git a/task-6232/pygeoip/timezone.py b/task-6232/pygeoip/timezone.py new file mode 100644 index 0000000..033c8d6 --- /dev/null +++ b/task-6232/pygeoip/timezone.py @@ -0,0 +1,714 @@ +__all__ = ['time_zone_by_country_and_region'] + +_country = {} +_country["AD"] = "Europe/Andorra" +_country["AE"] = "Asia/Dubai" +_country["AF"] = "Asia/Kabul" +_country["AG"] = "America/Antigua" +_country["AI"] = "America/Anguilla" +_country["AL"] = "Europe/Tirane" +_country["AM"] = "Asia/Yerevan" +_country["AO"] = "Africa/Luanda" +_country["AR"] = {} +_country["AR"]["01"] = "America/Argentina/Buenos_Aires" +_country["AR"]["02"] = "America/Argentina/Catamarca" +_country["AR"]["03"] = "America/Argentina/Tucuman" +_country["AR"]["04"] = "America/Argentina/Rio_Gallegos" +_country["AR"]["05"] = "America/Argentina/Cordoba" +_country["AR"]["06"] = "America/Argentina/Tucuman" +_country["AR"]["07"] = "America/Argentina/Buenos_Aires" +_country["AR"]["08"] = "America/Argentina/Buenos_Aires" +_country["AR"]["09"] = "America/Argentina/Tucuman" +_country["AR"]["10"] = "America/Argentina/Jujuy" +_country["AR"]["11"] = "America/Argentina/San_Luis" +_country["AR"]["12"] = "America/Argentina/La_Rioja" +_country["AR"]["13"] = "America/Argentina/Mendoza" +_country["AR"]["14"] = "America/Argentina/Buenos_Aires" +_country["AR"]["15"] = "America/Argentina/San_Luis" +_country["AR"]["16"] = "America/Argentina/Buenos_Aires" +_country["AR"]["17"] = "America/Argentina/Salta" +_country["AR"]["18"] = "America/Argentina/San_Juan" +_country["AR"]["19"] = "America/Argentina/San_Luis" +_country["AR"]["20"] = "America/Argentina/Rio_Gallegos" +_country["AR"]["21"] = "America/Argentina/Buenos_Aires" +_country["AR"]["22"] = "America/Argentina/Catamarca" +_country["AR"]["23"] = "America/Argentina/Ushuaia" +_country["AR"]["24"] = "America/Argentina/Tucuman" +_country["AS"] = "US/Samoa" +_country["AT"] = "Europe/Vienna" +_country["AU"] = {} +_country["AU"]["01"] = "Australia/Canberra" +_country["AU"]["02"] = "Australia/NSW" +_country["AU"]["03"] = "Australia/North" +_country["AU"]["04"] = "Australia/Queensland" +_country["AU"]["05"] = "Australia/South" +_country["AU"]["06"] = "Australia/Tasmania" +_country["AU"]["07"] = "Australia/Victoria" +_country["AU"]["08"] = "Australia/West" +_country["AW"] = "America/Aruba" +_country["AX"] = "Europe/Mariehamn" +_country["AZ"] = "Asia/Baku" +_country["BA"] = "Europe/Sarajevo" +_country["BB"] = "America/Barbados" +_country["BD"] = "Asia/Dhaka" +_country["BE"] = "Europe/Brussels" +_country["BF"] = "Africa/Ouagadougou" +_country["BG"] = "Europe/Sofia" +_country["BH"] = "Asia/Bahrain" +_country["BI"] = "Africa/Bujumbura" +_country["BJ"] = "Africa/Porto-Novo" +_country["BL"] = "America/St_Barthelemy" +_country["BM"] = "Atlantic/Bermuda" +_country["BN"] = "Asia/Brunei" +_country["BO"] = "America/La_Paz" +_country["BQ"] = "America/Curacao" +_country["BR"] = {} +_country["BR"]["01"] = "America/Rio_Branco" +_country["BR"]["02"] = "America/Maceio" +_country["BR"]["03"] = "America/Sao_Paulo" +_country["BR"]["04"] = "America/Manaus" +_country["BR"]["05"] = "America/Bahia" +_country["BR"]["06"] = "America/Fortaleza" +_country["BR"]["07"] = "America/Sao_Paulo" +_country["BR"]["08"] = "America/Sao_Paulo" +_country["BR"]["11"] = "America/Campo_Grande" +_country["BR"]["13"] = "America/Belem" +_country["BR"]["14"] = "America/Cuiaba" +_country["BR"]["15"] = "America/Sao_Paulo" +_country["BR"]["16"] = "America/Belem" +_country["BR"]["17"] = "America/Recife" +_country["BR"]["18"] = "America/Sao_Paulo" +_country["BR"]["20"] = "America/Fortaleza" +_country["BR"]["21"] = "America/Sao_Paulo" +_country["BR"]["22"] = "America/Recife" +_country["BR"]["23"] = "America/Sao_Paulo" +_country["BR"]["24"] = "America/Porto_Velho" +_country["BR"]["25"] = "America/Boa_Vista" +_country["BR"]["26"] = "America/Sao_Paulo" +_country["BR"]["27"] = "America/Sao_Paulo" +_country["BR"]["28"] = "America/Maceio" +_country["BR"]["29"] = "America/Sao_Paulo" +_country["BR"]["30"] = "America/Recife" +_country["BR"]["31"] = "America/Araguaina" +_country["BS"] = "America/Nassau" +_country["BT"] = "Asia/Thimphu" +_country["BW"] = "Africa/Gaborone" +_country["BY"] = "Europe/Minsk" +_country["BZ"] = "America/Belize" +_country["CA"] = {} +_country["CA"]["AB"] = "America/Edmonton" +_country["CA"]["BC"] = "America/Vancouver" +_country["CA"]["MB"] = "America/Winnipeg" +_country["CA"]["NB"] = "America/Halifax" +_country["CA"]["NL"] = "America/St_Johns" +_country["CA"]["NS"] = "America/Halifax" +_country["CA"]["NT"] = "America/Yellowknife" +_country["CA"]["NU"] = "America/Rankin_Inlet" +_country["CA"]["ON"] = "America/Rainy_River" +_country["CA"]["PE"] = "America/Halifax" +_country["CA"]["QC"] = "America/Montreal" +_country["CA"]["SK"] = "America/Regina" +_country["CA"]["YT"] = "America/Whitehorse" +_country["CC"] = "Indian/Cocos" +_country["CD"] = {} +_country["CD"]["02"] = "Africa/Kinshasa" +_country["CD"]["05"] = "Africa/Lubumbashi" +_country["CD"]["06"] = "Africa/Kinshasa" +_country["CD"]["08"] = "Africa/Kinshasa" +_country["CD"]["10"] = "Africa/Lubumbashi" +_country["CD"]["11"] = "Africa/Lubumbashi" +_country["CD"]["12"] = "Africa/Lubumbashi" +_country["CF"] = "Africa/Bangui" +_country["CG"] = "Africa/Brazzaville" +_country["CH"] = "Europe/Zurich" +_country["CI"] = "Africa/Abidjan" +_country["CK"] = "Pacific/Rarotonga" +_country["CL"] = "Chile/Continental" +_country["CM"] = "Africa/Lagos" +_country["CN"] = {} +_country["CN"]["01"] = "Asia/Shanghai" +_country["CN"]["02"] = "Asia/Shanghai" +_country["CN"]["03"] = "Asia/Shanghai" +_country["CN"]["04"] = "Asia/Shanghai" +_country["CN"]["05"] = "Asia/Harbin" +_country["CN"]["06"] = "Asia/Chongqing" +_country["CN"]["07"] = "Asia/Shanghai" +_country["CN"]["08"] = "Asia/Harbin" +_country["CN"]["09"] = "Asia/Shanghai" +_country["CN"]["10"] = "Asia/Shanghai" +_country["CN"]["11"] = "Asia/Chongqing" +_country["CN"]["12"] = "Asia/Shanghai" +_country["CN"]["13"] = "Asia/Urumqi" +_country["CN"]["14"] = "Asia/Chongqing" +_country["CN"]["15"] = "Asia/Chongqing" +_country["CN"]["16"] = "Asia/Chongqing" +_country["CN"]["18"] = "Asia/Chongqing" +_country["CN"]["19"] = "Asia/Harbin" +_country["CN"]["20"] = "Asia/Harbin" +_country["CN"]["21"] = "Asia/Chongqing" +_country["CN"]["22"] = "Asia/Harbin" +_country["CN"]["23"] = "Asia/Shanghai" +_country["CN"]["24"] = "Asia/Chongqing" +_country["CN"]["25"] = "Asia/Shanghai" +_country["CN"]["26"] = "Asia/Chongqing" +_country["CN"]["28"] = "Asia/Shanghai" +_country["CN"]["29"] = "Asia/Chongqing" +_country["CN"]["30"] = "Asia/Chongqing" +_country["CN"]["31"] = "Asia/Chongqing" +_country["CN"]["32"] = "Asia/Chongqing" +_country["CN"]["33"] = "Asia/Chongqing" +_country["CO"] = "America/Bogota" +_country["CR"] = "America/Costa_Rica" +_country["CU"] = "America/Havana" +_country["CV"] = "Atlantic/Cape_Verde" +_country["CW"] = "America/Curacao" +_country["CX"] = "Indian/Christmas" +_country["CY"] = "Asia/Nicosia" +_country["CZ"] = "Europe/Prague" +_country["DE"] = "Europe/Berlin" +_country["DJ"] = "Africa/Djibouti" +_country["DK"] = "Europe/Copenhagen" +_country["DM"] = "America/Dominica" +_country["DO"] = "America/Santo_Domingo" +_country["DZ"] = "Africa/Algiers" +_country["EC"] = {} +_country["EC"]["01"] = "Pacific/Galapagos" +_country["EC"]["02"] = "America/Guayaquil" +_country["EC"]["03"] = "America/Guayaquil" +_country["EC"]["04"] = "America/Guayaquil" +_country["EC"]["05"] = "America/Guayaquil" +_country["EC"]["06"] = "America/Guayaquil" +_country["EC"]["07"] = "America/Guayaquil" +_country["EC"]["08"] = "America/Guayaquil" +_country["EC"]["09"] = "America/Guayaquil" +_country["EC"]["10"] = "America/Guayaquil" +_country["EC"]["11"] = "America/Guayaquil" +_country["EC"]["12"] = "America/Guayaquil" +_country["EC"]["13"] = "America/Guayaquil" +_country["EC"]["14"] = "America/Guayaquil" +_country["EC"]["15"] = "America/Guayaquil" +_country["EC"]["17"] = "America/Guayaquil" +_country["EC"]["18"] = "America/Guayaquil" +_country["EC"]["19"] = "America/Guayaquil" +_country["EC"]["20"] = "America/Guayaquil" +_country["EC"]["22"] = "America/Guayaquil" +_country["EE"] = "Europe/Tallinn" +_country["EG"] = "Africa/Cairo" +_country["EH"] = "Africa/El_Aaiun" +_country["ER"] = "Africa/Asmera" +_country["ES"] = {} +_country["ES"]["07"] = "Europe/Madrid" +_country["ES"]["27"] = "Europe/Madrid" +_country["ES"]["29"] = "Europe/Madrid" +_country["ES"]["31"] = "Europe/Madrid" +_country["ES"]["32"] = "Europe/Madrid" +_country["ES"]["34"] = "Europe/Madrid" +_country["ES"]["39"] = "Europe/Madrid" +_country["ES"]["51"] = "Africa/Ceuta" +_country["ES"]["52"] = "Europe/Madrid" +_country["ES"]["53"] = "Atlantic/Canary" +_country["ES"]["54"] = "Europe/Madrid" +_country["ES"]["55"] = "Europe/Madrid" +_country["ES"]["56"] = "Europe/Madrid" +_country["ES"]["57"] = "Europe/Madrid" +_country["ES"]["58"] = "Europe/Madrid" +_country["ES"]["59"] = "Europe/Madrid" +_country["ES"]["60"] = "Europe/Madrid" +_country["ET"] = "Africa/Addis_Ababa" +_country["FI"] = "Europe/Helsinki" +_country["FJ"] = "Pacific/Fiji" +_country["FK"] = "Atlantic/Stanley" +_country["FO"] = "Atlantic/Faeroe" +_country["FR"] = "Europe/Paris" +_country["GA"] = "Africa/Libreville" +_country["GB"] = "Europe/London" +_country["GD"] = "America/Grenada" +_country["GE"] = "Asia/Tbilisi" +_country["GF"] = "America/Cayenne" +_country["GG"] = "Europe/Guernsey" +_country["GH"] = "Africa/Accra" +_country["GI"] = "Europe/Gibraltar" +_country["GL"] = {} +_country["GL"]["01"] = "America/Thule" +_country["GL"]["02"] = "America/Godthab" +_country["GL"]["03"] = "America/Godthab" +_country["GM"] = "Africa/Banjul" +_country["GN"] = "Africa/Conakry" +_country["GP"] = "America/Guadeloupe" +_country["GQ"] = "Africa/Malabo" +_country["GR"] = "Europe/Athens" +_country["GS"] = "Atlantic/South_Georgia" +_country["GT"] = "America/Guatemala" +_country["GU"] = "Pacific/Guam" +_country["GW"] = "Africa/Bissau" +_country["GY"] = "America/Guyana" +_country["HK"] = "Asia/Hong_Kong" +_country["HN"] = "America/Tegucigalpa" +_country["HR"] = "Europe/Zagreb" +_country["HT"] = "America/Port-au-Prince" +_country["HU"] = "Europe/Budapest" +_country["ID"] = {} +_country["ID"]["01"] = "Asia/Pontianak" +_country["ID"]["02"] = "Asia/Makassar" +_country["ID"]["03"] = "Asia/Jakarta" +_country["ID"]["04"] = "Asia/Jakarta" +_country["ID"]["05"] = "Asia/Jakarta" +_country["ID"]["06"] = "Asia/Jakarta" +_country["ID"]["07"] = "Asia/Jakarta" +_country["ID"]["08"] = "Asia/Jakarta" +_country["ID"]["09"] = "Asia/Jayapura" +_country["ID"]["10"] = "Asia/Jakarta" +_country["ID"]["11"] = "Asia/Pontianak" +_country["ID"]["12"] = "Asia/Makassar" +_country["ID"]["13"] = "Asia/Makassar" +_country["ID"]["14"] = "Asia/Makassar" +_country["ID"]["15"] = "Asia/Jakarta" +_country["ID"]["16"] = "Asia/Makassar" +_country["ID"]["17"] = "Asia/Makassar" +_country["ID"]["18"] = "Asia/Makassar" +_country["ID"]["19"] = "Asia/Pontianak" +_country["ID"]["20"] = "Asia/Makassar" +_country["ID"]["21"] = "Asia/Makassar" +_country["ID"]["22"] = "Asia/Makassar" +_country["ID"]["23"] = "Asia/Makassar" +_country["ID"]["24"] = "Asia/Jakarta" +_country["ID"]["25"] = "Asia/Pontianak" +_country["ID"]["26"] = "Asia/Pontianak" +_country["ID"]["30"] = "Asia/Jakarta" +_country["ID"]["31"] = "Asia/Makassar" +_country["ID"]["33"] = "Asia/Jakarta" +_country["IE"] = "Europe/Dublin" +_country["IL"] = "Asia/Jerusalem" +_country["IM"] = "Europe/Isle_of_Man" +_country["IN"] = "Asia/Calcutta" +_country["IO"] = "Indian/Chagos" +_country["IQ"] = "Asia/Baghdad" +_country["IR"] = "Asia/Tehran" +_country["IS"] = "Atlantic/Reykjavik" +_country["IT"] = "Europe/Rome" +_country["JE"] = "Europe/Jersey" +_country["JM"] = "America/Jamaica" +_country["JO"] = "Asia/Amman" +_country["JP"] = "Asia/Tokyo" +_country["KE"] = "Africa/Nairobi" +_country["KG"] = "Asia/Bishkek" +_country["KH"] = "Asia/Phnom_Penh" +_country["KI"] = "Pacific/Tarawa" +_country["KM"] = "Indian/Comoro" +_country["KN"] = "America/St_Kitts" +_country["KP"] = "Asia/Pyongyang" +_country["KR"] = "Asia/Seoul" +_country["KW"] = "Asia/Kuwait" +_country["KY"] = "America/Cayman" +_country["KZ"] = {} +_country["KZ"]["01"] = "Asia/Almaty" +_country["KZ"]["02"] = "Asia/Almaty" +_country["KZ"]["03"] = "Asia/Qyzylorda" +_country["KZ"]["04"] = "Asia/Aqtobe" +_country["KZ"]["05"] = "Asia/Qyzylorda" +_country["KZ"]["06"] = "Asia/Aqtau" +_country["KZ"]["07"] = "Asia/Oral" +_country["KZ"]["08"] = "Asia/Qyzylorda" +_country["KZ"]["09"] = "Asia/Aqtau" +_country["KZ"]["10"] = "Asia/Qyzylorda" +_country["KZ"]["11"] = "Asia/Almaty" +_country["KZ"]["12"] = "Asia/Qyzylorda" +_country["KZ"]["13"] = "Asia/Aqtobe" +_country["KZ"]["14"] = "Asia/Qyzylorda" +_country["KZ"]["15"] = "Asia/Almaty" +_country["KZ"]["16"] = "Asia/Aqtobe" +_country["KZ"]["17"] = "Asia/Almaty" +_country["LA"] = "Asia/Vientiane" +_country["LB"] = "Asia/Beirut" +_country["LC"] = "America/St_Lucia" +_country["LI"] = "Europe/Vaduz" +_country["LK"] = "Asia/Colombo" +_country["LR"] = "Africa/Monrovia" +_country["LS"] = "Africa/Maseru" +_country["LT"] = "Europe/Vilnius" +_country["LU"] = "Europe/Luxembourg" +_country["LV"] = "Europe/Riga" +_country["LY"] = "Africa/Tripoli" +_country["MA"] = "Africa/Casablanca" +_country["MC"] = "Europe/Monaco" +_country["MD"] = "Europe/Chisinau" +_country["ME"] = "Europe/Podgorica" +_country["MF"] = "America/Marigot" +_country["MG"] = "Indian/Antananarivo" +_country["MK"] = "Europe/Skopje" +_country["ML"] = "Africa/Bamako" +_country["MM"] = "Asia/Rangoon" +_country["MN"] = "Asia/Choibalsan" +_country["MO"] = "Asia/Macao" +_country["MP"] = "Pacific/Saipan" +_country["MQ"] = "America/Martinique" +_country["MR"] = "Africa/Nouakchott" +_country["MS"] = "America/Montserrat" +_country["MT"] = "Europe/Malta" +_country["MU"] = "Indian/Mauritius" +_country["MV"] = "Indian/Maldives" +_country["MW"] = "Africa/Blantyre" +_country["MX"] = {} +_country["MX"]["01"] = "America/Mexico_City" +_country["MX"]["02"] = "America/Tijuana" +_country["MX"]["03"] = "America/Hermosillo" +_country["MX"]["04"] = "America/Merida" +_country["MX"]["05"] = "America/Mexico_City" +_country["MX"]["06"] = "America/Chihuahua" +_country["MX"]["07"] = "America/Monterrey" +_country["MX"]["08"] = "America/Mexico_City" +_country["MX"]["09"] = "America/Mexico_City" +_country["MX"]["10"] = "America/Mazatlan" +_country["MX"]["11"] = "America/Mexico_City" +_country["MX"]["12"] = "America/Mexico_City" +_country["MX"]["13"] = "America/Mexico_City" +_country["MX"]["14"] = "America/Mazatlan" +_country["MX"]["15"] = "America/Chihuahua" +_country["MX"]["16"] = "America/Mexico_City" +_country["MX"]["17"] = "America/Mexico_City" +_country["MX"]["18"] = "America/Mazatlan" +_country["MX"]["19"] = "America/Monterrey" +_country["MX"]["20"] = "America/Mexico_City" +_country["MX"]["21"] = "America/Mexico_City" +_country["MX"]["22"] = "America/Mexico_City" +_country["MX"]["23"] = "America/Cancun" +_country["MX"]["24"] = "America/Mexico_City" +_country["MX"]["25"] = "America/Mazatlan" +_country["MX"]["26"] = "America/Hermosillo" +_country["MX"]["27"] = "America/Merida" +_country["MX"]["28"] = "America/Monterrey" +_country["MX"]["29"] = "America/Mexico_City" +_country["MX"]["30"] = "America/Mexico_City" +_country["MX"]["31"] = "America/Merida" +_country["MX"]["32"] = "America/Monterrey" +_country["MY"] = {} +_country["MY"]["01"] = "Asia/Kuala_Lumpur" +_country["MY"]["02"] = "Asia/Kuala_Lumpur" +_country["MY"]["03"] = "Asia/Kuala_Lumpur" +_country["MY"]["04"] = "Asia/Kuala_Lumpur" +_country["MY"]["05"] = "Asia/Kuala_Lumpur" +_country["MY"]["06"] = "Asia/Kuala_Lumpur" +_country["MY"]["07"] = "Asia/Kuala_Lumpur" +_country["MY"]["08"] = "Asia/Kuala_Lumpur" +_country["MY"]["09"] = "Asia/Kuala_Lumpur" +_country["MY"]["11"] = "Asia/Kuching" +_country["MY"]["12"] = "Asia/Kuala_Lumpur" +_country["MY"]["13"] = "Asia/Kuala_Lumpur" +_country["MY"]["14"] = "Asia/Kuala_Lumpur" +_country["MY"]["15"] = "Asia/Kuching" +_country["MY"]["16"] = "Asia/Kuching" +_country["MZ"] = "Africa/Maputo" +_country["NA"] = "Africa/Windhoek" +_country["NC"] = "Pacific/Noumea" +_country["NE"] = "Africa/Niamey" +_country["NF"] = "Pacific/Norfolk" +_country["NG"] = "Africa/Lagos" +_country["NI"] = "America/Managua" +_country["NL"] = "Europe/Amsterdam" +_country["NO"] = "Europe/Oslo" +_country["NP"] = "Asia/Katmandu" +_country["NR"] = "Pacific/Nauru" +_country["NU"] = "Pacific/Niue" +_country["NZ"] = {} +_country["NZ"]["85"] = "Pacific/Auckland" +_country["NZ"]["E7"] = "Pacific/Auckland" +_country["NZ"]["E8"] = "Pacific/Auckland" +_country["NZ"]["E9"] = "Pacific/Auckland" +_country["NZ"]["F1"] = "Pacific/Auckland" +_country["NZ"]["F2"] = "Pacific/Auckland" +_country["NZ"]["F3"] = "Pacific/Auckland" +_country["NZ"]["F4"] = "Pacific/Auckland" +_country["NZ"]["F5"] = "Pacific/Auckland" +_country["NZ"]["F7"] = "Pacific/Chatham" +_country["NZ"]["F8"] = "Pacific/Auckland" +_country["NZ"]["F9"] = "Pacific/Auckland" +_country["NZ"]["G1"] = "Pacific/Auckland" +_country["NZ"]["G2"] = "Pacific/Auckland" +_country["NZ"]["G3"] = "Pacific/Auckland" +_country["OM"] = "Asia/Muscat" +_country["PA"] = "America/Panama" +_country["PE"] = "America/Lima" +_country["PF"] = "Pacific/Marquesas" +_country["PG"] = "Pacific/Port_Moresby" +_country["PH"] = "Asia/Manila" +_country["PK"] = "Asia/Karachi" +_country["PL"] = "Europe/Warsaw" +_country["PM"] = "America/Miquelon" +_country["PN"] = "Pacific/Pitcairn" +_country["PR"] = "America/Puerto_Rico" +_country["PS"] = "Asia/Gaza" +_country["PT"] = {} +_country["PT"]["02"] = "Europe/Lisbon" +_country["PT"]["03"] = "Europe/Lisbon" +_country["PT"]["04"] = "Europe/Lisbon" +_country["PT"]["05"] = "Europe/Lisbon" +_country["PT"]["06"] = "Europe/Lisbon" +_country["PT"]["07"] = "Europe/Lisbon" +_country["PT"]["08"] = "Europe/Lisbon" +_country["PT"]["09"] = "Europe/Lisbon" +_country["PT"]["10"] = "Atlantic/Madeira" +_country["PT"]["11"] = "Europe/Lisbon" +_country["PT"]["13"] = "Europe/Lisbon" +_country["PT"]["14"] = "Europe/Lisbon" +_country["PT"]["16"] = "Europe/Lisbon" +_country["PT"]["17"] = "Europe/Lisbon" +_country["PT"]["18"] = "Europe/Lisbon" +_country["PT"]["19"] = "Europe/Lisbon" +_country["PT"]["20"] = "Europe/Lisbon" +_country["PT"]["21"] = "Europe/Lisbon" +_country["PT"]["22"] = "Europe/Lisbon" +_country["PW"] = "Pacific/Palau" +_country["PY"] = "America/Asuncion" +_country["QA"] = "Asia/Qatar" +_country["RE"] = "Indian/Reunion" +_country["RO"] = "Europe/Bucharest" +_country["RS"] = "Europe/Belgrade" +_country["RU"] = {} +_country["RU"]["01"] = "Europe/Volgograd" +_country["RU"]["02"] = "Asia/Irkutsk" +_country["RU"]["03"] = "Asia/Novokuznetsk" +_country["RU"]["04"] = "Asia/Novosibirsk" +_country["RU"]["05"] = "Asia/Vladivostok" +_country["RU"]["06"] = "Europe/Moscow" +_country["RU"]["07"] = "Europe/Volgograd" +_country["RU"]["08"] = "Europe/Samara" +_country["RU"]["09"] = "Europe/Moscow" +_country["RU"]["10"] = "Europe/Moscow" +_country["RU"]["11"] = "Asia/Irkutsk" +_country["RU"]["13"] = "Asia/Yekaterinburg" +_country["RU"]["14"] = "Asia/Irkutsk" +_country["RU"]["15"] = "Asia/Anadyr" +_country["RU"]["16"] = "Europe/Samara" +_country["RU"]["17"] = "Europe/Volgograd" +_country["RU"]["18"] = "Asia/Krasnoyarsk" +_country["RU"]["20"] = "Asia/Irkutsk" +_country["RU"]["21"] = "Europe/Moscow" +_country["RU"]["22"] = "Europe/Volgograd" +_country["RU"]["23"] = "Europe/Kaliningrad" +_country["RU"]["24"] = "Europe/Volgograd" +_country["RU"]["25"] = "Europe/Moscow" +_country["RU"]["26"] = "Asia/Kamchatka" +_country["RU"]["27"] = "Europe/Volgograd" +_country["RU"]["28"] = "Europe/Moscow" +_country["RU"]["29"] = "Asia/Novokuznetsk" +_country["RU"]["30"] = "Asia/Vladivostok" +_country["RU"]["31"] = "Asia/Krasnoyarsk" +_country["RU"]["32"] = "Asia/Omsk" +_country["RU"]["33"] = "Asia/Yekaterinburg" +_country["RU"]["34"] = "Asia/Yekaterinburg" +_country["RU"]["35"] = "Asia/Yekaterinburg" +_country["RU"]["36"] = "Asia/Anadyr" +_country["RU"]["37"] = "Europe/Moscow" +_country["RU"]["38"] = "Europe/Volgograd" +_country["RU"]["39"] = "Asia/Krasnoyarsk" +_country["RU"]["40"] = "Asia/Yekaterinburg" +_country["RU"]["41"] = "Europe/Moscow" +_country["RU"]["42"] = "Europe/Moscow" +_country["RU"]["43"] = "Europe/Moscow" +_country["RU"]["44"] = "Asia/Magadan" +_country["RU"]["45"] = "Europe/Samara" +_country["RU"]["46"] = "Europe/Samara" +_country["RU"]["47"] = "Europe/Moscow" +_country["RU"]["48"] = "Europe/Moscow" +_country["RU"]["49"] = "Europe/Moscow" +_country["RU"]["50"] = "Asia/Yekaterinburg" +_country["RU"]["51"] = "Europe/Moscow" +_country["RU"]["52"] = "Europe/Moscow" +_country["RU"]["53"] = "Asia/Novosibirsk" +_country["RU"]["54"] = "Asia/Omsk" +_country["RU"]["55"] = "Europe/Samara" +_country["RU"]["56"] = "Europe/Moscow" +_country["RU"]["57"] = "Europe/Samara" +_country["RU"]["58"] = "Asia/Yekaterinburg" +_country["RU"]["59"] = "Asia/Vladivostok" +_country["RU"]["60"] = "Europe/Kaliningrad" +_country["RU"]["61"] = "Europe/Volgograd" +_country["RU"]["62"] = "Europe/Moscow" +_country["RU"]["63"] = "Asia/Yakutsk" +_country["RU"]["64"] = "Asia/Sakhalin" +_country["RU"]["65"] = "Europe/Samara" +_country["RU"]["66"] = "Europe/Moscow" +_country["RU"]["67"] = "Europe/Samara" +_country["RU"]["68"] = "Europe/Volgograd" +_country["RU"]["69"] = "Europe/Moscow" +_country["RU"]["70"] = "Europe/Volgograd" +_country["RU"]["71"] = "Asia/Yekaterinburg" +_country["RU"]["72"] = "Europe/Moscow" +_country["RU"]["73"] = "Europe/Samara" +_country["RU"]["74"] = "Asia/Krasnoyarsk" +_country["RU"]["75"] = "Asia/Novosibirsk" +_country["RU"]["76"] = "Europe/Moscow" +_country["RU"]["77"] = "Europe/Moscow" +_country["RU"]["78"] = "Asia/Yekaterinburg" +_country["RU"]["79"] = "Asia/Irkutsk" +_country["RU"]["80"] = "Asia/Yekaterinburg" +_country["RU"]["81"] = "Europe/Samara" +_country["RU"]["82"] = "Asia/Irkutsk" +_country["RU"]["83"] = "Europe/Moscow" +_country["RU"]["84"] = "Europe/Volgograd" +_country["RU"]["85"] = "Europe/Moscow" +_country["RU"]["86"] = "Europe/Moscow" +_country["RU"]["87"] = "Asia/Novosibirsk" +_country["RU"]["88"] = "Europe/Moscow" +_country["RU"]["89"] = "Asia/Vladivostok" +_country["RW"] = "Africa/Kigali" +_country["SA"] = "Asia/Riyadh" +_country["SB"] = "Pacific/Guadalcanal" +_country["SC"] = "Indian/Mahe" +_country["SD"] = "Africa/Khartoum" +_country["SE"] = "Europe/Stockholm" +_country["SG"] = "Asia/Singapore" +_country["SH"] = "Atlantic/St_Helena" +_country["SI"] = "Europe/Ljubljana" +_country["SJ"] = "Arctic/Longyearbyen" +_country["SK"] = "Europe/Bratislava" +_country["SL"] = "Africa/Freetown" +_country["SM"] = "Europe/San_Marino" +_country["SN"] = "Africa/Dakar" +_country["SO"] = "Africa/Mogadishu" +_country["SR"] = "America/Paramaribo" +_country["ST"] = "Africa/Sao_Tome" +_country["SV"] = "America/El_Salvador" +_country["SX"] = "America/Curacao" +_country["SY"] = "Asia/Damascus" +_country["SZ"] = "Africa/Mbabane" +_country["TC"] = "America/Grand_Turk" +_country["TD"] = "Africa/Ndjamena" +_country["TF"] = "Indian/Kerguelen" +_country["TG"] = "Africa/Lome" +_country["TH"] = "Asia/Bangkok" +_country["TJ"] = "Asia/Dushanbe" +_country["TK"] = "Pacific/Fakaofo" +_country["TL"] = "Asia/Dili" +_country["TM"] = "Asia/Ashgabat" +_country["TN"] = "Africa/Tunis" +_country["TO"] = "Pacific/Tongatapu" +_country["TR"] = "Asia/Istanbul" +_country["TT"] = "America/Port_of_Spain" +_country["TV"] = "Pacific/Funafuti" +_country["TW"] = "Asia/Taipei" +_country["TZ"] = "Africa/Dar_es_Salaam" +_country["UA"] = {} +_country["UA"]["01"] = "Europe/Kiev" +_country["UA"]["02"] = "Europe/Kiev" +_country["UA"]["03"] = "Europe/Uzhgorod" +_country["UA"]["04"] = "Europe/Zaporozhye" +_country["UA"]["05"] = "Europe/Zaporozhye" +_country["UA"]["06"] = "Europe/Uzhgorod" +_country["UA"]["07"] = "Europe/Zaporozhye" +_country["UA"]["08"] = "Europe/Simferopol" +_country["UA"]["09"] = "Europe/Kiev" +_country["UA"]["10"] = "Europe/Zaporozhye" +_country["UA"]["11"] = "Europe/Simferopol" +_country["UA"]["13"] = "Europe/Kiev" +_country["UA"]["14"] = "Europe/Zaporozhye" +_country["UA"]["15"] = "Europe/Uzhgorod" +_country["UA"]["16"] = "Europe/Zaporozhye" +_country["UA"]["17"] = "Europe/Simferopol" +_country["UA"]["18"] = "Europe/Zaporozhye" +_country["UA"]["19"] = "Europe/Kiev" +_country["UA"]["20"] = "Europe/Simferopol" +_country["UA"]["21"] = "Europe/Kiev" +_country["UA"]["22"] = "Europe/Uzhgorod" +_country["UA"]["23"] = "Europe/Kiev" +_country["UA"]["24"] = "Europe/Uzhgorod" +_country["UA"]["25"] = "Europe/Uzhgorod" +_country["UA"]["26"] = "Europe/Zaporozhye" +_country["UA"]["27"] = "Europe/Kiev" +_country["UG"] = "Africa/Kampala" +_country["US"] = {} +_country["US"]["AK"] = "America/Anchorage" +_country["US"]["AL"] = "America/Chicago" +_country["US"]["AR"] = "America/Chicago" +_country["US"]["AZ"] = "America/Phoenix" +_country["US"]["CA"] = "America/Los_Angeles" +_country["US"]["CO"] = "America/Denver" +_country["US"]["CT"] = "America/New_York" +_country["US"]["DC"] = "America/New_York" +_country["US"]["DE"] = "America/New_York" +_country["US"]["FL"] = "America/New_York" +_country["US"]["GA"] = "America/New_York" +_country["US"]["HI"] = "Pacific/Honolulu" +_country["US"]["IA"] = "America/Chicago" +_country["US"]["ID"] = "America/Denver" +_country["US"]["IL"] = "America/Chicago" +_country["US"]["IN"] = "America/Indianapolis" +_country["US"]["KS"] = "America/Chicago" +_country["US"]["KY"] = "America/New_York" +_country["US"]["LA"] = "America/Chicago" +_country["US"]["MA"] = "America/New_York" +_country["US"]["MD"] = "America/New_York" +_country["US"]["ME"] = "America/New_York" +_country["US"]["MI"] = "America/New_York" +_country["US"]["MN"] = "America/Chicago" +_country["US"]["MO"] = "America/Chicago" +_country["US"]["MS"] = "America/Chicago" +_country["US"]["MT"] = "America/Denver" +_country["US"]["NC"] = "America/New_York" +_country["US"]["ND"] = "America/Chicago" +_country["US"]["NE"] = "America/Chicago" +_country["US"]["NH"] = "America/New_York" +_country["US"]["NJ"] = "America/New_York" +_country["US"]["NM"] = "America/Denver" +_country["US"]["NV"] = "America/Los_Angeles" +_country["US"]["NY"] = "America/New_York" +_country["US"]["OH"] = "America/New_York" +_country["US"]["OK"] = "America/Chicago" +_country["US"]["OR"] = "America/Los_Angeles" +_country["US"]["PA"] = "America/New_York" +_country["US"]["RI"] = "America/New_York" +_country["US"]["SC"] = "America/New_York" +_country["US"]["SD"] = "America/Chicago" +_country["US"]["TN"] = "America/Chicago" +_country["US"]["TX"] = "America/Chicago" +_country["US"]["UT"] = "America/Denver" +_country["US"]["VA"] = "America/New_York" +_country["US"]["VT"] = "America/New_York" +_country["US"]["WA"] = "America/Los_Angeles" +_country["US"]["WI"] = "America/Chicago" +_country["US"]["WV"] = "America/New_York" +_country["US"]["WY"] = "America/Denver" +_country["UY"] = "America/Montevideo" +_country["UZ"] = {} +_country["UZ"]["01"] = "Asia/Tashkent" +_country["UZ"]["02"] = "Asia/Samarkand" +_country["UZ"]["03"] = "Asia/Tashkent" +_country["UZ"]["06"] = "Asia/Tashkent" +_country["UZ"]["07"] = "Asia/Samarkand" +_country["UZ"]["08"] = "Asia/Samarkand" +_country["UZ"]["09"] = "Asia/Samarkand" +_country["UZ"]["10"] = "Asia/Samarkand" +_country["UZ"]["12"] = "Asia/Samarkand" +_country["UZ"]["13"] = "Asia/Tashkent" +_country["UZ"]["14"] = "Asia/Tashkent" +_country["VA"] = "Europe/Vatican" +_country["VC"] = "America/St_Vincent" +_country["VE"] = "America/Caracas" +_country["VG"] = "America/Tortola" +_country["VI"] = "America/St_Thomas" +_country["VN"] = "Asia/Phnom_Penh" +_country["VU"] = "Pacific/Efate" +_country["WF"] = "Pacific/Wallis" +_country["WS"] = "Pacific/Samoa" +_country["YE"] = "Asia/Aden" +_country["YT"] = "Indian/Mayotte" +_country["YU"] = "Europe/Belgrade" +_country["ZA"] = "Africa/Johannesburg" +_country["ZM"] = "Africa/Lusaka" +_country["ZW"] = "Africa/Harare" + +def time_zone_by_country_and_region(country_code, region_name=None): + + if country_code not in _country: + return None + + if not region_name or region_name == '00': + region_name = None + + timezones = _country[country_code] + + if isinstance(timezones, str): + return timezones + + if region_name: + return timezones.get(region_name) diff --git a/task-6232/pygeoip/util.py b/task-6232/pygeoip/util.py new file mode 100644 index 0000000..2ea6985 --- /dev/null +++ b/task-6232/pygeoip/util.py @@ -0,0 +1,35 @@ +""" +Misc. utility functions. It is part of the pygeoip package. + +@author: Jennifer Ennis <zaylea at gmail dot com> + +@license: +Copyright(C) 2004 MaxMind LLC + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU Lesser General Public License +along with this program. If not, see <http://www.gnu.org/licenses/lgpl.txt>. +""" + +def ip2long(ip): + """ + Convert a IPv4 address into a 32-bit integer. + + @param ip: quad-dotted IPv4 address + @type ip: str + @return: network byte order 32-bit integer + @rtype: int + """ + ip_array = ip.split('.') + ip_long = long(ip_array[0]) * 16777216 + long(ip_array[1]) * 65536 + long(ip_array[2]) * 256 + long(ip_array[3]) + return ip_long +

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 14 Jul '12

14 Jul '12

commit a9162bfb24a28ecfde0a87851904a4b45adbbf33 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jul 14 14:45:04 2012 +0000 Update translations for gettor --- ko/gettor.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ko/gettor.po b/ko/gettor.po index 3a79f0c..48ac8fb 100644 --- a/ko/gettor.po +++ b/ko/gettor.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2012-07-13 09:22+0000\n" +"PO-Revision-Date: 2012-07-14 14:23+0000\n" "Last-Translator: cwt96 <cwt967(a)naver.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -148,7 +148,7 @@ msgstr "간단히 'split' 을 다음 줄에 써 주십시오. 예시는 다음 msgid "" "Sending this text in an email to GetTor will cause it to send you \n" "the Tor Browser Bundle in a number of 1,4MB attachments." -msgstr "" +msgstr "이 텍스트를 이메일로 GetTor에 보내시면 Tor browser bundle을 1.4 MB 첨부 파일로 분할하여 보내드립니다." #: lib/gettor/i18n.py:105 msgid ""

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 13 Jul '12

13 Jul '12

commit 5cf6dd57d973c10cbca3b7495013368f31e3e2a4 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 13 15:45:07 2012 +0000 Update translations for orbot --- values-zh/strings.xml | 96 ------------------------------------------------- 1 files changed, 0 insertions(+), 96 deletions(-) diff --git a/values-zh/strings.xml b/values-zh/strings.xml index 81bf156..964adb0 100644 --- a/values-zh/strings.xml +++ b/values-zh/strings.xml @@ -85,18 +85,11 @@ <string name="pref_start_boot_summary">当您的 Android 设备开机时自动启动 Orbot 并连接至 Tor 网络</string>   - <string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string>  <string name="wizard_warning_title">警告</string> - <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string>  <string name="wizard_permissions_title">允许</string> - <string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string> - <string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string> - <string name="wizard_permissions_no_root_msg">Your device does not appear to be rooted or provide \'Superuser\' access.\n\nIn order to you to benefit from Tor, you will need to use apps built to work with Orbot, or that support HTTP or SOCKS proxy settings.\n\n</string>  - <string name="wizard_tips_title">Orbot-Enabled Apps</string> - <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string> <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> <string name="wizard_tips_orweb">ORWEB (仅 Android 1.x) - 着重隐私设计的浏览器</string> <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> @@ -105,110 +98,21 @@ <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string> <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/a…</string>-->  - <string name="wizard_transproxy_title">Transparent Proxying</string> - <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string> - <string name="wizard_transproxy_hint">(Check this box if you have no idea what we are talking about)</string> - <string name="wizard_transproxy_none">None</string> - <string name="pref_transparent_tethering_title">Tor Tethering</string> - <string name="pref_transparent_tethering_summary">Enable Tor Transparent Proxying for Wifi and USB Tethered Devices (requires restart)</string> - <string name="button_grant_superuser">Request Superuser Access</string> - <string name="pref_select_apps">Select Apps</string> - <string name="pref_select_apps_summary">Choose Apps to Route Through Tor</string> - <string name="pref_node_configuration">Node Configuration</string> - <string name="pref_node_configuration_summary">These are advanced settings that can reduce your anonymity</string> - <string name="pref_entrance_node">Entrance Nodes</string> - <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string> - <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string>  - <string name="pref_proxy_title">Outbound Network Proxy</string> - <string name="pref_proxy_type_title">Outbound Proxy Type</string> - <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string> - <string name="pref_proxy_type_dialog">Enter Proxy Type</string> - <string name="pref_proxy_host_title">Outbound Proxy Host</string> - <string name="pref_proxy_host_summary">Proxy server hostname</string> - <string name="pref_proxy_host_dialog">Enter Proxy Host</string> - <string name="pref_proxy_port_title">Outbound Proxy Port</string> - <string name="pref_proxy_port_summary">Proxy server port</string> - <string name="pref_proxy_port_dialog">Enter Proxy port</string> <string name="status">状态</string> - <string name="setting_up_full_transparent_proxying_">Setting up full transparent proxying...</string> - <string name="setting_up_app_based_transparent_proxying_">Setting up app-based transparent proxying...</string> - <string name="transparent_proxying_enabled">Transparent proxying ENABLED</string> - <string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string> - <string name="warning_error_starting_transparent_proxying_">WARNING: error starting transparent proxying!</string> - <string name="transproxy_rules_cleared">TransProxy rules cleared</string> - <string name="couldn_t_start_tor_process_">Couldn\'t start Tor process: </string> - <string name="privoxy_is_running_on_port_">Privoxy is running on port: </string> - <string name="setting_up_port_based_transparent_proxying_">Setting up port-based transparent proxying...</string> <string name="bridge_error">网桥错误</string> - <string name="bridge_requires_ip">In order to use the bridge feature, you must enter at least one bridge IP address.</string> - <string name="send_email_for_bridges">Send an email to bridges(a)torproject.org with the line \"get bridges\" by itself in the body of the mail from a gmail account.</string> <string name="error">错误</string> - <string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string> - <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string> - <string name="exit_nodes">Exit Nodes</string> - <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerprints, nicks, countries and addresses for the last hop</string> - <string name="enter_exit_nodes">Enter Exit Nodes</string> - <string name="exclude_nodes">Exclude Nodes</string> - <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, countries and addresses to exclude</string> - <string name="enter_exclude_nodes">Enter Exclude Nodes</string> - <string name="strict_nodes">Strict Nodes</string> - <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string> <string name="bridges">网桥</string> <string name="use_bridges">使用网桥</string> - <string name="bridges_obfuscated">Obfuscated Bridges</string> - <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</string> - <string name="enable_if_configured_bridges_are_obfuscated_bridges">Enable if configured bridges are obfuscated bridges</string> <string name="ip_address_and_port_of_bridges">网桥的IP地址和端口</string> - <string name="enter_bridge_addresses">Enter Bridge Addresses</string> - <string name="relays">Relays</string> - <string name="relaying">Relaying</string> - <string name="enable_your_device_to_be_a_non_exit_relay">Enable your device to be a non-exit relay</string> - <string name="relay_port">Relay Port</string> - <string name="listening_port_for_your_tor_relay">Listening port for your Tor relay</string> - <string name="enter_or_port">Enter OR port</string> - <string name="relay_nickname">Relay nickname</string> - <string name="the_nickname_for_your_tor_relay">The nickname for your Tor relay</string> - <string name="enter_a_custom_relay_nickname">Enter a custom relay nickname</string> - <string name="reachable_addresses">Reachable Addresses</string> - <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Run as a client behind a firewall with restrictive policies</string> - <string name="reachable_ports">Reachable ports</string> - <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string> - <string name="enter_ports">Enter ports</string> - <string name="enable_hidden_services">Hidden Service Hosting</string> - <string name="run_servers_accessible_via_the_tor_network">allow on-device server to be accessible via the Tor network</string> - <string name="enter_localhost_ports_for_hidden_services">enter localhost ports for hidden services</string> - <string name="hidden_service_ports">Hidden Service Ports</string> - <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string> - <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">enable debug log to output (must use adb or aLogCat to view)</string> - <string name="project_home">Project Home(s): </string> <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string> <string name="the_tor_license">Tor许可证</string> <string name="https_torproject_org">https://torproject.org</string> - <string name="third_party_software">3rd-Party-Software: </string> <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string> - <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string> - <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string> - <string name="found_existing_tor_process">found existing Tor process...</string> - <string name="something_bad_happened">Something bad happened. Check the log</string> - <string name="hidden_service_on">hidden service on:</string> - <string name="unable_to_read_hidden_service_name">unable to read hidden service name</string> - <string name="unable_to_start_tor">Unable to start Tor:</string> - <string name="pref_use_sys_iptables_title">Use Default Iptables</string> - <string name="pref_use_sys_iptables_summary">use the built-in iptables binary instead of the one bundled with Orbot</string> - <string name="error_installing_binares">The Tor binaries were not able to be installed or upgraded.</string> - <string name="pref_use_persistent_notifications">Always keep the icon in toolbar when Orbot is connected</string> - <string name="pref_use_persistent_notifications_title">Always-On Notifications</string> - <string name="notification_using_bridges">Bridges enabled!</string> <string name="default_bridges"/> - <string name="set_locale_title">Set Locale</string> - <string name="set_locale_summary">Choose the locale and language for Orbot</string> - <string name="wizard_locale_title">Choose Language</string> - <string name="wizard_locale_msg">Leave default or switch the current language</string> <string name="powered_by">由 Tor 项目强力驱动</string> - <string name="btn_save_settings">Save Settings</string> </resources>

1 0

[torbrowser/maint-2.3] update the alpha versions makefile with Sebastian's stable TBB changes
by erinn＠torproject.org 13 Jul '12

13 Jul '12

commit 48d75ebe651ec64c14458ac121c8e047a230f86c Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Jul 13 13:49:55 2012 +0200 update the alpha versions makefile with Sebastian's stable TBB changes --- build-scripts/versions-alpha.mk | 274 ++++++++++++++++++++++++++++----------- 1 files changed, 198 insertions(+), 76 deletions(-) diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index dc9ac0f..fe0810d 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -1,30 +1,27 @@ #!/usr/bin/make -RELEASE_VER=2.3.12-alpha - -HTTPSEVERY_VER=3.0development.1 -FIREFOX_VER=11.0 -LIBEVENT_VER=2.0.17-stable -LIBPNG_VER=1.5.7 -NOSCRIPT_VER=2.3.4 -OPENSSL_VER=1.0.1-beta1 -OTR_VER=3.2.0 +RELEASE_VER=2.3.17-alpha + +ZLIB_VER=1.2.7 +OPENSSL_VER=1.0.1c +LIBPNG_VER=1.5.11 +QT_VER=4.8.1 +VIDALIA_VER=0.2.20 +LIBEVENT_VER=2.0.19-stable +TOR_VER=0.2.3.19-rc PIDGIN_VER=2.6.4 -QT_VER=4.7.4 -TOR_VER=0.2.3.12-alpha -TORBUTTON_VER=1.4.5.1 -VIDALIA_VER=0.3.1 -ZLIB_VER=1.2.6 +FIREFOX_VER=13.0.1 +MOZBUILD_VER=1.5.1 +PYMAKE_VER=87d436cd8974 +TORBUTTON_VER=1.4.6 +NOSCRIPT_VER=2.4.6 +HTTPSEVERYWHERE_VER=3.0development.4 +OBFSPROXY_VER=0.1.4 +OTR_VER=3.2.0 ## Extension IDs FF_VENDOR_ID:=\{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} -## Extensions -TORBUTTON=https://www.torproject.org/dist/torbutton/torbutton-$(TORBUTTON_VER).xpi -NOSCRIPT=https://addons.mozilla.org/firefox/downloads/latest/722/addon-722-latest.xpi -BETTERPRIVACY=https://addons.mozilla.org/en-US/firefox/downloads/latest/6623/addon-6623-latest.xpi -HTTPSEVERYWHERE=https://eff.org/files/https-everywhere-$(HTTPSEVERY_VER).xpi - ## File names for the source packages ZLIB_PACKAGE=zlib-$(ZLIB_VER).tar.gz OPENSSL_PACKAGE=openssl-$(OPENSSL_VER).tar.gz @@ -35,93 +32,218 @@ LIBEVENT_PACKAGE=libevent-$(LIBEVENT_VER).tar.gz TOR_PACKAGE=tor-$(TOR_VER).tar.gz PIDGIN_PACKAGE=pidgin-$(PIDGIN_VER).tar.bz2 FIREFOX_PACKAGE=firefox-$(FIREFOX_VER).source.tar.bz2 +MOZBUILD_PACKAGE=MozillaBuildSetup-$(MOZBUILD_VER).exe +PYMAKE_PACKAGE=$(PYMAKE_VER).tar.bz2 +TORBUTTON_PACKAGE=torbutton-$(TORBUTTON_VER).xpi +NOSCRIPT_PACKAGE=addon-722-latest.xpi +HTTPSEVERYWHERE_PACKAGE=https-everywhere-$(HTTPSEVERYWHERE_VER).xpi +OBFSPROXY_PACKAGE=obfsproxy-$(OBFSPROXY_VER).tar.gz ## Location of files for download ZLIB_URL=http://www.zlib.net/$(ZLIB_PACKAGE) OPENSSL_URL=http://www.openssl.org/source/$(OPENSSL_PACKAGE) LIBPNG_URL=ftp://ftp.simplesystems.org/pub/libpng/png/src/$(LIBPNG_PACKAGE) QT_URL=ftp://ftp.qt.nokia.com/qt/source/$(QT_PACKAGE) -VIDALIA_URL=http://www.torproject.org/dist/vidalia/$(VIDALIA_PACKAGE) +VIDALIA_URL=https://archive.torproject.org/tor-package-archive/vidalia/$(VIDALIA_PACKAGE) LIBEVENT_URL=https://github.com/downloads/libevent/libevent/$(LIBEVENT_PACK… -TOR_URL=http://www.torproject.org/dist/$(TOR_PACKAGE) +TOR_URL=https://archive.torproject.org/tor-package-archive/$(TOR_PACKAGE) PIDGIN_URL=http://sourceforge.net/projects/pidgin/files/Pidgin/$(PIDGIN_PAC… -FIREFOX_URL=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(FIREFOX_VER)/source/$(FIREFOX_PACKAGE) - -fetch-source: fetch-zlib fetch-openssl fetch-libpng fetch-qt fetch-vidalia fetch-libevent fetch-tor fetch-firefox clone-qtscript clone-vidalia -fetch-source-osx: fetch-zlib fetch-openssl fetch-vidalia fetch-libevent fetch-tor fetch-firefox - -mkdir $(FETCH_DIR) - -fetch-zlib: - -rm -f $(FETCH_DIR)/$(ZLIB_PACKAGE) +FIREFOX_URL=https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$(FIREFOX_VER)/source/$(FIREFOX_PACKAGE) +MOZBUILD_URL=https://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/$(MOZBUILD_PACKAGE) +PYMAKE_URL=https://hg.mozilla.org/users/bsmedberg_mozilla.com/pymake/archive/$(PYMAKE_PACKAGE) +TORBUTTON_URL=https://archive.torproject.org/tor-package-archive/torbutton/$(TORBUTTON_PACKAGE) +NOSCRIPT_URL=https://addons.mozilla.org/firefox/downloads/latest/722/$(NOSCRIPT_PACKAGE) +HTTPSEVERYWHERE_URL=https://eff.org/files/$(HTTPSEVERYWHERE_PACKAGE) +OBFSPROXY_URL=https://archive.torproject.org/tor-package-archive/obfsproxy/$(OBFSPROXY_PACKAGE) + +# Provide some mappings between lower and upper case, which means we don't need +# to rely on shell shenanigans when we need the upper case version. This is +# necessary because our targets are lowercase, and our variables uppercase. +zlib=ZLIB +libpng=LIBPNG +qt=QT +openssl=OPENSSL +vidalia=VIDALIA +libevent=LIBEVENT +tor=TOR +firefox=FIREFOX +pidgin=PIDGIN +mozbuild=MOZBUILD +pymake=PYMAKE +obfsproxy=OBFSPROXY + +# The locations of the unpacked tarballs +ZLIB_DIR=$(BUILD_DIR)/zlib-$(ZLIB_VER) +LIBPNG_DIR=$(BUILD_DIR)/libpng-$(LIBPNG_VER) +QT_DIR=$(BUILD_DIR)/qt-$(QT_VER) +OPENSSL_DIR=$(BUILD_DIR)/openssl-$(OPENSSL_VER) +VIDALIA_DIR=$(BUILD_DIR)/vidalia-$(VIDALIA_VER) +LIBEVENT_DIR=$(BUILD_DIR)/libevent-$(LIBEVENT_VER) +TOR_DIR=$(BUILD_DIR)/tor-$(TOR_VER) +FIREFOX_DIR=$(BUILD_DIR)/firefox-$(FIREFOX_VER) +MOZBUILD_DIR=$(BUILD_DIR)/mozilla-build +PYMAKE_DIR=$(BUILD_DIR)/pymake-$(PYMAKE_VER) +OBFSPROXY_DIR=$(BUILD_DIR)/obfsproxy-$(OBFSPROXY_VER) + +# Empty targets are written in arch-dependent $(BUILD_DIR). Usual +# VPATH issues documented below should be avoided as the paths of +# these targes are never used in dependents recipes. We only make use +# of targets existence. +# +# http://mad-scientist.net/make/vpath.html +# +STAMP_DIR=$(FETCH_DIR) +vpath build-% $(STAMP_DIR) +vpath patch-% $(STAMP_DIR) +vpath %.stamp $(STAMP_DIR) + +fetch-source: $(FETCH_DIR)/$(ZLIB_PACKAGE) $(FETCH_DIR)/$(LIBPNG_PACKAGE) $(FETCH_DIR)/$(QT_PACKAGE) $(FETCH_DIR)/$(OPENSSL_PACKAGE) $(FETCH_DIR)/$(VIDALIA_PACKAGE) $(FETCH_DIR)/$(LIBEVENT_PACKAGE) $(FETCH_DIR)/$(TOR_PACKAGE) $(FETCH_DIR)/$(FIREFOX_PACKAGE) $(FETCH_DIR)/$(OBFSPROXY_PACKAGE) | $(FETCH_DIR) ; + +source-dance: fetch-source unpack-source ; + +$(FETCH_DIR): + mkdir -p $(FETCH_DIR) + +$(BUILD_DIR): + mkdir -p $(BUILD_DIR) + +# XXX +# If we can, we should definitely add some stuff here to check signatures - +# at least for those packages that support it. + +$(FETCH_DIR)/$(ZLIB_PACKAGE): | $(FETCH_DIR) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(ZLIB_URL) -fetch-libpng: - -rm -f $(FETCH_DIR)/$(LIBPNG_PACKAGE) +$(FETCH_DIR)/$(LIBPNG_PACKAGE): | $(FETCH_DIR) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(LIBPNG_URL) -fetch-qt: - -rm -f $(FETCH_DIR)/$(QT_PACKAGE) +$(FETCH_DIR)/$(QT_PACKAGE): | $(FETCH_DIR) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(QT_URL) -fetch-openssl: - -rm -f $(FETCH_DIR)/$(OPENSSL_PACKAGE) +$(FETCH_DIR)/$(OPENSSL_PACKAGE): | $(FETCH_DIR) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(OPENSSL_URL) -fetch-vidalia: - -rm -f $(FETCH_DIR)/$(VIDALIA_PACKAGE) +$(FETCH_DIR)/$(VIDALIA_PACKAGE): | $(FETCH_DIR) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(VIDALIA_URL) -fetch-libevent: - -rm -f $(FETCH_DIR)/$(LIBEVENT_PACKAGE) +$(FETCH_DIR)/$(LIBEVENT_PACKAGE): | $(FETCH_DIR) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(LIBEVENT_URL) -fetch-tor: - -rm -f $(FETCH_DIR)/$(TOR_PACKAGE) +$(FETCH_DIR)/$(TOR_PACKAGE): | $(FETCH_DIR) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(TOR_URL) -fetch-firefox: - -rm -f $(FETCH_DIR)/$(FIREFOX_PACKAGE) +$(FETCH_DIR)/$(FIREFOX_PACKAGE): | $(FETCH_DIR) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(FIREFOX_URL) -clone-qtscript: - git clone git://gitorious.org/qt-labs/qtscriptgenerator.git $(FETCH_DIR)/qtscriptgenerator +$(FETCH_DIR)/$(MOZBUILD_PACKAGE): | $(FETCH_DIR) + $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(MOZBUILD_URL) + +$(FETCH_DIR)/$(PYMAKE_PACKAGE): | $(FETCH_DIR) + $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(PYMAKE_URL) + +torbutton.xpi: + $(WGET) --no-check-certificate -O $@ $(TORBUTTON_URL) + +noscript.xpi: + $(WGET) --no-check-certificate -O $@ $(NOSCRIPT_URL) + +httpseverywhere.xpi: + $(WGET) --no-check-certificate -O $@ $(HTTPSEVERYWHERE_URL) + +## Generic language pack rule, needs OS-specific MOZILLA_LANGUAGE +langpack_%.xpi: + $(WGET) --no-check-certificate -O $@ $(MOZILLA_LANGUAGE)/$*.xpi + +## English comes as default, so nothing to do here for the language packe +langpack_en-US.xpi: + touch $@ + +$(FETCH_DIR)/$(OBFSPROXY_PACKAGE): | $(FETCH_DIR) + $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(OBFSPROXY_URL) + +unpack-source: $(ZLIB_DIR) $(OPENSSL_DIR) $(LIBPNG_DIR) $(QT_DIR) $(VIDALIA_DIR) $(LIBEVENT_DIR) $(TOR_DIR) $(FIREFOX_DIR) $(OBFSPROXY_DIR) + + +$(ZLIB_DIR): $(FETCH_DIR)/$(ZLIB_PACKAGE) | $(BUILD_DIR) + rm -rf $(ZLIB_DIR) + cd $(FETCH_DIR) && tar -xmf $(ZLIB_PACKAGE) -C $(BUILD_DIR)/ + +$(LIBPNG_DIR): $(FETCH_DIR)/$(LIBPNG_PACKAGE) + rm -rf $(LIBPNG_DIR) + cd $(FETCH_DIR) && tar -xmf $(LIBPNG_PACKAGE) -C $(BUILD_DIR)/ + +$(QT_DIR): $(FETCH_DIR)/$(QT_PACKAGE) | $(BUILD_DIR) + rm -rf $(QT_DIR) $(FETCH_DIR)/qt-everywhere-opensource-src-$(QT_VER) + cd $(FETCH_DIR) && tar -xmf $(QT_PACKAGE) -C $(BUILD_DIR)/ + mv $(BUILD_DIR)/qt-everywhere-opensource-src-$(QT_VER) $(QT_DIR) + +$(OPENSSL_DIR): $(FETCH_DIR)/$(OPENSSL_PACKAGE) ../src/current-patches/openssl/*patch | $(BUILD_DIR) + rm -rf $(OPENSSL_DIR) + cd $(FETCH_DIR) && tar -xmf $(OPENSSL_PACKAGE) -C $(BUILD_DIR)/ + cp ../src/current-patches/openssl/*patch $(OPENSSL_DIR) + cp patch-any-src.sh $(OPENSSL_DIR) + cd $(OPENSSL_DIR) && ./patch-any-src.sh + +$(VIDALIA_DIR): $(FETCH_DIR)/$(VIDALIA_PACKAGE) | $(BUILD_DIR) + rm -rf $(VIDALIA_DIR) + cd $(FETCH_DIR) && tar -xmf $(VIDALIA_PACKAGE) -C $(BUILD_DIR)/ + +$(LIBEVENT_DIR): $(FETCH_DIR)/$(LIBEVENT_PACKAGE) | $(BUILD_DIR) + rm -rf $(LIBEVENT_DIR) + cd $(FETCH_DIR) && tar -xmf $(LIBEVENT_PACKAGE) -C $(BUILD_DIR)/ + +$(TOR_DIR): $(FETCH_DIR)/$(TOR_PACKAGE) | $(BUILD_DIR) + rm -rf $(TOR_DIR) + cd $(FETCH_DIR) && tar -xmf $(TOR_PACKAGE) -C $(BUILD_DIR)/ + +$(FIREFOX_DIR): $(FETCH_DIR)/$(FIREFOX_PACKAGE) ../src/current-patches/firefox/alpha/* | $(BUILD_DIR) + rm -rf $(FIREFOX_DIR) $(FETCH_DIR)/mozilla-release + cd $(FETCH_DIR) && tar -xmf $(FIREFOX_PACKAGE) -C $(BUILD_DIR)/ + mv $(BUILD_DIR)/mozilla-release $(FIREFOX_DIR) + cp ../src/current-patches/firefox/alpha/* $(FIREFOX_DIR) + cp patch-any-src.sh $(FIREFOX_DIR) + cd $(FIREFOX_DIR) && ./patch-any-src.sh + +$(MOZBUILD_DIR): $(FETCH_DIR)/$(MOZBUILD_PACKAGE) ../src/current-patches/mozilla-build/start-msvc.patch ../src/current-patches/mozilla-build/guess-msvc-x64.bat patch-mozilla-build.sh | $(BUILD_DIR) + rm -rf $(MOZBUILD_DIR) /c/mozilla-build + cmd.exe //c "$(PWD)/install-mozbuild.bat" "$(abspath $(FETCH_DIR)/$(MOZBUILD_PACKAGE))" "$(abspath $(MOZBUILD_DIR))" +# We have to patch mozillabuild + cp ../src/current-patches/mozilla-build/start-msvc.patch $(MOZBUILD_DIR) + cp ../src/current-patches/mozilla-build/guess-msvc-x64.bat $(MOZBUILD_DIR) + cp patch-mozilla-build.sh $(MOZBUILD_DIR) + cd $(MOZBUILD_DIR) && ./patch-mozilla-build.sh $(MSVC_VER) + +$(PYMAKE_DIR): $(FETCH_DIR)/$(PYMAKE_PACKAGE) | $(BUILD_DIR) + rm -rf $(PYMAKE_DIR) + cd $(FETCH_DIR) && tar -xmf $(PYMAKE_PACKAGE) -C $(BUILD_DIR)/ + +$(OBFSPROXY_DIR): $(FETCH_DIR)/$(OBFSPROXY_PACKAGE) | $(BUILD_DIR) + rm -rf $(OBFSPROXY_DIR) + cd $(FETCH_DIR) && tar -xmf $(OBFSPROXY_PACKAGE) -C $(BUILD_DIR)/ -clone-vidalia: - -rm -rf $(FETCH_DIR)/vidalia-$(VIDALIA_VER) - git clone https://git.torproject.org/vidalia.git $(FETCH_DIR)/vidalia-$(VIDALIA_VER) - cd $(FETCH_DIR)/vidalia-$(VIDALIA_VER) && git fetch origin - cd $(FETCH_DIR)/vidalia-$(VIDALIA_VER) && git checkout alpha -clone-vidalia-plugins: - -rm -rf $(FETCH_DIR)/vidalia-plugins - git clone https://git.torproject.org/vidalia-plugins.git $(FETCH_DIR)/vidalia-plugins +# Common build functionality. Modified by variables set in OS-specific makefiles +build-tor: build-zlib build-openssl build-libevent $(TOR_DIR) + cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) --enable-gcc-warnings-advisory --prefix=$(BUILT_DIR) --disable-gcc-hardening 2>&1 | tee configuring.log + cd $(TOR_DIR) && make -j $(NUM_CORES) 2>&1 | tee build.log + cd $(TOR_DIR) && make install + touch $(STAMP_DIR)/build-tor -unpack-source: unpack-zlib unpack-openssl unpack-libpng unpack-qt unpack-vidalia unpack-libevent unpack-tor unpack-firefox +clean-fetch-%: + rm -rf $(FETCH_DIR)/$($($*)_PACKAGE) -unpack-zlib: - -rm -rf $(FETCH_DIR)/zlib-$(ZLIB_VER) - cd $(FETCH_DIR) && tar -xvzf $(ZLIB_PACKAGE) +clean-fetch: clean-fetch-zlib clean-fetch-libpng clean-fetch-qt clean-fetch-openssl clean-fetch-vidalia clean-fetch-libevent clean-fetch-tor clean-fetch-firefox clean-fetch-obfsproxy -unpack-libpng: - -rm -rf $(FETCH_DIR)/libpng-$(LIBPNG_VER) - cd $(FETCH_DIR) && tar -xvjf $(LIBPNG_PACKAGE) +clean-unpack-%: + rm -rf $($($*)_DIR) -unpack-openssl: - -rm -rf $(FETCH_DIR)/openssl-$(OPENSSL_VER) - cd $(FETCH_DIR) && tar -xvzf $(OPENSSL_PACKAGE) +clean-unpack: clean-unpack-zlib clean-unpack-libpng clean-unpack-qt clean-unpack-openssl clean-unpack-vidalia clean-unpack-libevent clean-unpack-tor clean-unpack-firefox clean-unpack-obfsproxy -unpack-vidalia: - -rm -rf $(FETCH_DIR)/vidalia-$(VIDALIA_VER) - cd $(FETCH_DIR) && tar -xvzf $(VIDALIA_PACKAGE) +clean-build-%: + rm -rf $($($*)_DIR) + rm -rf build-$* -unpack-libevent: - -rm -rf $(FETCH_DIR)/libevent-$(LIBEVENT_VER) - cd $(FETCH_DIR) && tar -xvzf $(LIBEVENT_PACKAGE) +clean-build: clean-build-zlib clean-build-libpng clean-build-qt clean-build-openssl clean-build-vidalia clean-build-libevent clean-build-tor clean-build-firefox clean-build-obfsproxy -unpack-tor: - -rm -rf $(FETCH_DIR)/tor-$(TOR-VER) - cd $(FETCH_DIR) && tar -xvzf $(TOR_PACKAGE) +.PHONY: clean-fetch clean-unpack clean-build -unpack-firefox: - -rm -rf $(FETCH_DIR)/mozilla-release - cd $(FETCH_DIR) && tar -xvjf $(FIREFOX_PACKAGE)

1 0

[torbrowser/maint-2.3] update windows alpha makefile with Sebastian's stable TBB changes
by erinn＠torproject.org 13 Jul '12

13 Jul '12

commit 78c122cefc948c255a7e20218085af2e8d1bc1f9 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Jul 13 13:51:41 2012 +0200 update windows alpha makefile with Sebastian's stable TBB changes --- build-scripts/windows-alpha.mk | 308 ++++++++++++++------------------------- 1 files changed, 111 insertions(+), 197 deletions(-) diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index 258e743..c12230c 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -1,154 +1,125 @@ ### -### Makefile for building Tor USB bundle on Mac OS X +### Makefile for building Tor USB bundle on Windows ### ### Copyright 2007 Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/> ### Copyright 2009, 2010 Jacob Appelbaum <jacob(a)appelbaum.net> ### Copyright 2010 Erinn Clark <erinn(a)torproject.org> ### -### You want to do the following currently supported activities: -# This downloads and compiles everything -### make -f windows-alpha.mk build-all-binaries -# This makes a generic bundle -### make -f windows-alpha.mk generic-bundle -# This makes the English bundle -### make -f windows-alpha.mk bundle_en-US -# This makes the German bundle -### make -f windows-alpha.mk bundle_de -# This makes the German compressed bundle -### make -f windows-alpha.mk compressed-bundle_de -# It's possible you may also want to do: -### make -f windows-alpha.mk build-all-binaries -### make -f windows-alpha.mk all-compressed-bundles -### ... -### Look in tbbwin-alpha-dist/ for your files. -### ### See LICENSE for licensing information ### + ##################### ### Configuration ### ##################### -## Include versions -include $(PWD)/versions-alpha.mk -BUILD_NUM=2 +BUILD_NUM=1 PLATFORM=Windows ## Location of required libraries -MING=/c/MinGW/bin +MING=/mingw/bin QT_LIB=/c/Qt/$(QT_VER)/bin OPENSSL_LIB=$(COMPILED_BINS) -WIX_LIB="/c/Program Files (x86)/Windows Installer XML v3.5/bin" +WIX_LIB="$(MOZBUILD_DIR)/wix-351728" ## Location of bundle components -VIDALIA=$(FETCH_DIR)/vidalia-$(VIDALIA_VER) -TOR=$(FETCH_DIR)/tor-$(TOR_VER) -FIREFOX=$(FETCH_DIR)/FirefoxPortable-$(FIREFOX_VER) -PIDGIN=$(FETCH_DIR)/PidginPortable-$(PIDGIN_VER) +VIDALIA=$(BUILD_DIR)/vidalia-$(VIDALIA_VER) +TOR=$(BUILD_DIR)/tor-$(TOR_VER) +FIREFOX=$(BUILD_DIR)/FirefoxPortable-$(FIREFOX_VER) +PIDGIN=$(BUILD_DIR)/PidginPortable-$(PIDGIN_VER) +VIDALIA_PLUGINS=$(BUILD_DIR)/vidalia-plugins ## Location of utility applications PWD:=$(shell pwd) -PYTHON=/c/Python26/python.exe -SEVENZIP="/c/Program Files/7-Zip/7z.exe" -PYGET=$(PYTHON) $(PWD)/pyget.py +PYTHON=$(MOZBUILD_DIR)/python/python.exe +PYMAKE=$(PYMAKE_DIR)/make.py +SEVENZIP="$(MOZBUILD_DIR)/7zip/7z.exe" WGET=wget VIRUSSCAN=$(PYTHON) $(PWD)/virus-scan.py -WINRAR="/c/Program Files (x86)/WinRAR/WinRAR.exe" CC=gcc MSVC_VER=9 -FIREFOX_DIR=/c/build/mozilla-build/mozilla-release -MOZ_BUILD=/c/build/mozilla-build + +## Build machine specific settings +# Number of cpu cores used to build in parallel +NUM_CORES=2 ## Location of directory for source unpacking -FETCH_DIR=$(PWD)/build-alpha-windows +FETCH_DIR=$(PWD)/build-alpha +## Location of directory for source unpacking/building +## This must be different from FETCH_DIR +BUILD_DIR=$(FETCH_DIR)/build ## Location of directory for prefix/destdir/compiles/etc -BUILT_DIR=$(FETCH_DIR)/built +BUILT_DIR=$(BUILD_DIR)/built TBB_FINAL=$(BUILT_DIR)/tbbwin-alpha-dist -source-dance: fetch-source unpack-source - echo "We're ready for building now." - -ZLIB_DIR=$(FETCH_DIR)/zlib-$(ZLIB_VER) -build-zlib: - cp ../src/current-patches/zlib/* $(ZLIB_DIR) - cp patch-any-src.sh $(ZLIB_DIR) - cd $(ZLIB_DIR) && ./patch-any-src.sh - cd $(ZLIB_DIR) && sed -i -e "s%prefix = /usr/local%prefix = ${BUILT_DIR}%" win32/Makefile.gcc - cd $(ZLIB_DIR) && make -f win32/Makefile.gcc - cd $(ZLIB_DIR) && make -f win32/Makefile.gcc install - -OPENSSL_DIR=$(FETCH_DIR)/openssl-$(OPENSSL_VER) -OPENSSL_OPTS=-no-idea -no-rc5 -no-md2 shared zlib --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -L$(BUILT_DIR)/lib -Wl,--nxcompat -Wl,--dynamicbase -I$(BUILT_DIR)/include -build-openssl: +## Include versions (must happen after variable definitions above +include $(PWD)/versions-alpha.mk + +ZLIB_OPTS=prefix="$(BUILT_DIR)" BINARY_PATH="$(BUILT_DIR)/bin" INCLUDE_PATH="$(BUILT_DIR)/include" LIBRARY_PATH="$(BUILT_DIR)/lib" +build-zlib: $(ZLIB_DIR) + cd $(ZLIB_DIR) && LDFLAGS="-Wl,--nxcompat -Wl,--dynamicbase" make -f win32/Makefile.gcc -j $(NUM_CORES) + cd $(ZLIB_DIR) && $(ZLIB_OPTS) make -f win32/Makefile.gcc install + touch $(STAMP_DIR)/build-zlib + +OPENSSL_OPTS=-no-idea -no-rc5 -no-md2 no-shared zlib --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -L$(BUILT_DIR)/lib -Wl,--nxcompat -Wl,--dynamicbase -I$(BUILT_DIR)/include +build-openssl: build-zlib $(OPENSSL_DIR) cd $(OPENSSL_DIR) && ./config $(OPENSSL_OPTS) cd $(OPENSSL_DIR) && make depend cd $(OPENSSL_DIR) && make - cd $(OPENSSL_DIR) && make install - -VIDALIA_DIR=$(FETCH_DIR)/vidalia-$(VIDALIA_VER) -VIDALIA_OPTS=-DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++ -Wl,--nxcompat -Wl,--dynamicbase" -DWIN2K=1 -DQT_MAKE_EXECUTABLE=/c/Qt/$(QT_VER)/bin/qmake -DCMAKE_BUILD_TYPE=minsizerel -DMINGW_BINARY_DIR=$(MING) -DOPENSSL_BINARY_DIR=$(OPENSSL) -DWIX_BINARY_DIR=$(WIX_LIB) -DTOR_SOURCE_DIR=$(TOR_DIR) -DSCRIPT_DIR=$(QTSCRIPT_DIR)/plugins/script -build-vidalia: + cd $(OPENSSL_DIR) && make install_sw + touch $(STAMP_DIR)/build-openssl + +QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-qt3support -fast -release -nomake demos -nomake examples +QT_OPTS=$(QT_BUILD_PREFS) -prefix $(BUILT_DIR) -I $(BUILT_DIR)/include -I $(BUILT_DIR)/include/openssl/ -L$(BUILT_DIR)/lib +build-qt: build-zlib build-openssl $(QT_DIR) + cd $(QT_DIR) && ./configure $(QT_OPTS) + cd $(QT_DIR) && make -j $(NUM_CORES) + cd $(QT_DIR) && make install + touch $(STAMP_DIR)/build-qt + +VIDALIA_OPTS=-DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++ -Wl,--nxcompat -Wl,--dynamicbase" -DWIN2K=1 -DQT_QMAKE_EXECUTABLE=$(QT_LIB)/qmake -DCMAKE_BUILD_TYPE=minsizerel -DMINGW_BINARY_DIR=$(MING) -DWIX_BINARY_DIR=$(WIX_LIB) -DSCRIPT_DIR=$(QTSCRIPT_DIR)/plugins/script -DTOR_SOURCE_DIR=$(TOR_DIR)/src/or +# XXX Once we build qt on windows, we'll want to add build-qt here +build-vidalia: PATH+=:$(QT_LIB) +build-vidalia: $(VIDALIA_DIR) $(WIX_LIB) -mkdir $(VIDALIA_DIR)/build cd $(VIDALIA_DIR)/build && cmake -G "MSYS Makefiles" $(VIDALIA_OPTS) .. - cd $(VIDALIA_DIR)/build && make - -QTSCRIPT_DIR=$(FETCH_DIR)/qtscriptgenerator -QTSCRIPT_OPTS= -build-qtscript: - cd $(QTSCRIPT_DIR)/generator && qmake - cd $(QTSCRIPT_DIR)/generator && make -j4 - cd $(QTSCRIPT_DIR)/generator && ./generator --include-paths=/c/Qt/2010.04/qt - cp ../src/current-patches/qt/000* $(QTSCRIPT_DIR)/qtbindings/qtscript_uitools - cp patch-any-src.sh $(QTSCRIPT_DIR)/qtbindings/qtscript_uitools - cd $(QTSCRIPT_DIR)/qtbindings/qtscript_uitools && ./patch-any-src.sh - cd $(QTSCRIPT_DIR)/generator && qmake -spec win32-g++ - cd $(QTSCRIPT_DIR)/generator && make -j4 - cd $(QTSCRIPT_DIR)/qtbindings && qmake -recursive CONFIG+="release" - -build-qtfoo: - cd $(QTSCRIPT_DIR)/qtbindings && for i in $(ls -d qtscript_*); do make -C $i release; done - -LIBEVENT_DIR=$(FETCH_DIR)/libevent-$(LIBEVENT_VER) -LIBEVENT_CFLAGS="-I$(BUILT_DIR)/include -O -g" + cd $(VIDALIA_DIR)/build && make -j $(NUM_CORES) + touch $(STAMP_DIR)/build-vidalia + +QTSCRIPT_DIR=$(BUILD_DIR)/qtscriptgenerator + +LIBEVENT_CFLAGS="-I$(BUILT_DIR)/include" LIBEVENT_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin -Wl,--nxcompat -Wl,--dynamicbase" LIBEVENT_OPTS=--prefix=$(BUILT_DIR) --enable-static --disable-shared --disable-dependency-tracking -build-libevent: +build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) cd $(LIBEVENT_DIR) && CFLAGS=$(LIBEVENT_CFLAGS) LDFLAGS=$(LIBEVENT_LDFLAGS) ./configure $(LIBEVENT_OPTS) - cd $(LIBEVENT_DIR) && make -j2 + cd $(LIBEVENT_DIR) && make -j $(NUM_CORES) cd $(LIBEVENT_DIR) && make install + touch $(STAMP_DIR)/build-libevent -TOR_DIR=$(FETCH_DIR)/tor-$(TOR_VER) -TOR_CFLAGS="-O -g -I$(BUILT_DIR)/include" +TOR_CFLAGS="-I$(BUILT_DIR)/include" TOR_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin" -TOR_OPTS=--enable-gcc-warnings --enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) +TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --disable-asciidoc build-tor:PATH+=:$(BUILT_DIR)/bin -build-tor: - cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) - cd $(TOR_DIR) && make -# cd $(TOR_DIR) && make install - -patch-mozbuild: - cp ../src/current-patches/mozilla-build/start-msvc.patch $(MOZ_BUILD) - cp ../src/current-patches/mozilla-build/guess-msvc-x64.bat $(MOZ_BUILD) - cp patch-mozilla-build.sh $(MOZ_BUILD) - cd $(MOZ_BUILD) && ./patch-mozilla-build.sh $(MSVC_VER) - cp $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR)/mozconfig - -patch-firefox-source: - cp ../src/current-patches/firefox/* $(FIREFOX_DIR) - cp patch-any-src.sh $(FIREFOX_DIR) - cd $(FIREFOX_DIR) && ./patch-any-src.sh - -build-firefox: - cd $(MOZ_BUILD) && cmd.exe /c "start-msvc$(MSVC_VER).bat $(FIREFOX_DIR)" + +build-obfsproxy: + cd $(OBFSPROXY_DIR) && libevent_CFLAGS=-I$(BUILT_DIR)/include libevent_LIBS="-L$(BUILT_DIR)/lib -levent" libcrypto_CFLAGS=-I$(BUILT_DIR)/include/openssl libcrypto_LIBS="-L$(BUILT_DIR)/lib -lssl -lcrypto" ./configure --prefix=$(BUILT_DIR) + cd $(OBFSPROXY_DIR) && make + cd $(OBFSPROXY_DIR) && make install + +build-firefox: $(FIREFOX_DIR) config/dot_mozconfig $(MOZBUILD_DIR) $(MOZBUILD_DIR)/start-msvc$(MSVC_VER).bat | $(PYTHON) $(PYMAKE_DIR) + cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig + cp branding/* $(FIREFOX_DIR)/browser/branding/official + cd $(MOZBUILD_DIR) && cmd.exe /c "start-msvc$(MSVC_VER).bat $(FIREFOX_DIR) $(PYTHON) $(PYMAKE)" + touch $(STAMP_DIR)/build-firefox copy-firefox: -rm -rf $(FIREFOX) -mkdir -p $(FIREFOX) cp -r config/firefox-portable/* $(FIREFOX) cp "/c/Program Files (x86)/Microsoft Visual Studio 9.0/VC/redist/x86/Microsoft.VC90.CRT/"msvc*90.dll $(FIREFOX)/App/Firefox - cp -r $(FIREFOX_DIR)/obj-*/dist/bin/* $(FIREFOX)/App/Firefox + cp -r $(FIREFOX_DIR)/obj-*/dist/firefox/* $(FIREFOX)/App/Firefox build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor build-firefox copy-firefox echo "If we're here, we've done something right." @@ -165,12 +136,6 @@ ZLIB=$(COMPILED_LIBS) LIBEVENT=$(COMPILED_LIBS) -## Size of split archive volumes for WinRAR -SPLITSIZE=1440k - -## Location of config files -CONFIG_SRC=config - ## Destination for the generic bundle DEST="Generic Bundle" @@ -197,7 +162,7 @@ endif DEFAULT_EXTENSIONS=torbutton.xpi ## Where to download Mozilla language packs -MOZILLA_LANGUAGE=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(FIREFOX_VER)/win32/xpi +MOZILLA_LANGUAGE=https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$(FIREFOX_VER)/win32/xpi ## Put more extensions here EXTENSIONS_DIR=extensions @@ -221,7 +186,7 @@ all-bundles-both: USE_PIDGIN=0 make -f windows-alpha.mk all-bundles make -f windows-alpha.mk clean -all-bundles: all-compressed-bundles all-split-bundles +all-bundles: all-compressed-bundles all-compressed-bundles: compressed-bundle_ar \ compressed-bundle_de \ @@ -229,25 +194,14 @@ all-compressed-bundles: compressed-bundle_ar \ compressed-bundle_es-ES \ compressed-bundle_fa \ compressed-bundle_fr \ + compressed-bundle_it \ + compressed-bundle_ko \ compressed-bundle_nl \ compressed-bundle_pl \ compressed-bundle_pt-PT \ compressed-bundle_ru \ - compressed-bundle_zh-CN \ - compressed-bundle_it - -all-split-bundles: split-bundle_ar \ - split-bundle_de \ - split-bundle_en-US \ - split-bundle_es-ES \ - split-bundle_fa \ - split-bundle_fr \ - split-bundle_nl \ - split-bundle_pl \ - split-bundle_pt-PT \ - split-bundle_ru \ - split-bundle_zh-CN \ - split-bundle_it + compressed-bundle_vi \ + compressed-bundle_zh-CN ## ## Cleanup @@ -258,22 +212,21 @@ clean: rm -f *~ rm -fr *.xpi *.jar *.zip rm -fr $(NAME)_* + rm -f $(STAMP_DIR)/*.stamp cd ../src/RelativeLink/ && $(MAKE) clean ## Also remove the output files reallyclean: clean rm -fr $(IM_COMPRESSED_BASENAME)*_*.exe rm -fr $(IM_COMPRESSED_BASENAME)*_*.rar - rm -fr $(IM_COMPRESSED_BASENAME)*_*_split rm -fr $(DEFAULT_COMPRESSED_BASENAME)*_*.exe rm -fr $(DEFAULT_COMPRESSED_BASENAME)*_*.rar - rm -fr $(DEFAULT_COMPRESSED_BASENAME)*_*_split ## ## Scan .exe files against VirusTotal to check for false positives ## -virus-scan: +virus-scan: | $(PYTHON) $(VIRUSSCAN) $(VIDALIA)/build/src/vidalia/vidalia.exe $(VIRUSSCAN) $(TOR)/src/or/tor.exe @@ -285,7 +238,7 @@ virus-scan: generic-bundle.stamp: make -f windows-alpha.mk generic-bundle generic-bundle: directory-structure install-binaries install-docs install-firefoxportable install-pidginportable configure-apps launcher - touch generic-bundle.stamp + touch $(STAMP_DIR)/generic-bundle.stamp APPDIR=$(DEST)/App DOCSDIR=$(DEST)/Docs @@ -302,13 +255,18 @@ directory-structure: ## Filenames extracted using Dependency Walker <http://www.dependencywalker.com/> install-binaries: cp $(MING)/mingwm10.dll $(APPDIR) - cp $(MING)/libgnurx-0.dll $(APPDIR) - cp $(QT_LIB)/QtScript4.dll $(QT_LIB)/QtCore4.dll $(QT_LIB)/QtGui4.dll $(QT_LIB)/QtNetwork4.dll $(QT_LIB)/QtXml4.dll $(QT_LIB)/libgcc_s_dw2-1.dll $(APPDIR) + cp $(QT_LIB)/QtCore4.dll $(QT_LIB)/QtGui4.dll $(QT_LIB)/QtNetwork4.dll $(QT_LIB)/QtXml4.dll $(QT_LIB)/libgcc_s_dw2-1.dll $(APPDIR) cp $(OPENSSL_LIB)/ssleay32.dll $(APPDIR) cp $(OPENSSL_LIB)/libeay32.dll $(APPDIR) cp $(VIDALIA)/build/src/vidalia/vidalia.exe $(APPDIR) cp $(TOR)/src/or/tor.exe $(APPDIR) +install-plugins: + mkdir -p $(DATADIR)/Vidalia/plugins + cp -r $(VIDALIA_PLUGINS)/tbb $(DATADIR)/Vidalia/plugins + mkdir -p $(APPDIR)/script + cp $(QTSCRIPT_DIR)/plugins/script/*.dll $(APPDIR)/script + ## Fixup ## Collect up license files install-docs: @@ -337,37 +295,34 @@ endif configure-apps: mkdir -p $(DEST)/FirefoxPortable/Data/profile + mkdir -p $(DEST)/FirefoxPortable/App/DefaultData/profile ## Configure Firefox preferences - cp $(CONFIG_SRC)/windows-4.0.js $(DEST)/FirefoxPortable/App/DefaultData/profile/prefs.js - cp $(CONFIG_SRC)/windows-4.0.js $(DEST)/FirefoxPortable/Data/profile/prefs.js - cp $(CONFIG_SRC)/bookmarks.html $(DEST)/FirefoxPortable/App/DefaultData/profile/ + cp config/prefs.js $(DEST)/FirefoxPortable/App/DefaultData/profile/prefs.js + cp config/prefs.js $(DEST)/FirefoxPortable/Data/profile/prefs.js + cp config/bookmarks.html $(DEST)/FirefoxPortable/App/DefaultData/profile/ ## Set up alternate launcher mv $(DEST)/FirefoxPortable/App/Firefox/firefox.exe $(DEST)/FirefoxPortable/App/Firefox/tbb-firefox.exe ## Configure FirefoxPortable - cp $(CONFIG_SRC)/FirefoxPortable.ini $(DEST)/FirefoxPortable - cp $(CONFIG_SRC)/FirefoxPortableSettings.ini $(DEST)/FirefoxPortable/Data/settings + cp config/FirefoxPortable.ini $(DEST)/FirefoxPortable + cp config/FirefoxPortableSettings.ini $(DEST)/FirefoxPortable/Data/settings ## Configure PidginPortable ifeq ($(USE_PIDGIN),1) - cp $(CONFIG_SRC)/PidginPortable.ini $(DEST)/PidginPortable + cp config/PidginPortable.ini $(DEST)/PidginPortable mkdir -p $(DEST)/PidginPortable/Data/settings/.purple - cp $(CONFIG_SRC)/prefs.xml $(DEST)/PidginPortable/Data/settings/.purple - cp $(CONFIG_SRC)/PidginPortableSettings.ini $(DEST)/PidginPortable/Data/settings + cp config/prefs.xml $(DEST)/PidginPortable/Data/settings/.purple + cp config/PidginPortableSettings.ini $(DEST)/PidginPortable/Data/settings endif ## Configure Vidalia - mkdir -p $(DEST)/Data/Vidalia/plugins - cp -r $(FETCH_DIR)/vidalia-plugins/tbb $(DEST)/Data/Vidalia/plugins - mkdir -p $(DEST)/App/script - cp $(FETCH_DIR)/qtscriptgenerator/plugins/script/*dll $(DEST)/App/script ifeq ($(USE_PIDGIN),1) - cp $(CONFIG_SRC)/alpha/vidalia.conf.ff+pidgin $(DEST)/Data/Vidalia/vidalia.conf + cp config/alpha/vidalia.conf.ff+pidgin $(DEST)/Data/Vidalia/vidalia.conf else - cp $(CONFIG_SRC)/alpha/vidalia.conf.ff $(DEST)/Data/Vidalia/vidalia.conf + cp config/alpha/vidalia.conf.ff $(DEST)/Data/Vidalia/vidalia.conf endif ## Configure Tor - cp $(CONFIG_SRC)/alpha/torrc $(DEST)/Data/Tor + cp config/alpha/torrc $(DEST)/Data/Tor/torrc cp $(TOR)/src/config/geoip $(DEST)/Data/Tor launcher: @@ -375,34 +330,6 @@ launcher: cp ../src/RelativeLink/StartTorBrowserBundle.exe $(DEST)/"Start Tor Browser.exe" ## -## How to create required extensions -## - -## Torbutton development version -torbutton.xpi: - $(PYGET) -O $@ $(TORBUTTON) - -## English comes as default -langpack_en-US.xpi: - touch $@ - -## BetterPrivacy -betterprivacy.xpi: - $(PYGET) -O $@ $(BETTERPRIVACY) - -## NoScript development version -noscript.xpi: - $(PYGET) -O $@ $(NOSCRIPT) - -## HTTPS Everywhere -#httpseverywhere.xpi: -# $(PYGET) -O $@ $(HTTPSEVERYWHERE) - -## Generic language pack rule -langpack_%.xpi: - $(PYGET) -O $@ $(MOZILLA_LANGUAGE)/$*.xpi - -## ## Customize the bundle ## @@ -410,25 +337,18 @@ bundle_%: LANGCODE=$* make -f windows-alpha.mk bundle-localized compressed-bundle_%: LANGCODE=$* make -f windows-alpha.mk compressed-bundle-localized -split-bundle_%: - LANGCODE=$* make -f windows-alpha.mk split-bundle-localized bundle-localized_%.stamp: make -f windows-alpha.mk copy-files_$* install-extensions install-torbutton install-httpseverywhere install-noscript \ patch-vidalia-language patch-firefox-language patch-pidgin-language write-tbb-version - touch bundle-localized_$*.stamp + touch $(STAMP_DIR)/bundle-localized_$*.stamp bundle-localized: bundle-localized_$(LANGCODE).stamp -compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp +compressed-bundle-localized: $(SEVENZIP) bundle-localized_$(LANGCODE).stamp rm -f $(COMPRESSED_NAME)_$(LANGCODE).exe cd $(NAME)_$(LANGCODE); $(SEVENZIP) a -mx9 -sfx7z.sfx ../$(COMPRESSED_NAME)_$(LANGCODE).exe $(NAME) -split-bundle-localized: bundle-localized_$(LANGCODE).stamp - rm -fr $(COMPRESSED_NAME)_$(LANGCODE)_split; mkdir $(COMPRESSED_NAME)_$(LANGCODE)_split - cd $(NAME)_$(LANGCODE); $(WINRAR) a -r -s -ibck -sfx -v$(SPLITSIZE) \ - ../$(COMPRESSED_NAME)_$(LANGCODE)_split/$(COMPRESSED_NAME)_$(LANGCODE)_split.exe $(NAME) - copy-files_%: generic-bundle.stamp rm -fr $(NAME)_$* mkdir $(NAME)_$* @@ -437,13 +357,6 @@ copy-files_%: generic-bundle.stamp BUNDLE=$(NAME)_$(LANGCODE)/$(NAME) DUMMYPROFILE=$(BUNDLE)/FirefoxPortable/App/DummyProfile -fix-install-rdf: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) -ifneq ($(LANGCODE), en-US) - rm -fr xx - mkdir xx - (cd xx && unzip ../langpack_$(LANGCODE).xpi && sed -i -e "s/em:maxVersion>6.0.1/em:maxVersion>6.0.*/" install.rdf && zip -r ../langpack_$(LANGCODE).xpi .) -endif - install-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) ## Make a dummy profile to stop Firefox creating some large files cp -r $(BUNDLE)/FirefoxPortable/App/DefaultData $(DUMMYPROFILE) @@ -453,22 +366,17 @@ ifneq ($(LANGCODE), en-US) endif rm -fr $(DUMMYPROFILE) -install-torbutton: torbutton.xpi +install-torbutton: $(SEVENZIP) torbutton.xpi mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca} cp torbutton.xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}/torbutton.zip (cd $(BUNDLE)/FirefoxPortable/Data/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca} && $(SEVENZIP) x *.zip && rm *.zip) -install-httpseverywhere: httpseverywhere.xpi +install-httpseverywhere: $(SEVENZIP) httpseverywhere.xpi mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions/https-everywhere(a)eff.org cp httpseverywhere.xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/https-everywhere(a)eff.org/httpseverywhere.zip (cd $(BUNDLE)/FirefoxPortable/Data/profile/extensions/https-everywhere(a)eff.org && $(SEVENZIP) x *.zip && rm *.zip) -install-betterprivacy: betterprivacy.xpi - mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\} - cp betterprivacy.xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\}/betterprivacy.zip - (cd $(BUNDLE)/FirefoxPortable/Data/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\} && $(SEVENZIP) x *.zip && rm *.zip) - -install-noscript: noscript.xpi +install-noscript: $(SEVENZIP) noscript.xpi mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions/\{73a6fe31-595d-460b-a920-fcc0f8843232\} cp noscript.xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/\{73a6fe31-595d-460b-a920-fcc0f8843232\}/noscript.zip (cd $(BUNDLE)/FirefoxPortable/Data/profile/extensions/\{73a6fe31-595d-460b-a920-fcc0f8843232\} && $(SEVENZIP) x *.zip && rm *.zip) @@ -494,6 +402,8 @@ patch-firefox-language: ./patch-firefox-language.sh $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js $(LANGCODE) sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js + chmod u+w $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js + chmod u+w $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js ### ### Utilities @@ -501,7 +411,7 @@ patch-firefox-language: ## Copy Firefox preferences from a run of FirefoxPortable to be the default apply-prefs: - cp $(DEST)/FirefoxPortable/Data/profile/prefs.js $(CONFIG_SRC) + cp $(DEST)/FirefoxPortable/Data/profile/prefs.js config print-version: @echo $(RELEASE_VER)-$(BUILD_NUM) @@ -520,3 +430,7 @@ SRCDEST=/tmp SRCDESTPATH=$(SRCDEST)/$(SRCNAME) srcdist: cd .. && git archive --format=tar --prefix=tor-browser-$(VERSION)-src/ torbrowser-$(VERSION) | gzip -9 > $(PWD)/tor-browser-$(VERSION)-src.tar.gz + +$(PYTHON): | $(MOZBUILD_DIR) ; +$(SEVENZIP): | $(MOZBUILD_DIR) ; +$(WIX_LIB): | $(MOZBUILD_DIR) ;

1 0

[torbrowser/master] update the alpha versions makefile with Sebastian's stable TBB changes
by erinn＠torproject.org 13 Jul '12

13 Jul '12

commit 48d75ebe651ec64c14458ac121c8e047a230f86c Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Jul 13 13:49:55 2012 +0200 update the alpha versions makefile with Sebastian's stable TBB changes --- build-scripts/versions-alpha.mk | 274 ++++++++++++++++++++++++++++----------- 1 files changed, 198 insertions(+), 76 deletions(-) diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index dc9ac0f..fe0810d 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -1,30 +1,27 @@ #!/usr/bin/make -RELEASE_VER=2.3.12-alpha - -HTTPSEVERY_VER=3.0development.1 -FIREFOX_VER=11.0 -LIBEVENT_VER=2.0.17-stable -LIBPNG_VER=1.5.7 -NOSCRIPT_VER=2.3.4 -OPENSSL_VER=1.0.1-beta1 -OTR_VER=3.2.0 +RELEASE_VER=2.3.17-alpha + +ZLIB_VER=1.2.7 +OPENSSL_VER=1.0.1c +LIBPNG_VER=1.5.11 +QT_VER=4.8.1 +VIDALIA_VER=0.2.20 +LIBEVENT_VER=2.0.19-stable +TOR_VER=0.2.3.19-rc PIDGIN_VER=2.6.4 -QT_VER=4.7.4 -TOR_VER=0.2.3.12-alpha -TORBUTTON_VER=1.4.5.1 -VIDALIA_VER=0.3.1 -ZLIB_VER=1.2.6 +FIREFOX_VER=13.0.1 +MOZBUILD_VER=1.5.1 +PYMAKE_VER=87d436cd8974 +TORBUTTON_VER=1.4.6 +NOSCRIPT_VER=2.4.6 +HTTPSEVERYWHERE_VER=3.0development.4 +OBFSPROXY_VER=0.1.4 +OTR_VER=3.2.0 ## Extension IDs FF_VENDOR_ID:=\{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} -## Extensions -TORBUTTON=https://www.torproject.org/dist/torbutton/torbutton-$(TORBUTTON_VER).xpi -NOSCRIPT=https://addons.mozilla.org/firefox/downloads/latest/722/addon-722-latest.xpi -BETTERPRIVACY=https://addons.mozilla.org/en-US/firefox/downloads/latest/6623/addon-6623-latest.xpi -HTTPSEVERYWHERE=https://eff.org/files/https-everywhere-$(HTTPSEVERY_VER).xpi - ## File names for the source packages ZLIB_PACKAGE=zlib-$(ZLIB_VER).tar.gz OPENSSL_PACKAGE=openssl-$(OPENSSL_VER).tar.gz @@ -35,93 +32,218 @@ LIBEVENT_PACKAGE=libevent-$(LIBEVENT_VER).tar.gz TOR_PACKAGE=tor-$(TOR_VER).tar.gz PIDGIN_PACKAGE=pidgin-$(PIDGIN_VER).tar.bz2 FIREFOX_PACKAGE=firefox-$(FIREFOX_VER).source.tar.bz2 +MOZBUILD_PACKAGE=MozillaBuildSetup-$(MOZBUILD_VER).exe +PYMAKE_PACKAGE=$(PYMAKE_VER).tar.bz2 +TORBUTTON_PACKAGE=torbutton-$(TORBUTTON_VER).xpi +NOSCRIPT_PACKAGE=addon-722-latest.xpi +HTTPSEVERYWHERE_PACKAGE=https-everywhere-$(HTTPSEVERYWHERE_VER).xpi +OBFSPROXY_PACKAGE=obfsproxy-$(OBFSPROXY_VER).tar.gz ## Location of files for download ZLIB_URL=http://www.zlib.net/$(ZLIB_PACKAGE) OPENSSL_URL=http://www.openssl.org/source/$(OPENSSL_PACKAGE) LIBPNG_URL=ftp://ftp.simplesystems.org/pub/libpng/png/src/$(LIBPNG_PACKAGE) QT_URL=ftp://ftp.qt.nokia.com/qt/source/$(QT_PACKAGE) -VIDALIA_URL=http://www.torproject.org/dist/vidalia/$(VIDALIA_PACKAGE) +VIDALIA_URL=https://archive.torproject.org/tor-package-archive/vidalia/$(VIDALIA_PACKAGE) LIBEVENT_URL=https://github.com/downloads/libevent/libevent/$(LIBEVENT_PACK… -TOR_URL=http://www.torproject.org/dist/$(TOR_PACKAGE) +TOR_URL=https://archive.torproject.org/tor-package-archive/$(TOR_PACKAGE) PIDGIN_URL=http://sourceforge.net/projects/pidgin/files/Pidgin/$(PIDGIN_PAC… -FIREFOX_URL=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(FIREFOX_VER)/source/$(FIREFOX_PACKAGE) - -fetch-source: fetch-zlib fetch-openssl fetch-libpng fetch-qt fetch-vidalia fetch-libevent fetch-tor fetch-firefox clone-qtscript clone-vidalia -fetch-source-osx: fetch-zlib fetch-openssl fetch-vidalia fetch-libevent fetch-tor fetch-firefox - -mkdir $(FETCH_DIR) - -fetch-zlib: - -rm -f $(FETCH_DIR)/$(ZLIB_PACKAGE) +FIREFOX_URL=https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$(FIREFOX_VER)/source/$(FIREFOX_PACKAGE) +MOZBUILD_URL=https://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/$(MOZBUILD_PACKAGE) +PYMAKE_URL=https://hg.mozilla.org/users/bsmedberg_mozilla.com/pymake/archive/$(PYMAKE_PACKAGE) +TORBUTTON_URL=https://archive.torproject.org/tor-package-archive/torbutton/$(TORBUTTON_PACKAGE) +NOSCRIPT_URL=https://addons.mozilla.org/firefox/downloads/latest/722/$(NOSCRIPT_PACKAGE) +HTTPSEVERYWHERE_URL=https://eff.org/files/$(HTTPSEVERYWHERE_PACKAGE) +OBFSPROXY_URL=https://archive.torproject.org/tor-package-archive/obfsproxy/$(OBFSPROXY_PACKAGE) + +# Provide some mappings between lower and upper case, which means we don't need +# to rely on shell shenanigans when we need the upper case version. This is +# necessary because our targets are lowercase, and our variables uppercase. +zlib=ZLIB +libpng=LIBPNG +qt=QT +openssl=OPENSSL +vidalia=VIDALIA +libevent=LIBEVENT +tor=TOR +firefox=FIREFOX +pidgin=PIDGIN +mozbuild=MOZBUILD +pymake=PYMAKE +obfsproxy=OBFSPROXY + +# The locations of the unpacked tarballs +ZLIB_DIR=$(BUILD_DIR)/zlib-$(ZLIB_VER) +LIBPNG_DIR=$(BUILD_DIR)/libpng-$(LIBPNG_VER) +QT_DIR=$(BUILD_DIR)/qt-$(QT_VER) +OPENSSL_DIR=$(BUILD_DIR)/openssl-$(OPENSSL_VER) +VIDALIA_DIR=$(BUILD_DIR)/vidalia-$(VIDALIA_VER) +LIBEVENT_DIR=$(BUILD_DIR)/libevent-$(LIBEVENT_VER) +TOR_DIR=$(BUILD_DIR)/tor-$(TOR_VER) +FIREFOX_DIR=$(BUILD_DIR)/firefox-$(FIREFOX_VER) +MOZBUILD_DIR=$(BUILD_DIR)/mozilla-build +PYMAKE_DIR=$(BUILD_DIR)/pymake-$(PYMAKE_VER) +OBFSPROXY_DIR=$(BUILD_DIR)/obfsproxy-$(OBFSPROXY_VER) + +# Empty targets are written in arch-dependent $(BUILD_DIR). Usual +# VPATH issues documented below should be avoided as the paths of +# these targes are never used in dependents recipes. We only make use +# of targets existence. +# +# http://mad-scientist.net/make/vpath.html +# +STAMP_DIR=$(FETCH_DIR) +vpath build-% $(STAMP_DIR) +vpath patch-% $(STAMP_DIR) +vpath %.stamp $(STAMP_DIR) + +fetch-source: $(FETCH_DIR)/$(ZLIB_PACKAGE) $(FETCH_DIR)/$(LIBPNG_PACKAGE) $(FETCH_DIR)/$(QT_PACKAGE) $(FETCH_DIR)/$(OPENSSL_PACKAGE) $(FETCH_DIR)/$(VIDALIA_PACKAGE) $(FETCH_DIR)/$(LIBEVENT_PACKAGE) $(FETCH_DIR)/$(TOR_PACKAGE) $(FETCH_DIR)/$(FIREFOX_PACKAGE) $(FETCH_DIR)/$(OBFSPROXY_PACKAGE) | $(FETCH_DIR) ; + +source-dance: fetch-source unpack-source ; + +$(FETCH_DIR): + mkdir -p $(FETCH_DIR) + +$(BUILD_DIR): + mkdir -p $(BUILD_DIR) + +# XXX +# If we can, we should definitely add some stuff here to check signatures - +# at least for those packages that support it. + +$(FETCH_DIR)/$(ZLIB_PACKAGE): | $(FETCH_DIR) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(ZLIB_URL) -fetch-libpng: - -rm -f $(FETCH_DIR)/$(LIBPNG_PACKAGE) +$(FETCH_DIR)/$(LIBPNG_PACKAGE): | $(FETCH_DIR) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(LIBPNG_URL) -fetch-qt: - -rm -f $(FETCH_DIR)/$(QT_PACKAGE) +$(FETCH_DIR)/$(QT_PACKAGE): | $(FETCH_DIR) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(QT_URL) -fetch-openssl: - -rm -f $(FETCH_DIR)/$(OPENSSL_PACKAGE) +$(FETCH_DIR)/$(OPENSSL_PACKAGE): | $(FETCH_DIR) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(OPENSSL_URL) -fetch-vidalia: - -rm -f $(FETCH_DIR)/$(VIDALIA_PACKAGE) +$(FETCH_DIR)/$(VIDALIA_PACKAGE): | $(FETCH_DIR) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(VIDALIA_URL) -fetch-libevent: - -rm -f $(FETCH_DIR)/$(LIBEVENT_PACKAGE) +$(FETCH_DIR)/$(LIBEVENT_PACKAGE): | $(FETCH_DIR) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(LIBEVENT_URL) -fetch-tor: - -rm -f $(FETCH_DIR)/$(TOR_PACKAGE) +$(FETCH_DIR)/$(TOR_PACKAGE): | $(FETCH_DIR) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(TOR_URL) -fetch-firefox: - -rm -f $(FETCH_DIR)/$(FIREFOX_PACKAGE) +$(FETCH_DIR)/$(FIREFOX_PACKAGE): | $(FETCH_DIR) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(FIREFOX_URL) -clone-qtscript: - git clone git://gitorious.org/qt-labs/qtscriptgenerator.git $(FETCH_DIR)/qtscriptgenerator +$(FETCH_DIR)/$(MOZBUILD_PACKAGE): | $(FETCH_DIR) + $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(MOZBUILD_URL) + +$(FETCH_DIR)/$(PYMAKE_PACKAGE): | $(FETCH_DIR) + $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(PYMAKE_URL) + +torbutton.xpi: + $(WGET) --no-check-certificate -O $@ $(TORBUTTON_URL) + +noscript.xpi: + $(WGET) --no-check-certificate -O $@ $(NOSCRIPT_URL) + +httpseverywhere.xpi: + $(WGET) --no-check-certificate -O $@ $(HTTPSEVERYWHERE_URL) + +## Generic language pack rule, needs OS-specific MOZILLA_LANGUAGE +langpack_%.xpi: + $(WGET) --no-check-certificate -O $@ $(MOZILLA_LANGUAGE)/$*.xpi + +## English comes as default, so nothing to do here for the language packe +langpack_en-US.xpi: + touch $@ + +$(FETCH_DIR)/$(OBFSPROXY_PACKAGE): | $(FETCH_DIR) + $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(OBFSPROXY_URL) + +unpack-source: $(ZLIB_DIR) $(OPENSSL_DIR) $(LIBPNG_DIR) $(QT_DIR) $(VIDALIA_DIR) $(LIBEVENT_DIR) $(TOR_DIR) $(FIREFOX_DIR) $(OBFSPROXY_DIR) + + +$(ZLIB_DIR): $(FETCH_DIR)/$(ZLIB_PACKAGE) | $(BUILD_DIR) + rm -rf $(ZLIB_DIR) + cd $(FETCH_DIR) && tar -xmf $(ZLIB_PACKAGE) -C $(BUILD_DIR)/ + +$(LIBPNG_DIR): $(FETCH_DIR)/$(LIBPNG_PACKAGE) + rm -rf $(LIBPNG_DIR) + cd $(FETCH_DIR) && tar -xmf $(LIBPNG_PACKAGE) -C $(BUILD_DIR)/ + +$(QT_DIR): $(FETCH_DIR)/$(QT_PACKAGE) | $(BUILD_DIR) + rm -rf $(QT_DIR) $(FETCH_DIR)/qt-everywhere-opensource-src-$(QT_VER) + cd $(FETCH_DIR) && tar -xmf $(QT_PACKAGE) -C $(BUILD_DIR)/ + mv $(BUILD_DIR)/qt-everywhere-opensource-src-$(QT_VER) $(QT_DIR) + +$(OPENSSL_DIR): $(FETCH_DIR)/$(OPENSSL_PACKAGE) ../src/current-patches/openssl/*patch | $(BUILD_DIR) + rm -rf $(OPENSSL_DIR) + cd $(FETCH_DIR) && tar -xmf $(OPENSSL_PACKAGE) -C $(BUILD_DIR)/ + cp ../src/current-patches/openssl/*patch $(OPENSSL_DIR) + cp patch-any-src.sh $(OPENSSL_DIR) + cd $(OPENSSL_DIR) && ./patch-any-src.sh + +$(VIDALIA_DIR): $(FETCH_DIR)/$(VIDALIA_PACKAGE) | $(BUILD_DIR) + rm -rf $(VIDALIA_DIR) + cd $(FETCH_DIR) && tar -xmf $(VIDALIA_PACKAGE) -C $(BUILD_DIR)/ + +$(LIBEVENT_DIR): $(FETCH_DIR)/$(LIBEVENT_PACKAGE) | $(BUILD_DIR) + rm -rf $(LIBEVENT_DIR) + cd $(FETCH_DIR) && tar -xmf $(LIBEVENT_PACKAGE) -C $(BUILD_DIR)/ + +$(TOR_DIR): $(FETCH_DIR)/$(TOR_PACKAGE) | $(BUILD_DIR) + rm -rf $(TOR_DIR) + cd $(FETCH_DIR) && tar -xmf $(TOR_PACKAGE) -C $(BUILD_DIR)/ + +$(FIREFOX_DIR): $(FETCH_DIR)/$(FIREFOX_PACKAGE) ../src/current-patches/firefox/alpha/* | $(BUILD_DIR) + rm -rf $(FIREFOX_DIR) $(FETCH_DIR)/mozilla-release + cd $(FETCH_DIR) && tar -xmf $(FIREFOX_PACKAGE) -C $(BUILD_DIR)/ + mv $(BUILD_DIR)/mozilla-release $(FIREFOX_DIR) + cp ../src/current-patches/firefox/alpha/* $(FIREFOX_DIR) + cp patch-any-src.sh $(FIREFOX_DIR) + cd $(FIREFOX_DIR) && ./patch-any-src.sh + +$(MOZBUILD_DIR): $(FETCH_DIR)/$(MOZBUILD_PACKAGE) ../src/current-patches/mozilla-build/start-msvc.patch ../src/current-patches/mozilla-build/guess-msvc-x64.bat patch-mozilla-build.sh | $(BUILD_DIR) + rm -rf $(MOZBUILD_DIR) /c/mozilla-build + cmd.exe //c "$(PWD)/install-mozbuild.bat" "$(abspath $(FETCH_DIR)/$(MOZBUILD_PACKAGE))" "$(abspath $(MOZBUILD_DIR))" +# We have to patch mozillabuild + cp ../src/current-patches/mozilla-build/start-msvc.patch $(MOZBUILD_DIR) + cp ../src/current-patches/mozilla-build/guess-msvc-x64.bat $(MOZBUILD_DIR) + cp patch-mozilla-build.sh $(MOZBUILD_DIR) + cd $(MOZBUILD_DIR) && ./patch-mozilla-build.sh $(MSVC_VER) + +$(PYMAKE_DIR): $(FETCH_DIR)/$(PYMAKE_PACKAGE) | $(BUILD_DIR) + rm -rf $(PYMAKE_DIR) + cd $(FETCH_DIR) && tar -xmf $(PYMAKE_PACKAGE) -C $(BUILD_DIR)/ + +$(OBFSPROXY_DIR): $(FETCH_DIR)/$(OBFSPROXY_PACKAGE) | $(BUILD_DIR) + rm -rf $(OBFSPROXY_DIR) + cd $(FETCH_DIR) && tar -xmf $(OBFSPROXY_PACKAGE) -C $(BUILD_DIR)/ -clone-vidalia: - -rm -rf $(FETCH_DIR)/vidalia-$(VIDALIA_VER) - git clone https://git.torproject.org/vidalia.git $(FETCH_DIR)/vidalia-$(VIDALIA_VER) - cd $(FETCH_DIR)/vidalia-$(VIDALIA_VER) && git fetch origin - cd $(FETCH_DIR)/vidalia-$(VIDALIA_VER) && git checkout alpha -clone-vidalia-plugins: - -rm -rf $(FETCH_DIR)/vidalia-plugins - git clone https://git.torproject.org/vidalia-plugins.git $(FETCH_DIR)/vidalia-plugins +# Common build functionality. Modified by variables set in OS-specific makefiles +build-tor: build-zlib build-openssl build-libevent $(TOR_DIR) + cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) --enable-gcc-warnings-advisory --prefix=$(BUILT_DIR) --disable-gcc-hardening 2>&1 | tee configuring.log + cd $(TOR_DIR) && make -j $(NUM_CORES) 2>&1 | tee build.log + cd $(TOR_DIR) && make install + touch $(STAMP_DIR)/build-tor -unpack-source: unpack-zlib unpack-openssl unpack-libpng unpack-qt unpack-vidalia unpack-libevent unpack-tor unpack-firefox +clean-fetch-%: + rm -rf $(FETCH_DIR)/$($($*)_PACKAGE) -unpack-zlib: - -rm -rf $(FETCH_DIR)/zlib-$(ZLIB_VER) - cd $(FETCH_DIR) && tar -xvzf $(ZLIB_PACKAGE) +clean-fetch: clean-fetch-zlib clean-fetch-libpng clean-fetch-qt clean-fetch-openssl clean-fetch-vidalia clean-fetch-libevent clean-fetch-tor clean-fetch-firefox clean-fetch-obfsproxy -unpack-libpng: - -rm -rf $(FETCH_DIR)/libpng-$(LIBPNG_VER) - cd $(FETCH_DIR) && tar -xvjf $(LIBPNG_PACKAGE) +clean-unpack-%: + rm -rf $($($*)_DIR) -unpack-openssl: - -rm -rf $(FETCH_DIR)/openssl-$(OPENSSL_VER) - cd $(FETCH_DIR) && tar -xvzf $(OPENSSL_PACKAGE) +clean-unpack: clean-unpack-zlib clean-unpack-libpng clean-unpack-qt clean-unpack-openssl clean-unpack-vidalia clean-unpack-libevent clean-unpack-tor clean-unpack-firefox clean-unpack-obfsproxy -unpack-vidalia: - -rm -rf $(FETCH_DIR)/vidalia-$(VIDALIA_VER) - cd $(FETCH_DIR) && tar -xvzf $(VIDALIA_PACKAGE) +clean-build-%: + rm -rf $($($*)_DIR) + rm -rf build-$* -unpack-libevent: - -rm -rf $(FETCH_DIR)/libevent-$(LIBEVENT_VER) - cd $(FETCH_DIR) && tar -xvzf $(LIBEVENT_PACKAGE) +clean-build: clean-build-zlib clean-build-libpng clean-build-qt clean-build-openssl clean-build-vidalia clean-build-libevent clean-build-tor clean-build-firefox clean-build-obfsproxy -unpack-tor: - -rm -rf $(FETCH_DIR)/tor-$(TOR-VER) - cd $(FETCH_DIR) && tar -xvzf $(TOR_PACKAGE) +.PHONY: clean-fetch clean-unpack clean-build -unpack-firefox: - -rm -rf $(FETCH_DIR)/mozilla-release - cd $(FETCH_DIR) && tar -xvjf $(FIREFOX_PACKAGE)

1 0

[torbrowser/master] add obfsproxy configs for windows
by erinn＠torproject.org 13 Jul '12

13 Jul '12

commit 177605a2ff602c4ab18b4e5fb1eab341466fe484 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Jul 13 13:55:02 2012 +0200 add obfsproxy configs for windows --- build-scripts/config/alpha/torrc-obfsproxy | 30 +++++++++++++++++ .../config/alpha/vidalia.conf.ff-obfsproxy | 34 ++++++++++++++++++++ 2 files changed, 64 insertions(+), 0 deletions(-) diff --git a/build-scripts/config/alpha/torrc-obfsproxy b/build-scripts/config/alpha/torrc-obfsproxy new file mode 100644 index 0000000..5df778a --- /dev/null +++ b/build-scripts/config/alpha/torrc-obfsproxy @@ -0,0 +1,30 @@ +# If non-zero, try to write to disk less frequently than we would otherwise. +AvoidDiskWrites 1 +# Store working data, state, keys, and caches here. +DataDirectory .\Data\Tor +GeoIPFile .\Data\Tor\geoip +# Where to send logging messages. Format is minSeverity[-maxSeverity] +# (stderr|stdout|syslog|file FILENAME). +Log notice stdout +# Bind to this address to listen to connections from SOCKS-speaking +# applications. +SocksListenAddress 127.0.0.1 + +UseBridges 1 + +bridge obfs2 38.229.33.18:42401 +bridge obfs2 85.17.20.242:61264 +bridge obfs2 85.214.131.213:1051 +bridge obfs2 86.59.30.35:45605 +bridge obfs2 91.208.34.7:5353 +bridge obfs2 109.105.109.163:53999 +bridge obfs2 109.163.233.195:1051 +bridge obfs2 128.31.0.34:1051 +bridge obfs2 131.215.158.1:29936 +bridge obfs2 173.254.192.38:1051 +bridge obfs2 188.40.20.215:32982 +bridge obfs2 212.112.242.160:49259 +bridge obfs2 213.108.105.129:36609 + +ClientTransportPlugin obfs2 exec obfsproxy --managed + diff --git a/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy new file mode 100644 index 0000000..6d6fa7d --- /dev/null +++ b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy @@ -0,0 +1,34 @@ +[General] +BrowserDirectory=..\\FirefoxPortable\\App\\Firefox +BrowserExecutable=tbb-firefox.exe +LanguageCode=en +ProfileDirectory=..\\..\\Data\\profile +DefaultProfileDirectory=..\\DefaultData\\profile +PluginsDirectory=..\\..\\Data\\plugins +DefaultPluginsDirectory=..\\DefaultData\\plugins + +[Tor] +ControlPort=9051 +TorExecutable=.\\tor.exe +Torrc=..\\Data\\Tor\\torrc +DataDirectory=..\\Data\\Tor + +[Network] +ProxyType=none +UseBridges=true +Bridge=obfs2 38.229.33.18:42401, obfs2 85.17.20.242:61264, obfs2 85.214.131.213:1051, obfs2 86.59.30.35:45605, obfs2 91.208.34.7:5353, obfs2 109.105.109.163:53999, obfs2 109.163.233.195:1051, obfs2 128.31.0.34:1051, obfs2 131.215.158.1:29936, obfs2 173.254.192.38:1051, obfs2 188.40.20.215:32982, obfs2 212.112.242.160:49259, obfs2 213.108.105.129:36609 + +[MessageLog] +Geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x2\xc9\0\0\x2\x96\0\0\0\b\0\0\0\x1e\0\0\x2\xc1\0\0\x2\x8e\0\0\0\0\0\0) + +[BandwidthGraph] +Geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x2(\0\0\x1X\0\0\0\0\0\0\0\0\0\0\x2(\0\0\x1X\0\0\0\0\0\0) + +[NetViewer] +Geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x3K\0\0\x2S\0\0\0\0\0\0\0\0\0\0\x3K\0\0\x2S\0\0\0\0\0\0) + +[ConfigDialog] +Geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x2W\0\0\x1\x8f\0\0\0\0\0\0\0\0\0\0\x2W\0\0\x1\x8f\0\0\0\0\0\0) + +[MainWindow] +Geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x1\0\0\0\0\x1J\0\0\0\xaf\0\0\x2\xb5\0\0\x2R\0\0\x1R\0\0\0\xcd\0\0\x2\xad\0\0\x2J\0\0\0\0\0\0)

1 0

[torbrowser/master] update windows alpha makefile with Sebastian's stable TBB changes
by erinn＠torproject.org 13 Jul '12

13 Jul '12

commit 78c122cefc948c255a7e20218085af2e8d1bc1f9 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Jul 13 13:51:41 2012 +0200 update windows alpha makefile with Sebastian's stable TBB changes --- build-scripts/windows-alpha.mk | 308 ++++++++++++++------------------------- 1 files changed, 111 insertions(+), 197 deletions(-) diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index 258e743..c12230c 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -1,154 +1,125 @@ ### -### Makefile for building Tor USB bundle on Mac OS X +### Makefile for building Tor USB bundle on Windows ### ### Copyright 2007 Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/> ### Copyright 2009, 2010 Jacob Appelbaum <jacob(a)appelbaum.net> ### Copyright 2010 Erinn Clark <erinn(a)torproject.org> ### -### You want to do the following currently supported activities: -# This downloads and compiles everything -### make -f windows-alpha.mk build-all-binaries -# This makes a generic bundle -### make -f windows-alpha.mk generic-bundle -# This makes the English bundle -### make -f windows-alpha.mk bundle_en-US -# This makes the German bundle -### make -f windows-alpha.mk bundle_de -# This makes the German compressed bundle -### make -f windows-alpha.mk compressed-bundle_de -# It's possible you may also want to do: -### make -f windows-alpha.mk build-all-binaries -### make -f windows-alpha.mk all-compressed-bundles -### ... -### Look in tbbwin-alpha-dist/ for your files. -### ### See LICENSE for licensing information ### + ##################### ### Configuration ### ##################### -## Include versions -include $(PWD)/versions-alpha.mk -BUILD_NUM=2 +BUILD_NUM=1 PLATFORM=Windows ## Location of required libraries -MING=/c/MinGW/bin +MING=/mingw/bin QT_LIB=/c/Qt/$(QT_VER)/bin OPENSSL_LIB=$(COMPILED_BINS) -WIX_LIB="/c/Program Files (x86)/Windows Installer XML v3.5/bin" +WIX_LIB="$(MOZBUILD_DIR)/wix-351728" ## Location of bundle components -VIDALIA=$(FETCH_DIR)/vidalia-$(VIDALIA_VER) -TOR=$(FETCH_DIR)/tor-$(TOR_VER) -FIREFOX=$(FETCH_DIR)/FirefoxPortable-$(FIREFOX_VER) -PIDGIN=$(FETCH_DIR)/PidginPortable-$(PIDGIN_VER) +VIDALIA=$(BUILD_DIR)/vidalia-$(VIDALIA_VER) +TOR=$(BUILD_DIR)/tor-$(TOR_VER) +FIREFOX=$(BUILD_DIR)/FirefoxPortable-$(FIREFOX_VER) +PIDGIN=$(BUILD_DIR)/PidginPortable-$(PIDGIN_VER) +VIDALIA_PLUGINS=$(BUILD_DIR)/vidalia-plugins ## Location of utility applications PWD:=$(shell pwd) -PYTHON=/c/Python26/python.exe -SEVENZIP="/c/Program Files/7-Zip/7z.exe" -PYGET=$(PYTHON) $(PWD)/pyget.py +PYTHON=$(MOZBUILD_DIR)/python/python.exe +PYMAKE=$(PYMAKE_DIR)/make.py +SEVENZIP="$(MOZBUILD_DIR)/7zip/7z.exe" WGET=wget VIRUSSCAN=$(PYTHON) $(PWD)/virus-scan.py -WINRAR="/c/Program Files (x86)/WinRAR/WinRAR.exe" CC=gcc MSVC_VER=9 -FIREFOX_DIR=/c/build/mozilla-build/mozilla-release -MOZ_BUILD=/c/build/mozilla-build + +## Build machine specific settings +# Number of cpu cores used to build in parallel +NUM_CORES=2 ## Location of directory for source unpacking -FETCH_DIR=$(PWD)/build-alpha-windows +FETCH_DIR=$(PWD)/build-alpha +## Location of directory for source unpacking/building +## This must be different from FETCH_DIR +BUILD_DIR=$(FETCH_DIR)/build ## Location of directory for prefix/destdir/compiles/etc -BUILT_DIR=$(FETCH_DIR)/built +BUILT_DIR=$(BUILD_DIR)/built TBB_FINAL=$(BUILT_DIR)/tbbwin-alpha-dist -source-dance: fetch-source unpack-source - echo "We're ready for building now." - -ZLIB_DIR=$(FETCH_DIR)/zlib-$(ZLIB_VER) -build-zlib: - cp ../src/current-patches/zlib/* $(ZLIB_DIR) - cp patch-any-src.sh $(ZLIB_DIR) - cd $(ZLIB_DIR) && ./patch-any-src.sh - cd $(ZLIB_DIR) && sed -i -e "s%prefix = /usr/local%prefix = ${BUILT_DIR}%" win32/Makefile.gcc - cd $(ZLIB_DIR) && make -f win32/Makefile.gcc - cd $(ZLIB_DIR) && make -f win32/Makefile.gcc install - -OPENSSL_DIR=$(FETCH_DIR)/openssl-$(OPENSSL_VER) -OPENSSL_OPTS=-no-idea -no-rc5 -no-md2 shared zlib --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -L$(BUILT_DIR)/lib -Wl,--nxcompat -Wl,--dynamicbase -I$(BUILT_DIR)/include -build-openssl: +## Include versions (must happen after variable definitions above +include $(PWD)/versions-alpha.mk + +ZLIB_OPTS=prefix="$(BUILT_DIR)" BINARY_PATH="$(BUILT_DIR)/bin" INCLUDE_PATH="$(BUILT_DIR)/include" LIBRARY_PATH="$(BUILT_DIR)/lib" +build-zlib: $(ZLIB_DIR) + cd $(ZLIB_DIR) && LDFLAGS="-Wl,--nxcompat -Wl,--dynamicbase" make -f win32/Makefile.gcc -j $(NUM_CORES) + cd $(ZLIB_DIR) && $(ZLIB_OPTS) make -f win32/Makefile.gcc install + touch $(STAMP_DIR)/build-zlib + +OPENSSL_OPTS=-no-idea -no-rc5 -no-md2 no-shared zlib --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -L$(BUILT_DIR)/lib -Wl,--nxcompat -Wl,--dynamicbase -I$(BUILT_DIR)/include +build-openssl: build-zlib $(OPENSSL_DIR) cd $(OPENSSL_DIR) && ./config $(OPENSSL_OPTS) cd $(OPENSSL_DIR) && make depend cd $(OPENSSL_DIR) && make - cd $(OPENSSL_DIR) && make install - -VIDALIA_DIR=$(FETCH_DIR)/vidalia-$(VIDALIA_VER) -VIDALIA_OPTS=-DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++ -Wl,--nxcompat -Wl,--dynamicbase" -DWIN2K=1 -DQT_MAKE_EXECUTABLE=/c/Qt/$(QT_VER)/bin/qmake -DCMAKE_BUILD_TYPE=minsizerel -DMINGW_BINARY_DIR=$(MING) -DOPENSSL_BINARY_DIR=$(OPENSSL) -DWIX_BINARY_DIR=$(WIX_LIB) -DTOR_SOURCE_DIR=$(TOR_DIR) -DSCRIPT_DIR=$(QTSCRIPT_DIR)/plugins/script -build-vidalia: + cd $(OPENSSL_DIR) && make install_sw + touch $(STAMP_DIR)/build-openssl + +QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-qt3support -fast -release -nomake demos -nomake examples +QT_OPTS=$(QT_BUILD_PREFS) -prefix $(BUILT_DIR) -I $(BUILT_DIR)/include -I $(BUILT_DIR)/include/openssl/ -L$(BUILT_DIR)/lib +build-qt: build-zlib build-openssl $(QT_DIR) + cd $(QT_DIR) && ./configure $(QT_OPTS) + cd $(QT_DIR) && make -j $(NUM_CORES) + cd $(QT_DIR) && make install + touch $(STAMP_DIR)/build-qt + +VIDALIA_OPTS=-DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++ -Wl,--nxcompat -Wl,--dynamicbase" -DWIN2K=1 -DQT_QMAKE_EXECUTABLE=$(QT_LIB)/qmake -DCMAKE_BUILD_TYPE=minsizerel -DMINGW_BINARY_DIR=$(MING) -DWIX_BINARY_DIR=$(WIX_LIB) -DSCRIPT_DIR=$(QTSCRIPT_DIR)/plugins/script -DTOR_SOURCE_DIR=$(TOR_DIR)/src/or +# XXX Once we build qt on windows, we'll want to add build-qt here +build-vidalia: PATH+=:$(QT_LIB) +build-vidalia: $(VIDALIA_DIR) $(WIX_LIB) -mkdir $(VIDALIA_DIR)/build cd $(VIDALIA_DIR)/build && cmake -G "MSYS Makefiles" $(VIDALIA_OPTS) .. - cd $(VIDALIA_DIR)/build && make - -QTSCRIPT_DIR=$(FETCH_DIR)/qtscriptgenerator -QTSCRIPT_OPTS= -build-qtscript: - cd $(QTSCRIPT_DIR)/generator && qmake - cd $(QTSCRIPT_DIR)/generator && make -j4 - cd $(QTSCRIPT_DIR)/generator && ./generator --include-paths=/c/Qt/2010.04/qt - cp ../src/current-patches/qt/000* $(QTSCRIPT_DIR)/qtbindings/qtscript_uitools - cp patch-any-src.sh $(QTSCRIPT_DIR)/qtbindings/qtscript_uitools - cd $(QTSCRIPT_DIR)/qtbindings/qtscript_uitools && ./patch-any-src.sh - cd $(QTSCRIPT_DIR)/generator && qmake -spec win32-g++ - cd $(QTSCRIPT_DIR)/generator && make -j4 - cd $(QTSCRIPT_DIR)/qtbindings && qmake -recursive CONFIG+="release" - -build-qtfoo: - cd $(QTSCRIPT_DIR)/qtbindings && for i in $(ls -d qtscript_*); do make -C $i release; done - -LIBEVENT_DIR=$(FETCH_DIR)/libevent-$(LIBEVENT_VER) -LIBEVENT_CFLAGS="-I$(BUILT_DIR)/include -O -g" + cd $(VIDALIA_DIR)/build && make -j $(NUM_CORES) + touch $(STAMP_DIR)/build-vidalia + +QTSCRIPT_DIR=$(BUILD_DIR)/qtscriptgenerator + +LIBEVENT_CFLAGS="-I$(BUILT_DIR)/include" LIBEVENT_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin -Wl,--nxcompat -Wl,--dynamicbase" LIBEVENT_OPTS=--prefix=$(BUILT_DIR) --enable-static --disable-shared --disable-dependency-tracking -build-libevent: +build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) cd $(LIBEVENT_DIR) && CFLAGS=$(LIBEVENT_CFLAGS) LDFLAGS=$(LIBEVENT_LDFLAGS) ./configure $(LIBEVENT_OPTS) - cd $(LIBEVENT_DIR) && make -j2 + cd $(LIBEVENT_DIR) && make -j $(NUM_CORES) cd $(LIBEVENT_DIR) && make install + touch $(STAMP_DIR)/build-libevent -TOR_DIR=$(FETCH_DIR)/tor-$(TOR_VER) -TOR_CFLAGS="-O -g -I$(BUILT_DIR)/include" +TOR_CFLAGS="-I$(BUILT_DIR)/include" TOR_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin" -TOR_OPTS=--enable-gcc-warnings --enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) +TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --disable-asciidoc build-tor:PATH+=:$(BUILT_DIR)/bin -build-tor: - cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) - cd $(TOR_DIR) && make -# cd $(TOR_DIR) && make install - -patch-mozbuild: - cp ../src/current-patches/mozilla-build/start-msvc.patch $(MOZ_BUILD) - cp ../src/current-patches/mozilla-build/guess-msvc-x64.bat $(MOZ_BUILD) - cp patch-mozilla-build.sh $(MOZ_BUILD) - cd $(MOZ_BUILD) && ./patch-mozilla-build.sh $(MSVC_VER) - cp $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR)/mozconfig - -patch-firefox-source: - cp ../src/current-patches/firefox/* $(FIREFOX_DIR) - cp patch-any-src.sh $(FIREFOX_DIR) - cd $(FIREFOX_DIR) && ./patch-any-src.sh - -build-firefox: - cd $(MOZ_BUILD) && cmd.exe /c "start-msvc$(MSVC_VER).bat $(FIREFOX_DIR)" + +build-obfsproxy: + cd $(OBFSPROXY_DIR) && libevent_CFLAGS=-I$(BUILT_DIR)/include libevent_LIBS="-L$(BUILT_DIR)/lib -levent" libcrypto_CFLAGS=-I$(BUILT_DIR)/include/openssl libcrypto_LIBS="-L$(BUILT_DIR)/lib -lssl -lcrypto" ./configure --prefix=$(BUILT_DIR) + cd $(OBFSPROXY_DIR) && make + cd $(OBFSPROXY_DIR) && make install + +build-firefox: $(FIREFOX_DIR) config/dot_mozconfig $(MOZBUILD_DIR) $(MOZBUILD_DIR)/start-msvc$(MSVC_VER).bat | $(PYTHON) $(PYMAKE_DIR) + cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig + cp branding/* $(FIREFOX_DIR)/browser/branding/official + cd $(MOZBUILD_DIR) && cmd.exe /c "start-msvc$(MSVC_VER).bat $(FIREFOX_DIR) $(PYTHON) $(PYMAKE)" + touch $(STAMP_DIR)/build-firefox copy-firefox: -rm -rf $(FIREFOX) -mkdir -p $(FIREFOX) cp -r config/firefox-portable/* $(FIREFOX) cp "/c/Program Files (x86)/Microsoft Visual Studio 9.0/VC/redist/x86/Microsoft.VC90.CRT/"msvc*90.dll $(FIREFOX)/App/Firefox - cp -r $(FIREFOX_DIR)/obj-*/dist/bin/* $(FIREFOX)/App/Firefox + cp -r $(FIREFOX_DIR)/obj-*/dist/firefox/* $(FIREFOX)/App/Firefox build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor build-firefox copy-firefox echo "If we're here, we've done something right." @@ -165,12 +136,6 @@ ZLIB=$(COMPILED_LIBS) LIBEVENT=$(COMPILED_LIBS) -## Size of split archive volumes for WinRAR -SPLITSIZE=1440k - -## Location of config files -CONFIG_SRC=config - ## Destination for the generic bundle DEST="Generic Bundle" @@ -197,7 +162,7 @@ endif DEFAULT_EXTENSIONS=torbutton.xpi ## Where to download Mozilla language packs -MOZILLA_LANGUAGE=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(FIREFOX_VER)/win32/xpi +MOZILLA_LANGUAGE=https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$(FIREFOX_VER)/win32/xpi ## Put more extensions here EXTENSIONS_DIR=extensions @@ -221,7 +186,7 @@ all-bundles-both: USE_PIDGIN=0 make -f windows-alpha.mk all-bundles make -f windows-alpha.mk clean -all-bundles: all-compressed-bundles all-split-bundles +all-bundles: all-compressed-bundles all-compressed-bundles: compressed-bundle_ar \ compressed-bundle_de \ @@ -229,25 +194,14 @@ all-compressed-bundles: compressed-bundle_ar \ compressed-bundle_es-ES \ compressed-bundle_fa \ compressed-bundle_fr \ + compressed-bundle_it \ + compressed-bundle_ko \ compressed-bundle_nl \ compressed-bundle_pl \ compressed-bundle_pt-PT \ compressed-bundle_ru \ - compressed-bundle_zh-CN \ - compressed-bundle_it - -all-split-bundles: split-bundle_ar \ - split-bundle_de \ - split-bundle_en-US \ - split-bundle_es-ES \ - split-bundle_fa \ - split-bundle_fr \ - split-bundle_nl \ - split-bundle_pl \ - split-bundle_pt-PT \ - split-bundle_ru \ - split-bundle_zh-CN \ - split-bundle_it + compressed-bundle_vi \ + compressed-bundle_zh-CN ## ## Cleanup @@ -258,22 +212,21 @@ clean: rm -f *~ rm -fr *.xpi *.jar *.zip rm -fr $(NAME)_* + rm -f $(STAMP_DIR)/*.stamp cd ../src/RelativeLink/ && $(MAKE) clean ## Also remove the output files reallyclean: clean rm -fr $(IM_COMPRESSED_BASENAME)*_*.exe rm -fr $(IM_COMPRESSED_BASENAME)*_*.rar - rm -fr $(IM_COMPRESSED_BASENAME)*_*_split rm -fr $(DEFAULT_COMPRESSED_BASENAME)*_*.exe rm -fr $(DEFAULT_COMPRESSED_BASENAME)*_*.rar - rm -fr $(DEFAULT_COMPRESSED_BASENAME)*_*_split ## ## Scan .exe files against VirusTotal to check for false positives ## -virus-scan: +virus-scan: | $(PYTHON) $(VIRUSSCAN) $(VIDALIA)/build/src/vidalia/vidalia.exe $(VIRUSSCAN) $(TOR)/src/or/tor.exe @@ -285,7 +238,7 @@ virus-scan: generic-bundle.stamp: make -f windows-alpha.mk generic-bundle generic-bundle: directory-structure install-binaries install-docs install-firefoxportable install-pidginportable configure-apps launcher - touch generic-bundle.stamp + touch $(STAMP_DIR)/generic-bundle.stamp APPDIR=$(DEST)/App DOCSDIR=$(DEST)/Docs @@ -302,13 +255,18 @@ directory-structure: ## Filenames extracted using Dependency Walker <http://www.dependencywalker.com/> install-binaries: cp $(MING)/mingwm10.dll $(APPDIR) - cp $(MING)/libgnurx-0.dll $(APPDIR) - cp $(QT_LIB)/QtScript4.dll $(QT_LIB)/QtCore4.dll $(QT_LIB)/QtGui4.dll $(QT_LIB)/QtNetwork4.dll $(QT_LIB)/QtXml4.dll $(QT_LIB)/libgcc_s_dw2-1.dll $(APPDIR) + cp $(QT_LIB)/QtCore4.dll $(QT_LIB)/QtGui4.dll $(QT_LIB)/QtNetwork4.dll $(QT_LIB)/QtXml4.dll $(QT_LIB)/libgcc_s_dw2-1.dll $(APPDIR) cp $(OPENSSL_LIB)/ssleay32.dll $(APPDIR) cp $(OPENSSL_LIB)/libeay32.dll $(APPDIR) cp $(VIDALIA)/build/src/vidalia/vidalia.exe $(APPDIR) cp $(TOR)/src/or/tor.exe $(APPDIR) +install-plugins: + mkdir -p $(DATADIR)/Vidalia/plugins + cp -r $(VIDALIA_PLUGINS)/tbb $(DATADIR)/Vidalia/plugins + mkdir -p $(APPDIR)/script + cp $(QTSCRIPT_DIR)/plugins/script/*.dll $(APPDIR)/script + ## Fixup ## Collect up license files install-docs: @@ -337,37 +295,34 @@ endif configure-apps: mkdir -p $(DEST)/FirefoxPortable/Data/profile + mkdir -p $(DEST)/FirefoxPortable/App/DefaultData/profile ## Configure Firefox preferences - cp $(CONFIG_SRC)/windows-4.0.js $(DEST)/FirefoxPortable/App/DefaultData/profile/prefs.js - cp $(CONFIG_SRC)/windows-4.0.js $(DEST)/FirefoxPortable/Data/profile/prefs.js - cp $(CONFIG_SRC)/bookmarks.html $(DEST)/FirefoxPortable/App/DefaultData/profile/ + cp config/prefs.js $(DEST)/FirefoxPortable/App/DefaultData/profile/prefs.js + cp config/prefs.js $(DEST)/FirefoxPortable/Data/profile/prefs.js + cp config/bookmarks.html $(DEST)/FirefoxPortable/App/DefaultData/profile/ ## Set up alternate launcher mv $(DEST)/FirefoxPortable/App/Firefox/firefox.exe $(DEST)/FirefoxPortable/App/Firefox/tbb-firefox.exe ## Configure FirefoxPortable - cp $(CONFIG_SRC)/FirefoxPortable.ini $(DEST)/FirefoxPortable - cp $(CONFIG_SRC)/FirefoxPortableSettings.ini $(DEST)/FirefoxPortable/Data/settings + cp config/FirefoxPortable.ini $(DEST)/FirefoxPortable + cp config/FirefoxPortableSettings.ini $(DEST)/FirefoxPortable/Data/settings ## Configure PidginPortable ifeq ($(USE_PIDGIN),1) - cp $(CONFIG_SRC)/PidginPortable.ini $(DEST)/PidginPortable + cp config/PidginPortable.ini $(DEST)/PidginPortable mkdir -p $(DEST)/PidginPortable/Data/settings/.purple - cp $(CONFIG_SRC)/prefs.xml $(DEST)/PidginPortable/Data/settings/.purple - cp $(CONFIG_SRC)/PidginPortableSettings.ini $(DEST)/PidginPortable/Data/settings + cp config/prefs.xml $(DEST)/PidginPortable/Data/settings/.purple + cp config/PidginPortableSettings.ini $(DEST)/PidginPortable/Data/settings endif ## Configure Vidalia - mkdir -p $(DEST)/Data/Vidalia/plugins - cp -r $(FETCH_DIR)/vidalia-plugins/tbb $(DEST)/Data/Vidalia/plugins - mkdir -p $(DEST)/App/script - cp $(FETCH_DIR)/qtscriptgenerator/plugins/script/*dll $(DEST)/App/script ifeq ($(USE_PIDGIN),1) - cp $(CONFIG_SRC)/alpha/vidalia.conf.ff+pidgin $(DEST)/Data/Vidalia/vidalia.conf + cp config/alpha/vidalia.conf.ff+pidgin $(DEST)/Data/Vidalia/vidalia.conf else - cp $(CONFIG_SRC)/alpha/vidalia.conf.ff $(DEST)/Data/Vidalia/vidalia.conf + cp config/alpha/vidalia.conf.ff $(DEST)/Data/Vidalia/vidalia.conf endif ## Configure Tor - cp $(CONFIG_SRC)/alpha/torrc $(DEST)/Data/Tor + cp config/alpha/torrc $(DEST)/Data/Tor/torrc cp $(TOR)/src/config/geoip $(DEST)/Data/Tor launcher: @@ -375,34 +330,6 @@ launcher: cp ../src/RelativeLink/StartTorBrowserBundle.exe $(DEST)/"Start Tor Browser.exe" ## -## How to create required extensions -## - -## Torbutton development version -torbutton.xpi: - $(PYGET) -O $@ $(TORBUTTON) - -## English comes as default -langpack_en-US.xpi: - touch $@ - -## BetterPrivacy -betterprivacy.xpi: - $(PYGET) -O $@ $(BETTERPRIVACY) - -## NoScript development version -noscript.xpi: - $(PYGET) -O $@ $(NOSCRIPT) - -## HTTPS Everywhere -#httpseverywhere.xpi: -# $(PYGET) -O $@ $(HTTPSEVERYWHERE) - -## Generic language pack rule -langpack_%.xpi: - $(PYGET) -O $@ $(MOZILLA_LANGUAGE)/$*.xpi - -## ## Customize the bundle ## @@ -410,25 +337,18 @@ bundle_%: LANGCODE=$* make -f windows-alpha.mk bundle-localized compressed-bundle_%: LANGCODE=$* make -f windows-alpha.mk compressed-bundle-localized -split-bundle_%: - LANGCODE=$* make -f windows-alpha.mk split-bundle-localized bundle-localized_%.stamp: make -f windows-alpha.mk copy-files_$* install-extensions install-torbutton install-httpseverywhere install-noscript \ patch-vidalia-language patch-firefox-language patch-pidgin-language write-tbb-version - touch bundle-localized_$*.stamp + touch $(STAMP_DIR)/bundle-localized_$*.stamp bundle-localized: bundle-localized_$(LANGCODE).stamp -compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp +compressed-bundle-localized: $(SEVENZIP) bundle-localized_$(LANGCODE).stamp rm -f $(COMPRESSED_NAME)_$(LANGCODE).exe cd $(NAME)_$(LANGCODE); $(SEVENZIP) a -mx9 -sfx7z.sfx ../$(COMPRESSED_NAME)_$(LANGCODE).exe $(NAME) -split-bundle-localized: bundle-localized_$(LANGCODE).stamp - rm -fr $(COMPRESSED_NAME)_$(LANGCODE)_split; mkdir $(COMPRESSED_NAME)_$(LANGCODE)_split - cd $(NAME)_$(LANGCODE); $(WINRAR) a -r -s -ibck -sfx -v$(SPLITSIZE) \ - ../$(COMPRESSED_NAME)_$(LANGCODE)_split/$(COMPRESSED_NAME)_$(LANGCODE)_split.exe $(NAME) - copy-files_%: generic-bundle.stamp rm -fr $(NAME)_$* mkdir $(NAME)_$* @@ -437,13 +357,6 @@ copy-files_%: generic-bundle.stamp BUNDLE=$(NAME)_$(LANGCODE)/$(NAME) DUMMYPROFILE=$(BUNDLE)/FirefoxPortable/App/DummyProfile -fix-install-rdf: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) -ifneq ($(LANGCODE), en-US) - rm -fr xx - mkdir xx - (cd xx && unzip ../langpack_$(LANGCODE).xpi && sed -i -e "s/em:maxVersion>6.0.1/em:maxVersion>6.0.*/" install.rdf && zip -r ../langpack_$(LANGCODE).xpi .) -endif - install-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) ## Make a dummy profile to stop Firefox creating some large files cp -r $(BUNDLE)/FirefoxPortable/App/DefaultData $(DUMMYPROFILE) @@ -453,22 +366,17 @@ ifneq ($(LANGCODE), en-US) endif rm -fr $(DUMMYPROFILE) -install-torbutton: torbutton.xpi +install-torbutton: $(SEVENZIP) torbutton.xpi mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca} cp torbutton.xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}/torbutton.zip (cd $(BUNDLE)/FirefoxPortable/Data/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca} && $(SEVENZIP) x *.zip && rm *.zip) -install-httpseverywhere: httpseverywhere.xpi +install-httpseverywhere: $(SEVENZIP) httpseverywhere.xpi mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions/https-everywhere(a)eff.org cp httpseverywhere.xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/https-everywhere(a)eff.org/httpseverywhere.zip (cd $(BUNDLE)/FirefoxPortable/Data/profile/extensions/https-everywhere(a)eff.org && $(SEVENZIP) x *.zip && rm *.zip) -install-betterprivacy: betterprivacy.xpi - mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\} - cp betterprivacy.xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\}/betterprivacy.zip - (cd $(BUNDLE)/FirefoxPortable/Data/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\} && $(SEVENZIP) x *.zip && rm *.zip) - -install-noscript: noscript.xpi +install-noscript: $(SEVENZIP) noscript.xpi mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions/\{73a6fe31-595d-460b-a920-fcc0f8843232\} cp noscript.xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/\{73a6fe31-595d-460b-a920-fcc0f8843232\}/noscript.zip (cd $(BUNDLE)/FirefoxPortable/Data/profile/extensions/\{73a6fe31-595d-460b-a920-fcc0f8843232\} && $(SEVENZIP) x *.zip && rm *.zip) @@ -494,6 +402,8 @@ patch-firefox-language: ./patch-firefox-language.sh $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js $(LANGCODE) sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js + chmod u+w $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js + chmod u+w $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js ### ### Utilities @@ -501,7 +411,7 @@ patch-firefox-language: ## Copy Firefox preferences from a run of FirefoxPortable to be the default apply-prefs: - cp $(DEST)/FirefoxPortable/Data/profile/prefs.js $(CONFIG_SRC) + cp $(DEST)/FirefoxPortable/Data/profile/prefs.js config print-version: @echo $(RELEASE_VER)-$(BUILD_NUM) @@ -520,3 +430,7 @@ SRCDEST=/tmp SRCDESTPATH=$(SRCDEST)/$(SRCNAME) srcdist: cd .. && git archive --format=tar --prefix=tor-browser-$(VERSION)-src/ torbrowser-$(VERSION) | gzip -9 > $(PWD)/tor-browser-$(VERSION)-src.tar.gz + +$(PYTHON): | $(MOZBUILD_DIR) ; +$(SEVENZIP): | $(MOZBUILD_DIR) ; +$(WIX_LIB): | $(MOZBUILD_DIR) ;

1 0