July 2012 - tor-commits - lists.torproject.org

[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

[torbrowser/master] update vidalia config for the 0.2.x series instead
by erinn＠torproject.org 13 Jul '12

13 Jul '12

commit c29fe3f466bf2075087f60b645d63476cf42ace0 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Jul 13 13:48:44 2012 +0200 update vidalia config for the 0.2.x series instead --- build-scripts/config/alpha/vidalia.conf.ff | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/build-scripts/config/alpha/vidalia.conf.ff b/build-scripts/config/alpha/vidalia.conf.ff index 58036b5..1d9d2fa 100644 --- a/build-scripts/config/alpha/vidalia.conf.ff +++ b/build-scripts/config/alpha/vidalia.conf.ff @@ -1,13 +1,14 @@ [General] -PluginPath=.\\Data\\Vidalia\\plugins +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=.\\App\\tor.exe -Torrc=.\\Data\\Tor\\torrc -DataDirectory=.\\Data\\Tor - -[TBB] -BrowserDirectory=FirefoxPortable -BrowserExecutable=tbb-firefox.exe +TorExecutable=.\\tor.exe +Torrc=..\\Data\\Tor\\torrc +DataDirectory=..\\Data\\Tor

1 0

[torbrowser/maint-2.3] 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/maint-2.3] update vidalia config for the 0.2.x series instead
by erinn＠torproject.org 13 Jul '12

13 Jul '12

commit c29fe3f466bf2075087f60b645d63476cf42ace0 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Jul 13 13:48:44 2012 +0200 update vidalia config for the 0.2.x series instead --- build-scripts/config/alpha/vidalia.conf.ff | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/build-scripts/config/alpha/vidalia.conf.ff b/build-scripts/config/alpha/vidalia.conf.ff index 58036b5..1d9d2fa 100644 --- a/build-scripts/config/alpha/vidalia.conf.ff +++ b/build-scripts/config/alpha/vidalia.conf.ff @@ -1,13 +1,14 @@ [General] -PluginPath=.\\Data\\Vidalia\\plugins +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=.\\App\\tor.exe -Torrc=.\\Data\\Tor\\torrc -DataDirectory=.\\Data\\Tor - -[TBB] -BrowserDirectory=FirefoxPortable -BrowserExecutable=tbb-firefox.exe +TorExecutable=.\\tor.exe +Torrc=..\\Data\\Tor\\torrc +DataDirectory=..\\Data\\Tor

1 0

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

13 Jul '12

