Unverified Commit de3f97f3 authored by boklm's avatar boklm
Browse files

Bug 17381: add and adapt the update_responses script 

Add the update_responses and incrementals makefile rules.

The update_responses script is identical to what we have in
tor-browser-bundle.git, however the config.yml file it is using is now
generated using the infos from rbm.
parent f3fed13f

Makefile

+20 −0
Original line number Diff line number Diff line
@@ -83,6 +83,26 @@ signtag-release: submodule-update 
signtag-alpha: submodule-update

	$(rbm) build release --step signtag --target alpha



incrementals-release: submodule-update

	$(rbm) build release --step update_responses_config --target release

	tools/update-responses/download_missing_versions release

	tools/update-responses/gen_incrementals release

	$(rbm) build release --step hash_incrementals --target release



incrementals-alpha: submodule-update

	$(rbm) build release --step update_responses_config --target alpha

	tools/update-responses/download_missing_versions alpha

	tools/update-responses/gen_incrementals alpha

	$(rbm) build release --step hash_incrementals --target alpha



update_responses-release: submodule-update

	$(rbm) build release --step update_responses_config --target release --target signed

	tools/update-responses/update_responses release



update_responses-alpha: submodule-update

	$(rbm) build release --step update_responses_config --target alpha --target signed

	tools/update-responses/update_responses alpha



submodule-update:

	git submodule update --init

README.MAKEFILE

+10 −0
Original line number Diff line number Diff line
@@ -77,3 +77,13 @@ signtag-{release,alpha} 
Create a git signed tag for the selected channel, using the version and

build number defined as var/torbrowser_version and var/torbrowser_build.



incrementals-{release,alpha}

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

Create incremental mar files for an unsigned build in the release or

alpha channel.



update_responses-{release,alpha}

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

Create update responses xml files for a signed build in the release or

alpha channel.

keyring/torbrowser.gpg

0 → 100644
+48.1 KiB

File added.

No diff preview for this file type.

View file

projects/firefox/config

+2 −1
Original line number Diff line number Diff line
@@ -7,7 +7,8 @@ git_url: https://git.torproject.org/tor-browser.git 
gpg_keyring: torbutton.gpg



var:

  firefox_version: 52.3.0esr

  firefox_platform_version: 52.3.0

  firefox_version: '[% c("var/firefox_platform_version") %]esr'

  torbrowser_branch: 7.5

  torbrowser_update_channel: alpha

  copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'

projects/release/config

+18 −3
Original line number Diff line number Diff line 
# vim: filetype=yaml sw=2

version: '[% c("var/torbrowser_version") %]'

output_dir: 'release/unsigned'

output_dir: release



var:

  signed_status: unsigned

  today: '[% USE date; date.format(format = "%Y-%m-%d") %]'

  publish_dir: '[% c("version") %]-[% c("var/torbrowser_build") %]'

  publish_dir: '[% c("var/signed_status") %]/[% c("version") %]-[% c("var/torbrowser_build") %]'



targets:

  torbrowser-all:
@@ -50,7 +51,7 @@ targets: 
      publish_dir: '[% c("var/today") %]'



  alpha:

    output_dir: 'alpha/unsigned'

    output_dir: alpha

    var:

      build_target: alpha
@@ -60,6 +61,10 @@ targets: 
      build_target: torbrowser-testbuild

      publish_dir: ''



  signed:

    var:

      signed_status: signed



input_files:



# Release
@@ -112,3 +117,13 @@ steps: 
    debug: 0

    input_files: []

    signtag: '[% INCLUDE signtag %]'

  update_responses_config:

    build_log: '-'

    debug: 0

    input_files: []

    update_responses_config: '[% INCLUDE update_responses_config %]'

  hash_incrementals:

    build_log: '-'

    debug: 0

    input_files: []

    hash_incrementals: '[% INCLUDE hash_incrementals %]'