nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 514665 - fix stupid module name differences on windows. r=ted

Browse source
This commit is contained in:
Mitchell Field 2009-09-25 18:41:16 +02:00
parent 71dcd7caa3
commit 41c8798093
31 changed files with 14 additions and 100 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

3
accessible/build/Makefile.in
View file

@ -46,15 +46,12 @@ include $(DEPTH)/config/autoconf.mk
MODULE = accessibility
LIBRARY_NAME = accessibility
EXPORT_LIBRARY = 1
ifneq ($(OS_ARCH),WINNT)
SHORT_LIBNAME = access
endif
IS_COMPONENT = 1
MODULE_NAME = nsAccessibilityModule
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
CPPSRCS = nsAccessibilityFactory.cpp
LOCAL_INCLUDES = -I$(srcdir)/../src

3
browser/app/Makefile.in
View file

@ -86,13 +86,12 @@ include $(topsrcdir)/config/rules.mk
else
# Build a binary bootstrapping with XRE_main
ifeq ($(USE_SHORT_LIBNAME), 1)
ifneq (,$(filter OS2 WINCE WINNT,$(OS_ARCH)))
PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
else
PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
endif
CPPSRCS = nsBrowserApp.cpp
LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre

3
browser/components/dirprovider/Makefile.in
View file

@ -44,9 +44,7 @@ include $(DEPTH)/config/autoconf.mk
MODULE = browsercomps
LIBRARY_NAME = browserdirprovider
ifeq (,$(filter WINNT WINCE,$(OS_ARCH)))
SHORT_LIBNAME = brwsrdir
endif
IS_COMPONENT = 1
MODULE_NAME = BrowserDirProvider
FORCE_SHARED_LIB = 1
@ -57,7 +55,6 @@ ifndef MOZ_MEMORY
USE_STATIC_LIBS = 1
endif
CPPSRCS = nsBrowserDirectoryProvider.cpp
EXTRA_DSO_LDOPTS = \

20
browser/installer/package-manifest.in
View file

@ -135,12 +135,7 @@
@BINPATH@/components/contentprefs.xpt
@BINPATH@/components/cookie.xpt
@BINPATH@/components/directory.xpt
#ifdef XP_WIN32
;XXX: this is stupid. fix this.
@BINPATH@/components/docshell_base.xpt
#else
@BINPATH@/components/docshell.xpt
#endif
@BINPATH@/components/dom.xpt
@BINPATH@/components/dom_base.xpt
@BINPATH@/components/dom_canvas.xpt
@ -222,12 +217,7 @@
@BINPATH@/components/pref.xpt
@BINPATH@/components/prefetch.xpt
@BINPATH@/components/profile.xpt
;XXX: stupid, fix this!
#ifdef XP_WIN32
@BINPATH@/components/proxyObject.xpt
#else
@BINPATH@/components/proxyObjInst.xpt
#endif
@BINPATH@/components/rdf.xpt
@BINPATH@/components/satchel.xpt
@BINPATH@/components/saxparser.xpt
@ -262,12 +252,7 @@
@BINPATH@/components/xpcom_components.xpt
@BINPATH@/components/xpcom_ds.xpt
@BINPATH@/components/xpcom_io.xpt
;XXX: stupid, fix this!
#ifdef XP_WIN32
@BINPATH@/components/xpcom_thread.xpt
#else
@BINPATH@/components/xpcom_threads.xpt
#endif
@BINPATH@/components/xpcom_xpti.xpt
@BINPATH@/components/xpconnect.xpt
@BINPATH@/components/xpinstall.xpt
@ -315,12 +300,7 @@
@BINPATH@/components/nsSessionStore.js
@BINPATH@/components/nsURLFormatter.js
@BINPATH@/components/@DLL_PREFIX@browserdirprovider@DLL_SUFFIX@
#ifdef XP_WIN32
;XXX: lame, kill use_short_libname
@BINPATH@/components/brwsrcmp.dll
#else
@BINPATH@/components/@DLL_PREFIX@browsercomps@DLL_SUFFIX@
#endif
@BINPATH@/components/txEXSLTRegExFunctions.js
@BINPATH@/components/nsLivemarkService.js
@BINPATH@/components/nsTaggingService.js

3
browser/installer/removed-files.in
View file

@ -808,3 +808,6 @@ xpicleanup@BIN_SUFFIX@
chrome.manifest
install.rdf
@DLL_PREFIX@jsj@DLL_SUFFIX@
#ifdef XP_WIN
components/brwsrcmp.dll
#endif

3
build/automation-build.mk
View file

@ -1,5 +1,4 @@
ifeq ($(USE_SHORT_LIBNAME), 1)
ifneq (,$(filter OS2 WINCE WINNT,$(OS_ARCH)))
PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
else
PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)

