зеркало из https://github.com/mozilla/pjs.git
Adding nsProxyAutoConfig.js to makefiles and installer manifests. b=53080 r=blizzard@mozilla.org
This commit is contained in:
Родитель
30d4d975ab
Коммит
f368832434
|
@ -615,6 +615,7 @@ sub BuildClientDist()
|
||||||
InstallFromManifest(":mozilla:netwerk:build:MANIFEST", "$distdirectory:netwerk:");
|
InstallFromManifest(":mozilla:netwerk:build:MANIFEST", "$distdirectory:netwerk:");
|
||||||
InstallFromManifest(":mozilla:netwerk:base:public:MANIFEST", "$distdirectory:netwerk:");
|
InstallFromManifest(":mozilla:netwerk:base:public:MANIFEST", "$distdirectory:netwerk:");
|
||||||
InstallFromManifest(":mozilla:netwerk:base:public:MANIFEST_IDL", "$distdirectory:idl:");
|
InstallFromManifest(":mozilla:netwerk:base:public:MANIFEST_IDL", "$distdirectory:idl:");
|
||||||
|
InstallFromManifest(":mozilla:netwerk:base:src:MANIFEST_COMPONENTS", "${dist_dir}Components:");
|
||||||
InstallFromManifest(":mozilla:netwerk:socket:base:MANIFEST_IDL", "$distdirectory:idl:");
|
InstallFromManifest(":mozilla:netwerk:socket:base:MANIFEST_IDL", "$distdirectory:idl:");
|
||||||
InstallFromManifest(":mozilla:netwerk:protocol:about:public:MANIFEST_IDL", "$distdirectory:idl:");
|
InstallFromManifest(":mozilla:netwerk:protocol:about:public:MANIFEST_IDL", "$distdirectory:idl:");
|
||||||
InstallFromManifest(":mozilla:netwerk:protocol:data:public:MANIFEST_IDL", "$distdirectory:idl:");
|
InstallFromManifest(":mozilla:netwerk:protocol:data:public:MANIFEST_IDL", "$distdirectory:idl:");
|
||||||
|
|
|
@ -63,6 +63,10 @@ CPPSRCS = \
|
||||||
nsStreamListenerTee.cpp \
|
nsStreamListenerTee.cpp \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
|
JSFILES = \
|
||||||
|
$(srcdir)/nsProxyAutoConfig.js \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
# we don't want the shared lib, but we want to force the creation of a
|
# we don't want the shared lib, but we want to force the creation of a
|
||||||
# static lib.
|
# static lib.
|
||||||
override NO_SHARED_LIB=1
|
override NO_SHARED_LIB=1
|
||||||
|
@ -70,3 +74,6 @@ override NO_STATIC_LIB=
|
||||||
|
|
||||||
include $(topsrcdir)/config/rules.mk
|
include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
|
install::
|
||||||
|
$(INSTALL) $(JSFILES) $(DIST)/bin/components
|
||||||
|
|
||||||
|
|
|
@ -59,6 +59,10 @@ CPP_OBJS = \
|
||||||
.\$(OBJDIR)\nsStreamListenerTee.obj \
|
.\$(OBJDIR)\nsStreamListenerTee.obj \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
|
JSFILES = \
|
||||||
|
.\nsProxyAutoConfig.js \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
INCS = $(INCS) \
|
INCS = $(INCS) \
|
||||||
-I$(DEPTH)\dist\include \
|
-I$(DEPTH)\dist\include \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
@ -67,6 +71,7 @@ include <$(DEPTH)\config\rules.mak>
|
||||||
|
|
||||||
install:: $(LIBRARY)
|
install:: $(LIBRARY)
|
||||||
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
|
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
|
||||||
|
$(MAKE_INSTALL) $(JSFILES) $(DIST)\bin\components
|
||||||
|
|
||||||
clobber::
|
clobber::
|
||||||
$(RM) $(DIST)\lib\$(LIBRARY_NAME).lib
|
$(RM) $(DIST)\lib\$(LIBRARY_NAME).lib
|
||||||
|
|
|
@ -180,6 +180,7 @@ viewer:Components:xpinstall.xpt
|
||||||
viewer:Components:autocomplete.xpt
|
viewer:Components:autocomplete.xpt
|
||||||
viewer:Components:xml-rpc.xpt
|
viewer:Components:xml-rpc.xpt
|
||||||
viewer:Components:nsDictionary.js
|
viewer:Components:nsDictionary.js
|
||||||
|
viewer:Components:nsProxyAutoConfig.js
|
||||||
viewer:Components:nsXmlRpcClient.js
|
viewer:Components:nsXmlRpcClient.js
|
||||||
viewer:Components:xmlextras.xpt
|
viewer:Components:xmlextras.xpt
|
||||||
viewer:Components:xmlextras.shlb
|
viewer:Components:xmlextras.shlb
|
||||||
|
|
|
@ -208,6 +208,7 @@ bin/components/xpcom_components.xpt
|
||||||
bin/components/xpcom_threads.xpt
|
bin/components/xpcom_threads.xpt
|
||||||
bin/components/xml-rpc.xpt
|
bin/components/xml-rpc.xpt
|
||||||
bin/components/nsDictionary.js
|
bin/components/nsDictionary.js
|
||||||
|
bin/components/nsProxyAutoConfig.js
|
||||||
bin/components/nsXmlRpcClient.js
|
bin/components/nsXmlRpcClient.js
|
||||||
bin/components/libxremote_client.so
|
bin/components/libxremote_client.so
|
||||||
bin/components/windowwatcher.xpt
|
bin/components/windowwatcher.xpt
|
||||||
|
|
|
@ -212,6 +212,7 @@ bin\components\xpinstall.xpt
|
||||||
bin\components\xppref32.dll
|
bin\components\xppref32.dll
|
||||||
bin\components\xml-rpc.xpt
|
bin\components\xml-rpc.xpt
|
||||||
bin\components\nsDictionary.js
|
bin\components\nsDictionary.js
|
||||||
|
bin\components\nsProxyAutoConfig.js
|
||||||
bin\components\nsXmlRpcClient.js
|
bin\components\nsXmlRpcClient.js
|
||||||
bin\plugins\npnul32.dll
|
bin\plugins\npnul32.dll
|
||||||
bin\components\xmlextras.xpt
|
bin\components\xmlextras.xpt
|
||||||
|
|
Загрузка…
Ссылка в новой задаче