Unverified Commit 055e7514 authored by boklm's avatar boklm
Browse files

Bug 21998: add option for debug builds

parent a718f53f

Makefile

+12 −0
Original line number Diff line number Diff line
@@ -8,6 +8,9 @@ release: submodule-update 
release-linux-x86_64: submodule-update

	$(rbm) build release --target release --target torbrowser-linux-x86_64



release-linux-x86_64-debug: submodule-update

	$(rbm) build release --target release --target torbrowser-linux-x86_64-debug



release-linux-i686: submodule-update

	$(rbm) build release --target release --target torbrowser-linux-i686
@@ -26,6 +29,9 @@ alpha: submodule-update 
alpha-linux-x86_64: submodule-update

	$(rbm) build release --target alpha --target torbrowser-linux-x86_64



alpha-linux-x86_64-debug: submodule-update

	$(rbm) build release --target alpha --target torbrowser-linux-x86_64-debug



alpha-linux-i686: submodule-update

	$(rbm) build release --target alpha --target torbrowser-linux-i686
@@ -44,6 +50,9 @@ nightly: submodule-update 
nightly-linux-x86_64: submodule-update

	$(rbm) build release --target nightly --target torbrowser-linux-x86_64



nightly-linux-x86_64-debug: submodule-update

	$(rbm) build release --target nightly --target torbrowser-linux-x86_64-debug



nightly-linux-i686: submodule-update

	$(rbm) build release --target nightly --target torbrowser-linux-i686
@@ -80,6 +89,9 @@ testbuild: submodule-update 
testbuild-linux-x86_64: submodule-update

	$(rbm) build release --target testbuild --target torbrowser-linux-x86_64



testbuild-linux-x86_64-debug: submodule-update

	$(rbm) build release --target testbuild --target torbrowser-linux-x86_64-debug



testbuild-linux-i686: submodule-update

	$(rbm) build release --target testbuild --target torbrowser-linux-i686

README.MAKEFILE

+4 −0
Original line number Diff line number Diff line
@@ -50,6 +50,10 @@ locale is created, without mar files. By default it is based on the 
alpha channel, but you can change that by editing rbm.conf.local.

The resulting build can be found in directory testbuild.



{release,alpha,nightly,testbuild}-linux-x86_64-debug

----------------------------------------------------

Create a debug build for Linux x86_64 with debug features such as ASan.



fetch

-----

Fetch new commits from all components. This is useful when you want to

projects/firefox/build

+6 −0
Original line number Diff line number Diff line
@@ -49,6 +49,12 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz 


cd /var/tmp/build/[% project %]-[% c("version") %]

mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig

[% IF c("var/asan") -%]

  mv -f .mozconfig-asan .mozconfig

  # Without disabling LSan our build is blowing up:

  # https://bugs.torproject.org/10599#comment:52

  export ASAN_OPTIONS="detect_leaks=0"

[% END -%]



eval $(perl $rootdir/get-moz-build-date [% c("var/copyright_year") %] $(cat browser/config/version.txt))

if [ -z $MOZ_BUILD_DATE ]

projects/release/config

+5 −1
Original line number Diff line number Diff line
@@ -17,6 +17,10 @@ targets: 
  torbrowser-linux-x86_64:

    var:

      torbrowser-linux-x86_64: 1

  torbrowser-linux-x86_64-debug:

    var:

      torbrowser-linux-x86_64: 1

      debug-build: '-debug'

  torbrowser-linux-i686:

    var:

      torbrowser-linux-i686: 1
@@ -77,7 +81,7 @@ input_files: 
   enable: '[% c("var/torbrowser-linux-x86_64") %]'

   target:

     - '[% c("var/build_target") %]'

     - torbrowser-linux-x86_64

     - 'torbrowser-linux-x86_64[% c("var/debug-build") %]'



 - name: sandbox-linux-x86_64

   project: sandbox

projects/tor-browser/RelativeLink/start-tor-browser

+7 −0
Original line number Diff line number Diff line
@@ -272,6 +272,13 @@ LD_LIBRARY_PATH="${HOME}/TorBrowser/Tor/" 
export LD_LIBRARY_PATH

export SELFRANDO_write_layout_file=



[% IF c("var/asan") -%]

# We need to disable LSan which is enabled by default now. Otherwise we'll get

# a crash during shutdown: https://bugs.torproject.org/10599#comment:59

ASAN_OPTIONS="detect_leaks=0"

export ASAN_OPTIONS

[% END -%]



function setControlPortPasswd() {

    local ctrlPasswd=$1