From 703fbf484866b1771cfedf14cc7571c89f00807d Mon Sep 17 00:00:00 2001
From: Morgan Pretty <morgan.t.pretty@gmail.com>
Date: Wed, 3 Jul 2024 17:08:33 +1000
Subject: [PATCH] Fixed invalid python escape and added LOCAL_MIRROR arg to
libSession
---
Scripts/ProtoWrappers.py | 6 +++---
Scripts/build_libSession_util.sh | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Scripts/ProtoWrappers.py b/Scripts/ProtoWrappers.py
index ad3b5eed7..b743f4ffa 100755
--- a/Scripts/ProtoWrappers.py
+++ b/Scripts/ProtoWrappers.py
@@ -572,7 +572,7 @@ public func serializedData() throws -> Data {
# if self.can_field_be_optional(field):
writer.add('guard proto.%s else {' % field.has_accessor_name() )
writer.push_indent()
- writer.add('throw %s.invalidProtobuf(description: "\(NSStringFromClass(self)) missing required field: %s")' % ( writer.invalid_protobuf_error_name, field.name_swift, ) )
+ writer.add('throw %s.invalidProtobuf(description: "\\(NSStringFromClass(self)) missing required field: %s")' % ( writer.invalid_protobuf_error_name, field.name_swift, ) )
writer.pop_indent()
writer.add('}')
@@ -648,7 +648,7 @@ public func serializedData() throws -> Data {
# description
writer.add('@objc public override var debugDescription: String {')
writer.push_indent()
- writer.add('return "\(proto)"')
+ writer.add('return "\\(proto)"')
writer.pop_indent()
writer.add('}')
writer.newline()
@@ -842,7 +842,7 @@ public func serializedData() throws -> Data {
writer.push_indent()
writer.add('var fields = [String]()')
for field in self.fields():
- writer.add('fields.append("%s: \(proto.%s)")' % ( field.name_swift, field.name_swift, ) )
+ writer.add('fields.append("%s: \\(proto.%s)")' % ( field.name_swift, field.name_swift, ) )
writer.add('return "[" + fields.joined(separator: ", ") + "]"')
writer.pop_indent()
writer.add('}')
diff --git a/Scripts/build_libSession_util.sh b/Scripts/build_libSession_util.sh
index b3841a28b..15389064a 100755
--- a/Scripts/build_libSession_util.sh
+++ b/Scripts/build_libSession_util.sh
@@ -222,7 +222,8 @@ for i in "${!TARGET_ARCHS[@]}"; do
-DBUILD_STATIC_DEPS=ON \
-DENABLE_VISIBILITY=ON \
-DSUBMODULE_CHECK=$submodule_check \
- -DCMAKE_BUILD_TYPE=$build_type
+ -DCMAKE_BUILD_TYPE=$build_type \
+ -DLOCAL_MIRROR=https://oxen.rocks/deps
# Capture the exit status of the ./utils/static-bundle.sh command
EXIT_STATUS=$?