commit 2e888bbf07d1bdd62c37198ad6f319a8085885f9 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 13 09:45:35 2012 +0000 Update translations for https_everywhere_completed --- ko/ssl-observatory.dtd | 87 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 87 insertions(+), 0 deletions(-) diff --git a/ko/ssl-observatory.dtd b/ko/ssl-observatory.dtd new file mode 100644 index 0000000..e6821f5 --- /dev/null +++ b/ko/ssl-observatory.dtd @@ -0,0 +1,87 @@ + +<!ENTITY ssl-observatory.popup.details "세부 사항과 사생활 정보"> +<!ENTITY ssl-observatory.popup.later "나중에 알림"> +<!ENTITY ssl-observatory.popup.no "아니도"> + +<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere"> + + + +<!ENTITY ssl-observatory.popup.title +"HTTPS Everywhere이 SSL 관측소를 사용해야 합니까?"> + +<!ENTITY ssl-observatory.popup.yes "예"> + + + +<!ENTITY ssl-observatory.prefs.adv_priv_opts1 +"매우 방해하는 기업 네트워크를 사용중이지 않으면, 이것을 사용하는 것이 안전압니다."> + +<!ENTITY ssl-observatory.prefs.adv_priv_opts2 +"다음 비밀 서버 이름과 기업 네트워크를 사용하지 않는다면, 안전합니다."> + +<!ENTITY ssl-observatory.prefs.alt_roots +"비표준 루트 CA로부터 서명되지 않은 인증서를 확인하고 제보함."> + +<!ENTITY ssl-observatory.prefs.alt_roots_tooltip +"개인 루트 인증서 권한과 부라우징을 모니터하는 방해하는 기업 네트워크나 TLS 프록시와 카스퍼스키 안티바이러스를 사용하지 않는다면, 이 옵션을 활성화하는 것은 안전합니다(그리고 좋은 생각입니다). 그 네트워크에서 활성화된다면, 이 옵션은 제공되어져야하는 드문 인증서 때문에 https:// 도메인을 그 프록시를 통해 방문한 증거를 알릴 것입니다. 그래서 우리는 기본값으로 두는 것을 추천합니다."> + +<!ENTITY ssl-observatory.prefs.anonymous "익명을 위해 Tor를 사용하는 동안 인증서 확인"> +<!ENTITY ssl-observatory.prefs.anonymous_unavailable +"익명을 위해 Tor를 사용하는 동안 인증서 확인 (Torcheck 권장)"> +<!ENTITY ssl-observatory.prefs.anonymous_tooltip +"이 옵션은 Tor와 Torbutton이 설치된 경우 권장됩니다."> + +<!ENTITY ssl-observatory.prefs.asn +"새로운 인증서를 볼 때, 어떤 ISP에 연결되어 있는지 관측소에 말하십시오."> + +<!ENTITY ssl-observatory.prefs.asn_tooltip +"이것은 귀하의 네트워크의 "자율 시스템 번호"를 수집하고 전송할 것입니다. 이것은 우리가 HTTPS에 대항하는 공격을 찾는 것에 대해 도움을 줄 것입니다. 그리고 우리는 공격이 비교적 일반적인 이란과 시리아와 같은 장소에서 네트워크에서 관측소를 가지고 있는지에 대한 여부를 확인하는 데 도움이 될 것입니다."> + +<!ENTITY ssl-observatory.prefs.done "완료"> + +<!ENTITY ssl-observatory.prefs.explanation +"HTTPS Everywhere은 EFF의 SSL 관측소를 사용할 수 있습니다. 이것은 두 가지 일을 합니다: (1) +중간자 공격을 감지하고 웹의 보안을 향상시키는 것을 돕기 위해, HTTPS 인증서의 복사본을 SSL 관측소로 보냅니다. 그리고 (2) 우리가 귀하에게 보안적이지 않는 연결이나 브라우저에 대한 공격에 대해 경고하도록 합니다."> + + + +<!ENTITY ssl-observatory.prefs.explanation2 + +"예를 들어, https://www.something.com을 방문할 때, 관측소에서 받은 인증서는 누가 사이트를 방문했는지가 아닌, 누가 www.something.com을 방문했거나, 그들이 본 특정한 페이지 키를 표시할 것입니다. 더 많은 세부사항을 위해 옵션을 선택하십시오."> + +<!ENTITY ssl-observatory.prefs.hide "고급 설정 숨기기"> + +<!ENTITY ssl-observatory.prefs.nonanon +"Tor가 가능하지 않더라도 인증서 확인"> + +<!ENTITY ssl-observatory.prefs.nonanon_tooltip +"우리는 계속 데이터를 익명으로 보내겠지만, 이 선택은 덜 보안적입니다."> + +<!ENTITY ssl-observatory.prefs.priv_dns +"non-public DNS 이름을 위한 인증서 확인과 제출"> + +<!ENTITY ssl-observatory.prefs.priv_dns_tooltip +"이 옵션이 선택되지 않는다면, 관측소는 DNS 시스템을 통해 분석될 수 없는 인증서를 기록하지 않을 것입니다."> + +<!ENTITY ssl-observatory.prefs.show "고급 설정 보이기"> + +<!ENTITY ssl-observatory.prefs.title "SSL 관측소 설정"> + +<!ENTITY ssl-observatory.prefs.use "관측소 사용?"> +<!ENTITY ssl-observatory.warning.title "EFF의 SSL 관측소로부터의 경고"> +<!ENTITY ssl-observatory.warning.showcert "인증서 체인 보이기"> +<!ENTITY ssl-observatory.warning.okay "이해했습니다."> +<!ENTITY ssl-observatory.warning.text "EFF의 SSL 관측소가 다음 사이트를 위한 HTTPS 인증서에 대한 경고를 보내왔습니다."> +<!ENTITY ssl-observatory.warning.defense "만약 이 사이트에 로그인되어 있다면, 안전한 연결에 일단 연결한 뒤, 비밀번호를 바꾸는 것이 권장됩니다."> + +<!ENTITY ssl-observatory.prefs.self_signed +"자신-서명 인증서 확인 및 제보"> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +"이것은 추천됩니다: 암호화 문제는 자기 서명된 임베디드 장치에서 특히 일반적입니다.">

1 0

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

13 Jul '12