1
config/autoconf.mk.in
View file

@ -327,7 +327,6 @@ LD = @LD@
RC = @RC@
RCFLAGS = @RCFLAGS@
WINDRES = @WINDRES@
USE_SHORT_LIBNAME = @USE_SHORT_LIBNAME@
IMPLIB = @IMPLIB@
FILTER = @FILTER@
BIN_FLAGS = @BIN_FLAGS@

4
config/rules.mk
View file

@ -229,12 +229,10 @@ endif # ENABLE_TESTS
ifndef LIBRARY
ifdef STATIC_LIBRARY_NAME
ifneq (,$(filter OS2 WINNT WINCE,$(OS_ARCH)))
ifdef SHORT_LIBNAME
ifeq (OS2,$(OS_ARCH))
STATIC_LIBRARY_NAME := $(SHORT_LIBNAME)
SHARED_LIBRARY_NAME := $(SHORT_LIBNAME)
endif
endif
LIBRARY := $(LIB_PREFIX)$(STATIC_LIBRARY_NAME).$(LIB_SUFFIX)
endif # STATIC_LIBRARY_NAME
endif # LIBRARY

4
configure.in
View file

@ -2053,7 +2053,6 @@ case "$target" in
TARGET_MD_ARCH=win32
_PLATFORM_DEFAULT_TOOLKIT='cairo-windows'
BIN_SUFFIX='.exe'
USE_SHORT_LIBNAME=1
MOZ_ENABLE_POSTSCRIPT=
MOZ_USER_DIR="Mozilla"
@ -2171,7 +2170,6 @@ case "$target" in
TARGET_MD_ARCH=win32
_PLATFORM_DEFAULT_TOOLKIT='cairo-windows'
BIN_SUFFIX='.exe'
USE_SHORT_LIBNAME=1
MOZ_ENABLE_POSTSCRIPT=
MOZ_USER_DIR="Mozilla"
@ -2414,7 +2412,6 @@ case "$target" in
AC_DEFINE(XP_OS2)
AC_DEFINE(OS2EMX_PLAIN_CHAR)
AC_DEFINE(TCPV40HDRS)
USE_SHORT_LIBNAME=1
DLL_PREFIX=
LIB_PREFIX=
LIB_SUFFIX=lib
@ -7682,7 +7679,6 @@ AC_SUBST(LD)
AC_SUBST(RC)
AC_SUBST(RCFLAGS)
AC_SUBST(WINDRES)
AC_SUBST(USE_SHORT_LIBNAME)
AC_SUBST(IMPLIB)
AC_SUBST(FILTER)
AC_SUBST(BIN_FLAGS)

3
docshell/base/Makefile.in
View file

@ -44,9 +44,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = docshell
ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
XPIDL_MODULE = docshell_base
endif
LIBRARY_NAME = basedocshell_s
GRE_MODULE = 1
LIBXUL_LIBRARY = 1

2
embedding/components/build/Makefile.in
View file

@ -44,9 +44,7 @@ include $(DEPTH)/config/autoconf.mk
MODULE = embedcomponents
LIBRARY_NAME = embedcomponents
EXPORT_LIBRARY = 1
ifneq ($(OS_ARCH),WINNT)
SHORT_LIBNAME = embedcmp
endif
IS_COMPONENT = 1
MODULE_NAME = embedcomponents
GRE_MODULE = 1

4
embedding/config/basebrowser-installer-win.pkg
View file

@ -50,7 +50,7 @@ components\xpcom_components.xpt
components\xpcom_ds.xpt
components\xpcom_io.xpt
components\xpcom_nativeapp.xpt
components\xpcom_thread.xpt
components\xpcom_threads.xpt
components\xpcom_xpti.xpt
; xpconnect
@ -106,7 +106,7 @@ components\cookie.dll
components\appshell.dll
components\appshell.xpt
components\docshell.dll
components\docshell_base.xpt
components\docshell.xpt
components\uriloader.xpt
components\chrome.dll
components\chrome.xpt

4
embedding/config/basebrowser-win
View file

@ -51,7 +51,7 @@ components\xpcom_components.xpt
components\xpcom_ds.xpt
components\xpcom_io.xpt
components\xpcom_nativeapp.xpt
components\xpcom_thread.xpt
components\xpcom_threads.xpt
components\xpcom_xpti.xpt
components\mozreg.dll
;components\mozreg.xpt
@ -113,7 +113,7 @@ components\cookie.dll
components\appshell.dll
components\appshell.xpt
components\docshell.dll
components\docshell_base.xpt
components\docshell.xpt
components\uriloader.xpt
components\chrome.dll
components\chrome.xpt

2
extensions/access-builtin/accessproxy/Makefile.in
View file

