diff options
| -rw-r--r-- | basilisk/installer/Makefile.in | 16 | ||||
| -rw-r--r-- | basilisk/installer/package-manifest.in | 6 | ||||
| -rw-r--r-- | basilisk/locales/jar.mn | 5 | ||||
| -rw-r--r-- | basilisk/moz.build | 7 |
4 files changed, 0 insertions, 34 deletions
diff --git a/basilisk/installer/Makefile.in b/basilisk/installer/Makefile.in index dd16ecd..0f27be7 100644 --- a/basilisk/installer/Makefile.in +++ b/basilisk/installer/Makefile.in @@ -15,12 +15,6 @@ MOZ_PKG_DUPEFLAGS = -f $(srcdir)/allowed-dupes.mn # Some files have been already bundled with xulrunner MOZ_PKG_FATAL_WARNINGS = 1 -# When packaging an artifact build not all xpt files expected by the -# packager will be present. -ifdef MOZ_ARTIFACT_BUILDS -MOZ_PKG_FATAL_WARNINGS = -endif - DEFINES += -DMOZ_APP_NAME=$(MOZ_APP_NAME) -DPREF_DIR=$(PREF_DIR) ifdef MOZ_DEBUG @@ -46,10 +40,6 @@ ifdef NSS_DISABLE_DBM DEFINES += -DNSS_DISABLE_DBM=1 endif -ifdef MOZ_ARTIFACT_BUILDS -DEFINES += -DMOZ_ARTIFACT_BUILDS=1 -endif - DEFINES += -DJAREXT= ifdef MOZ_ANGLE_RENDERER @@ -149,14 +139,8 @@ endif endif -# Builds using the hybrid FasterMake/RecursiveMake backend will -# fail to produce a langpack. See bug 1255096. make-langpack: -ifeq (,$(filter FasterMake+RecursiveMake,$(BUILD_BACKENDS))) $(MAKE) -C $(DEPTH)/basilisk/locales langpack -else - @echo WARNING: "Language Pack was not generated due to using the hybrid FasterMake/RecursiveMake backend." >&2 -endif libs:: make-langpack diff --git a/basilisk/installer/package-manifest.in b/basilisk/installer/package-manifest.in index ea90972..ee5d205 100644 --- a/basilisk/installer/package-manifest.in +++ b/basilisk/installer/package-manifest.in @@ -140,12 +140,6 @@ #endif ; [Components] -#ifdef MOZ_ARTIFACT_BUILDS -@RESPATH@/components/prebuilt-interfaces.manifest -@RESPATH@/components/interfaces.xpt -@RESPATH@/browser/components/prebuilt-interfaces.manifest -@RESPATH@/browser/components/interfaces.xpt -#endif @RESPATH@/browser/components/components.manifest @RESPATH@/components/alerts.xpt #ifdef ACCESSIBILITY diff --git a/basilisk/locales/jar.mn b/basilisk/locales/jar.mn index 11ff502..d123fb1 100644 --- a/basilisk/locales/jar.mn +++ b/basilisk/locales/jar.mn @@ -85,13 +85,8 @@ locale/browser/aboutSyncTabs.dtd (%chrome/browser/aboutSyncTabs.dtd) #endif % resource search-plugins chrome://browser/locale/searchplugins/ -#if BUILD_FASTER - locale/browser/searchplugins/ (searchplugins/*.xml) - locale/browser/searchplugins/list.json (search/list.json) -#else locale/browser/searchplugins/ (.deps/generated_@AB_CD@/*.xml) locale/browser/searchplugins/list.json (.deps/generated_@AB_CD@/list.json) -#endif % locale browser-region @AB_CD@ %locale/browser-region/ locale/browser-region/region.properties (%chrome/browser-region/region.properties) # the following files are browser-specific overrides diff --git a/basilisk/moz.build b/basilisk/moz.build index 7166b81..74a63c7 100644 --- a/basilisk/moz.build +++ b/basilisk/moz.build @@ -29,10 +29,3 @@ TEST_DIRS += [ DIST_SUBDIR = 'browser' export('DIST_SUBDIR') - -if CONFIG['MOZ_ARTIFACT_BUILDS']: - # Ensure a pre-built interfaces.xpt installed to the objdir by the artifact - # code is included by the top-level chrome.manifest. - EXTRA_COMPONENTS += [ - '../../build/prebuilt-interfaces.manifest', - ] |