Commits

Andrew Sutherland  committed 4f72e87

de-bitrot some make/build stuff

  • Participants
  • Parent commits 25d8075

Comments (0)

Files changed (2)

File add-jsprobemgr-class

 # HG changeset patch
-# Parent 4117bba35beb560e2e75322b9a305b6149db36ec
+# Parent 4a664fc2c20368d4cef171afc80bf5d4503880fb
 Add the ProbeManager class.
 
 diff --git a/js/src/Makefile.in b/js/src/Makefile.in
 --- a/js/src/Makefile.in
 +++ b/js/src/Makefile.in
-@@ -137,16 +137,17 @@ CPPSRCS		= \
+@@ -131,16 +131,17 @@ CPPSRCS		= \
  		jsnum.cpp \
  		jsobj.cpp \
  		json.cpp \
  		jsscript.cpp \
  		jsstr.cpp \
  		jstypedarray.cpp \
-@@ -205,16 +206,17 @@ INSTALLED_HEADERS = \
+@@ -196,16 +197,17 @@ INSTALLED_HEADERS = \
+ 		jscell.h \
+ 		jsgcstats.h \
  		jshash.h \
  		jslock.h \
  		json.h \
- 		jsopcode.tbl \
- 		jsopcode.h \
  		jsproxy.h \
  		jsprf.h \
  		jsprobedefs.h \
  		jsproto.tbl \
  		jsprvtd.h \
  		jspubtd.h \
- 		jsstdint.h \
  		jstypedarray.h \
  		jstypes.h \
  		jsutil.h \
+ 		jsversion.h \
 diff --git a/js/src/jsprobedefs.cpp b/js/src/jsprobedefs.cpp
 --- a/js/src/jsprobedefs.cpp
 +++ b/js/src/jsprobedefs.cpp

File xpcom-nsIProbeService

 # User Steve Fink <sfink@mozilla.com>
 # Date 1315439921 25200
 # Node ID 485bc3c84dd3b340bade0754c33d4cc094198e5e
-# Parent 7e417fa08eace8e00a8eed7ebed93dd31bdc3706
+# Parent 6e7bf9c91bf2aa849df5c5d9b0ca02292fef23fa
 [mq]: xpcom-probes
 
 diff --git a/toolkit/components/Makefile.in b/toolkit/components/Makefile.in
 --- a/toolkit/components/Makefile.in
 +++ b/toolkit/components/Makefile.in
-@@ -66,6 +66,7 @@
+@@ -61,16 +61,17 @@ PARALLEL_DIRS += \
+   filepicker \
+   find \
+   intl \
+   microformats \
+   parentalcontrols \
    passwordmgr \
    perf \
    places \
    prompts \
    reflect \
    startup \
+   statusfilter \
+   telemetry \
+   typeaheadfind \
+   urlformatter \
+   viewconfig \
 diff --git a/toolkit/components/probes/Makefile.in b/toolkit/components/probes/Makefile.in
 new file mode 100644
 --- /dev/null
 diff --git a/toolkit/content/Services.jsm b/toolkit/content/Services.jsm
 --- a/toolkit/content/Services.jsm
 +++ b/toolkit/content/Services.jsm
-@@ -75,6 +75,7 @@
+@@ -70,16 +70,17 @@ let initTable = [
+   ["cookies", "@mozilla.org/cookiemanager;1", "nsICookieManager2"],
+   ["droppedLinkHandler", "@mozilla.org/content/dropped-link-handler;1", "nsIDroppedLinkHandler"],
+   ["eTLD", "@mozilla.org/network/effective-tld-service;1", "nsIEffectiveTLDService"],
+   ["io", "@mozilla.org/network/io-service;1", "nsIIOService2"],
+   ["locale", "@mozilla.org/intl/nslocaleservice;1", "nsILocaleService"],
    ["logins", "@mozilla.org/login-manager;1", "nsILoginManager"],
    ["obs", "@mozilla.org/observer-service;1", "nsIObserverService"],
    ["perms", "@mozilla.org/permissionmanager;1", "nsIPermissionManager"],
    ["prompt", "@mozilla.org/embedcomp/prompt-service;1", "nsIPromptService"],
    ["scriptloader", "@mozilla.org/moz/jssubscript-loader;1", "mozIJSSubScriptLoader"],
    ["scriptSecurityManager", "@mozilla.org/scriptsecuritymanager;1", "nsIScriptSecurityManager"],
+ #ifdef MOZ_TOOLKIT_SEARCH
+   ["search", "@mozilla.org/browser/search-service;1", "nsIBrowserSearchService"],
+ #endif
+   ["storage", "@mozilla.org/storage/service;1", "mozIStorageService"],
+   ["domStorageManager", "@mozilla.org/dom/storagemanager;1", "nsIDOMStorageManager"],
 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
 --- a/toolkit/library/Makefile.in
 +++ b/toolkit/library/Makefile.in
-@@ -193,6 +193,7 @@
+@@ -154,16 +154,17 @@ COMPONENT_LIBS += \
+   commandlines \
+   toolkitcomps \
+   pipboot \
+   pipnss \
+   appcomps \
    jsreflect \
    composer \
    telemetry \
 +  probes \
+   jsinspector \
    jsdebugger \
    storagecomps \
    rdf \
+   windowds \
+   $(NULL)
+ 
+ ifdef BUILD_CTYPES
 diff --git a/toolkit/library/nsStaticXULComponents.cpp b/toolkit/library/nsStaticXULComponents.cpp
 --- a/toolkit/library/nsStaticXULComponents.cpp
 +++ b/toolkit/library/nsStaticXULComponents.cpp
-@@ -251,6 +251,7 @@
+@@ -246,16 +246,17 @@
+     OSXPROXY_MODULE                          \
+     WINDOWSPROXY_MODULE                      \
+     JSCTYPES_MODULE                          \
+     MODULE(jsreflect)                        \
+     MODULE(jsperf)                           \
      MODULE(nsServicesCryptoModule)           \
      MOZ_APP_COMPONENT_MODULES                \
      MODULE(nsTelemetryModule)                \
 +    MODULE(nsProbesModule)                   \
+     MODULE(jsinspector)                      \
      MODULE(jsdebugger)                       \
      /* end of list */
  
+ #define MODULE(_name) \
+   NSMODULE_DECL(_name);
+ 
+ XUL_MODULES