@ -45,9 +45,7 @@ include $(DEPTH)/config/autoconf.mk
MODULE = accessproxy
XPIDL_MODULE = accessproxy
LIBRARY_NAME = accessproxy
ifneq ($(OS_ARCH),WINNT)
SHORT_LIBNAME = accproxy
endif
MOZILLA_INTERNAL_API = 1
EXPORT_LIBRARY = 1

2
extensions/java/xpcom/glue/Makefile.in
View file

@ -44,9 +44,7 @@ include $(DEPTH)/config/autoconf.mk
MODULE = javaxpcomglue
LIBRARY_NAME = javaxpcomglue
ifeq ($(OS_ARCH),OS2)
SHORT_LIBNAME = jxpcmglu
endif
# On Mac OS X, JNI libraries must end with a '.jnilib' extension
ifeq ($(OS_ARCH),Darwin)

2
extensions/pref/autoconfig/src/Makefile.in
View file

@ -45,9 +45,7 @@ include $(DEPTH)/config/autoconf.mk
MODULE = autoconfig
LIBRARY_NAME = autoconfig
ifneq ($(OS_ARCH),WINNT)
SHORT_LIBNAME = autocfg
endif
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsAutoConfigModule

2
extensions/pref/system-pref/src/Makefile.in
View file

@ -44,9 +44,7 @@ include $(DEPTH)/config/autoconf.mk
MODULE = system-pref
LIBRARY_NAME = system-pref_s
ifneq ($(OS_ARCH),WINNT)
SHORT_LIBNAME = syspref
endif
# We want to force the creation of a static lib.
FORCE_STATIC_LIB = 1

3
extensions/universalchardet/src/xpcom/Makefile.in
View file

@ -50,12 +50,9 @@ LIBRARY_NAME = universalchardet
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsUniversalCharDetModule
ifneq ($(OS_ARCH),WINNT)
SHORT_LIBNAME = ucdet
endif
LIBXUL_LIBRARY = 1
CPPSRCS = \
nsUniversalCharDetModule.cpp \
nsUdetXPCOMWrapper.cpp \

3
extensions/widgetutils/src/Makefile.in
View file

@ -45,13 +45,10 @@ include $(DEPTH)/config/autoconf.mk
MODULE = widgetutils
XPI_NAME = widgetutils
LIBRARY_NAME = widgetutils
ifneq ($(OS_ARCH),WINNT)
SHORT_LIBNAME = widgetutils
endif
FORCE_SHARED_LIB = 1
IS_COMPONENT = 1
CPPSRCS = nsWidgetUtils.cpp
EXTRA_DSO_LDOPTS = \

2
gfx/src/thebes/Makefile.in
View file

@ -44,9 +44,7 @@ include $(DEPTH)/config/autoconf.mk
MODULE = gfx
LIBRARY_NAME = gkgfxthebes
ifneq ($(OS_ARCH),WINNT)
SHORT_LIBNAME = gkgfxthb
endif
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsGfxModule

3
intl/uconv/src/Makefile.in
View file

@ -49,11 +49,8 @@ IS_COMPONENT = 1
MODULE_NAME = nsUConvModule
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
ifneq ($(OS_ARCH),WINNT)
# To avoid conflict with OS/2 system uconv.dll
SHORT_LIBNAME = mozuconv
endif
CPPSRCS = \
nsUConvModule.cpp \

1
js/src/config/autoconf.mk.in
View file

@ -181,7 +181,6 @@ LD = @LD@
RC = @RC@
RCFLAGS = @RCFLAGS@
WINDRES = @WINDRES@
USE_SHORT_LIBNAME = @USE_SHORT_LIBNAME@
IMPLIB = @IMPLIB@
FILTER = @FILTER@
BIN_FLAGS = @BIN_FLAGS@

4
js/src/config/rules.mk
View file

@ -229,12 +229,10 @@ endif # ENABLE_TESTS
ifndef LIBRARY
ifdef STATIC_LIBRARY_NAME
ifneq (,$(filter OS2 WINNT WINCE,$(OS_ARCH)))
ifdef SHORT_LIBNAME
ifeq (OS2,$(OS_ARCH))
STATIC_LIBRARY_NAME := $(SHORT_LIBNAME)
SHARED_LIBRARY_NAME := $(SHORT_LIBNAME)
endif
endif
LIBRARY := $(LIB_PREFIX)$(STATIC_LIBRARY_NAME).$(LIB_SUFFIX)
endif # STATIC_LIBRARY_NAME
endif # LIBRARY

4
js/src/configure.in
View file

