diff --git a/Cargo.lock b/Cargo.lock index 5d91457..40e14eb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3285,7 +3285,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667" dependencies = [ "cfg-if", - "windows-targets 0.53.3", + "windows-targets 0.48.5", ] [[package]] @@ -3820,8 +3820,8 @@ dependencies = [ [[package]] name = "ng-rocksdb" -version = "0.21.0-ngpreview.7" -source = "git+https://git.nextgraph.org/NextGraph/rust-rocksdb.git?branch=master#0861351ab34188cb2ed71ee865f463d80019b165" +version = "0.21.0-ngpreview.8" +source = "git+https://git.nextgraph.org/NextGraph/rust-rocksdb.git?branch=master#d21a1b4ae64f7025d2b8be7f70f4e1a2562113c2" dependencies = [ "bindgen", "bzip2-sys", diff --git a/DEV.md b/DEV.md index 7ca596f..b0476b5 100644 --- a/DEV.md +++ b/DEV.md @@ -6,6 +6,11 @@ On OpenBSD, for LLVM you need to choose llvm-17. +On MacOS, there are several bugs with LLVM above version 17. So you have to install version 17 only. +``` +brew install llvm@17 +``` + On all platforms, we have to install wasm-pack this way: ``` diff --git a/app/nextgraph/src-tauri/gen/apple/.gitignore b/app/nextgraph/src-tauri/gen/apple/.gitignore new file mode 100644 index 0000000..6726e2f --- /dev/null +++ b/app/nextgraph/src-tauri/gen/apple/.gitignore @@ -0,0 +1,3 @@ +xcuserdata/ +build/ +Externals/ diff --git a/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@1x.png b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@1x.png new file mode 100644 index 0000000..25df8b8 Binary files /dev/null and b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@1x.png differ diff --git a/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@2x-1.png b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@2x-1.png new file mode 100644 index 0000000..0f2ba1e Binary files /dev/null and b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@2x-1.png differ diff --git a/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@2x.png b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@2x.png new file mode 100644 index 0000000..0f2ba1e Binary files /dev/null and b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@2x.png differ diff --git a/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@3x.png b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@3x.png new file mode 100644 index 0000000..54887ef Binary files /dev/null and b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@3x.png differ diff --git a/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@1x.png b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@1x.png new file mode 100644 index 0000000..67aa500 Binary files /dev/null and b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@1x.png differ diff --git a/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@2x-1.png b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@2x-1.png new file mode 100644 index 0000000..a066ffb Binary files /dev/null and b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@2x-1.png differ diff --git a/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@2x.png b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@2x.png new file mode 100644 index 0000000..a066ffb Binary files /dev/null and b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@2x.png differ diff --git a/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@3x.png b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@3x.png new file mode 100644 index 0000000..4fb1e83 Binary files /dev/null and b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@3x.png differ diff --git a/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@1x.png b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@1x.png new file mode 100644 index 0000000..0f2ba1e Binary files /dev/null and b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@1x.png differ diff --git a/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@2x-1.png b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@2x-1.png new file mode 100644 index 0000000..99701d7 Binary files /dev/null and b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@2x-1.png differ diff --git a/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@2x.png b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@2x.png new file mode 100644 index 0000000..99701d7 Binary files /dev/null and b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@2x.png differ diff --git a/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@3x.png b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@3x.png new file mode 100644 index 0000000..7750e70 Binary files /dev/null and b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@3x.png differ diff --git a/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png new file mode 100644 index 0000000..0e491b4 Binary files /dev/null and b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png differ diff --git a/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-60x60@2x.png b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-60x60@2x.png new file mode 100644 index 0000000..7750e70 Binary files /dev/null and b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-60x60@2x.png differ diff --git a/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-60x60@3x.png b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-60x60@3x.png new file mode 100644 index 0000000..85768cd Binary files /dev/null and b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-60x60@3x.png differ diff --git a/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-76x76@1x.png b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-76x76@1x.png new file mode 100644 index 0000000..d1b31d0 Binary files /dev/null and b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-76x76@1x.png differ diff --git a/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-76x76@2x.png b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-76x76@2x.png new file mode 100644 index 0000000..27d00cf Binary files /dev/null and b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-76x76@2x.png differ diff --git a/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-83.5x83.5@2x.png b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-83.5x83.5@2x.png new file mode 100644 index 0000000..35ae069 Binary files /dev/null and b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-83.5x83.5@2x.png differ diff --git a/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/Contents.json b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..90eea7e --- /dev/null +++ b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,116 @@ +{ + "images" : [ + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "AppIcon-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "AppIcon-20x20@3x.png", + "scale" : "3x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "AppIcon-29x29@2x-1.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "AppIcon-29x29@3x.png", + "scale" : "3x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "AppIcon-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "AppIcon-40x40@3x.png", + "scale" : "3x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "AppIcon-60x60@2x.png", + "scale" : "2x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "AppIcon-60x60@3x.png", + "scale" : "3x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "AppIcon-20x20@1x.png", + "scale" : "1x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "AppIcon-20x20@2x-1.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "AppIcon-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "AppIcon-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "AppIcon-40x40@1x.png", + "scale" : "1x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "AppIcon-40x40@2x-1.png", + "scale" : "2x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "AppIcon-76x76@1x.png", + "scale" : "1x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "AppIcon-76x76@2x.png", + "scale" : "2x" + }, + { + "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "AppIcon-83.5x83.5@2x.png", + "scale" : "2x" + }, + { + "size" : "1024x1024", + "idiom" : "ios-marketing", + "filename" : "AppIcon-512@2x.png", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/Contents.json b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/Contents.json new file mode 100644 index 0000000..da4a164 --- /dev/null +++ b/app/nextgraph/src-tauri/gen/apple/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/app/nextgraph/src-tauri/gen/apple/ExportOptions.plist b/app/nextgraph/src-tauri/gen/apple/ExportOptions.plist new file mode 100644 index 0000000..0428a17 --- /dev/null +++ b/app/nextgraph/src-tauri/gen/apple/ExportOptions.plist @@ -0,0 +1,8 @@ + + + + + method + debugging + + diff --git a/app/nextgraph/src-tauri/gen/apple/LaunchScreen.storyboard b/app/nextgraph/src-tauri/gen/apple/LaunchScreen.storyboard new file mode 100644 index 0000000..81b5f90 --- /dev/null +++ b/app/nextgraph/src-tauri/gen/apple/LaunchScreen.storyboard @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/nextgraph/src-tauri/gen/apple/NextGraph.xcodeproj/project.pbxproj b/app/nextgraph/src-tauri/gen/apple/NextGraph.xcodeproj/project.pbxproj new file mode 100644 index 0000000..1b530b2 --- /dev/null +++ b/app/nextgraph/src-tauri/gen/apple/NextGraph.xcodeproj/project.pbxproj @@ -0,0 +1,489 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 63; + objects = { + +/* Begin PBXBuildFile section */ + 17C2C3B49573CFD0033A2DD1 /* libapp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 88375B8FD377D3DB2202AAEF /* libapp.a */; }; + 24A46A3F7BDBEEDDCEC72883 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B3F0FE576647EFEA9B974B9 /* QuartzCore.framework */; }; + 6764DC9321630630C4626EBE /* assets in Resources */ = {isa = PBXBuildFile; fileRef = 09156D03E89F5AF02429F6B6 /* assets */; }; + 736F452D2DCACCCC56715034 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AC9BBCA21C7EF49AD2A90CB8 /* UIKit.framework */; }; + 74B6D60233951A2A9E638765 /* Metal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 93302473CB3DDD57BBB9B0A2 /* Metal.framework */; }; + 81ECBDB355808D591EFCF38B /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6DD828EE0D38486E4AA16490 /* Security.framework */; }; + 99CD09722C7AE47A5742A57D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = AB8927103FC1FF933C50E5DC /* Assets.xcassets */; }; + 9EE7D934D956B1FC64EB2210 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BA1F11DD2BCB23E7C2DE61DD /* LaunchScreen.storyboard */; }; + C64D21F9A429A2B871EFBC92 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C2A698773377A47A86ED1F5D /* WebKit.framework */; }; + DD170D650C2636B9961F8F82 /* MetalKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA0D1431EF2E7A1D0602B8C8 /* MetalKit.framework */; }; + F2909A3605AC8C092E5C3DD5 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0DEE31735B783420817CF0CF /* main.mm */; }; + FCA7EAD7BD4B070FA4096C61 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A94630F0F07AFF3C332FC7E5 /* CoreGraphics.framework */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 007CB1C605CA1A09BEF4BB0B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; + 09156D03E89F5AF02429F6B6 /* assets */ = {isa = PBXFileReference; lastKnownFileType = folder; path = assets; sourceTree = SOURCE_ROOT; }; + 0A0346B5D5C2940A5E0AB0BC /* NextGraph_iOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = NextGraph_iOS.entitlements; sourceTree = ""; }; + 0ADA97739500F49409A7F15D /* main.rs */ = {isa = PBXFileReference; lastKnownFileType = text; path = main.rs; sourceTree = ""; }; + 0DEE31735B783420817CF0CF /* main.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = ""; }; + 483C1C806521BF3EA9E3AAC8 /* lib.rs */ = {isa = PBXFileReference; lastKnownFileType = text; path = lib.rs; sourceTree = ""; }; + 4B3F0FE576647EFEA9B974B9 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; + 6DD828EE0D38486E4AA16490 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; + 88375B8FD377D3DB2202AAEF /* libapp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libapp.a; sourceTree = ""; }; + 93302473CB3DDD57BBB9B0A2 /* Metal.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Metal.framework; path = System/Library/Frameworks/Metal.framework; sourceTree = SDKROOT; }; + A94630F0F07AFF3C332FC7E5 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; + AA0D1431EF2E7A1D0602B8C8 /* MetalKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MetalKit.framework; path = System/Library/Frameworks/MetalKit.framework; sourceTree = SDKROOT; }; + AB8927103FC1FF933C50E5DC /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + AC9BBCA21C7EF49AD2A90CB8 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; + BA1F11DD2BCB23E7C2DE61DD /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = ""; }; + BA6121E1EFF0DFB1E1423DEB /* NextGraph.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = NextGraph.app; sourceTree = BUILT_PRODUCTS_DIR; }; + C2A698773377A47A86ED1F5D /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; }; + CEF75F12E8F974A6F3172202 /* bindings.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = bindings.h; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 5D19E846B602814F62A3C699 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 17C2C3B49573CFD0033A2DD1 /* libapp.a in Frameworks */, + FCA7EAD7BD4B070FA4096C61 /* CoreGraphics.framework in Frameworks */, + 74B6D60233951A2A9E638765 /* Metal.framework in Frameworks */, + DD170D650C2636B9961F8F82 /* MetalKit.framework in Frameworks */, + 24A46A3F7BDBEEDDCEC72883 /* QuartzCore.framework in Frameworks */, + 81ECBDB355808D591EFCF38B /* Security.framework in Frameworks */, + 736F452D2DCACCCC56715034 /* UIKit.framework in Frameworks */, + C64D21F9A429A2B871EFBC92 /* WebKit.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 26C2BAA91F3BD6BD6709CD29 /* bindings */ = { + isa = PBXGroup; + children = ( + CEF75F12E8F974A6F3172202 /* bindings.h */, + ); + path = bindings; + sourceTree = ""; + }; + 2F0DA6A5F702287A34DA138E /* Products */ = { + isa = PBXGroup; + children = ( + BA6121E1EFF0DFB1E1423DEB /* NextGraph.app */, + ); + name = Products; + sourceTree = ""; + }; + 3D018EB0D61E9D18DE81808D /* Externals */ = { + isa = PBXGroup; + children = ( + ); + path = Externals; + sourceTree = ""; + }; + 4071AAA4D69F66AAA4520D2E /* NextGraph_iOS */ = { + isa = PBXGroup; + children = ( + 007CB1C605CA1A09BEF4BB0B /* Info.plist */, + 0A0346B5D5C2940A5E0AB0BC /* NextGraph_iOS.entitlements */, + ); + path = NextGraph_iOS; + sourceTree = ""; + }; + 427044912E6AA58EEC5C00F6 /* src */ = { + isa = PBXGroup; + children = ( + 483C1C806521BF3EA9E3AAC8 /* lib.rs */, + 0ADA97739500F49409A7F15D /* main.rs */, + ); + name = src; + path = ../../src; + sourceTree = ""; + }; + 52F30348858D75F78ACA7371 /* NextGraph */ = { + isa = PBXGroup; + children = ( + 0DEE31735B783420817CF0CF /* main.mm */, + 26C2BAA91F3BD6BD6709CD29 /* bindings */, + ); + path = NextGraph; + sourceTree = ""; + }; + 6020D550346B92EDDDF2CBCB = { + isa = PBXGroup; + children = ( + 09156D03E89F5AF02429F6B6 /* assets */, + AB8927103FC1FF933C50E5DC /* Assets.xcassets */, + BA1F11DD2BCB23E7C2DE61DD /* LaunchScreen.storyboard */, + 3D018EB0D61E9D18DE81808D /* Externals */, + 4071AAA4D69F66AAA4520D2E /* NextGraph_iOS */, + 86DBF291FF787F8D701882CF /* Sources */, + 427044912E6AA58EEC5C00F6 /* src */, + AF63976EA2FB8E4BF304FC65 /* Frameworks */, + 2F0DA6A5F702287A34DA138E /* Products */, + ); + sourceTree = ""; + }; + 86DBF291FF787F8D701882CF /* Sources */ = { + isa = PBXGroup; + children = ( + 52F30348858D75F78ACA7371 /* NextGraph */, + ); + path = Sources; + sourceTree = ""; + }; + AF63976EA2FB8E4BF304FC65 /* Frameworks */ = { + isa = PBXGroup; + children = ( + A94630F0F07AFF3C332FC7E5 /* CoreGraphics.framework */, + 88375B8FD377D3DB2202AAEF /* libapp.a */, + 93302473CB3DDD57BBB9B0A2 /* Metal.framework */, + AA0D1431EF2E7A1D0602B8C8 /* MetalKit.framework */, + 4B3F0FE576647EFEA9B974B9 /* QuartzCore.framework */, + 6DD828EE0D38486E4AA16490 /* Security.framework */, + AC9BBCA21C7EF49AD2A90CB8 /* UIKit.framework */, + C2A698773377A47A86ED1F5D /* WebKit.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 538D32911BC4F9D614628ECE /* NextGraph_iOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = E83A6ABD07E7A9F60AE68EE7 /* Build configuration list for PBXNativeTarget "NextGraph_iOS" */; + buildPhases = ( + 71CCC584DCDC63D5382521FF /* Build Rust Code */, + 0AE5EDE6A0275295E7702295 /* Sources */, + CE761CD300B579B8D3CC9A78 /* Resources */, + 5D19E846B602814F62A3C699 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = NextGraph_iOS; + packageProductDependencies = ( + ); + productName = NextGraph_iOS; + productReference = BA6121E1EFF0DFB1E1423DEB /* NextGraph.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 94CE6550C38DCCFAE51A9B25 /* Project object */ = { + isa = PBXProject; + attributes = { + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 1430; + }; + buildConfigurationList = D1AF3851FBED98183F42B094 /* Build configuration list for PBXProject "NextGraph" */; + compatibilityVersion = "Xcode 14.0"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + Base, + en, + ); + mainGroup = 6020D550346B92EDDDF2CBCB; + minimizedProjectReferenceProxies = 1; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 538D32911BC4F9D614628ECE /* NextGraph_iOS */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + CE761CD300B579B8D3CC9A78 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 99CD09722C7AE47A5742A57D /* Assets.xcassets in Resources */, + 9EE7D934D956B1FC64EB2210 /* LaunchScreen.storyboard in Resources */, + 6764DC9321630630C4626EBE /* assets in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 71CCC584DCDC63D5382521FF /* Build Rust Code */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "Build Rust Code"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(SRCROOT)/Externals/x86_64/${CONFIGURATION}/libapp.a", + "$(SRCROOT)/Externals/arm64/${CONFIGURATION}/libapp.a", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "pnpm tauri ios xcode-script -v --platform ${PLATFORM_DISPLAY_NAME:?} --sdk-root ${SDKROOT:?} --framework-search-paths \"${FRAMEWORK_SEARCH_PATHS:?}\" --header-search-paths \"${HEADER_SEARCH_PATHS:?}\" --gcc-preprocessor-definitions \"${GCC_PREPROCESSOR_DEFINITIONS:-}\" --configuration ${CONFIGURATION:?} ${FORCE_COLOR} ${ARCHS:?}"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 0AE5EDE6A0275295E7702295 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + F2909A3605AC8C092E5C3DD5 /* main.mm in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 1EC719938E9ED140DA886853 /* debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + ARCHS = ( + arm64, + x86_64, + ); + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_ENTITLEMENTS = NextGraph_iOS/NextGraph_iOS.entitlements; + CODE_SIGN_IDENTITY = "iPhone Developer"; + DEVELOPMENT_TEAM = V2YR9RLTN7; + ENABLE_BITCODE = NO; + "EXCLUDED_ARCHS[sdk=iphoneos*]" = x86_64; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "\".\"", + ); + INFOPLIST_FILE = NextGraph_iOS/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = NextGraph; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + "LIBRARY_SEARCH_PATHS[arch=arm64]" = ( + "$(inherited)", + "$(PROJECT_DIR)/Externals/arm64/$(CONFIGURATION)", + "$(SDKROOT)/usr/lib/swift", + "$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)", + "$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)", + ); + "LIBRARY_SEARCH_PATHS[arch=x86_64]" = ( + "$(inherited)", + "$(PROJECT_DIR)/Externals/x86_64/$(CONFIGURATION)", + "$(SDKROOT)/usr/lib/swift", + "$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)", + "$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)", + ); + MARKETING_VERSION = 0.1.2; + PRODUCT_BUNDLE_IDENTIFIER = org.nextgraph.app; + PRODUCT_NAME = "NextGraph"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALID_ARCHS = "arm64 x86_64"; + }; + name = debug; + }; + 270A2E2A731397691B0271A9 /* release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + ARCHS = ( + arm64, + x86_64, + ); + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_ENTITLEMENTS = NextGraph_iOS/NextGraph_iOS.entitlements; + CODE_SIGN_IDENTITY = "iPhone Developer"; + DEVELOPMENT_TEAM = V2YR9RLTN7; + ENABLE_BITCODE = NO; + "EXCLUDED_ARCHS[sdk=iphoneos*]" = x86_64; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "\".\"", + ); + INFOPLIST_FILE = NextGraph_iOS/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = NextGraph; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + "LIBRARY_SEARCH_PATHS[arch=arm64]" = ( + "$(inherited)", + "$(PROJECT_DIR)/Externals/arm64/$(CONFIGURATION)", + "$(SDKROOT)/usr/lib/swift", + "$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)", + "$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)", + ); + "LIBRARY_SEARCH_PATHS[arch=x86_64]" = ( + "$(inherited)", + "$(PROJECT_DIR)/Externals/x86_64/$(CONFIGURATION)", + "$(SDKROOT)/usr/lib/swift", + "$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)", + "$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)", + ); + MARKETING_VERSION = 0.1.2; + PRODUCT_BUNDLE_IDENTIFIER = org.nextgraph.app; + PRODUCT_NAME = "NextGraph"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALID_ARCHS = "arm64 x86_64"; + }; + name = release; + }; + 74B63DC39FD248C50AB30C17 /* debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + "DEBUG=1", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + }; + name = debug; + }; + 9A4BD7E20178FB661B89477D /* release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + SWIFT_VERSION = 5.0; + }; + name = release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + D1AF3851FBED98183F42B094 /* Build configuration list for PBXProject "NextGraph" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 74B63DC39FD248C50AB30C17 /* debug */, + 9A4BD7E20178FB661B89477D /* release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = debug; + }; + E83A6ABD07E7A9F60AE68EE7 /* Build configuration list for PBXNativeTarget "NextGraph_iOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 1EC719938E9ED140DA886853 /* debug */, + 270A2E2A731397691B0271A9 /* release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = debug; + }; +/* End XCConfigurationList section */ + }; + rootObject = 94CE6550C38DCCFAE51A9B25 /* Project object */; +} diff --git a/app/nextgraph/src-tauri/gen/apple/NextGraph.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/app/nextgraph/src-tauri/gen/apple/NextGraph.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..919434a --- /dev/null +++ b/app/nextgraph/src-tauri/gen/apple/NextGraph.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/app/nextgraph/src-tauri/gen/apple/NextGraph.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/app/nextgraph/src-tauri/gen/apple/NextGraph.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..ac90d5a --- /dev/null +++ b/app/nextgraph/src-tauri/gen/apple/NextGraph.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,10 @@ + + + + + BuildSystemType + Original + DisableBuildSystemDeprecationDiagnostic + + + diff --git a/app/nextgraph/src-tauri/gen/apple/NextGraph.xcodeproj/xcshareddata/xcschemes/NextGraph_iOS.xcscheme b/app/nextgraph/src-tauri/gen/apple/NextGraph.xcodeproj/xcshareddata/xcschemes/NextGraph_iOS.xcscheme new file mode 100644 index 0000000..b3e569a --- /dev/null +++ b/app/nextgraph/src-tauri/gen/apple/NextGraph.xcodeproj/xcshareddata/xcschemes/NextGraph_iOS.xcscheme @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/nextgraph/src-tauri/gen/apple/NextGraph_iOS/Info.plist b/app/nextgraph/src-tauri/gen/apple/NextGraph_iOS/Info.plist new file mode 100644 index 0000000..f65912f --- /dev/null +++ b/app/nextgraph/src-tauri/gen/apple/NextGraph_iOS/Info.plist @@ -0,0 +1,44 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + 0.1.2 + CFBundleVersion + 0.1.2 + LSRequiresIPhoneOS + + UILaunchStoryboardName + LaunchScreen + UIRequiredDeviceCapabilities + + arm64 + metal + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + + \ No newline at end of file diff --git a/app/nextgraph/src-tauri/gen/apple/NextGraph_iOS/NextGraph_iOS.entitlements b/app/nextgraph/src-tauri/gen/apple/NextGraph_iOS/NextGraph_iOS.entitlements new file mode 100644 index 0000000..0c67376 --- /dev/null +++ b/app/nextgraph/src-tauri/gen/apple/NextGraph_iOS/NextGraph_iOS.entitlements @@ -0,0 +1,5 @@ + + + + + diff --git a/app/nextgraph/src-tauri/gen/apple/Podfile b/app/nextgraph/src-tauri/gen/apple/Podfile new file mode 100644 index 0000000..7c43d25 --- /dev/null +++ b/app/nextgraph/src-tauri/gen/apple/Podfile @@ -0,0 +1,21 @@ +# Uncomment the next line to define a global platform for your project + +target 'NextGraph_iOS' do +platform :ios, '14.0' + # Pods for NextGraph_iOS +end + +target 'NextGraph_macOS' do +platform :osx, '11.0' + # Pods for NextGraph_macOS +end + +# Delete the deployment target for iOS and macOS, causing it to be inherited from the Podfile +post_install do |installer| + installer.pods_project.targets.each do |target| + target.build_configurations.each do |config| + config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET' + config.build_settings.delete 'MACOSX_DEPLOYMENT_TARGET' + end + end +end diff --git a/app/nextgraph/src-tauri/gen/apple/Sources/NextGraph/bindings/bindings.h b/app/nextgraph/src-tauri/gen/apple/Sources/NextGraph/bindings/bindings.h new file mode 100644 index 0000000..5152200 --- /dev/null +++ b/app/nextgraph/src-tauri/gen/apple/Sources/NextGraph/bindings/bindings.h @@ -0,0 +1,8 @@ +#pragma once + +namespace ffi { + extern "C" { + void start_app(); + } +} + diff --git a/app/nextgraph/src-tauri/gen/apple/Sources/NextGraph/main.mm b/app/nextgraph/src-tauri/gen/apple/Sources/NextGraph/main.mm new file mode 100644 index 0000000..7793a9d --- /dev/null +++ b/app/nextgraph/src-tauri/gen/apple/Sources/NextGraph/main.mm @@ -0,0 +1,6 @@ +#include "bindings/bindings.h" + +int main(int argc, char * argv[]) { + ffi::start_app(); + return 0; +} diff --git a/app/nextgraph/src-tauri/gen/apple/project.yml b/app/nextgraph/src-tauri/gen/apple/project.yml new file mode 100644 index 0000000..0576dd7 --- /dev/null +++ b/app/nextgraph/src-tauri/gen/apple/project.yml @@ -0,0 +1,88 @@ +name: NextGraph +options: + bundleIdPrefix: org.nextgraph.app + deploymentTarget: + iOS: 14.0 +fileGroups: [../../src] +configs: + debug: debug + release: release +settingGroups: + app: + base: + PRODUCT_NAME: NextGraph + PRODUCT_BUNDLE_IDENTIFIER: org.nextgraph.app +targetTemplates: + app: + type: application + sources: + - path: Sources + scheme: + environmentVariables: + RUST_BACKTRACE: full + RUST_LOG: info + settings: + groups: [app] +targets: + NextGraph_iOS: + type: application + platform: iOS + sources: + - path: Sources + - path: Assets.xcassets + - path: Externals + - path: NextGraph_iOS + - path: assets + buildPhase: resources + type: folder + - path: LaunchScreen.storyboard + info: + path: NextGraph_iOS/Info.plist + properties: + LSRequiresIPhoneOS: true + UILaunchStoryboardName: LaunchScreen + UIRequiredDeviceCapabilities: [arm64, metal] + UISupportedInterfaceOrientations: + - UIInterfaceOrientationPortrait + - UIInterfaceOrientationLandscapeLeft + - UIInterfaceOrientationLandscapeRight + UISupportedInterfaceOrientations~ipad: + - UIInterfaceOrientationPortrait + - UIInterfaceOrientationPortraitUpsideDown + - UIInterfaceOrientationLandscapeLeft + - UIInterfaceOrientationLandscapeRight + CFBundleShortVersionString: 0.1.2 + CFBundleVersion: "0.1.2" + entitlements: + path: NextGraph_iOS/NextGraph_iOS.entitlements + scheme: + environmentVariables: + RUST_BACKTRACE: full + RUST_LOG: info + settings: + base: + ENABLE_BITCODE: false + ARCHS: [arm64, x86_64] + VALID_ARCHS: arm64 x86_64 + LIBRARY_SEARCH_PATHS[arch=x86_64]: $(inherited) $(PROJECT_DIR)/Externals/x86_64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME) + LIBRARY_SEARCH_PATHS[arch=arm64]: $(inherited) $(PROJECT_DIR)/Externals/arm64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME) + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES: true + EXCLUDED_ARCHS[sdk=iphoneos*]: x86_64 + groups: [app] + dependencies: + - framework: libapp.a + embed: false + - sdk: CoreGraphics.framework + - sdk: Metal.framework + - sdk: MetalKit.framework + - sdk: QuartzCore.framework + - sdk: Security.framework + - sdk: UIKit.framework + - sdk: WebKit.framework + preBuildScripts: + - script: pnpm tauri ios xcode-script -v --platform ${PLATFORM_DISPLAY_NAME:?} --sdk-root ${SDKROOT:?} --framework-search-paths "${FRAMEWORK_SEARCH_PATHS:?}" --header-search-paths "${HEADER_SEARCH_PATHS:?}" --gcc-preprocessor-definitions "${GCC_PREPROCESSOR_DEFINITIONS:-}" --configuration ${CONFIGURATION:?} ${FORCE_COLOR} ${ARCHS:?} + name: Build Rust Code + basedOnDependencyAnalysis: false + outputFiles: + - $(SRCROOT)/Externals/x86_64/${CONFIGURATION}/libapp.a + - $(SRCROOT)/Externals/arm64/${CONFIGURATION}/libapp.a \ No newline at end of file diff --git a/app/nextgraph/src-tauri/icons/icon.icns b/app/nextgraph/src-tauri/icons/icon.icns index d33f11f..a043dba 100644 Binary files a/app/nextgraph/src-tauri/icons/icon.icns and b/app/nextgraph/src-tauri/icons/icon.icns differ diff --git a/app/nextgraph/src-tauri/src/lib.rs b/app/nextgraph/src-tauri/src/lib.rs index 3a91050..ab73162 100644 --- a/app/nextgraph/src-tauri/src/lib.rs +++ b/app/nextgraph/src-tauri/src/lib.rs @@ -34,6 +34,11 @@ use ng_wallet::*; use nextgraph::local_broker::*; +#[cfg(mobile)] +mod mobile; +#[cfg(mobile)] +pub use mobile::*; + pub type SetupHook = Box Result<(), Box> + Send>; #[tauri::command(rename_all = "snake_case")] diff --git a/app/nextgraph/src-tauri/src/mobile.rs b/app/nextgraph/src-tauri/src/mobile.rs new file mode 100644 index 0000000..6ce8995 --- /dev/null +++ b/app/nextgraph/src-tauri/src/mobile.rs @@ -0,0 +1,13 @@ +// Copyright (c) 2022-2025 Niko Bonnieure, Par le Peuple, NextGraph.org developers +// All rights reserved. +// Licensed under the Apache License, Version 2.0 +// +// or the MIT license , +// at your option. All files in the project carrying such +// notice may not be copied, modified, or distributed except +// according to those terms. + +#[tauri::mobile_entry_point] +fn main() { + crate::AppBuilder::new().run(); +} diff --git a/app/nextgraph/src/App.svelte b/app/nextgraph/src/App.svelte index 3d3e4a2..9f5469e 100644 --- a/app/nextgraph/src/App.svelte +++ b/app/nextgraph/src/App.svelte @@ -22,7 +22,7 @@ } -
+
diff --git a/engine/oxigraph/Cargo.toml b/engine/oxigraph/Cargo.toml index f64a143..9eb17e9 100644 --- a/engine/oxigraph/Cargo.toml +++ b/engine/oxigraph/Cargo.toml @@ -51,7 +51,7 @@ ng-repo = { path = "../repo", version = "0.1.2" } [target.'cfg(all(not(target_family = "wasm"),not(docsrs)))'.dependencies] libc = "0.2" -ng-rocksdb = { version = "0.21.0-ngpreview.7", git = "https://git.nextgraph.org/NextGraph/rust-rocksdb.git", branch = "master", features = [ ] } +ng-rocksdb = { version = "0.21.0-ngpreview.8", git = "https://git.nextgraph.org/NextGraph/rust-rocksdb.git", branch = "master", features = [ ] } [target.'cfg(all(target_family = "wasm", target_os = "unknown"))'.dependencies] getrandom = { version = "0.3.3", features = ["wasm_js"] } diff --git a/engine/storage-rocksdb/Cargo.toml b/engine/storage-rocksdb/Cargo.toml index 6f810b1..404630e 100644 --- a/engine/storage-rocksdb/Cargo.toml +++ b/engine/storage-rocksdb/Cargo.toml @@ -20,4 +20,4 @@ ng-repo = { path = "../repo", version = "0.1.2" } git = "https://git.nextgraph.org/NextGraph/rust-rocksdb.git" branch = "master" features = [ ] -version = "0.21.0-ngpreview.7" +version = "0.21.0-ngpreview.8" diff --git a/sdk/python/Cargo.toml b/sdk/python/Cargo.toml index 0fcc93e..48deddb 100644 --- a/sdk/python/Cargo.toml +++ b/sdk/python/Cargo.toml @@ -17,7 +17,7 @@ name = "nextgraphpy" crate-type = ["cdylib"] [dependencies] -pyo3 = "0.23.3" +pyo3 = "0.23.5" pyo3-async-runtimes = { version = "0.23", features = ["async-std-runtime"] } pythonize = "0.23.0" async-std = "1.12.0"