commit d3834a997f73c481db9458d67ccc06a2852f9d9b Author: Sukhbir Singh sukhbir@torproject.org Date: Sat Jan 7 01:00:09 2017 -0500

Remove redundant $PLUGINSDIR from Windows build

The version of 7z (9.02) we are using for the builds creates redundant $PLUGINSDIR which we remove. --- projects/tor-messenger/build | 2 ++ 1 file changed, 2 insertions(+)

diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build index 1415f22..817af38 100755 --- a/projects/tor-messenger/build +++ b/projects/tor-messenger/build @@ -64,6 +64,8 @@ cat $rootdir/Bundle-Data/PTConfigs/bridge_prefs.js >> \

[% IF c("var/windows") -%] 7z x ../../../../../../../[% c('input_files_by_name/tor-browser') %] +# The version of 7z (9.02) we are using for the builds creates redundant $PLUGINSDIR which we remove. +rm -rf $PLUGINSDIR Browser/$PLUGINSDIR mv $_OUTDIR tor-browser_en-US cp -pf tor-browser_en-US/Browser/libssp-0.dll tor-browser_en-US/Browser/TorBrowser/Tor/