ICE-6466 - Replace --icejs metadata js:ice-build

42 files changed, 192 insertions, 192 deletions

diff --git a/cpp/src/slice2js/Gen.cpp b/cpp/src/slice2js/Gen.cpp
index 9ad4b2d63a4..0f14a9be27e 100644
--- a/cpp/src/slice2js/Gen.cpp
+++ b/cpp/src/slice2js/Gen.cpp
@@ -617,9 +617,8 @@ Slice::JsVisitor::writeDocComment(const ContainedPtr& p, const string& deprecate
     _out << nl << " **/";
 }
 
-Slice::Gen::Gen(const string& base, const vector<string>& includePaths, const string& dir, bool icejs) :
+Slice::Gen::Gen(const string& base, const vector<string>& includePaths, const string& dir) :
     _includePaths(includePaths),
-    _icejs(icejs),
     _useStdout(false)
 {
     _fileBase = base;
@@ -650,10 +649,9 @@ Slice::Gen::Gen(const string& base, const vector<string>& includePaths, const st
     printGeneratedHeader(_out, _fileBase + ".ice");
 }
 
-Slice::Gen::Gen(const string& base, const vector<string>& includePaths, const string& dir, bool icejs, ostream& out) :
+Slice::Gen::Gen(const string& base, const vector<string>& includePaths, const string& dir, ostream& out) :
     _out(out),
     _includePaths(includePaths),
-    _icejs(icejs),
     _useStdout(true)
 {
     _fileBase = base;
@@ -678,7 +676,16 @@ Slice::Gen::~Gen()
 void
 Slice::Gen::generate(const UnitPtr& p)
 {
-    if(_icejs)
+    //
+    // Check for global "js:ice-build" metadata.
+    // If this is set then we are building Ice.
+    //
+    DefinitionContextPtr dc = p->findDefinitionContext(p->topLevelFile());
+    assert(dc);
+    StringList globalMetaData = dc->getMetaData();
+    bool icejs = find(globalMetaData.begin(), globalMetaData.end(), "js:ice-build") != globalMetaData.end();
+
+    if(icejs)
     {
         _out.zeroIndent();
         _out << nl << "/* slice2js browser-bundle-skip */";
@@ -686,26 +693,26 @@ Slice::Gen::generate(const UnitPtr& p)
     }
     _out << nl << "(function(module, require, exports)";
     _out << sb;
-    if(_icejs)
+    if(icejs)
     {
         _out.zeroIndent();
         _out << nl << "/* slice2js browser-bundle-skip-end */";
         _out.restoreIndent();
     }
-    RequireVisitor requireVisitor(_out, _includePaths, _icejs);
+    RequireVisitor requireVisitor(_out, _includePaths, icejs);
     p->visit(&requireVisitor, false);
     vector<string> seenModules = requireVisitor.writeRequires(p);
 
-    TypesVisitor typesVisitor(_out, seenModules, _icejs);
+    TypesVisitor typesVisitor(_out, seenModules, icejs);
     p->visit(&typesVisitor, false);
 
     //
     // Export the top-level modules.
     //
-    ExportVisitor exportVisitor(_out, _icejs);
+    ExportVisitor exportVisitor(_out, icejs);
     p->visit(&exportVisitor, false);
 
-    if(_icejs)
+    if(icejs)
     {
         _out.zeroIndent();
         _out << nl << "/* slice2js browser-bundle-skip */";
@@ -717,7 +724,7 @@ Slice::Gen::generate(const UnitPtr& p)
          << nl << " typeof(global) !== \"undefined\" && typeof(global.process) !== \"undefined\" ? require : window.Ice.__require,"
          << nl << " typeof(global) !== \"undefined\" && typeof(global.process) !== \"undefined\" ? exports : window));";
 
-    if(_icejs)
+    if(icejs)
     {
         _out.zeroIndent();
         _out << nl << "/* slice2js browser-bundle-skip-end */";
diff --git a/cpp/src/slice2js/Gen.h b/cpp/src/slice2js/Gen.h
index 8b788ae334b..3c9781471c7 100644
--- a/cpp/src/slice2js/Gen.h
+++ b/cpp/src/slice2js/Gen.h
@@ -53,13 +53,11 @@ public:
 
     Gen(const std::string&,
         const std::vector<std::string>&,
-        const std::string&,
-        bool);
+        const std::string&);
 
     Gen(const std::string&,
         const std::vector<std::string>&,
         const std::string&,
-        bool,
         std::ostream&);
     ~Gen();
 
@@ -73,7 +71,6 @@ private:
 
     std::vector<std::string> _includePaths;
     std::string _fileBase;
-    bool _icejs;
     bool _useStdout;
 
     void printHeader();
diff --git a/cpp/src/slice2js/Main.cpp b/cpp/src/slice2js/Main.cpp
index 35aca5463d4..b751dd295bf 100644
--- a/cpp/src/slice2js/Main.cpp
+++ b/cpp/src/slice2js/Main.cpp
@@ -75,7 +75,6 @@ usage(const char* n)
         "-d, --debug             Print debug messages.\n"
         "--ice                   Permit `Ice' prefix (for building Ice source code only).\n"
         "--underscore            Permit underscores in Slice identifiers.\n"
-        "--icejs                 Build icejs module\n"
         ;
 }
 
@@ -98,7 +97,6 @@ compile(int argc, char* argv[])
     opts.addOpt("d", "debug");
     opts.addOpt("", "ice");
     opts.addOpt("", "underscore");
-    opts.addOpt("", "icejs");
 
     vector<string> args;
     try
@@ -146,11 +144,11 @@ compile(int argc, char* argv[])
     bool preprocess = opts.isSet("E");
 
     bool useStdout = opts.isSet("stdout");
-    
+
     string output = opts.optArg("output-dir");
 
     bool depend = opts.isSet("depend");
-    
+
     bool dependJSON = opts.isSet("depend-json");
 
     bool dependxml = opts.isSet("depend-xml");
@@ -163,8 +161,6 @@ compile(int argc, char* argv[])
 
     bool underscore = opts.isSet("underscore");
 
-    bool icejs = opts.isSet("icejs");
-    
     if(args.empty())
     {
         getErrorStream() << argv[0] << ": error: no input file" << endl;
@@ -207,7 +203,7 @@ compile(int argc, char* argv[])
     {
         out.os() << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<dependencies>" << endl;
     }
-    
+
     //
     // Create a copy of args without the duplicates.
     //
@@ -220,9 +216,9 @@ compile(int argc, char* argv[])
             sources.push_back(*i);
         }
     }
-    
+
     for(vector<string>::const_iterator i = sources.begin(); i != sources.end();)
-    {        
+    {
         if(depend || dependJSON || dependxml)
         {
             PreprocessorPtr icecpp = Preprocessor::create(argv[0], *i, cppArgs);
@@ -243,9 +239,9 @@ compile(int argc, char* argv[])
                 out.cleanup();
                 return EXIT_FAILURE;
             }
-            
+
             bool last = (++i == sources.end());
-            
+
             if(!icecpp->printMakefileDependencies(out.os(),
                     depend ? Preprocessor::JavaScript : (dependJSON ? Preprocessor::JavaScriptJSON : Preprocessor::SliceXML),
                     includePaths,
@@ -260,7 +256,7 @@ compile(int argc, char* argv[])
                 out.cleanup();
                 return EXIT_FAILURE;
             }
-            
+
             if(dependJSON)
             {
                 if(!last)
@@ -315,12 +311,12 @@ compile(int argc, char* argv[])
                     {
                         if(useStdout)
                         {
-                            Gen gen(icecpp->getBaseName(), includePaths, output, icejs, cout);
+                            Gen gen(icecpp->getBaseName(), includePaths, output, cout);
                             gen.generate(p);
                         }
                         else
                         {
-                            Gen gen(icecpp->getBaseName(), includePaths, output, icejs);
+                            Gen gen(icecpp->getBaseName(), includePaths, output);
                             gen.generate(p);
                         }
                     }
@@ -352,7 +348,7 @@ compile(int argc, char* argv[])
             }
         }
     }
-    
+
     if(dependJSON)
     {
         out.os() << "}" << endl;
diff --git a/js/gulpfile.js b/js/gulpfile.js
index 34b0c9ec7f4..23f524d7d35 100644
--- a/js/gulpfile.js
+++ b/js/gulpfile.js
@@ -317,7 +317,7 @@ libs.forEach(
         gulp.task(generateTask(lib),
             function(){
                 return gulp.src(sources.slice.map(sliceFile))
-                    .pipe(slice2js({args: ["--ice","--icejs"], dest: srcDir(lib)}))
+                    .pipe(slice2js({args: ["--ice"], dest: srcDir(lib)}))
                     .pipe(gulp.dest(srcDir(lib)));
             });
 
diff --git a/slice/Glacier2/Metrics.ice b/slice/Glacier2/Metrics.ice
index 5554d660a8f..9ea04ae663c 100644
--- a/slice/Glacier2/Metrics.ice
+++ b/slice/Glacier2/Metrics.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 [["cpp:include:Glacier2/Config.h"]]
 
 #include <Ice/Metrics.ice>
@@ -38,14 +38,14 @@ class SessionMetrics extends Metrics
      *
      **/
     int forwardedServer = 0;
- 
+
     /**
      *
      * The size of the routing table.
-     * 
+     *
      **/
     int routingTableSize = 0;
- 
+
     /**
      *
      * Number of client requests queued.
@@ -59,7 +59,7 @@ class SessionMetrics extends Metrics
      *
      **/
     int queuedServer = 0;
- 
+
     /**
      *
      * Number of client requests overridden.
diff --git a/slice/Glacier2/PermissionsVerifier.ice b/slice/Glacier2/PermissionsVerifier.ice
index 6a1051989fa..fce3a101837 100644
--- a/slice/Glacier2/PermissionsVerifier.ice
+++ b/slice/Glacier2/PermissionsVerifier.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 [["cpp:include:Glacier2/Config.h"]]
 
 #include <Glacier2/SSLInfo.ice>
@@ -97,7 +97,7 @@ interface SSLPermissionsVerifier
      * @see SSLInfo
      *
      **/
-    ["nonmutating", "cpp:const", "format:sliced"] 
+    ["nonmutating", "cpp:const", "format:sliced"]
     idempotent bool authorize(SSLInfo info, out string reason)
         throws PermissionDeniedException;
 };
diff --git a/slice/Glacier2/PermissionsVerifierF.ice b/slice/Glacier2/PermissionsVerifierF.ice
index f1bb1d65279..a7407154ecb 100644
--- a/slice/Glacier2/PermissionsVerifierF.ice
+++ b/slice/Glacier2/PermissionsVerifierF.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 
 ["objc:prefix:GLACIER2"]
 module Glacier2
diff --git a/slice/Glacier2/Router.ice b/slice/Glacier2/Router.ice
index d1f75b16639..34390f1bbb1 100644
--- a/slice/Glacier2/Router.ice
+++ b/slice/Glacier2/Router.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 [["cpp:include:Glacier2/Config.h"]]
 
 #include <Ice/Router.ice>
@@ -53,7 +53,7 @@ interface Router extends Ice::Router
      * This category must be used in the identities of all of the client's
      * callback objects. This is necessary in order for the router to
      * forward callback requests to the intended client. If the Glacier2
-     * server endpoints are not set, the returned category is an empty 
+     * server endpoints are not set, the returned category is an empty
      * string.
      *
      * @return The category.
diff --git a/slice/Glacier2/RouterF.ice b/slice/Glacier2/RouterF.ice
index 3117d525a1d..b4a8d8a3303 100644
--- a/slice/Glacier2/RouterF.ice
+++ b/slice/Glacier2/RouterF.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 
 ["objc:prefix:GLACIER2"]
 module Glacier2
diff --git a/slice/Glacier2/SSLInfo.ice b/slice/Glacier2/SSLInfo.ice
index 2c68700a057..9be10e02b53 100644
--- a/slice/Glacier2/SSLInfo.ice
+++ b/slice/Glacier2/SSLInfo.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 [["cpp:include:Glacier2/Config.h"]]
 
 #include <Ice/BuiltinSequences.ice>
diff --git a/slice/Glacier2/Session.ice b/slice/Glacier2/Session.ice
index 404bb5ed47a..93658145f98 100644
--- a/slice/Glacier2/Session.ice
+++ b/slice/Glacier2/Session.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 [["cpp:include:Glacier2/Config.h"]]
 
 #include <Ice/BuiltinSequences.ice>
@@ -66,7 +66,7 @@ interface Session
  *
  * An object for managing the set of identity constraints for specific
  * parts of object identity on a
- * {@link Session}. 
+ * {@link Session}.
  *
  * @see Session
  * @see SessionControl
@@ -99,7 +99,7 @@ interface StringSet
      * Returns a sequence of strings describing the constraints in this
      * set.
      *
-     * @return The sequence of strings for this set. 
+     * @return The sequence of strings for this set.
      *
      **/
     idempotent Ice::StringSeq get();
@@ -108,7 +108,7 @@ interface StringSet
 /**
  *
  * An object for managing the set of object identity constraints on a
- * {@link Session}. 
+ * {@link Session}.
  *
  * @see Session
  * @see SessionControl
@@ -141,7 +141,7 @@ interface IdentitySet
      * Returns a sequence of identities describing the constraints in this
      * set.
      *
-     * @return The sequence of Ice identities for this set. 
+     * @return The sequence of Ice identities for this set.
      *
      **/
     idempotent Ice::IdentitySeq get();
@@ -160,7 +160,7 @@ interface SessionControl
     /**
      *
      * Access the object that manages the allowable categories
-     * for object identities for this session. 
+     * for object identities for this session.
      *
      * @return A StringSet object.
      *
@@ -170,7 +170,7 @@ interface SessionControl
     /**
      *
      * Access the object that manages the allowable adapter identities
-     * for objects for this session. 
+     * for objects for this session.
      *
      * @return A StringSet object.
      *
@@ -180,7 +180,7 @@ interface SessionControl
     /**
      *
      * Access the object that manages the allowable object identities
-     * for this session. 
+     * for this session.
      *
      * @return An IdentitySet object.
      *
@@ -195,7 +195,7 @@ interface SessionControl
      *
      **/
     idempotent int getSessionTimeout();
-    
+
     /**
      *
      * Destroy the associated session.
@@ -265,7 +265,7 @@ interface SSLSessionManager
      * cannot be created.
      *
      **/
-    ["format:sliced"] 
+    ["format:sliced"]
     Session* create(SSLInfo info, SessionControl* control)
         throws CannotCreateSessionException;
 };
diff --git a/slice/Ice/BuiltinSequences.ice b/slice/Ice/BuiltinSequences.ice
index a2a08cea140..37d8a14e88c 100644
--- a/slice/Ice/BuiltinSequences.ice
+++ b/slice/Ice/BuiltinSequences.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 
 ["objc:prefix:ICE"]
 module Ice
@@ -41,7 +41,7 @@ sequence<string> StringSeq;
 
 /** A sequence of objects. **/
 sequence<Object> ObjectSeq;
-    
+
 /** A sequence of object proxies. **/
 sequence<Object*> ObjectProxySeq;
 
diff --git a/slice/Ice/Connection.ice b/slice/Ice/Connection.ice
index d08275a966f..bc8db075af4 100644
--- a/slice/Ice/Connection.ice
+++ b/slice/Ice/Connection.ice
@@ -10,7 +10,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 
 #include <Ice/ObjectAdapterF.ice>
 #include <Ice/Identity.ice>
diff --git a/slice/Ice/ConnectionF.ice b/slice/Ice/ConnectionF.ice
index 9efb4ac85e1..890aeba9e09 100644
--- a/slice/Ice/ConnectionF.ice
+++ b/slice/Ice/ConnectionF.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 
 ["objc:prefix:ICE"]
 module Ice
diff --git a/slice/Ice/Current.ice b/slice/Ice/Current.ice
index b360fc10e7b..3a9f146a782 100644
--- a/slice/Ice/Current.ice
+++ b/slice/Ice/Current.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 
 #include <Ice/ObjectAdapterF.ice>
 #include <Ice/ConnectionF.ice>
@@ -97,7 +97,7 @@ local struct Current
      *
      **/
     ObjectAdapter adapter;
-    
+
     /**
      *
      * Information about the connection over which the current method
diff --git a/slice/Ice/Endpoint.ice b/slice/Ice/Endpoint.ice
index 3cd23807984..4796b97b6f5 100644
--- a/slice/Ice/Endpoint.ice
+++ b/slice/Ice/Endpoint.ice
@@ -13,7 +13,7 @@
 #include <Ice/BuiltinSequences.ice>
 #include <Ice/EndpointF.ice>
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 
 ["objc:prefix:ICE"]
 module Ice
diff --git a/slice/Ice/EndpointF.ice b/slice/Ice/EndpointF.ice
index e3d34d34429..d0449e02fd7 100644
--- a/slice/Ice/EndpointF.ice
+++ b/slice/Ice/EndpointF.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 
 ["objc:prefix:ICE"]
 module Ice
diff --git a/slice/Ice/EndpointTypes.ice b/slice/Ice/EndpointTypes.ice
index c989a99fae9..909d5e19097 100644
--- a/slice/Ice/EndpointTypes.ice
+++ b/slice/Ice/EndpointTypes.ice
@@ -10,7 +10,7 @@
 #pragma once
 
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 
 ["objc:prefix:ICE"]
 module Ice
diff --git a/slice/Ice/Identity.ice b/slice/Ice/Identity.ice
index cf2f0b9b9bd..e2db9111194 100644
--- a/slice/Ice/Identity.ice
+++ b/slice/Ice/Identity.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 
 ["objc:prefix:ICE"]
 module Ice
diff --git a/slice/Ice/LocalException.ice b/slice/Ice/LocalException.ice
index ad0fb29236b..1677ffee949 100644
--- a/slice/Ice/LocalException.ice
+++ b/slice/Ice/LocalException.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 
 #include <Ice/Identity.ice>
 #include <Ice/Version.ice>
@@ -100,7 +100,7 @@ local exception AlreadyRegisteredException
  * registered with the Ice run time or Ice locator.
  *
  * This exception is raised if an attempt is made to remove a servant,
- * servant locator, facet, object factory, plug-in, object adapter, 
+ * servant locator, facet, object factory, plug-in, object adapter,
  * object, or user exception factory that is not currently registered.
  *
  * It's also raised if the Ice locator can't find an object or object
@@ -114,7 +114,7 @@ local exception NotRegisteredException
     /**
      *
      * The kind of object that could not be removed: "servant",
-     * "servant locator", "object factory", "plug-in", 
+     * "servant locator", "object factory", "plug-in",
      * "object adapter", "object", or "user exception factory".
      *
      **/
@@ -179,13 +179,13 @@ local exception UnknownException
 {
     /**
      *
-     * This field is set to the textual representation of the unknown 
+     * This field is set to the textual representation of the unknown
      * exception if available.
      *
      **/
     string unknown;
 };
-    
+
 /**
  *
  * This exception is raised if an operation call on a server raises a
@@ -258,7 +258,7 @@ local exception CommunicatorDestroyedException
 local exception ObjectAdapterDeactivatedException
 {
     /**
-     * 
+     *
      * Name of the adapter.
      *
      **/
@@ -293,7 +293,7 @@ local exception ObjectAdapterIdInUseException
 local exception NoEndpointException
 {
     /**
-     * 
+     *
      * The stringified proxy for which no suitable endpoint is
      * available.
      *
@@ -1008,7 +1008,7 @@ local exception SecurityException
 };
 
 /**
- * 
+ *
  * This exception indicates that an attempt has been made to
  * change the connection properties of a fixed proxy.
  *
@@ -1019,7 +1019,7 @@ local exception FixedProxyException
 };
 
 /**
- * 
+ *
  * Indicates that the response to a request has already been sent;
  * re-dispatching such a request is not possible.
  *
diff --git a/slice/Ice/Locator.ice b/slice/Ice/Locator.ice
index 169e9bb87e0..d4bf3a5f6e0 100644
--- a/slice/Ice/Locator.ice
+++ b/slice/Ice/Locator.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 
 
 #include <Ice/Identity.ice>
@@ -105,7 +105,7 @@ interface Locator
      * @param id The adapter id.
      *
      * @return The adapter proxy, or null if the adapter is not active.
-     * 
+     *
      * @throws AdapterNotFoundException Raised if the adapter cannot be
      * found.
      *
diff --git a/slice/Ice/Metrics.ice b/slice/Ice/Metrics.ice
index d099b212e1b..82b8f239be1 100644
--- a/slice/Ice/Metrics.ice
+++ b/slice/Ice/Metrics.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 
 #include <Ice/BuiltinSequences.ice>
 
@@ -18,7 +18,7 @@
  * The Ice Management eXtension facility. It provides the {@link
  * IceMX#MetricsAdmin} interface for management clients to retrieve
  * metrics from Ice applications.
- * 
+ *
  **/
 ["objc:prefix:ICEMX"]
 module IceMX
@@ -36,7 +36,7 @@ dictionary<string, int> StringIntDict;
  * The base class for metrics. A metrics object represents a
  * collection of measurements associated to a given a system.
  *
- **/ 
+ **/
 class Metrics
 {
     /**
@@ -45,14 +45,14 @@ class Metrics
      *
      **/
     string id;
-    
+
     /**
      *
      * The total number of objects that were observed by this metrics.
      *
      **/
     long total = 0;
-    
+
     /**
      *
      * The current number of objects observed by this metrics.
@@ -128,7 +128,7 @@ dictionary<string, MetricsMap> MetricsView;
 /**
  *
  * Raised if a metrics view cannot be found.
- * 
+ *
  **/
 exception UnknownMetricsView
 {
@@ -141,7 +141,7 @@ exception UnknownMetricsView
  * that enabled the Ice administrative facility and configured some
  * metrics views.
  *
- **/ 
+ **/
 ["format:sliced"]
 interface MetricsAdmin
 {
@@ -161,7 +161,7 @@ interface MetricsAdmin
      * Enables a metrics view.
      *
      * @param name The metrics view name.
-     * 
+     *
      * @throws UnknownMetricsView Raised if the metrics view cannot be
      * found.
      *
@@ -174,7 +174,7 @@ interface MetricsAdmin
      * Disable a metrics view.
      *
      * @param name The metrics view name.
-     * 
+     *
      * @throws UnknownMetricsView Raised if the metrics view cannot be
      * found.
      *
@@ -264,7 +264,7 @@ class ThreadMetrics extends Metrics
      *
      **/
     int inUseForUser = 0;
-    
+
     /**
      *
      * The number of threads which are currently performing other
@@ -279,7 +279,7 @@ class ThreadMetrics extends Metrics
 /**
  *
  * Provides information on servant dispatch.
- * 
+ *
  **/
 class DispatchMetrics extends Metrics
 {
@@ -330,7 +330,7 @@ class ChildInvocationMetrics extends Metrics
      *
      * The size of the invocation reply. This corresponds to the size
      * of the marshalled output and return parameters.
-     * 
+     *
      **/
     long replySize = 0;
 };
@@ -407,7 +407,7 @@ class ConnectionMetrics extends Metrics
 {
     /**
      *
-     * The number of bytes received by the connection. 
+     * The number of bytes received by the connection.
      *
      **/
     long receivedBytes = 0;
diff --git a/slice/Ice/ObjectAdapterF.ice b/slice/Ice/ObjectAdapterF.ice
index aa5a6a1b354..eeaa91f7f5b 100644
--- a/slice/Ice/ObjectAdapterF.ice
+++ b/slice/Ice/ObjectAdapterF.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 
 ["objc:prefix:ICE"]
 module Ice
diff --git a/slice/Ice/Process.ice b/slice/Ice/Process.ice
index 08073d39fc2..be1b766cb75 100644
--- a/slice/Ice/Process.ice
+++ b/slice/Ice/Process.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 
 ["objc:prefix:ICE"]
 module Ice
diff --git a/slice/Ice/ProcessF.ice b/slice/Ice/ProcessF.ice
index b824ab321ec..8be94362d81 100644
--- a/slice/Ice/ProcessF.ice
+++ b/slice/Ice/ProcessF.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 
 ["objc:prefix:ICE"]
 module Ice
diff --git a/slice/Ice/PropertiesAdmin.ice b/slice/Ice/PropertiesAdmin.ice
index 6b8fe6932d9..b8bc97b7639 100644
--- a/slice/Ice/PropertiesAdmin.ice
+++ b/slice/Ice/PropertiesAdmin.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 
 #include <Ice/BuiltinSequences.ice>
 
diff --git a/slice/Ice/Router.ice b/slice/Ice/Router.ice
index 44c7957402e..26725c125ed 100644
--- a/slice/Ice/Router.ice
+++ b/slice/Ice/Router.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 
 #include <Ice/BuiltinSequences.ice>
 
diff --git a/slice/Ice/SliceChecksumDict.ice b/slice/Ice/SliceChecksumDict.ice
index bb4ee67c3e6..db67867b306 100644
--- a/slice/Ice/SliceChecksumDict.ice
+++ b/slice/Ice/SliceChecksumDict.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 
 ["objc:prefix:ICE"]
 module Ice
diff --git a/slice/Ice/Version.ice b/slice/Ice/Version.ice
index 7291cc43d78..147887976ac 100644
--- a/slice/Ice/Version.ice
+++ b/slice/Ice/Version.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 
 ["objc:prefix:ICE"]
 module Ice
diff --git a/slice/IceGrid/Admin.ice b/slice/IceGrid/Admin.ice
index 42c11385002..9c2a794218b 100644
--- a/slice/IceGrid/Admin.ice
+++ b/slice/IceGrid/Admin.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 [["cpp:include:IceGrid/Config.h"]]
 
 #include <Ice/Identity.ice>
@@ -62,7 +62,7 @@ enum ServerState
      *
      **/
     Active,
-    
+
     /**
      *
      * The server is being deactivated.
@@ -102,14 +102,14 @@ struct ObjectInfo
 {
     /**
      *
-     * The proxy of the object. 
+     * The proxy of the object.
      *
      **/
     Object* proxy;
 
-    /** 
+    /**
      *
-     * The type of the object. 
+     * The type of the object.
      *
      **/
     string type;
@@ -130,7 +130,7 @@ sequence<ObjectInfo> ObjectInfoSeq;
 ["cpp:comparable"]
 struct AdapterInfo
 {
-    /** 
+    /**
      *
      * The id of the adapter.
      *
@@ -139,12 +139,12 @@ struct AdapterInfo
 
     /**
      *
-     * A dummy direct proxy that contains the adapter endpoints. 
+     * A dummy direct proxy that contains the adapter endpoints.
      *
      **/
     Object* proxy;
 
-    /** 
+    /**
      *
      * The replica group id of the object adapter, or empty if the
      * adapter doesn't belong to a replica group.
@@ -169,7 +169,7 @@ struct ServerInfo
 {
     /**
      *
-     * The server application. 
+     * The server application.
      *
      **/
     string application;
@@ -180,7 +180,7 @@ struct ServerInfo
      *
      **/
     string uuid;
-    
+
     /**
      *
      * The application revision.
@@ -188,16 +188,16 @@ struct ServerInfo
      **/
     int revision;
 
-    /** 
+    /**
      *
-     * The server node. 
+     * The server node.
      *
      **/
     string node;
-       
+
     /**
      *
-     * The server descriptor. 
+     * The server descriptor.
      *
      **/
     ServerDescriptor descriptor;
@@ -242,7 +242,7 @@ struct NodeInfo
     /**
      *
      * The operation system release level (as defined in uname()).
-     * 
+     *
      **/
     string release;
 
@@ -258,7 +258,7 @@ struct NodeInfo
      * The machine hardware type (as defined in uname()).
      *
      **/
-    string machine;    
+    string machine;
 
     /**
      *
@@ -268,7 +268,7 @@ struct NodeInfo
      *
      **/
     int nProcessors;
-    
+
     /**
      *
      * The path to the node data directory.
@@ -336,7 +336,7 @@ struct ApplicationInfo
 
     /** The creation time. */
     long createTime;
-    
+
     /** The user who created the application. */
     string createUser;
 
@@ -345,7 +345,7 @@ struct ApplicationInfo
 
     /** The user who updated the application. */
     string updateUser;
-    
+
     /** The application revision number. */
     int revision;
 
@@ -523,12 +523,12 @@ interface Admin
      * node.
      *
      * @param application The application name.
-     * 
+     *
      * @param node The name of the node where the server will be
      * deployed.
      *
      * @param desc The descriptor of the server instance to deploy.
-     * 
+     *
      * @throws AccessDeniedException Raised if the session doesn't
      * hold the exclusive lock or if another session is holding the
      * lock.
@@ -617,7 +617,7 @@ interface Admin
      * @param id The server id.
      *
      * @return The server state.
-     * 
+     *
      * @throws ServerNotExistException Raised if the server doesn't exist.
      *
      * @throws NodeUnreachableException Raised if the node could not be
@@ -629,7 +629,7 @@ interface Admin
      **/
     ["nonmutating", "cpp:const"] idempotent ServerState getServerState(string id)
         throws ServerNotExistException, NodeUnreachableException, DeploymentException;
-    
+
     /**
      *
      * Get a server's system process id. The process id is operating
@@ -638,7 +638,7 @@ interface Admin
      * @param id The server id.
      *
      * @return The server's process id.
-     * 
+     *
      * @throws ServerNotExistException Raised if the server doesn't exist.
      *
      * @throws NodeUnreachableException Raised if the node could not be
@@ -660,7 +660,7 @@ interface Admin
      * @return The category for server admin objects.
      *
      **/
-    ["cpp:const"] 
+    ["cpp:const"]
     idempotent string getServerAdminCategory();
 
     /**
@@ -680,7 +680,7 @@ interface Admin
      * deployed on the node.
      *
      **/
-    ["cpp:const"] 
+    ["cpp:const"]
     idempotent Object* getServerAdmin(string id)
         throws ServerNotExistException, NodeUnreachableException, DeploymentException;
 
@@ -719,7 +719,7 @@ interface Admin
      *
      * @throws NodeUnreachableException Raised if the node could not
      * be reached.
-     * 
+     *
      * @throws DeploymentException Raised if the server couldn't be
      * deployed on the node.
      *
@@ -812,7 +812,7 @@ interface Admin
      * @throws DeploymentException Raised if the server couldn't be
      * deployed on the node.
      *
-     * @throws BadSignalException Raised if the signal is not recognized 
+     * @throws BadSignalException Raised if the signal is not recognized
      * by the target server.
      *
      **/
@@ -942,7 +942,7 @@ interface Admin
      * deployment descriptor.
      *
      **/
-    void removeObject(Ice::Identity id) 
+    void removeObject(Ice::Identity id)
         throws ObjectNotRegisteredException, DeploymentException;
 
     /**
@@ -986,7 +986,7 @@ interface Admin
      *
      **/
     ["nonmutating", "cpp:const"] idempotent ObjectInfoSeq getAllObjectInfos(string expr);
-    
+
     /**
      *
      * Ping an IceGrid node to see if it is active.
@@ -994,7 +994,7 @@ interface Admin
      * @param name The node name.
      *
      * @return true if the node ping succeeded, false otherwise.
-     * 
+     *
      * @throws NodeNotExistException Raised if the node doesn't exist.
      *
      **/
@@ -1008,7 +1008,7 @@ interface Admin
      * @param name The node name.
      *
      * @return The node load information.
-     * 
+     *
      * @throws NodeNotExistException Raised if the node doesn't exist.
      *
      * @throws NodeUnreachableException Raised if the node could not be
@@ -1025,7 +1025,7 @@ interface Admin
      * @param name The node name.
      *
      * @return The node information.
-     * 
+     *
      * @throws NodeNotExistException Raised if the node doesn't exist.
      *
      * @throws NodeUnreachableException Raised if the node could not be
@@ -1056,7 +1056,7 @@ interface Admin
     /**
      *
      * Get the number of physical processor sockets for the machine
-     * running the node with the given name. 
+     * running the node with the given name.
      *
      * Note that this method will return 1 on operating systems where
      * this can't be automatically determined and where the
@@ -1067,20 +1067,20 @@ interface Admin
      *
      * @return The number of processor sockets or 1 if the number of
      * sockets can't determined.
-     * 
+     *
      * @throws NodeNotExistException Raised if the node doesn't exist.
      *
      * @throws NodeUnreachableException Raised if the node could not be
      * reached.
      *
-     **/    
+     **/
     ["nonmutating", "cpp:const"] idempotent int getNodeProcessorSocketCount(string name)
         throws NodeNotExistException, NodeUnreachableException;
-    
+
     /**
      *
      * Shutdown an IceGrid node.
-     * 
+     *
      * @param name The node name.
      *
      * @throws NodeNotExistException Raised if the node doesn't exist.
@@ -1125,7 +1125,7 @@ interface Admin
      * @param name The registry name.
      *
      * @return true if the registry ping succeeded, false otherwise.
-     * 
+     *
      * @throws RegistryNotExistException Raised if the registry doesn't exist.
      *
      **/
@@ -1139,7 +1139,7 @@ interface Admin
      * @param name The registry name.
      *
      * @return The registry information.
-     * 
+     *
      * @throws RegistryNotExistException Raised if the registry doesn't exist.
      *
      * @throws RegistryUnreachableException Raised if the registry could not be
@@ -1148,7 +1148,7 @@ interface Admin
      **/
     ["cpp:const"] idempotent RegistryInfo getRegistryInfo(string name)
         throws RegistryNotExistException, RegistryUnreachableException;
-    
+
     /**
      *
      * Get a proxy to the IceGrid registry's admin object.
@@ -1160,13 +1160,13 @@ interface Admin
      * @throws RegistryNotExistException Raised if the registry doesn't exist.
      *
      **/
-    ["cpp:const"] idempotent Object* getRegistryAdmin(string name) 
+    ["cpp:const"] idempotent Object* getRegistryAdmin(string name)
         throws RegistryNotExistException;
 
     /**
      *
      * Shutdown an IceGrid registry.
-     * 
+     *
      * @param name The registry name.
      *
      * @throws RegistryNotExistException Raised if the registry doesn't exist.
@@ -1218,7 +1218,7 @@ interface FileIterator
      * @param size Specifies the maximum number of bytes to be
      * received. The server will ensure that the returned message
      * doesn't exceed the given size.
-     * 
+     *
      * @param lines The lines read from the file. If there was nothing to
      * read from the file since the last call to read, an empty
      * sequence is returned. The last line of the sequence is always
@@ -1254,7 +1254,7 @@ interface ObjectObserver;
  * update, and receive observer updates from the IceGrid
  * registry. Admin sessions are created either with the {@link Registry}
  * object or the registry admin {@link Glacier2.SessionManager} object.
- * 
+ *
  * @see Registry
  * @see Glacier2.SessionManager
  *
@@ -1351,7 +1351,7 @@ interface AdminSession extends Glacier2::Session
      * Acquires an exclusive lock to start updating the registry applications.
      *
      * @return The current serial.
-     * 
+     *
      * @throws AccessDeniedException Raised if the exclusive lock can't be
      * acquired. This might happen if the lock is currently acquired by
      * another session.
@@ -1359,7 +1359,7 @@ interface AdminSession extends Glacier2::Session
      **/
     int startUpdate()
         throws AccessDeniedException;
-    
+
     /**
      *
      * Finish updating the registry and release the exclusive lock.
diff --git a/slice/IceGrid/Descriptor.ice b/slice/IceGrid/Descriptor.ice
index 9c3f35b1825..fa3d3688e90 100644
--- a/slice/IceGrid/Descriptor.ice
+++ b/slice/IceGrid/Descriptor.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 [["cpp:include:IceGrid/Config.h"]]
 
 #include <Ice/Identity.ice>
diff --git a/slice/IceGrid/Exception.ice b/slice/IceGrid/Exception.ice
index 98413934a50..d2f6b51a162 100644
--- a/slice/IceGrid/Exception.ice
+++ b/slice/IceGrid/Exception.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 [["cpp:include:IceGrid/Config.h"]]
 
 #include <Ice/Identity.ice>
@@ -62,7 +62,7 @@ exception ServerStartException
      *
      **/
     string id;
-    
+
     /**
      *
      * The reason for the failure.
@@ -259,9 +259,9 @@ exception RegistryUnreachableException
 exception BadSignalException
 {
     /**
-     * 
+     *
      * The details of the unknown signal.
-     * 
+     *
      **/
     string reason;
 };
diff --git a/slice/IceGrid/FileParser.ice b/slice/IceGrid/FileParser.ice
index 3572b0c1e94..e2705b882fa 100644
--- a/slice/IceGrid/FileParser.ice
+++ b/slice/IceGrid/FileParser.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 [["cpp:include:IceGrid/Config.h"]]
 
 #include <IceGrid/Admin.ice>
@@ -28,7 +28,7 @@ exception ParseException
     /** The reason for the failure. */
     string reason;
 };
-    
+
 /**
  *
  * <tt>icegridadmin</tt> provides a {@link FileParser}
diff --git a/slice/IceGrid/Locator.ice b/slice/IceGrid/Locator.ice
index 03b3d2328c3..c960e3b5ab0 100644
--- a/slice/IceGrid/Locator.ice
+++ b/slice/IceGrid/Locator.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 [["cpp:include:IceGrid/Config.h"]]
 
 #include <Ice/Locator.ice>
@@ -28,7 +28,7 @@ interface Query;
  *
  * @see Query
  * @see Registry
- * 
+ *
  **/
 interface Locator extends Ice::Locator
 {
diff --git a/slice/IceGrid/Observer.ice b/slice/IceGrid/Observer.ice
index ad96b7f6aae..63afd4d0078 100644
--- a/slice/IceGrid/Observer.ice
+++ b/slice/IceGrid/Observer.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 [["cpp:include:IceGrid/Config.h"]]
 
 #include <Glacier2/Session.ice>
@@ -28,27 +28,27 @@ module IceGrid
  **/
 struct ServerDynamicInfo
 {
-    /** 
+    /**
      *
      * The id of the server.
      *
      **/
     string id;
-    
-    /** 
+
+    /**
      *
      * The state of the server.
      *
      **/
     ServerState state;
 
-    /** 
+    /**
      *
      * The process id of the server.
      *
-     **/    
+     **/
     int pid;
-    
+
     /**
      *
      * Indicates whether the server is enabled.
@@ -60,18 +60,18 @@ struct ServerDynamicInfo
 /**
  *
  * A sequence of server dynamic information structures.
- * 
+ *
  **/
 ["java:type:java.util.LinkedList<ServerDynamicInfo>"] sequence<ServerDynamicInfo> ServerDynamicInfoSeq;
 
 /**
  *
  * Dynamic information about the state of an adapter.
- * 
+ *
  **/
 struct AdapterDynamicInfo
 {
-    /** 
+    /**
      *
      * The id of the adapter.
      *
@@ -134,7 +134,7 @@ sequence<NodeDynamicInfo> NodeDynamicInfoSeq;
  * The node observer interface. Observers should implement this
  * interface to receive information about the state of the IceGrid
  * nodes.
- * 
+ *
  **/
 interface NodeObserver
 {
@@ -152,7 +152,7 @@ interface NodeObserver
      *
      * The <tt>nodeUp</tt> operation is called to notify an observer that a node
      * came up.
-     * 
+     *
      * @param node The node state.
      *
      **/
@@ -162,7 +162,7 @@ interface NodeObserver
      *
      * The <tt>nodeDown</tt> operation is called to notify an observer that a node
      * went down.
-     * 
+     *
      * @param name The node name.
      *
      **/
@@ -174,9 +174,9 @@ interface NodeObserver
      * the state of a server changed.
      *
      * @param node The node hosting the server.
-     * 
+     *
      * @param updatedInfo The new server state.
-     * 
+     *
      **/
     void updateServer(string node, ServerDynamicInfo updatedInfo);
 
@@ -184,11 +184,11 @@ interface NodeObserver
      *
      * The <tt>updateAdapter</tt> operation is called to notify an observer that
      * the state of an adapter changed.
-     * 
+     *
      * @param node The node hosting the adapter.
-     * 
+     *
      * @param updatedInfo The new adapter state.
-     * 
+     *
      **/
      void updateAdapter(string node, AdapterDynamicInfo updatedInfo);
 };
@@ -198,7 +198,7 @@ interface NodeObserver
  * The database observer interface. Observers should implement this
  * interface to receive information about the state of the IceGrid
  * registry database.
- * 
+ *
  **/
 interface ApplicationObserver
 {
@@ -218,14 +218,14 @@ interface ApplicationObserver
     void applicationInit(int serial, ApplicationInfoSeq applications);
 
     /**
-     * 
+     *
      * The <tt>applicationAdded</tt> operation is called to notify an observer
      * that an application was added.
      *
      * @param serial The new serial number of the registry database.
      *
      * @param desc The descriptor of the new application.
-     * 
+     *
      **/
     void applicationAdded(int serial, ApplicationInfo desc);
 
@@ -237,19 +237,19 @@ interface ApplicationObserver
      * @param serial The new serial number of the registry database.
      *
      * @param name The name of the application that was removed.
-     * 
+     *
      **/
     void applicationRemoved(int serial, string name);
 
     /**
-     * 
+     *
      * The <tt>applicationUpdated</tt> operation is called to notify an observer
      * that an application was updated.
      *
      * @param serial The new serial number of the registry database.
      *
      * @param desc The descriptor of the update.
-     * 
+     *
      **/
     void applicationUpdated(int serial, ApplicationUpdateInfo desc);
 };
@@ -374,7 +374,7 @@ interface RegistryObserver
      *
      * The <tt>nodeUp</tt> operation is called to notify an observer that a node
      * came up.
-     * 
+     *
      * @param node The node state.
      *
      **/
@@ -384,7 +384,7 @@ interface RegistryObserver
      *
      * The <tt>nodeDown</tt> operation is called to notify an observer that a node
      * went down.
-     * 
+     *
      * @param name The node name.
      *
      **/
diff --git a/slice/IceGrid/Query.ice b/slice/IceGrid/Query.ice
index 97c293cd671..73704f77cfc 100644
--- a/slice/IceGrid/Query.ice
+++ b/slice/IceGrid/Query.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 [["cpp:include:IceGrid/Config.h"]]
 
 #include <Ice/Identity.ice>
diff --git a/slice/IceGrid/Registry.ice b/slice/IceGrid/Registry.ice
index 1ea91ea27ad..a980ed12f89 100644
--- a/slice/IceGrid/Registry.ice
+++ b/slice/IceGrid/Registry.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 [["cpp:include:IceGrid/Config.h"]]
 
 #include <IceGrid/Exception.ice>
@@ -27,7 +27,7 @@ module IceGrid
  *
  * @see Session
  * @see AdminSession
- * 
+ *
  **/
 interface Registry
 {
diff --git a/slice/IceGrid/Session.ice b/slice/IceGrid/Session.ice
index 585f46f5165..f5d0e81e5a3 100644
--- a/slice/IceGrid/Session.ice
+++ b/slice/IceGrid/Session.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 [["cpp:include:IceGrid/Config.h"]]
 
 #include <Glacier2/Session.ice>
@@ -28,7 +28,7 @@ module IceGrid
  *
  * @see Registry
  * @see Glacier2.SessionManager
- * 
+ *
  **/
 interface Session extends Glacier2::Session
 {
@@ -47,7 +47,7 @@ interface Session extends Glacier2::Session
      * Allocate an object. Depending on the allocation timeout, this
      * operation might hang until the object is available or until the
      * timeout is reached.
-     * 
+     *
      * @param id The identity of the object to allocate.
      *
      * @return The proxy of the allocated object.
@@ -64,7 +64,7 @@ interface Session extends Glacier2::Session
      **/
     ["amd"] Object* allocateObjectById(Ice::Identity id)
         throws ObjectNotRegisteredException, AllocationException;
-    
+
     /**
      *
      * Allocate an object with the given type. Depending on the
@@ -85,7 +85,7 @@ interface Session extends Glacier2::Session
      **/
     ["amd"] Object* allocateObjectByType(string type)
         throws AllocationException;
-    
+
     /**
      *
      * Release an object.
@@ -105,11 +105,11 @@ interface Session extends Glacier2::Session
      **/
     void releaseObject(Ice::Identity id)
         throws ObjectNotRegisteredException, AllocationException;
-    
+
     /**
      *
      * Set the allocation timeout. If no objects are available for an
-     * allocation request, the request will hang for the duration of 
+     * allocation request, the request will hang for the duration of
      * this timeout.
      *
      * @param timeout The timeout in milliseconds.
diff --git a/slice/IceGrid/UserAccountMapper.ice b/slice/IceGrid/UserAccountMapper.ice
index a7923407b1a..7ba8cb2f079 100644
--- a/slice/IceGrid/UserAccountMapper.ice
+++ b/slice/IceGrid/UserAccountMapper.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 [["cpp:include:IceGrid/Config.h"]]
 
 ["objc:prefix:ICEGRID"]
@@ -49,7 +49,7 @@ interface UserAccountMapper
      *
      * @throws UserAccountNotFoundException Raised if no user account
      * is found for the given user.
-     * 
+     *
      **/
     string getUserAccount(string user)
         throws UserAccountNotFoundException;
diff --git a/slice/IceSSL/EndpointInfo.ice b/slice/IceSSL/EndpointInfo.ice
index f11a5d54050..330f6aa5e47 100644
--- a/slice/IceSSL/EndpointInfo.ice
+++ b/slice/IceSSL/EndpointInfo.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 
 #include <Ice/Endpoint.ice>
 
diff --git a/slice/IceStorm/IceStorm.ice b/slice/IceStorm/IceStorm.ice
index 271a20c75fe..557cb9cd934 100644
--- a/slice/IceStorm/IceStorm.ice
+++ b/slice/IceStorm/IceStorm.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 [["cpp:include:IceStorm/Config.h"]]
 
 #include <Ice/Identity.ice>
diff --git a/slice/IceStorm/Metrics.ice b/slice/IceStorm/Metrics.ice
index 0442274298a..bf3dc2d7496 100644
--- a/slice/IceStorm/Metrics.ice
+++ b/slice/IceStorm/Metrics.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 [["cpp:include:IceStorm/Config.h"]]
 
 #include <Ice/Metrics.ice>
@@ -59,7 +59,7 @@ class SubscriberMetrics extends Metrics
      * Number of outstanding events.
      *
      **/
-    int outstanding = 0; 
+    int outstanding = 0;
 
     /**
      *