Unverified Commit 52ad50f0 authored by boklm's avatar boklm
Browse files

Add a testbuild target

parent 3f018465
...@@ -6,5 +6,6 @@ alpha ...@@ -6,5 +6,6 @@ alpha
alpha_nightly alpha_nightly
nightly nightly
hardened hardened
testbuild
rbm.local.conf rbm.local.conf
logs logs
...@@ -62,6 +62,21 @@ alpha_nightly-windows-i686: submodule-update ...@@ -62,6 +62,21 @@ alpha_nightly-windows-i686: submodule-update
alpha_nightly-osx-x86_64: submodule-update alpha_nightly-osx-x86_64: submodule-update
$(rbm) build release --target alpha_nightly --target torbrowser-osx-x86_64 $(rbm) build release --target alpha_nightly --target torbrowser-osx-x86_64
testbuild: submodule-update
$(rbm) build release --target testbuild --target torbrowser-all
testbuild-linux-x86_64: submodule-update
$(rbm) build release --target testbuild --target torbrowser-linux-x86_64
testbuild-linux-i686: submodule-update
$(rbm) build release --target testbuild --target torbrowser-linux-i686
testbuild-windows-i686: submodule-update
$(rbm) build release --target testbuild --target torbrowser-windows-i686
testbuild-osx-x86_64: submodule-update
$(rbm) build release --target testbuild --target torbrowser-osx-x86_64
hardened-linux-x86_64: submodule-update hardened-linux-x86_64: submodule-update
$(rbm) build release --target hardened --target torbrowser-linux-x86_64 $(rbm) build release --target hardened --target torbrowser-linux-x86_64
......
...@@ -70,6 +70,12 @@ name to the makefile target: ...@@ -70,6 +70,12 @@ name to the makefile target:
$ make nightly-windows-i686 $ make nightly-windows-i686
$ make nightly-osx-x86_64 $ make nightly-osx-x86_64
When you want to quickly do a build to test a change, you can use the
testbuild makefile target, and find the build in the testbuild directory.
The build will be the same as regular alpha builds, except that in order
to make the build faster, only the en-US locale will be built, and no
mar file will be created.
Updating git sources Updating git sources
-------------------- --------------------
......
...@@ -54,6 +54,12 @@ targets: ...@@ -54,6 +54,12 @@ targets:
var: var:
build_target: alpha build_target: alpha
testbuild:
output_dir: 'testbuild'
version: '.'
var:
build_target: torbrowser-testbuild
hardened_nightly: hardened_nightly:
output_dir: 'hardened_nightly' output_dir: 'hardened_nightly'
version: '[% c("var/today") %]' version: '[% c("var/today") %]'
......
...@@ -240,9 +240,13 @@ python $MARTOOLS/createprecomplete.py ...@@ -240,9 +240,13 @@ python $MARTOOLS/createprecomplete.py
popd popd
cd $distdir cd $distdir
# Create full MAR file and compressed package.
MAR_FILE=tor-browser-[% c("var/mar_osname") %]-[% c("var/torbrowser_version") %]_${PKG_LOCALE}.mar [% IF c("var/build_mar") -%]
MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE "$TBDIR" # Create full MAR file and compressed package.
MAR_FILE=tor-browser-[% c("var/mar_osname") %]-[% c("var/torbrowser_version") %]_${PKG_LOCALE}.mar
MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE "$TBDIR"
[% END -%]
[% IF c("var/linux") %] [% IF c("var/linux") %]
[% c('tar', { [% c('tar', {
tar_src => [ '$PKG_DIR' ], tar_src => [ '$PKG_DIR' ],
......
...@@ -10,6 +10,7 @@ var: ...@@ -10,6 +10,7 @@ var:
torbrowser_version: '6.5n' torbrowser_version: '6.5n'
project_name: tor-browser project_name: tor-browser
multi_lingual: 0 multi_lingual: 0
build_mar: 1
# By default, we sort the list of installed packages. This allows sharing # By default, we sort the list of installed packages. This allows sharing
# containers with identical list of packages, even if they are not listed # containers with identical list of packages, even if they are not listed
# in the same order. In the cases where the installation order is # in the same order. In the cases where the installation order is
...@@ -63,6 +64,16 @@ targets: ...@@ -63,6 +64,16 @@ targets:
var: var:
multi_lingual: 1 multi_lingual: 1
torbrowser-testbuild:
- testbuild
- alpha
testbuild:
var:
# To make build faster, don't build any locale
locales: []
# Don't create mar files to save time
build_mar: 0
torbrowser-linux-x86_64: torbrowser-linux-x86_64:
- linux-x86_64 - linux-x86_64
- linux - linux
......
...@@ -39,4 +39,19 @@ var: ...@@ -39,4 +39,19 @@ var:
### file. ### file.
#sign_build_gpg_opts: '--local-user XXXXXXXX' #sign_build_gpg_opts: '--local-user XXXXXXXX'
targets:
### testbuild is based on alpha by default. Uncomment this if you want it
### to be based on nightly.
#torbrowser-testbuild:
# - testbuild
# - nightly
testbuild:
var:
testbuild: 1
### Uncomment this if you want to create mar files in your test build.
#build_mar: 1
# vim: filetype=yaml sw=2 # vim: filetype=yaml sw=2
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment