[tor-bugs] #9114 [Tor bundles/installation]: Reorganize bundle directory structure for TBB 3.0

[Tor Bug Tracker & Wiki]

#9114: Reorganize bundle directory structure for TBB 3.0
--------------------------------------+-------------------------------------
 Reporter:  mikeperry                 |          Owner:  brade       
     Type:  defect                    |         Status:  needs_review
 Priority:  normal                    |      Milestone:              
Component:  Tor bundles/installation  |        Version:              
 Keywords:  tbb-3.0                   |         Parent:  #4234       
   Points:                            |   Actualpoints:              
--------------------------------------+-------------------------------------
Changes (by mcs):

  * status:  assigned => needs_review


Comment:

 A few explanations about the patch I just attached:

 - Compared to our earlier proposal, sources was moved under Docs.

 - Under the Data directory we have:
 {{{
   Data/
     Browser/
       profile.default/
       profiles.ini
     Tor/
       geoip
       torrc
       torrc-defaults
 }}}

 - Most of the contents of torrc were moved to torrc-defaults
 (DataDirectory and GeoIPFile were removed; their paths are passed in on
 the tor command line by Tor Launcher).

 - On Mac OS, the bookmarks.html file was missing from the browser profile.
 We added it.

 - On Mac OS, we switched the top-level bundle's icon set to the "globe"
 icon (firefox.icns).

 - Some files were simply moved (not modified): bookmarks.html, extension-
 overrides.js, profiles.ini.

 - For some reason, our Windows builds lack webapprt, which is why we made
 the re-dzip conditional in our gitian-firefox.yml changes:
 {{{
    #   cd $INSTDIR
 -  ~/build/re-dzip.sh App/Firefox/omni.ja
 -  ~/build/re-dzip.sh App/Firefox/webapprt/omni.ja
 -  cd ..
 -  ~/build/dzip.sh tor-browser-win32-gbuilt.zip ./FirefoxPortable/
 +  ~/build/re-dzip.sh Browser/omni.ja
 +  if [ -f Browser/webapprt/omni.ja ]; then
 +    ~/build/re-dzip.sh Browser/webapprt/omni.ja
 +  fi
 +  ~/build/dzip.sh tor-browser-win32-gbuilt.zip Browser
    cp tor-browser-win32-gbuilt.zip $OUTDIR
 }}}
 If this is just a problem with our build process, those changes should be
 ignored.

 With these changes, the TBB package structure will be consistent across
 all platforms.  That should help keep developers and users sane, and also
 make updater work easier (e.g., #4234).

-- 
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/9114#comment:8>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online