Commit 9c3bda0e authored by Brian R. Bondy's avatar Brian R. Bondy Committed by Georg Koppen
Browse files

Bug 903135 - Multi platform MAR verification build config. r=rstrong 

Conflicts:
	browser/confvars.sh
parent 1582f105

browser/confvars.sh

+11 −0
Original line number Diff line number Diff line
@@ -8,6 +8,17 @@ MOZ_APP_VENDOR=Mozilla 
MOZ_UPDATER=1

MOZ_PHOENIX=1



if test "$OS_ARCH" = "WINNT"; then

  MOZ_VERIFY_MAR_SIGNATURE=1

elif test "$OS_ARCH" = "Linux"; then

  MOZ_VERIFY_MAR_SIGNATURE=1

elif test "$OS_ARCH" = "Darwin"; then

  MOZ_VERIFY_MAR_SIGNATURE=1

fi



# Enable building ./signmar and running libmar signature tests

MOZ_ENABLE_SIGNMAR=1



MOZ_CHROME_FILE_FORMAT=omni

MOZ_DISABLE_EXPORT_JS=1

MOZ_SAFE_BROWSING=1

configure.in

+1 −5
Original line number Diff line number Diff line
@@ -6456,11 +6456,7 @@ MOZ_ARG_ENABLE_BOOL(verify-mar, 
    MOZ_VERIFY_MAR_SIGNATURE= )



if test -n "$MOZ_VERIFY_MAR_SIGNATURE"; then

  if test "$OS_ARCH" = "WINNT"; then

  AC_DEFINE(MOZ_VERIFY_MAR_SIGNATURE)

  else

    AC_MSG_ERROR([Can only build with --enable-verify-mar with a Windows target])

  fi

fi



dnl ========================================================

modules/libmar/moz.build

+1 −5
Original line number Diff line number Diff line
@@ -9,11 +9,7 @@ DIRS += ['src'] 
if CONFIG['MOZ_ENABLE_SIGNMAR']:

    DIRS += ['sign', 'verify']

    TEST_DIRS += ['tests']

elif CONFIG['OS_ARCH'] == 'WINNT':

    # On Windows we don't verify with NSS and updater needs to link to it

    DIRS += ['verify']

elif CONFIG['OS_ARCH'] == 'Darwin':

    # On OSX we don't verify with NSS and updater needs to link to it.

elif CONFIG['MOZ_VERIFY_MAR_SIGNATURE']:

    DIRS += ['verify']



# If we are building ./sign and ./verify then ./tool must come after it

toolkit/mozapps/update/updater/moz.build

+6 −1
Original line number Diff line number Diff line
@@ -45,7 +45,12 @@ if CONFIG['OS_ARCH'] == 'WINNT': 
else:

    USE_LIBS += [

        'updatecommon',

        '/modules/libmar/sign/signmar',

        '/modules/libmar/sign/verifymar',

        '/security/nss/lib/nss/nss3',

        '/security/nss/lib/util/nssutil3',

    ]

    OS_LIBS += CONFIG['NSPR_LIBS']



USE_LIBS += [

    'mar',
@@ -70,7 +75,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': 
        'launchchild_osx.mm',

        'progressui_osx.mm',

    ]

    OS_LIBS += ['-framework Cocoa']

    OS_LIBS += ['-framework Cocoa -framework Security']

elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':

    have_progressui = 1

    SOURCES += [