Backed out changeset 96059b4f6d8a (bug 1490119) for breaking OSX builds r=bhearsum a=backout

build/gen_test_packages_manifest.py

@@ -21,7 +21,6 @@ ALL_HARNESSES = [
     'raptor',
     'awsy',
     'gtest',
-    'updater-dep'
 ]
 
 PACKAGE_SPECIFIED_HARNESSES = [
@@ -33,7 +32,6 @@ PACKAGE_SPECIFIED_HARNESSES = [
     'talos',
     'raptor',
     'awsy',
-    'updater-dep',
 ]
 
 # These packages are not present for every build configuration.

python/mozbuild/mozbuild/action/test_archive.py

@@ -110,7 +110,6 @@ ARCHIVE_FILES = {
                 'awsy/**',
                 'web-platform/**',
                 'xpcshell/**',
-                'updater-dep/**',
             ],
         },
         {
@@ -520,21 +519,6 @@ ARCHIVE_FILES = {
             'dest': 'xpcshell',
         },
     ],
-    'updater-dep': [
-        {
-            'source': buildconfig.topobjdir,
-            'base': '_tests/updater-dep',
-            'pattern': '**',
-            'dest': 'updater-dep',
-        },
-        # Required by the updater on Linux
-        {
-            'source': buildconfig.topobjdir,
-            'base': 'config/external/sqlite',
-            'pattern': 'libmozsqlite3.so',
-            'dest': 'updater-dep',
-        },
-    ],
 }
 
 if buildconfig.substs.get('MOZ_CODE_COVERAGE'):
@@ -642,7 +626,7 @@ def find_files(archive):
             '**/*.pyc',
         ])
 
-        if archive not in ('common', 'updater-dep') and base.startswith('_tests'):
+        if archive != 'common' and base.startswith('_tests'):
             # We may have generated_harness_files to exclude from this entry.
             for path in generated_harness_files:
                 if path.startswith(base):

testing/testsuite-targets.mk

@@ -125,7 +125,6 @@ TEST_PKGS_TARGZ := \
   awsy \
   xpcshell \
   web-platform \
-  updater-dep \
   $(NULL)
 
 ifdef LINK_GTEST_DURING_COMPILE

toolkit/mozapps/update/updater/archivereader.cpp

@@ -25,9 +25,6 @@
 #ifdef MOZ_VERIFY_MAR_SIGNATURE
 #ifdef TEST_UPDATER
 #include "../xpcshellCert.h"
-#elif DEP_UPDATER
-#include "../dep1Cert.h"
-#include "../dep2Cert.h"
 #else
 #include "primaryCert.h"
 #include "secondaryCert.h"
@@ -90,11 +87,6 @@ ArchiveReader::VerifySignature()
 #else
 #ifdef TEST_UPDATER
   int rv = VerifyLoadedCert(mArchive, xpcshellCertData);
-#elif DEP_UPDATER
-  int rv = VerifyLoadedCert(mArchive, dep1CertData);
-  if (rv != OK) {
-    rv = VerifyLoadedCert(mArchive, dep2CertData);
-  }
 #else
   int rv = VerifyLoadedCert(mArchive, primaryCertData);
   if (rv != OK) {

toolkit/mozapps/update/updater/moz.build

@@ -11,7 +11,6 @@ else:
 
 updater_rel_path = ''
 include('updater-common.build')
-DIRS += ['updater-dep']
 if CONFIG['ENABLE_TESTS']:
     DIRS += ['updater-xpcshell']
 
@@ -26,8 +25,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
                 SRCDIR + '/Launchd.plist']
 
 GENERATED_FILES = [
-    'dep1Cert.h',
-    'dep2Cert.h',
     'primaryCert.h',
     'secondaryCert.h',
     'xpcshellCert.h',
@@ -40,14 +37,10 @@ secondary_cert = GENERATED_FILES['secondaryCert.h']
 # have to regenerate it.
 # ./certutil -L -d modules/libmar/tests/unit/data -n mycert -r > xpcshellCertificate.der
 xpcshell_cert = GENERATED_FILES['xpcshellCert.h']
-dep1_cert = GENERATED_FILES['dep1Cert.h']
-dep2_cert = GENERATED_FILES['dep2Cert.h']
 
 primary_cert.script = 'gen_cert_header.py:create_header'
 secondary_cert.script = 'gen_cert_header.py:create_header'
 xpcshell_cert.script = 'gen_cert_header.py:create_header'
-dep1_cert.script = 'gen_cert_header.py:create_header'
-dep2_cert.script = 'gen_cert_header.py:create_header'
 
 if CONFIG['MOZ_UPDATE_CHANNEL'] in ('beta', 'release', 'esr'):
     primary_cert.inputs += ['release_primary.der']
@@ -61,8 +54,6 @@ else:
     primary_cert.inputs += ['dep1.der']
     secondary_cert.inputs += ['dep2.der']
 
-dep1_cert.inputs += ['dep1.der']
-dep2_cert.inputs += ['dep2.der']
 xpcshell_cert.inputs += ['xpcshellCertificate.der']
 
 if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:

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

@@ -1,20 +0,0 @@
-# vim:set ts=8 sw=8 sts=8 noet:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# For changes here, also consider ../Makefile.in
-
-include $(topsrcdir)/config/rules.mk
-
-tools::
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-	# Copy for xpcshell tests
-	$(NSINSTALL) -D $(FINAL_TARGET)/updater-dep.app
-	rsync -a -C --exclude '*.in' $(srcdir)/../macbuild/Contents $(FINAL_TARGET)/updater-dep.app
-	sed -e 's/%APP_NAME%/$(MOZ_APP_DISPLAYNAME)/' $(srcdir)/../macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | \
-	  iconv -f UTF-8 -t UTF-16 > $(FINAL_TARGET)/updater-dep.app/Contents/Resources/English.lproj/InfoPlist.strings
-	$(NSINSTALL) -D $(FINAL_TARGET)/updater-dep.app/Contents/MacOS
-	$(NSINSTALL) $(FINAL_TARGET)/updater-dep $(FINAL_TARGET)/updater-dep.app/Contents/MacOS
-	mv $(FINAL_TARGET)/updater-dep.app/Contents/MacOS/updater-dep $(FINAL_TARGET)/updater-dep.app/Contents/MacOS/org.mozilla.updater
-endif

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

@@ -1,14 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-FINAL_TARGET = '_tests/updater-dep'
-
-Program('updater-dep')
-
-updater_rel_path = '../'
-DEFINES['DEP_UPDATER'] = True
-include('../updater-common.build')
-

toolkit/mozapps/update/updater/updater.rc

@@ -4,7 +4,7 @@
 
 // Microsoft Visual C++ generated resource script.
 //
-#if defined(TEST_UPDATER) || defined(DEP_UPDATER)
+#ifdef TEST_UPDATER
 #include "../resource.h"
 #define MANIFEST_PATH "../updater.exe.manifest"
 #define COMCTL32_MANIFEST_PATH "../updater.exe.comctl32.manifest"