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

Bug 973933 - Fix Nightly builds failing on updater-xpcshell. r=rstrong

parent 75450607

toolkit/mozapps/update/updater/moz.build

+2 −1
Original line number Diff line number Diff line
@@ -8,5 +8,6 @@ Program('updater') 


updater_rel_path = ''

include('updater-common.build')

if CONFIG['ENABLE_TESTS']:

    DIRS += ['updater-xpcshell']

FAIL_ON_WARNINGS = True

toolkit/mozapps/update/updater/updater-common.build

+7 −5
Original line number Diff line number Diff line
@@ -47,11 +47,11 @@ if CONFIG['OS_ARCH'] == 'WINNT': 
    ]

elif CONFIG['OS_ARCH'] == 'Linux' and CONFIG['MOZ_VERIFY_MAR_SIGNATURE']:

    USE_LIBS += [

        '/modules/libmar/sign/signmar',

        'nss',

        'signmar',

        'updatecommon',

    ]

    OS_LIBS += CONFIG['NSPR_LIBS']

    OS_LIBS += CONFIG['nspr']

else:

    USE_LIBS += [

        'updatecommon',
@@ -80,7 +80,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': 
        'launchchild_osx.mm',

        'progressui_osx.mm',

    ]

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

    OS_LIBS += [

        '-framework Cocoa',

        '-framework Security',

    ]

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

    have_progressui = 1

    srcs += [
@@ -98,8 +101,7 @@ if have_progressui == 0: 
        'progressui_null.cpp',

    ]



srcs.sort()

SOURCES += ['%s%s' % (updater_rel_path, f) for f in srcs]

SOURCES += ['%s%s' % (updater_rel_path, f) for f in sorted(srcs)]



DEFINES['NS_NO_XPCOM'] = True

DISABLE_STL_WRAPPING = True

toolkit/mozapps/update/updater/updater-xpcshell/Makefile.in

+3 −18
Original line number Diff line number Diff line
@@ -8,15 +8,6 @@ 
XPCSHELLTESTROOT = $(abspath $(DEPTH))/_tests/xpcshell/toolkit/mozapps/update/tests

MOCHITESTROOT = $(abspath $(DEPTH))/_tests/testing/mochitest/chrome/toolkit/mozapps/update/tests



ifndef MOZ_PROFILE_GENERATE

ifdef COMPILE_ENVIRONMENT

INSTALL_TARGETS += xpcshell-updater

xpcshell-updater_TARGET  := libs

xpcshell-updater_DEST    := $(XPCSHELLTESTROOT)/data

xpcshell-updater_FILES   := $(DIST)/bin/updater-xpcshell$(BIN_SUFFIX)

endif

endif # Not MOZ_PROFILE_GENERATE



include $(topsrcdir)/config/rules.mk



ifndef MOZ_WINCONSOLE
@@ -27,12 +18,6 @@ MOZ_WINCONSOLE = 0 
endif

endif



ifdef MOZ_WIDGET_GTK

libs:: ../updater.png

	$(NSINSTALL) -D $(DIST)/bin/icons

	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/icons

endif



libs::

ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))

	# Copy for xpcshell tests
@@ -41,8 +26,8 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) 
	sed -e 's/%APP_NAME%/$(MOZ_APP_DISPLAYNAME)/' $(srcdir)/../macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | \

	  iconv -f UTF-8 -t UTF-16 > $(XPCSHELLTESTROOT)/data/updater-xpcshell.app/Contents/Resources/English.lproj/InfoPlist.strings

	$(NSINSTALL) -D $(XPCSHELLTESTROOT)/data/updater-xpcshell.app/Contents/MacOS/updater-xpcshell

	$(NSINSTALL) $(XPCSHELLTESTROOT)/data/updater-xpcshell $(XPCSHELLTESTROOT)/data/updater-xpcshell.app/Contents/MacOS

	rm -f $(XPCSHELLTESTROOT)/data/updater-xpcshell

	$(NSINSTALL) $(PROGRAM) $(XPCSHELLTESTROOT)/data/updater-xpcshell.app/Contents/MacOS

	rm -f $(PROGRAM)

	rm -Rf $(XPCSHELLTESTROOT)/data/updater.app

	mv $(XPCSHELLTESTROOT)/data/updater-xpcshell.app $(XPCSHELLTESTROOT)/data/updater.app

	mv $(XPCSHELLTESTROOT)/data/updater.app/Contents/MacOS/updater-xpcshell $(XPCSHELLTESTROOT)/data/updater.app/Contents/MacOS/updater
@@ -50,7 +35,7 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) 
	# Copy for mochitest chrome tests

	rsync -a -C $(XPCSHELLTESTROOT)/data/updater.app $(MOCHITESTROOT)/data/updater.app

else

	mv $(XPCSHELLTESTROOT)/data/updater-xpcshell$(BIN_SUFFIX) $(XPCSHELLTESTROOT)/data/updater$(BIN_SUFFIX)

	mv $(PROGRAM) $(XPCSHELLTESTROOT)/data/updater$(BIN_SUFFIX)

	cp $(XPCSHELLTESTROOT)/data/updater$(BIN_SUFFIX) $(MOCHITESTROOT)/data/updater$(BIN_SUFFIX)

endif

toolkit/mozapps/update/updater/updater-xpcshell/moz.build

+1 −0
Original line number Diff line number Diff line
@@ -7,5 +7,6 @@ 
Program('updater-xpcshell')



updater_rel_path = '../'

NO_DIST_INSTALL = True

DEFINES['UPDATER_XPCSHELL_CERT'] = True

include('../updater-common.build')