Opened 6 years ago

Closed 5 years ago

Last modified 5 years ago

#9837 closed defect (fixed)

make package is broken for TBB 3.0 based on Firefox 24 ESR

Reported by: gk Owned by: erinn
Priority: Medium Milestone:
Component: Applications/Tor bundles/installation Version:
Severity: Keywords: tbb-3.0, ff24-esr, MikePerry201311R
Cc: Actual Points:
Parent ID: #10103 Points:
Reviewer: Sponsor:

Description

The output is:

+ make -C obj-mingw package INNER_MAKE_PACKAGE=true
make: Entering directory `/home/ubuntu/build/tor-browser/obj-mingw'
make[1]: Entering directory `/home/ubuntu/build/tor-browser/obj-mingw/browser/installer'
make export
make[2]: Entering directory `/home/ubuntu/build/tor-browser/obj-mingw/browser/installer'
make[2]: Nothing to be done for `export'.
make[2]: Leaving directory `/home/ubuntu/build/tor-browser/obj-mingw/browser/installer'
make libs
make[2]: Entering directory `/home/ubuntu/build/tor-browser/obj-mingw/browser/installer'
make make-package-internal
make[3]: Entering directory `/home/ubuntu/build/tor-browser/obj-mingw/browser/installer'
/home/ubuntu/build/tor-browser/obj-mingw/_virtualenv/bin/python /home/ubuntu/build/tor-browser/config/Preprocessor.py -DNO_NSPR_10_SUPPORT -DAB_CD=en-US -DMOZ_APP_NAME=firefox -DPREF_DIR=defaults/preferences -DJAREXT= -DMOZ_CHILD_PROCESS_NAME=plugin-container.exe -DMOZ_SHARED_MOZGLUE=1 -DMOZ_JSDEBUGGER -DNECKO_WIFI -DDLL_PREFIX= -DDLL_SUFFIX=.dll -DBIN_SUFFIX=.exe -DBINPATH=bin -DCROSS_COMPILE=1 -DWINVER=0x502 -D_WIN32_WINNT=0x502 -D_WIN32_IE=0x0603 -DMOZ_WINSDK_TARGETVER=0x06010000 -DMOZ_NTDDI_WIN7=0x06010000 -DMOZ_WINSDK_MAXVER=0x06020000 -DX_DISPLAY_MISSING=1 -DJSGC_INCREMENTAL=1 -DMOZ_ENABLE_PROFILER_SPS=1 -DMOZILLA_VERSION=\"24.0\" -DMOZILLA_VERSION_U=24.0 -DMOZILLA_UAVERSION=\"24.0\" -DHAVE_SNPRINTF=1 -D_WINDOWS=1 -DWIN32=1 -DXP_WIN=1 -DXP_WIN32=1 -DHW_THREADS=1 -DSTDC_HEADERS=1 -DWIN32_LEAN_AND_MEAN=1 -DNO_X11=1 -D_X86_=1 -DD_INO=d_ino -DSTDC_HEADERS=1 -DHAVE_STDCALL=1 -DHAVE_SSIZE_T=1 -DHAVE_DIRENT_H=1 -DHAVE_GETOPT_H=1 -DHAVE_MEMORY_H=1 -DHAVE_UNISTD_H=1 -DHAVE_MALLOC_H=1 -DHAVE_IO_H=1 -DHAVE_CPUID_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_CDEFS_H=1 -DNO_X11=1 -DHAVE_STRERROR=1 -DHAVE_SNPRINTF=1 -DHAVE_MEMMOVE=1 -DHAVE_RINT=1 -DHAVE_TRUNCATE64=1 -DHAVE_SETBUF=1 -DHAVE_ISATTY=1 -DHAVE_THREAD_TLS_KEYWORD=1 -DMALLOC_H=\<malloc.h\> -DHAVE_LOCALECONV=1 -DNS_ATTR_MALLOC=__attribute__\(\(malloc\)\) -DNS_WARN_UNUSED_RESULT=__attribute__\(\(warn_unused_result\)\) -DRELEASE_BUILD=1 -DNS_ENABLE_TSF=1 -DMOZ_UPDATE_CHANNEL=default -DMOZ_GOOGLE_API_KEY=no-google-api-key -DEARLY_BETA_OR_EARLIER=1 -DMOZ_PHOENIX=1 -DMOZ_BUILD_APP=browser -DMOZ_PDF_PRINTING=1 -DMOZ_INSTRUMENT_EVENT_LOOP=1 -DMOZ_OFFICIAL_BRANDING=1 -DMOZ_DISTRIBUTION_ID=\"org.mozilla\" -DIBMBIDI=1 -DNS_PRINTING=1 -DNS_PRINT_PREVIEW=1 -DMOZ_SAMPLE_TYPE_FLOAT32=1 -DMOZ_WEBSPEECH=1 -DMOZ_OGG=1 -DATTRIBUTE_ALIGNED_MAX=64 -DMOZ_WEBM=1 -DMOZ_WMF=1 -DMOZ_MEDIA_NAVIGATOR=1 -DMOZ_VP8=1 -DVPX_X86_ASM=1 -DMOZ_WAVE=1 -DMOZ_SPEEX_RESAMPLER=1 -DMOZ_SOUNDTOUCH=1 -DMOZ_CUBEB=1 -DMOZ_VORBIS=1 -DMOZ_OPUS=1 -DENABLE_SYSTEM_EXTENSION_DIRS=1 -DMOZ_GAMEPAD=1 -DBREAKPAD_CUSTOM_STDINT_H=\"mozilla/StandardInteger.h\" -DMOZ_CRASHREPORTER_ENABLE_PERCENT=100 -DLIBJPEG_TURBO_X86_ASM=1 -DMOZ_VERIFY_MAR_SIGNATURE=1 -DMOZ_FEEDS=1 -DMOZ_SAFE_BROWSING=1 -DMOZ_URL_CLASSIFIER=1 -DGL_PROVIDER_=1 -DMOZ_DEBUG_SYMBOLS=1 -DMOZ_LOGGING=1 -DJSGC_INCREMENTAL=1 -DHAVE___CXA_DEMANGLE=1 -DHAVE__UNWIND_BACKTRACE=1 -DJS_DEFAULT_JITREPORT_GRANULARITY=3 -DMOZ_OMNIJAR=1 -DMOZ_USER_DIR=\"Mozilla\" -DMOZ_TREE_PIXMAN=1 -DHAVE_STDINT_H=1 -DHAVE_INTTYPES_H=1 -DMOZ_TREE_CAIRO=1 -DHAVE_UINT64_T=1 -DMOZ_ENABLE_SKIA=1 -DUSE_SKIA=1 -DSKIA_DLL=1 -DGR_DLL=1 -DUSE_SKIA_GPU=1 -DMOZ_XUL=1 -DMOZ_PROFILELOCKING=1 -DBUILD_CTYPES=1 -DMOZ_PLACES=1 -DMOZ_SOCIAL=1 -DMOZ_SERVICES_COMMON=1 -DMOZ_SERVICES_CRYPTO=1 -DMOZ_SERVICES_HEALTHREPORT=1 -DMOZ_SERVICES_METRICS=1 -DMOZ_SERVICES_SYNC=1 -DMOZ_MACBUNDLE_ID=org.mozilla.torbrowser -DMOZ_B2G_VERSION=\"1.0.0\" -DMOZ_B2G_OS_NAME=\"\" -DMOZ_APP_UA_NAME=\"\" -DMOZ_APP_UA_VERSION=\"24.0\" -DFIREFOX_VERSION=24.0 -DMOZ_UA_BUILDID=\"20100101\" -DMOZ_TELEMETRY_DISPLAY_REV=2 -DMOZ_DATA_REPORTING=1 -DMOZ_DLL_SUFFIX=\".dll\" /home/ubuntu/build/tor-browser/browser/installer/package-manifest.in > package-manifest
OMNIJAR_NAME=omni.ja \
	/home/ubuntu/build/tor-browser/obj-mingw/_virtualenv/bin/python /home/ubuntu/build/tor-browser/toolkit/mozapps/installer/packager.py -DNO_NSPR_10_SUPPORT -DAB_CD=en-US -DMOZ_APP_NAME=firefox -DPREF_DIR=defaults/preferences -DJAREXT= -DMOZ_CHILD_PROCESS_NAME=plugin-container.exe -DMOZ_SHARED_MOZGLUE=1 -DMOZ_JSDEBUGGER -DNECKO_WIFI -DDLL_PREFIX= -DDLL_SUFFIX=.dll -DBIN_SUFFIX=.exe -DBINPATH=bin \
		--format omni \
		--removals /home/ubuntu/build/tor-browser/browser/installer/removed-files.in \
		 \
		 \
		 \
		--optimizejars \
		 \
		package-manifest ../../dist ../../dist/firefox \
		
Error: /home/ubuntu/build/tor-browser/obj-mingw/browser/installer/package-manifest:35: Missing file(s): bin/uninstall/helper.exe
Error: /home/ubuntu/build/tor-browser/obj-mingw/browser/installer/package-manifest:397: Missing file(s): bin/defaults/preferences/000-tor-browser.js
Traceback (most recent call last):
  File "/home/ubuntu/build/tor-browser/toolkit/mozapps/installer/packager.py", line 375, in <module>
    main()
  File "/home/ubuntu/build/tor-browser/toolkit/mozapps/installer/packager.py", line 328, in main
    copier.add(mozpack.path.join(binpath, 'removed-files'), removals)
  File "/usr/lib/python2.7/contextlib.py", line 24, in __exit__
    self.gen.next()
  File "/home/ubuntu/build/tor-browser/python/mozbuild/mozpack/errors.py", line 129, in accumulate
    raise AccumulatedErrors()
mozpack.errors.AccumulatedErrors
make[3]: *** [stage-package] Error 1
make[3]: Leaving directory `/home/ubuntu/build/tor-browser/obj-mingw/browser/installer'
make[2]: *** [make-package] Error 2
make[2]: Leaving directory `/home/ubuntu/build/tor-browser/obj-mingw/browser/installer'
make[1]: *** [default] Error 2
make[1]: Leaving directory `/home/ubuntu/build/tor-browser/obj-mingw/browser/installer'
make: *** [package] Error 2
make: Leaving directory `/home/ubuntu/build/tor-browser/obj-mingw'

Child Tickets

Attachments (1)

0001-patching-package-manifest.in-to-adapt-location-of-00.patch (1.2 KB) - added by gk 6 years ago.

Download all attachments as: .zip

Change History (8)

comment:1 Changed 6 years ago by gk

Status: newneeds_review
Summary: make package is broken for mingw-w64 buildsmake package is broken for TBB 3.0 based on Firefox 24 ESR

comment:2 Changed 6 years ago by gk

Note: This patch is currently only tested with the build process for Windows bundles as #9828 and #9829 (and likely some related ones) are not fixed yet.

comment:3 Changed 6 years ago by gk

It is working on Linux as well.

comment:4 Changed 6 years ago by gk

Parent ID: #9827#10103

comment:5 Changed 6 years ago by mikeperry

Keywords: MikePerry201311R added

comment:6 Changed 5 years ago by mikeperry

Resolution: fixed
Status: needs_reviewclosed

Ok. This is merged. Will we want to bring back helper.exe if we have an updater though?

comment:7 Changed 5 years ago by gk

Good question. Looking at https://mxr.mozilla.org/comm-esr24/source/mozilla/toolkit/mozapps/update/common/updatehelper.cpp seems to make that necessary. Not sure if we can patch around that and if that would be worth the effort.

Note: See TracTickets for help on using tickets.