@ -1851,7 +1851,6 @@ case "$target" in
TARGET_MD_ARCH=win32
_PLATFORM_DEFAULT_TOOLKIT='windows'
BIN_SUFFIX='.exe'
USE_SHORT_LIBNAME=1
MOZ_ENABLE_POSTSCRIPT=
MOZ_USER_DIR="Mozilla"
;;
@ -1985,7 +1984,6 @@ case "$target" in
TARGET_MD_ARCH=win32
_PLATFORM_DEFAULT_TOOLKIT='cairo-windows'
BIN_SUFFIX='.exe'
USE_SHORT_LIBNAME=1
MOZ_ENABLE_POSTSCRIPT=
MOZ_USER_DIR="Mozilla"
@ -2145,7 +2143,6 @@ case "$target" in
AC_DEFINE(XP_OS2)
AC_DEFINE(OS2EMX_PLAIN_CHAR)
AC_DEFINE(TCPV40HDRS)
USE_SHORT_LIBNAME=1
DLL_PREFIX=
LIB_PREFIX=
LIB_SUFFIX=lib
@ -4818,7 +4815,6 @@ AC_SUBST(LD)
AC_SUBST(RC)
AC_SUBST(RCFLAGS)
AC_SUBST(WINDRES)
AC_SUBST(USE_SHORT_LIBNAME)
AC_SUBST(IMPLIB)
AC_SUBST(FILTER)
AC_SUBST(BIN_FLAGS)

3
modules/libjar/zipwriter/src/Makefile.in
View file

@ -44,15 +44,12 @@ include $(DEPTH)/config/autoconf.mk
MODULE = zipwriter
LIBRARY_NAME = zipwriter
ifneq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
SHORT_LIBNAME = zipwrite
endif
MODULE_NAME = ZipWriterModule
EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1
IS_COMPONENT = 1
CPPSRCS = \
StreamFunctions.cpp \
nsDeflateConverter.cpp \

6
xpcom/build/Makefile.in
View file

@ -48,11 +48,7 @@ EXTRA_DEPS += $(srcdir)/../glue/objs.mk
MODULE = xpcom
LIBRARY_NAME = xpcom_core
ifneq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
SHORT_LIBNAME = xpcomcor
endif
LIBXUL_LIBRARY = 1
# This is only a static library in libxul builds
@ -63,8 +59,6 @@ endif
GRE_MODULE = 1
MOZILLA_INTERNAL_API = 1
CSRCS = \
$(XPCOM_GLUE_SRC_LCSRCS) \
$(NULL)

4
xpcom/proxy/public/Makefile.in
View file

@ -43,11 +43,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = xpcom
ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
XPIDL_MODULE = proxyObject
else
XPIDL_MODULE = proxyObjInst
endif
EXPORTS = \
nsProxiedService.h \

4
xpcom/sample/Makefile.in
View file

@ -58,8 +58,8 @@ XPIDL_MODULE = xpcomsample
# i.e. dist/bin/components/libxpcomsample.so
LIBRARY_NAME = xpcomsample
# On MS Windows and OS/2, SHORT_LIBNAME is used to generate a library
# with an 8.3 filename, e.g. dist/bin/components/xpcomsmp.dll
# On OS/2, SHORT_LIBNAME is used to generate a library with an 8.3 filename,
# e.g. dist/bin/components/xpcomsmp.dll
SHORT_LIBNAME = xpcomsmp
# IS_COMPONENT indicates that this makefile builds a component shared library.

4
xpcom/threads/Makefile.in
View file

@ -43,11 +43,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = xpcom
ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
XPIDL_MODULE = xpcom_thread
else
XPIDL_MODULE = xpcom_threads
endif
LIBRARY_NAME = xpcomthreads_s
GRE_MODULE = 1
MOZILLA_INTERNAL_API = 1

6
xulrunner/app/Makefile.in
View file

@ -54,15 +54,11 @@ GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/,xulrunner.js)
DEFINES += -DAB_CD=$(AB_CD)
ifeq ($(USE_SHORT_LIBNAME), 1)
PROGRAM = xulrunner$(BIN_SUFFIX)
else
ifeq ($(OS_ARCH), BeOS)
ifneq (,$(filter BeOS OS2 WINCE WINNT,$(OS_ARCH)))
PROGRAM = xulrunner$(BIN_SUFFIX)
else
PROGRAM = xulrunner-bin$(BIN_SUFFIX)
endif
endif
DEFINES += -DXULRUNNER_PROGNAME=\"xulrunner\"

2
xulrunner/examples/simple/components/src/Makefile.in
View file

@ -45,9 +45,7 @@ include $(DEPTH)/config/autoconf.mk
MODULE = simple
XPI_NAME = simple
LIBRARY_NAME = simpletest
ifneq ($(OS_ARCH),WINNT)
SHORT_LIBNAME = simpltst
endif
IS_COMPONENT = 1
CPPSRCS = SimpleTest.cpp