commit e193932055f5d6d0850e19f8bd5a1574e85bb9e4 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 13 09:45:32 2012 +0000 Update translations for https_everywhere --- ko/ssl-observatory.dtd | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ko/ssl-observatory.dtd b/ko/ssl-observatory.dtd index 727e44d..e6821f5 100644 --- a/ko/ssl-observatory.dtd +++ b/ko/ssl-observatory.dtd @@ -39,7 +39,7 @@ to turn it on?">--> "새로운 인증서를 볼 때, 어떤 ISP에 연결되어 있는지 관측소에 말하십시오."> <!ENTITY ssl-observatory.prefs.asn_tooltip -""> +"이것은 귀하의 네트워크의 "자율 시스템 번호"를 수집하고 전송할 것입니다. 이것은 우리가 HTTPS에 대항하는 공격을 찾는 것에 대해 도움을 줄 것입니다. 그리고 우리는 공격이 비교적 일반적인 이란과 시리아와 같은 장소에서 네트워크에서 관측소를 가지고 있는지에 대한 여부를 확인하는 데 도움이 될 것입니다."> <!ENTITY ssl-observatory.prefs.done "완료"> @@ -54,7 +54,7 @@ Mouseover the options for further details:">--> <!ENTITY ssl-observatory.prefs.explanation2 -""> +"예를 들어, https://www.something.com을 방문할 때, 관측소에서 받은 인증서는 누가 사이트를 방문했는지가 아닌, 누가 www.something.com을 방문했거나, 그들이 본 특정한 페이지 키를 표시할 것입니다. 더 많은 세부사항을 위해 옵션을 선택하십시오."> <!ENTITY ssl-observatory.prefs.hide "고급 설정 숨기기"> @@ -62,13 +62,13 @@ Mouseover the options for further details:">--> "Tor가 가능하지 않더라도 인증서 확인"> <!ENTITY ssl-observatory.prefs.nonanon_tooltip -""> +"우리는 계속 데이터를 익명으로 보내겠지만, 이 선택은 덜 보안적입니다."> <!ENTITY ssl-observatory.prefs.priv_dns "non-public DNS 이름을 위한 인증서 확인과 제출"> <!ENTITY ssl-observatory.prefs.priv_dns_tooltip -""> +"이 옵션이 선택되지 않는다면, 관측소는 DNS 시스템을 통해 분석될 수 없는 인증서를 기록하지 않을 것입니다."> <!ENTITY ssl-observatory.prefs.show "고급 설정 보이기">

1 0

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

13 Jul '12

commit fefde1744ccf5812a83e7c8c87277714104ca673 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 13 09:45:08 2012 +0000 Update translations for orbot --- values-ko/strings.xml | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/values-ko/strings.xml b/values-ko/strings.xml index 406c4f6..8a11b29 100644 --- a/values-ko/strings.xml +++ b/values-ko/strings.xml @@ -39,14 +39,14 @@ <string name="pref_transparent_all_summary">토르를 통한 모든 응용 프로그램에 대한 프록시 트래픽</string> <string name="pref_transparent_port_fallback_title">포트 프록시 대체</string> <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string> - <string name="pref_transparent_port_title">Port List</string> + <string name="pref_transparent_port_title">포트 목록</string> <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string> <string name="pref_transparent_port_dialog">Enter ports to proxy</string> - <string name="pref_has_root">Request Root Access</string> + <string name="pref_has_root">루트 권한에 대한 접근 필요</string> <string name="pref_has_root_summary">Request root access for transparent proxying</string> - <string name="status_install_success">Tor binaries successfully installed!</string> - <string name="status_install_fail">The Tor binary files were unable to be installed. Please check the log and notify tor-assistants(a)torproject.org</string> - <string name="title_error">Application Error</string> + <string name="status_install_success">Tor 바이너리가 성공적으로 설치됨!</string> + <string name="status_install_fail">Tor 바이너리 파일이 설치될 수 없습니다. Log를 확인해 주시고 tor-assistants(a)torproject.org 에 알려 주십시오.</string> + <string name="title_error">애플리케이션 오류</string> <string name="wizard_title">Orbot</string> <string name="wizard_btn_tell_me_more">Orbot 정보</string> <string name="btn_next">다음</string> @@ -66,15 +66,15 @@ <string name="wizard_permission_enable_root">Grant Root for Orbot</string> <string name="wizard_configure">Configure Torification</string> <string name="wizard_configure_msg">Orbot gives you the option to route all application traffic through Tor OR to choose your applications individually.</string> - <string name="wizard_configure_all">Proxy All Apps Through Tor</string> + <string name="wizard_configure_all">모든 App이 Tor를 사용하기</string> <string name="wizard_configure_select_apps">Select Individual Apps for Tor</string> <string name="wizard_tips_tricks">Orbot-enabled Apps</string> <string name="wizard_tips_msg">The apps below were developed to work with Orbot. Click each button to install now, or you can find them later in the Android Market.</string> <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string> <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string> - <string name="wizard_proxy_help_info">Proxy Settings</string> + <string name="wizard_proxy_help_info">프록시 설정</string> <string name="wizard_proxy_help_msg">If the Android app you are using can support the use of an HTTP or SOCKS proxy, then you can configure it to connect to Orbot and use Tor.\n\n\n The host settings is 127.0.0.1 or \"localhost\". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible.\n \n\n\n You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid\n </string> - <string name="wizard_final">Orbot is ready!</string> + <string name="wizard_final">Orbot이 준비됨!</string> <string name="wizard_final_msg">Hundreds of thousands of people around the world use Tor for a wide variety of reasons.\n\nJournalists and bloggers, human rights defenders, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens... and now you are ready to, as well!</string>  <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help(a)guardianproject.info to learn more.</string>

1 0