Commit b0098afa authored by Cosmin Sabou's avatar Cosmin Sabou
Browse files

Merge mozilla-inbound to mozilla-central. r=merge a=merge

parents f0ba907a 8f80d8a5

browser/app/profile/firefox.js

+0 −1
Original line number Diff line number Diff line
@@ -1626,7 +1626,6 @@ pref("reader.errors.includeURLs", true); 
pref("view_source.tab", true);



pref("dom.serviceWorkers.enabled", true);

pref("dom.serviceWorkers.openWindow.enabled", true);



// Enable Push API.

pref("dom.push.enabled", true);

build/moz.configure/init.configure

+20 −0
Original line number Diff line number Diff line
@@ -994,6 +994,7 @@ add_old_configure_assignment('MOZ_BUILD_APP', build_project) 
# - otherwise, we're building Release/Beta (define RELEASE_OR_BETA)

@depends(check_build_environment, '--help')

@imports(_from='__builtin__', _import='open')

@imports('re')

def milestone(build_env, _):

    milestone_path = os.path.join(build_env.topsrcdir,

                                  'config',
@@ -1008,7 +1009,18 @@ def milestone(build_env, _): 
    elif 'a' not in milestone:

        is_release_or_beta = True



    major_version = milestone.split('.')[0]

    m = re.search(r"([ab]\d+)", milestone)

    ab_patch = m.group(1) if m else ''



    # Only expose the major version milestone in the UA string and hide the

    # patch leve (bugs 572659 and 870868).

    #

    # Only expose major milestone and alpha version in the symbolversion

    # string; as the name suggests, we use it for symbol versioning on Linux.

    return namespace(version=milestone,

                     uaversion='%s.0' % major_version,

                     symbolversion='%s%s' % (major_version, ab_patch),

                     is_nightly=is_nightly,

                     is_release_or_beta=is_release_or_beta)
@@ -1021,6 +1033,14 @@ set_config('RELEASE_OR_BETA', milestone.is_release_or_beta) 
set_define('RELEASE_OR_BETA', milestone.is_release_or_beta)

add_old_configure_assignment('RELEASE_OR_BETA',

                             milestone.is_release_or_beta)

set_define('MOZILLA_VERSION', depends(milestone)(lambda m: '"%s"' % m.version))

set_config('MOZILLA_VERSION', milestone.version)

set_define('MOZILLA_VERSION_U', milestone.version)

set_define('MOZILLA_UAVERSION', depends(milestone)(lambda m: '"%s"' % m.uaversion))

set_config('MOZILLA_SYMBOLVERSION', milestone.symbolversion)

# JS configure still wants to look at these.

add_old_configure_assignment('MOZILLA_VERSION', milestone.version)

add_old_configure_assignment('MOZILLA_SYMBOLVERSION', milestone.symbolversion)



# The app update channel is 'default' when not supplied. The value is used in

# the application's confvars.sh (and is made available to a project specific

config/milestone.txt

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#    x.x.x.x

#    x.x.x+

#

# Referenced by milestone.py.

# Referenced by build/moz.configure/init.configure.

# Hopefully I'll be able to automate replacement of *all*

# hardcoded milestones in the tree from these two files.

#--------------------------------------------------------

config/pathsub.c

+1 −5
Original line number Diff line number Diff line
@@ -27,10 +27,6 @@ 
#include "sunos4.h"

#endif



#ifndef D_INO

#define D_INO	d_ino

#endif



char *program;



void
@@ -108,7 +104,7 @@ ino2name(ino_t ino) 
    for (;;) {

	if (!(ep = readdir(dp)))

	    fail("cannot find current directory");

	if (ep->D_INO == ino)

	if (ep->d_ino == ino)

	    break;

    }

    name = xstrdup(ep->d_name);

devtools/client/aboutdebugging/test/browser.ini

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ skip-if = !e10s # This test is only valid in e10s 
[browser_service_workers_not_compatible.js]

[browser_service_workers_push.js]

[browser_service_workers_push_service.js]

skip-if = !e10s # Bug 1424895

[browser_service_workers_start.js]

[browser_service_workers_status.js]

[browser_service_workers_timeout.js]