diff options
| author | Joe George <joe@zeroc.com> | 2015-04-22 15:55:59 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2015-04-23 14:35:45 -0400 |
| commit | b5b19c1640c2d85d24073432477136487ed1bdcc (patch) | |
| tree | 47beab55d3cff877f388bb61c977a372b930bb95 /cpp/src/slice2js | |
| parent | ICE-6450 Dependencies and system headers (diff) | |
| download | ice-b5b19c1640c2d85d24073432477136487ed1bdcc.tar.bz2 ice-b5b19c1640c2d85d24073432477136487ed1bdcc.tar.xz ice-b5b19c1640c2d85d24073432477136487ed1bdcc.zip | |
Various Ice for JavaScript changes
* Rename zeroc-ice to ice
* Fix slice2js to generate code with requrie('ice')
* Update tests
* Slim bower.json
Diffstat (limited to 'cpp/src/slice2js')
| -rw-r--r-- | cpp/src/slice2js/Gen.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/slice2js/Gen.cpp b/cpp/src/slice2js/Gen.cpp index b7e5a8bdd55..9ad4b2d63a4 100644 --- a/cpp/src/slice2js/Gen.cpp +++ b/cpp/src/slice2js/Gen.cpp @@ -901,7 +901,7 @@ Slice::Gen::RequireVisitor::writeRequires(const UnitPtr& p) else { requires["Ice"] = vector<string>(); - requires["Ice"].push_back("zeroc-icejs"); + requires["Ice"].push_back("ice"); } StringList includes = p->includeFiles(); @@ -915,7 +915,7 @@ Slice::Gen::RequireVisitor::writeRequires(const UnitPtr& p) if(requires.find(*j) == requires.end()) { requires[*j] = vector<string>(); - requires[*j].push_back("zeroc-icejs"); + requires[*j].push_back("ice"); } } else @@ -938,7 +938,7 @@ Slice::Gen::RequireVisitor::writeRequires(const UnitPtr& p) if(!_icejs) { - _out << nl << "var Ice = require(\"zeroc-icejs\").Ice;"; + _out << nl << "var Ice = require(\"ice\").Ice;"; _out << nl << "var __M = Ice.__M;"; } else |