зеркало из https://github.com/mozilla/pjs.git
Enabling xpidl as a standard part of the unix and windows build. Changed checks against BUILD_XPIDL to the (as yet undefined) USE_XPIDL variable in libpref, rdf, xpfe/AppCores, to keep them from firing just yet. The BUILD_XPIDL-enabling machinery in configure.in is unchanged, but BUILD_XPIDL is unused for now.
See http://www.mozilla.org/scriptable/xpidl/ if this breaks you.
This commit is contained in:
Родитель
7c116f72b8
Коммит
e33e295f30
|
@ -603,7 +603,7 @@ endif #STRICT_CPLUSPLUS_SUFFIX
|
|||
|
||||
|
||||
# these rules only apply when the XPIDL compiler is available
|
||||
ifdef BUILD_XPIDL
|
||||
ifdef USE_XPIDL
|
||||
%.h: %.idl $(IDL_COMPILE)
|
||||
$(IDL_COMPILE) -m header -w -I $(DIST)/idl $<
|
||||
|
||||
|
|
|
@ -42,7 +42,7 @@ EXTRA_LIBS = $(DIST)/lib/js$(MOZ_BITS)$(VERSION_NUMBER).lib \
|
|||
$(NULL)
|
||||
endif
|
||||
|
||||
ifdef BUILD_XPIDL
|
||||
ifdef USE_XPIDL
|
||||
#temporary hack - eventually nsIPref should live in public
|
||||
#but put it here for now so we don't auto-generate the header and loose it
|
||||
IDLSRCS = nsIPref.idl
|
||||
|
|
|
@ -24,7 +24,7 @@ include $(DEPTH)/config/autoconf.mk
|
|||
|
||||
DIRS = public src
|
||||
|
||||
ifdef BUILD_XPIDL
|
||||
ifdef USE_XPIDL
|
||||
DIRS += idl
|
||||
endif
|
||||
|
||||
|
|
|
@ -23,8 +23,8 @@ include $(DEPTH)/config/autoconf.mk
|
|||
|
||||
DIRS = registry
|
||||
|
||||
ifdef BUILD_XPIDL
|
||||
#ifdef BUILD_XPIDL
|
||||
DIRS += xpidl
|
||||
endif
|
||||
#endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
@ -21,9 +21,9 @@ IGNORE_MANIFEST=1
|
|||
|
||||
DIRS = windows \
|
||||
registry \
|
||||
!ifdef BUILD_XPIDL
|
||||
xpidl \
|
||||
!endif
|
||||
$(NULL)
|
||||
|
||||
# removed !ifdef BUILD_XPIDL above...
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
|
|
@ -22,7 +22,7 @@ VPATH = @srcdir@
|
|||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
ifdef BUILD_XPIDL
|
||||
ifdef USE_XPIDL
|
||||
IDLSRCS = \
|
||||
nsIDOMBaseAppCore.idl \
|
||||
nsIDOMWindow.idl \
|
||||
|
|
Загрузка…
Ссылка в новой задаче