From cc9b754801f901636e32d61d4702bece533fa949 Mon Sep 17 00:00:00 2001 From: StunxFS <56417208+StunxFS@users.noreply.github.com> Date: Tue, 18 Oct 2022 11:01:25 -0400 Subject: [PATCH] vlib: delete unused `darwin` module (#16093) --- vlib/darwin/README.md | 4 --- vlib/darwin/darwin.m | 9 ------- vlib/darwin/darwin.v | 57 ------------------------------------------- 3 files changed, 70 deletions(-) delete mode 100644 vlib/darwin/README.md delete mode 100644 vlib/darwin/darwin.m delete mode 100644 vlib/darwin/darwin.v diff --git a/vlib/darwin/README.md b/vlib/darwin/README.md deleted file mode 100644 index 2fd56aab5d..0000000000 --- a/vlib/darwin/README.md +++ /dev/null @@ -1,4 +0,0 @@ -## Description: - -`darwin` is a deprecated module that will be removed soon. -Do not rely on it. diff --git a/vlib/darwin/darwin.m b/vlib/darwin/darwin.m deleted file mode 100644 index 5cab83ad64..0000000000 --- a/vlib/darwin/darwin.m +++ /dev/null @@ -1,9 +0,0 @@ - -///void NSLog(id x); - -#include - -NSString* nsstring2(string s) { - return [ [ NSString alloc ] initWithBytesNoCopy:s.str length:s.len - encoding:NSUTF8StringEncoding freeWhenDone: false]; -} diff --git a/vlib/darwin/darwin.v b/vlib/darwin/darwin.v deleted file mode 100644 index 36c72659b6..0000000000 --- a/vlib/darwin/darwin.v +++ /dev/null @@ -1,57 +0,0 @@ -module darwin - -#include -#include - -#flag -framework Cocoa -#flag -framework Carbon - -struct C.NSString {} - -#include "@VEXEROOT/vlib/darwin/darwin.m" - -fn C.nsstring2(s string) voidptr - -// macOS and iOS helpers -// pub fn nsstring(s string) *C.NSString { -pub fn nsstring(s string) voidptr { - return C.nsstring2(s) - // println('ns $s len=$s.len') - //# return [ [ NSString alloc ] initWithBytesNoCopy:s.str length:s.len - //# encoding:NSUTF8StringEncoding freeWhenDone: false]; - // return 0 - - // ns := C.alloc_NSString() - // return ns.initWithBytesNoCopy(s.str, length: s.len, - // encoding: NSUTF8StringEncoding, freeWhenDone: false) -} - -// returns absolute path to folder where your resources should / will reside -// for .app packages: .../my.app/Contents/Resources -// for cli: .../parent_folder/Resources - -fn C.CFBundleCopyResourcesDirectoryURL(bundle voidptr) &u8 -fn C.CFBundleGetMainBundle() voidptr -fn C.CFURLGetFileSystemRepresentation(url &u8, resolve_against_base bool, buffer &u8, buffer_size int) int -fn C.CFRelease(url &u8) - -pub fn resource_path() string { - main_bundle := C.CFBundleGetMainBundle() - resource_dir_url := C.CFBundleCopyResourcesDirectoryURL(main_bundle) - if resource_dir_url == unsafe { nil } { - panic('CFBundleCopyResourcesDirectoryURL failed') - } - buffer_size := 4096 - mut buffer := unsafe { malloc_noscan(buffer_size) } - unsafe { - buffer[0] = 0 - } - conv_result := C.CFURLGetFileSystemRepresentation(resource_dir_url, true, buffer, - buffer_size) - if conv_result == 0 { - panic('CFURLGetFileSystemRepresentation failed') - } - result := unsafe { buffer.vstring() } - C.CFRelease(resource_dir_url) - return result -}