mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 503469, Support packaging WinCE Firefox builds as zip, complete.mar, r=ted.mielczarek
This commit is contained in:
parent
0d6773462a
commit
0a334199c2
@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = browsercomps
|
||||
LIBRARY_NAME = browserdirprovider
|
||||
ifneq ($(OS_ARCH),WINNT)
|
||||
ifeq (,$(filter WINNT WINCE,$(OS_ARCH)))
|
||||
SHORT_LIBNAME = brwsrdir
|
||||
endif
|
||||
IS_COMPONENT = 1
|
||||
|
@ -60,7 +60,7 @@ include $(topsrcdir)/config/rules.mk
|
||||
MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
|
||||
|
||||
ifneq (,$(BUILD_STATIC_LIBS)$(MOZ_ENABLE_LIBXUL))
|
||||
ifeq (WINNT,$(OS_ARCH))
|
||||
ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
|
||||
MOZ_PKG_MANIFEST_P = $(srcdir)/windows/packages-static
|
||||
else
|
||||
ifneq (,$(filter-out OS2 Darwin,$(OS_ARCH)))
|
||||
|
@ -42,6 +42,9 @@ bin\xpcom_core.dll
|
||||
bin\components\xpinstal.dll
|
||||
bin\components\jar50.dll
|
||||
#endif
|
||||
#ifdef WINCE
|
||||
bin\mozce_shunt.dll
|
||||
#else
|
||||
#ifndef MOZ_MEMORY
|
||||
bin\Microsoft.VC80.CRT.manifest
|
||||
bin\msvcm80.dll
|
||||
@ -50,6 +53,7 @@ bin\msvcr80.dll
|
||||
#else
|
||||
bin\mozcrt19.dll
|
||||
#endif
|
||||
#endif
|
||||
|
||||
[browser]
|
||||
; [Base Browser Files]
|
||||
@ -139,7 +143,9 @@ bin\components\inspector.xpt
|
||||
bin\components\locale.xpt
|
||||
bin\components\lwbrk.xpt
|
||||
bin\components\microsummaries.xpt
|
||||
#ifndef WINCE
|
||||
bin\components\migration.xpt
|
||||
#endif
|
||||
bin\components\mimetype.xpt
|
||||
bin\components\mozbrwsr.xpt
|
||||
bin\components\mozfind.xpt
|
||||
@ -367,8 +373,10 @@ bin\chrome\pippki.manifest
|
||||
;
|
||||
bin\updater.exe
|
||||
|
||||
#ifdef MOZ_CRASHREPORTER
|
||||
; [Crash Reporter]
|
||||
bin\crashreporter.exe
|
||||
bin\crashreporter.ini
|
||||
bin\crashreporter-override.ini
|
||||
#endif
|
||||
|
||||
|
@ -97,3 +97,5 @@ include $(topsrcdir)/config/rules.mk
|
||||
mozce_shunt.def: mozce_shunt.def.in
|
||||
$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $^ > $@
|
||||
|
||||
.NOTPARALLEL:
|
||||
|
||||
|
@ -44,7 +44,7 @@ VPATH = @srcdir@
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = docshell
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
|
||||
XPIDL_MODULE = docshell_base
|
||||
endif
|
||||
LIBRARY_NAME = basedocshell_s
|
||||
|
@ -48,12 +48,12 @@ ifndef MOZ_PKG_FORMAT
|
||||
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
||||
MOZ_PKG_FORMAT = DMG
|
||||
else
|
||||
ifeq (,$(filter-out OS2 WINNT BeOS, $(OS_ARCH)))
|
||||
ifeq (,$(filter-out OS2 WINNT WINCE BeOS, $(OS_ARCH)))
|
||||
MOZ_PKG_FORMAT = ZIP
|
||||
ifeq ($(OS_ARCH),OS2)
|
||||
INSTALLER_DIR = os2
|
||||
else
|
||||
ifeq ($(OS_ARCH), WINNT)
|
||||
ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
|
||||
INSTALLER_DIR = windows
|
||||
endif
|
||||
endif
|
||||
@ -64,13 +64,9 @@ else
|
||||
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
|
||||
MOZ_PKG_FORMAT = BZ2
|
||||
else
|
||||
ifeq (,$(filter-out WINCE, $(OS_ARCH)))
|
||||
MOZ_PKG_FORMAT = ZIP
|
||||
else
|
||||
MOZ_PKG_FORMAT = TGZ
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
INSTALLER_DIR = unix
|
||||
endif
|
||||
endif
|
||||
@ -292,7 +288,7 @@ STRIP_FLAGS =
|
||||
PLATFORM_EXCLUDE_LIST = ! -name "*.ico" ! -name "$(MOZ_PKG_APPNAME).exe"
|
||||
endif
|
||||
|
||||
ifneq (,$(filter WINNT OS2,$(OS_ARCH)))
|
||||
ifneq (,$(filter WINNT WINCE OS2,$(OS_ARCH)))
|
||||
PKGCP_OS = dos
|
||||
else
|
||||
PKGCP_OS = unix
|
||||
@ -419,7 +415,7 @@ make-package: stage-package $(PACKAGE_XULRUNNER)
|
||||
# dist/sdk/lib -> prefix/lib/appname-devel-version/lib
|
||||
# prefix/lib/appname-devel-version/* symlinks to the above directories
|
||||
install:: stage-package
|
||||
ifneq (,$(filter WINNT,$(OS_ARCH)))
|
||||
ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
|
||||
$(error "make install" is not supported on this platform. Use "make package" instead.)
|
||||
endif
|
||||
ifeq (bundle,$(MOZ_FS_LAYOUT))
|
||||
|
@ -43,7 +43,7 @@ VPATH = @srcdir@
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = xpcom
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
|
||||
XPIDL_MODULE = proxyObject
|
||||
else
|
||||
XPIDL_MODULE = proxyObjInst
|
||||
|
@ -43,7 +43,7 @@ VPATH = @srcdir@
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = xpcom
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
|
||||
XPIDL_MODULE = xpcom_thread
|
||||
else
|
||||
XPIDL_MODULE = xpcom_threads
|
||||
|
Loading…
Reference in New Issue
Block a user