From 70f5f5dace69179818b346bee46b3dc2839051d5 Mon Sep 17 00:00:00 2001 From: Nathanael Anderson Date: Fri, 9 Oct 2020 19:39:16 -0500 Subject: [PATCH 1/4] chore: RC1 changes --- NativeScript/inspector/src/inspector/v8-stack-trace-impl.cc | 2 +- NativeScript/inspector/utils.h | 3 ++- .../src/Meta/Filters/ResolveGlobalNamesCollisionsFilter.h | 2 +- package.json | 4 ++-- project-template/internal/nativescript-build.xcconfig | 5 +++-- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/NativeScript/inspector/src/inspector/v8-stack-trace-impl.cc b/NativeScript/inspector/src/inspector/v8-stack-trace-impl.cc index dc991937..7283013f 100644 --- a/NativeScript/inspector/src/inspector/v8-stack-trace-impl.cc +++ b/NativeScript/inspector/src/inspector/v8-stack-trace-impl.cc @@ -151,7 +151,7 @@ V8StackTraceId::V8StackTraceId(StringView json) V8DebuggerId debuggerId(s); if (!debuggerId.isValid()) return; if (!dict->getBoolean(kShouldPause, &should_pause)) return; - id = parsedId; + id = (unsigned int)parsedId; debugger_id = debuggerId.pair(); } diff --git a/NativeScript/inspector/utils.h b/NativeScript/inspector/utils.h index 3d290b42..d9064619 100644 --- a/NativeScript/inspector/utils.h +++ b/NativeScript/inspector/utils.h @@ -23,7 +23,8 @@ static std::unique_ptr> fromValue(protocol::Value* value, pro std::unique_ptr> result(new protocol::Array()); errors->Push(); for (size_t i = 0; i < array->size(); ++i) { - const char* name = std::to_string(i).c_str(); + auto nameStr = std::to_string(i); + const char* name = nameStr.c_str(); errors->SetName(name); std::unique_ptr item = protocol::ValueConversions::fromValue(array->at(i), errors); result->push_back(std::move(item)); diff --git a/metadata-generator/src/Meta/Filters/ResolveGlobalNamesCollisionsFilter.h b/metadata-generator/src/Meta/Filters/ResolveGlobalNamesCollisionsFilter.h index 6c2a88c1..e0ed65b5 100644 --- a/metadata-generator/src/Meta/Filters/ResolveGlobalNamesCollisionsFilter.h +++ b/metadata-generator/src/Meta/Filters/ResolveGlobalNamesCollisionsFilter.h @@ -37,7 +37,7 @@ class ResolveGlobalNamesCollisionsFilter { for (auto& mptr : v) { auto& module = *mptr; std::pair > modulePair(module.first, std::vector()); - for (const std::pair >& metas : module.second) { + for (const std::pair > metas : module.second) { assert(metas.second.size() == 1); for (Meta* meta : metas.second) { modulePair.second.push_back(meta); diff --git a/package.json b/package.json index 2d19835b..71a2f1ee 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@nativescript/ios", "description": "NativeScript Runtime for iOS", - "version": "7.0.0", + "version": "7.0.2-rc1", "keywords": [ "NativeScript", "iOS", @@ -9,7 +9,7 @@ ], "repository": { "type": "git", - "url": "https://github.com/NativeScript/ios-runtime" + "url": "https://github.com/NativeScript/ns-v8ios-runtime" }, "author": { "name": "NativeScript Team", diff --git a/project-template/internal/nativescript-build.xcconfig b/project-template/internal/nativescript-build.xcconfig index 5276a721..a502054c 100644 --- a/project-template/internal/nativescript-build.xcconfig +++ b/project-template/internal/nativescript-build.xcconfig @@ -19,5 +19,6 @@ LDPLUSPLUS = $SRCROOT/internal/nsld.sh // TNS_DEBUG_METADATA_PATH = $(SRCROOT)/debug-metadata // Xcode 12 -EXCLUDED_ARCHS__PLATFORM_NAME_iphonesimulator__NATIVE_ARCH_64_BIT_x86_64=arm64 arm64e armv7 armv7s armv6 armv8 -EXCLUDED_ARCHS=$(EXCLUDED_ARCHS__PLATFORM_NAME_$(PLATFORM_NAME)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)) \ No newline at end of file +EXCLUDED_ARCHS_x86_64 = arm64 arm64e +EXCLUDED_ARCHS[sdk=iphonesimulator*] = i386 armv6 armv7 armv7s armv8 $(EXCLUDED_ARCHS_$(NATIVE_ARCH_64_BIT)) +EXCLUDED_ARCHS[sdk=iphoneos*] = i386 armv6 armv7 armv7s armv8 x86_64 \ No newline at end of file From 4517d7340d072476eb3d6030a6e471ae9005de0a Mon Sep 17 00:00:00 2001 From: Nathanael Anderson Date: Fri, 9 Oct 2020 20:22:13 -0500 Subject: [PATCH 2/4] chore: RC1 changes --- NativeScript/inspector/src/inspector/v8-stack-trace-impl.cc | 2 +- NativeScript/inspector/utils.h | 3 ++- .../src/Meta/Filters/ResolveGlobalNamesCollisionsFilter.h | 2 +- package.json | 4 ++-- project-template/internal/nativescript-build.xcconfig | 5 +++-- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/NativeScript/inspector/src/inspector/v8-stack-trace-impl.cc b/NativeScript/inspector/src/inspector/v8-stack-trace-impl.cc index dc991937..7283013f 100644 --- a/NativeScript/inspector/src/inspector/v8-stack-trace-impl.cc +++ b/NativeScript/inspector/src/inspector/v8-stack-trace-impl.cc @@ -151,7 +151,7 @@ V8StackTraceId::V8StackTraceId(StringView json) V8DebuggerId debuggerId(s); if (!debuggerId.isValid()) return; if (!dict->getBoolean(kShouldPause, &should_pause)) return; - id = parsedId; + id = (unsigned int)parsedId; debugger_id = debuggerId.pair(); } diff --git a/NativeScript/inspector/utils.h b/NativeScript/inspector/utils.h index 3d290b42..d9064619 100644 --- a/NativeScript/inspector/utils.h +++ b/NativeScript/inspector/utils.h @@ -23,7 +23,8 @@ static std::unique_ptr> fromValue(protocol::Value* value, pro std::unique_ptr> result(new protocol::Array()); errors->Push(); for (size_t i = 0; i < array->size(); ++i) { - const char* name = std::to_string(i).c_str(); + auto nameStr = std::to_string(i); + const char* name = nameStr.c_str(); errors->SetName(name); std::unique_ptr item = protocol::ValueConversions::fromValue(array->at(i), errors); result->push_back(std::move(item)); diff --git a/metadata-generator/src/Meta/Filters/ResolveGlobalNamesCollisionsFilter.h b/metadata-generator/src/Meta/Filters/ResolveGlobalNamesCollisionsFilter.h index 6c2a88c1..e0ed65b5 100644 --- a/metadata-generator/src/Meta/Filters/ResolveGlobalNamesCollisionsFilter.h +++ b/metadata-generator/src/Meta/Filters/ResolveGlobalNamesCollisionsFilter.h @@ -37,7 +37,7 @@ class ResolveGlobalNamesCollisionsFilter { for (auto& mptr : v) { auto& module = *mptr; std::pair > modulePair(module.first, std::vector()); - for (const std::pair >& metas : module.second) { + for (const std::pair > metas : module.second) { assert(metas.second.size() == 1); for (Meta* meta : metas.second) { modulePair.second.push_back(meta); diff --git a/package.json b/package.json index 2d19835b..71a2f1ee 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@nativescript/ios", "description": "NativeScript Runtime for iOS", - "version": "7.0.0", + "version": "7.0.2-rc1", "keywords": [ "NativeScript", "iOS", @@ -9,7 +9,7 @@ ], "repository": { "type": "git", - "url": "https://github.com/NativeScript/ios-runtime" + "url": "https://github.com/NativeScript/ns-v8ios-runtime" }, "author": { "name": "NativeScript Team", diff --git a/project-template/internal/nativescript-build.xcconfig b/project-template/internal/nativescript-build.xcconfig index 5276a721..a502054c 100644 --- a/project-template/internal/nativescript-build.xcconfig +++ b/project-template/internal/nativescript-build.xcconfig @@ -19,5 +19,6 @@ LDPLUSPLUS = $SRCROOT/internal/nsld.sh // TNS_DEBUG_METADATA_PATH = $(SRCROOT)/debug-metadata // Xcode 12 -EXCLUDED_ARCHS__PLATFORM_NAME_iphonesimulator__NATIVE_ARCH_64_BIT_x86_64=arm64 arm64e armv7 armv7s armv6 armv8 -EXCLUDED_ARCHS=$(EXCLUDED_ARCHS__PLATFORM_NAME_$(PLATFORM_NAME)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)) \ No newline at end of file +EXCLUDED_ARCHS_x86_64 = arm64 arm64e +EXCLUDED_ARCHS[sdk=iphonesimulator*] = i386 armv6 armv7 armv7s armv8 $(EXCLUDED_ARCHS_$(NATIVE_ARCH_64_BIT)) +EXCLUDED_ARCHS[sdk=iphoneos*] = i386 armv6 armv7 armv7s armv8 x86_64 \ No newline at end of file From fb0e9fbe76ec89822904cb7f4d39656b6c429731 Mon Sep 17 00:00:00 2001 From: Nathanael Anderson Date: Sat, 10 Oct 2020 19:58:46 -0500 Subject: [PATCH 3/4] Update Package JSON to be RC.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 71a2f1ee..d1a2acff 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@nativescript/ios", "description": "NativeScript Runtime for iOS", - "version": "7.0.2-rc1", + "version": "7.0.2-rc.1", "keywords": [ "NativeScript", "iOS", From 26566f794769a2dae850a1c4fca4ff2318463610 Mon Sep 17 00:00:00 2001 From: Nathanael Anderson Date: Fri, 16 Oct 2020 17:28:12 -0500 Subject: [PATCH 4/4] Update to be dynamically allocated line numbers --- NativeScript/inspector/utils.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/NativeScript/inspector/utils.h b/NativeScript/inspector/utils.h index d9064619..b3825f86 100644 --- a/NativeScript/inspector/utils.h +++ b/NativeScript/inspector/utils.h @@ -4,6 +4,8 @@ #include "include/v8-inspector.h" #include "src/inspector/protocol/Protocol.h" #include +#include +#include namespace v8_inspector { @@ -22,9 +24,15 @@ static std::unique_ptr> fromValue(protocol::Value* value, pro std::unique_ptr> result(new protocol::Array()); errors->Push(); + + // This (log10) will return the max number of digits(-1) in the length of the array that we have to worry about, +1 for the null + int sizeArray = log10(array->size()) + 2; + for (size_t i = 0; i < array->size(); ++i) { - auto nameStr = std::to_string(i); - const char* name = nameStr.c_str(); + // Convert array index to a string value + char* name = new char[sizeArray]; + sprintf(name, "%lu", i); + errors->SetName(name); std::unique_ptr item = protocol::ValueConversions::fromValue(array->at(i), errors); result->push_back(std::move(item));