Unverified Commit 68767e58 authored by boklm's avatar boklm
Browse files

Bug 40737: Prefix alpha/release/nightly directory with projectname

parent 7855f0b6

.gitignore

+2 −3
Changes for .gitignore: 2 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -2,9 +2,8 @@ 
/hg_clones

/gclient

/out

/release

/alpha

/nightly

/torbrowser

/basebrowser

/testbuild

/rbm.local.conf

/logs

Makefile

+14 −14
Changes for Makefile: 14 added lines, 14 removed lines.
Original line number Diff line number Diff line
@@ -187,39 +187,39 @@ signtag-alpha: submodule-update 
	$(rbm) build release --step signtag --target alpha



incrementals-release: submodule-update

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

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

	tools/update-responses/download_missing_versions release

	tools/update-responses/gen_incrementals release

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

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



incrementals-alpha: submodule-update

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

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

	tools/update-responses/download_missing_versions alpha

	tools/update-responses/gen_incrementals alpha

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

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



incrementals-nightly: submodule-update

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

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

	NO_CODESIGNATURE=1 tools/update-responses/gen_incrementals nightly

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

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



update_responses-release: submodule-update

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

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

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

	$(rbm) build release --step create_update_responses_tar --target release --target signed --target torbrowser



update_responses-alpha: submodule-update

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

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

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

	$(rbm) build release --step create_update_responses_tar --target alpha --target signed --target torbrowser



dmg2mar-release: submodule-update

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

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

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

	$(rbm) build release --step dmg2mar --target release --target signed --target torbrowser

	tools/update-responses/download_missing_versions release

	CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals release



dmg2mar-alpha: submodule-update

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

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

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

	$(rbm) build release --step dmg2mar --target alpha --target signed --target torbrowser

	tools/update-responses/download_missing_versions alpha

	CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals alpha

README

+4 −3
Changes for README: 4 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -70,9 +70,10 @@ channel you want to build: 
  $ make torbrowser-alpha

  $ make torbrowser-nightly



You can find the build result in the directory release/unsigned/$version

or alpha/unsigned/$version for release or alpha builds. The result of

nightly can be found in the nightly/$version directory.

You can find the build result in the directory

torbrowser/release/unsigned/$version or torbrowser/alpha/unsigned/$version

for release or alpha builds. The result of nightly can be found in the

torbrowser/nightly/$version directory.



If you want to build for a specific platform only, append the platform

name to the makefile target:

doc/MAKEFILE.txt

+3 −3
Changes for doc/MAKEFILE.txt: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ Description of makefile rules 
torbrowser-release

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

Build Tor Browser for the release channel, for all supported platforms.

The resulting build can be found in directory release/$version.

The resulting build can be found in directory torbrowser/release/$version.



torbrowser-release-{linux-x86_64,linux-i686,windows-i686,macos,

                    android-armv7, android-x86,android-x86_64,
@@ -18,7 +18,7 @@ android for all architectures we support. 
torbrowser-alpha

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

Build Tor Browser for the alpha channel, for all supported platforms.

The resulting build can be found in directory alpha/$version.

The resulting build can be found in directory torbrowser/alpha/$version.



torbrowser-alpha-{linux-x86_64,linux-i686,windows-i686,macos,

                  android-armv7,android-x86,android-x86_64,
@@ -33,7 +33,7 @@ Many of the components will be based on the main branch. You might 
want to run "make fetch" before, to fetch the latest commits from all

components.



The resulting build can be found in directory nightly/$date

The resulting build can be found in directory torbrowser/nightly/$date



torbrowser-nightly-{linux-x86_64,linux-i686,windows-i686,macos,

                    android-armv7,android-x86,android-x86_64,

projects/release/config

+3 −3
Changes for projects/release/config: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line 
# vim: filetype=yaml sw=2

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

output_dir: release

output_dir: '[% c("var/projectname", { output_dir => "." }) %]/release'

link_input_files: 1



var:
@@ -99,13 +99,13 @@ targets: 
      build_target: release



  nightly:

    output_dir: 'nightly'

    output_dir: '[% c("var/projectname", { output_dir => "." }) %]/nightly'

    var:

      build_target: nightly

      publish_dir: '[% c("version") %]'



  alpha:

    output_dir: alpha

    output_dir: '[% c("var/projectname", { output_dir => "." }) %]/alpha'

    var:

      build_target: alpha