Use working directory for aapt commands

This commit is contained in:
gingerBill
2025-03-27 10:31:59 +00:00
parent caac504b88
commit 0e6cc6ec4b
3 changed files with 104 additions and 22 deletions

View File

@@ -30,28 +30,80 @@ gb_internal String remove_directory_from_path(String const &s) {
}
// NOTE(Mark Naughton): getcwd as String
#if !defined(GB_SYSTEM_WINDOWS)
gb_internal String get_current_directory(void) {
char cwd[256];
getcwd(cwd, 256);
#if defined(GB_SYSTEM_WINDOWS)
gb_global SRWLOCK cwd_lock;
return make_string_c(cwd);
String get_working_directory(gbAllocator allocator) {
AcquireSRWLockExclusive(&cwd_lock);
TEMPORARY_ALLOCATOR_GUARD();
DWORD sz_utf16 = GetCurrentDirectoryW(0, nullptr);
wchar_t *dir_buf_wstr = gb_alloc_array(temporary_allocator(), wchar_t, sz_utf16);
if (dir_buf_wstr == nullptr) {
ReleaseSRWLockExclusive(&cwd_lock);
return {};
}
DWORD n = GetCurrentDirectoryW(sz_utf16, dir_buf_wstr);
GB_ASSERT(n+1 == sz_utf16);
ReleaseSRWLockExclusive(&cwd_lock);
isize buf_len = sz_utf16*4;
u8 *buf = gb_alloc_array(allocator, u8, buf_len);
gb_ucs2_to_utf8(buf, buf_len, cast(u16 *)dir_buf_wstr);
return make_string_c(cast(char const *)buf);
}
bool set_working_directory(String dir) {
bool ok = false;
TEMPORARY_ALLOCATOR_GUARD();
char const *cdir = alloc_cstring(temporary_allocator(), dir);
wchar_t *wstr = gb__alloc_utf8_to_ucs2(temporary_allocator(), cdir, nullptr);
AcquireSRWLockExclusive(&cwd_lock);
ok = SetCurrentDirectoryW(wstr);
ReleaseSRWLockExclusive(&cwd_lock);
return ok;
}
#else
gb_internal String get_current_directory(void) {
gbAllocator a = heap_allocator();
wchar_t cwd[256];
GetCurrentDirectoryW(256, cwd);
String get_working_directory(gbAllocator allocator) {
TEMPORARY_ALLOCATOR_GUARD();
String16 wstr = make_string16_c(cwd);
auto buf = array_make<char>(temporary_allocator());
size_t size = PATH_MAX:
return string16_to_string(a, wstr);
char const *cwd;
for (; cwd == nullptr; size *= 2) {
array_resize(&buf, size);
cwd = getcwd(buf.data, buf.count);
if cwd == nullptr && errno() != ERANGE {
return {};
}
}
return copy_string(allocator, make_string_c(cwd));
}
bool set_working_directory(String dir) {
TEMPORARY_ALLOCATOR_GUARD();
char const *cdir = alloc_cstring(temporary_allocator(), dir);
return !chdir(cdir);
}
#endif
gb_internal bool path_is_directory(String path);
gb_internal String directory_from_path(String const &s) {