|
@@ -38,10 +38,19 @@ index c0bce3bce42c848d63a10147ef483c9d4465f5ce..7f296e459d46b4cda51baf9887df060f
|
|
|
|
|
|
bool Exists(const char* id);
|
|
|
diff --git a/tools/js2c.py b/tools/js2c.py
|
|
|
-index d5109fcae5542730623f5ec3ca244ec0973109f2..8537f7fd50b0441307f91cad3bf9f730c2cb8cdf 100755
|
|
|
+index d5109fcae5542730623f5ec3ca244ec0973109f2..b25a9038ea7cfdb49b81e85f5bf497cc360e2b9e 100755
|
|
|
--- a/tools/js2c.py
|
|
|
+++ b/tools/js2c.py
|
|
|
-@@ -56,13 +56,15 @@ namespace native_module {{
|
|
|
+@@ -38,6 +38,8 @@ import functools
|
|
|
+ import codecs
|
|
|
+
|
|
|
+ def ReadFile(filename):
|
|
|
++ if filename.startswith("//v8"):
|
|
|
++ filename = "../../" + filename[2:]
|
|
|
+ if is_verbose:
|
|
|
+ print(filename)
|
|
|
+ with codecs.open(filename, "r", "utf-8") as f:
|
|
|
+@@ -56,13 +58,15 @@ namespace native_module {{
|
|
|
|
|
|
{0}
|
|
|
|
|
@@ -59,7 +68,7 @@ index d5109fcae5542730623f5ec3ca244ec0973109f2..8537f7fd50b0441307f91cad3bf9f730
|
|
|
|
|
|
}} // namespace native_module
|
|
|
|
|
|
-@@ -112,8 +114,8 @@ def GetDefinition(var, source, step=30):
|
|
|
+@@ -112,8 +116,8 @@ def GetDefinition(var, source, step=30):
|
|
|
return definition, len(code_points)
|
|
|
|
|
|
|
|
@@ -70,16 +79,18 @@ index d5109fcae5542730623f5ec3ca244ec0973109f2..8537f7fd50b0441307f91cad3bf9f730
|
|
|
name = NormalizeFileName(filename)
|
|
|
slug = SLUGGER_RE.sub('_', name)
|
|
|
var = slug + '_raw'
|
|
|
-@@ -123,7 +125,7 @@ def AddModule(filename, definitions, initializers):
|
|
|
+@@ -123,7 +127,9 @@ def AddModule(filename, definitions, initializers):
|
|
|
initializers.append(initializer)
|
|
|
|
|
|
def NormalizeFileName(filename):
|
|
|
- split = filename.split(os.path.sep)
|
|
|
++ if filename.startswith('//v8'):
|
|
|
++ filename = "deps/" + filename[2:]
|
|
|
+ split = os.path.normpath(filename).split(os.path.sep)
|
|
|
if split[0] == 'deps':
|
|
|
split = ['internal'] + split
|
|
|
else: # `lib/**/*.js` so drop the 'lib' part
|
|
|
-@@ -141,7 +143,7 @@ def NormalizeFileName(filename):
|
|
|
+@@ -141,7 +147,7 @@ def NormalizeFileName(filename):
|
|
|
return os.path.splitext(filename)[0]
|
|
|
|
|
|
|
|
@@ -88,7 +99,7 @@ index d5109fcae5542730623f5ec3ca244ec0973109f2..8537f7fd50b0441307f91cad3bf9f730
|
|
|
# Build source code lines
|
|
|
definitions = []
|
|
|
initializers = []
|
|
|
-@@ -149,13 +151,26 @@ def JS2C(source_files, target):
|
|
|
+@@ -149,13 +155,26 @@ def JS2C(source_files, target):
|
|
|
for filename in source_files['.js']:
|
|
|
AddModule(filename, definitions, initializers)
|
|
|
|
|
@@ -118,7 +129,7 @@ index d5109fcae5542730623f5ec3ca244ec0973109f2..8537f7fd50b0441307f91cad3bf9f730
|
|
|
write_if_chaged(out, target)
|
|
|
|
|
|
|
|
|
-@@ -209,17 +224,21 @@ def main():
|
|
|
+@@ -209,17 +228,21 @@ def main():
|
|
|
)
|
|
|
parser.add_argument('--target', help='output file')
|
|
|
parser.add_argument('--verbose', action='store_true', help='output file')
|