# HG changeset patch # User Olaf Wintermann # Date 1694707910 -7200 # Node ID 378b5ab86f77597fbf35ec9df9598810adf2e4a8 # Parent 9b9420041d8e00543a4923dd89d4233756f850fd add new build system for windows diff -r 9b9420041d8e -r 378b5ab86f77 .hgignore --- a/.hgignore Tue Sep 12 21:07:54 2023 +0200 +++ b/.hgignore Thu Sep 14 18:11:50 2023 +0200 @@ -7,3 +7,6 @@ ^.c?project$ ^.settings/.*$ ^test/bin-test/tmp-sync +^make/vs/vcpkg_installed$ +^make/vs/.vs$ +^make/.*vcxproj.user$ diff -r 9b9420041d8e -r 378b5ab86f77 dav/finfo.c --- a/dav/finfo.c Tue Sep 12 21:07:54 2023 +0200 +++ b/dav/finfo.c Thu Sep 14 18:11:50 2023 +0200 @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include @@ -42,6 +41,10 @@ #include #include +#ifndef _WIN32 +#include +#endif + #include "libxattr.h" uint32_t parse_finfo_settings(const char *str, char **error) { diff -r 9b9420041d8e -r 378b5ab86f77 dav/libxattr.h --- a/dav/libxattr.h Tue Sep 12 21:07:54 2023 +0200 +++ b/dav/libxattr.h Thu Sep 14 18:11:50 2023 +0200 @@ -32,6 +32,11 @@ #include #include +#ifdef _MSC_VER +#include +typedef SSIZE_T ssize_t; +#endif + #ifdef __cplusplus extern "C" { #endif diff -r 9b9420041d8e -r 378b5ab86f77 dav/main.c --- a/dav/main.c Tue Sep 12 21:07:54 2023 +0200 +++ b/dav/main.c Thu Sep 14 18:11:50 2023 +0200 @@ -32,18 +32,18 @@ #include #include #include -#include #include #include #ifndef _WIN32 #include +#include #endif #include #include #include #include #include -#include + #include #include @@ -82,6 +82,9 @@ int dav_main(int argc, char **argv); #ifdef _WIN32 + +#define strcasecmp _stricmp + static char* wchar2utf8(const wchar_t *wstr, size_t wlen) { size_t maxlen = wlen * 4; char *ret = malloc(maxlen + 1); @@ -1205,6 +1208,18 @@ return ret; } +#if !defined(S_ISREG) && defined(S_IFMT) && defined(S_IFREG) +#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) +#endif + +#ifdef _WIN32 +#ifndef S_ISDIR +#define S_ISDIR(mode) ((mode) & _S_IFMT) == _S_IFDIR +#define S_ISREG(mode) ((mode) & _S_IFMT) == _S_IFREG +#endif +#endif + + int put_entry( Repository *repo, CmdArgs *a, diff -r 9b9420041d8e -r 378b5ab86f77 dav/pwd.c --- a/dav/pwd.c Tue Sep 12 21:07:54 2023 +0200 +++ b/dav/pwd.c Thu Sep 14 18:11:50 2023 +0200 @@ -38,6 +38,7 @@ #ifdef _WIN32 #include +#pragma comment(lib, "Ws2_32.lib") #else #include #endif diff -r 9b9420041d8e -r 378b5ab86f77 dav/scfg.h --- a/dav/scfg.h Tue Sep 12 21:07:54 2023 +0200 +++ b/dav/scfg.h Thu Sep 14 18:11:50 2023 +0200 @@ -32,7 +32,12 @@ #include #include #include + +#ifdef _WIN32 +#include "pcreposix.h" +#else #include +#endif #include "db.h" #include "tags.h" diff -r 9b9420041d8e -r 378b5ab86f77 dav/sync.c --- a/dav/sync.c Tue Sep 12 21:07:54 2023 +0200 +++ b/dav/sync.c Thu Sep 14 18:11:50 2023 +0200 @@ -30,10 +30,9 @@ #include #include #include -#include + #include #include -#include #include #include #include @@ -42,7 +41,17 @@ #include #include #include -#include + +#ifndef _WIN32 +// unix includes +#include +#include +#include +#else +//windows includes + +#endif + #include @@ -63,9 +72,19 @@ #include "system.h" -#include + #include +#ifdef _WIN32 +#define strcasecmp _stricmp + +#ifndef S_ISDIR +#define S_ISDIR(mode) ((mode) & _S_IFMT) == _S_IFDIR +#define S_ISREG(mode) ((mode) & _S_IFMT) == _S_IFREG +#endif + +#endif + static DavContext *ctx; static int sync_shutdown = 0; @@ -299,12 +318,15 @@ memset(&act, 0, sizeof(struct sigaction)); act.sa_handler = SIG_IGN; sigaction(SIGPIPE, &act, NULL); -#endif - + // prepare signal handler thread pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; pthread_mutex_lock(&mutex); pthread_t tid; +#else + int tid; + int mutex; +#endif if(!strcmp(cmd, "check") || !strcmp(cmd, "check-config")) { if(!cfgret) { @@ -432,6 +454,7 @@ sync_shutdown = 1; } +#ifndef _WIN32 static void* sighandler(void *data) { signal(SIGTERM, handlesig); signal(SIGINT, handlesig); @@ -455,6 +478,16 @@ void *data; pthread_join(tid, &data); } +#else + +int start_sighandler(int* mutex) { + return 0; +} +int stop_sighandler(int* mutex, int tid) { + return 0; +} + +#endif static char* create_local_path(SyncDirectory *dir, const char *path) { char *local_path = util_concat_path(dir->path, path); @@ -1364,6 +1397,11 @@ local->size = s->st_size; } +#ifdef _WIN32 +#define fseeko fseek +#define ftello ftell +#endif + static CxList* sync_download_changed_parts( DavResource *res, LocalResource *local, @@ -1666,7 +1704,7 @@ if(issplit || (SYNC_HASHING(dir) && !link)) { if(truncate_file >= 0) { // only true if issplit is true - if(truncate(local_path, truncate_file)) { + if(sys_truncate(local_path, truncate_file)) { perror("truncate"); } } @@ -3055,10 +3093,10 @@ // therefore we remove the .lnk extension from the file name // change res->path // we only do this, if there isn't any other file with this name - sstr_t fpath = sstr(file_path); - sstr_t rpath = sstr(path); + cxstring fpath = cx_str(file_path); + cxstring rpath = cx_str(path); // remove last 4 chars (.lnk) - sstr_t new_file_path = sstrdup(sstrsubsl(fpath, 0 , fpath.length-4)); + cxmutstr new_file_path = cx_strdup(cx_strsubsl(fpath, 0 , fpath.length-4)); // check if a file with this name exists SYS_STAT nfp_s; if(!sys_stat(new_file_path.ptr, &nfp_s)) { @@ -3067,7 +3105,7 @@ free(lnkbuf); lnkbuf = NULL; } else { - sstr_t new_path = sstrdup(sstrsubsl(rpath, 0, rpath.length-4)); + cxmutstr new_path = cx_strdup(cx_strsubsl(rpath, 0, rpath.length-4)); res->local_path = res->path; res->path = new_path.ptr; // remove .lnk ext from resource path } @@ -3410,7 +3448,7 @@ #ifdef SYS_LINK_EXT // on Windows, add .lnk extension to links if(dav_get_property_ns(res, DAV_PROPS_NS, "link")) { - return ucx_sprintf("%s%s", res->path, SYS_LINK_EXT).ptr; + return cx_asprintf("%s%s", res->path, SYS_LINK_EXT).ptr; } else { // not a link return strdup(res->path); @@ -3563,6 +3601,8 @@ FileInfo f; finfo_get_values(fileinfo, &f); if((dir->metadata & FINFO_MTIME) == FINFO_MTIME && f.date_set) { + // TODO: implement on windows +#ifndef _WIN32 // set mtime struct utimbuf t; t.actime = f.last_modified; @@ -3573,6 +3613,9 @@ } else { local->last_modified = f.last_modified; } +#else + local->last_modified = 0; +#endif } if((dir->metadata & FINFO_MODE) == FINFO_MODE && f.mode_set) { // set mode diff -r 9b9420041d8e -r 378b5ab86f77 dav/sync.h --- a/dav/sync.h Tue Sep 12 21:07:54 2023 +0200 +++ b/dav/sync.h Thu Sep 14 18:11:50 2023 +0200 @@ -34,8 +34,6 @@ #include #include -#include - #include "scfg.h" #include "config.h" #include "sopt.h" @@ -96,8 +94,14 @@ void print_usage(char *cmd); +#ifndef _WIN32 pthread_t start_sighandler(pthread_mutex_t *mutex) ; void stop_sighandler(pthread_mutex_t *mutex, pthread_t tid); +#else +// TODO: just dummies at the moment +int start_sighandler(int* mutex); +int stop_sighandler(int* mutex, int tid); +#endif void res2map(DavResource *root, CxMap *map); diff -r 9b9420041d8e -r 378b5ab86f77 dav/system.c --- a/dav/system.c Tue Sep 12 21:07:54 2023 +0200 +++ b/dav/system.c Thu Sep 14 18:11:50 2023 +0200 @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include @@ -165,6 +164,10 @@ return err; } +int sys_truncate(const char* path, off_t length) { + return truncate(path, length); +} + #else /* ---------- Windows implementation ---------- */ @@ -507,4 +510,22 @@ return ret; } +int sys_truncate(const char* path, off_t length) { + wchar_t* wpath = path2winpath(path, FALSE, NULL); + if (!wpath) { + fprintf(stderr, "sys_truncate: cannot convert path\n"); + return -1; + } + + FILE* file = _wfopen(wpath, L"wb"); + int ret = 1; + if (file) { + ret = _chsize(fileno(file), length); + fclose(file); + } + + free(wpath); + return ret; +} + #endif diff -r 9b9420041d8e -r 378b5ab86f77 dav/system.h --- a/dav/system.h Tue Sep 12 21:07:54 2023 +0200 +++ b/dav/system.h Thu Sep 14 18:11:50 2023 +0200 @@ -33,10 +33,13 @@ #include #include #include -#include + #ifdef _WIN32 #include +#define mode_t unsigned int +#else +#include #endif #ifdef __cplusplus @@ -102,6 +105,8 @@ int sys_symlink(const char *target, const char *linkpath); +int sys_truncate(const char* path, off_t length); + #ifdef __cplusplus } #endif diff -r 9b9420041d8e -r 378b5ab86f77 libidav/crypto.c --- a/libidav/crypto.c Tue Sep 12 21:07:54 2023 +0200 +++ b/libidav/crypto.c Thu Sep 14 18:11:50 2023 +0200 @@ -29,8 +29,12 @@ #include #include #include +#include + +#ifndef _WIN32 #include -#include +#endif + #include "utils.h" #include "crypto.h" @@ -1195,7 +1199,7 @@ copy_iv_len = len > copy_iv_len ? copy_iv_len : len; memcpy(buf, enc->iv, copy_iv_len); - buf += copy_iv_len; + (char*)buf += copy_iv_len; len -= copy_iv_len; nread = copy_iv_len; diff -r 9b9420041d8e -r 378b5ab86f77 libidav/resource.c --- a/libidav/resource.c Tue Sep 12 21:07:54 2023 +0200 +++ b/libidav/resource.c Thu Sep 14 18:11:50 2023 +0200 @@ -1633,6 +1633,7 @@ return nitems; } +/* DavInputStream* dav_inputstream_open(DavResource *res) { DavSession *sn = res->session; @@ -1871,3 +1872,4 @@ return ret; } +*/ diff -r 9b9420041d8e -r 378b5ab86f77 libidav/utils.c --- a/libidav/utils.c Tue Sep 12 21:07:54 2023 +0200 +++ b/libidav/utils.c Thu Sep 14 18:11:50 2023 +0200 @@ -146,8 +146,10 @@ tparts.tm_isdst = -1; return mktime(&tparts); } else if(!cx_strcmp(tzinfo, cx_str("Z"))) { -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) return timegm(&tparts); +#elif defined(_WIN32) + return mktime(&tparts); #else return mktime(&tparts) - timezone; #endif @@ -161,8 +163,10 @@ extractval(tzinfo, conv, ':'); val = atol(conv); val = 60 * (val / 100) + (val % 100); -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) return timegm(&tparts) + (time_t) (60 * val * sign); +#elif defined(_WIN32) + return mktime(&tparts) + (time_t)(60 * val * sign); #else return mktime(&tparts) - timezone + (time_t) (60 * val * sign); #endif @@ -307,6 +311,10 @@ return util_url_base_s(cx_str(url)); } +#ifdef _WIN32 +#define strncasecmp _strnicmp +#endif + const char* util_url_path(const char *url) { const char *path = NULL; size_t len = strlen(url); diff -r 9b9420041d8e -r 378b5ab86f77 libidav/utils.h --- a/libidav/utils.h Tue Sep 12 21:07:54 2023 +0200 +++ b/libidav/utils.h Thu Sep 14 18:11:50 2023 +0200 @@ -44,16 +44,23 @@ #include #include "webdav.h" +#ifdef _WIN32 +#ifndef mode_t +#define mode_t int +#endif +#endif + #ifndef S_IRWXG /* if one is not defined, the others are probably also not defined */ -#define S_IRWXG 070 -#define S_IRGRP 040 -#define S_IWGRP 020 -#define S_IXGRP 010 -#define S_IRWXO 07 -#define S_IROTH 04 -#define S_IWOTH 02 -#define S_IXOTH 01 +#define S_IRWXU 0700 +#define S_IRWXG 070 +#define S_IRGRP 040 +#define S_IWGRP 020 +#define S_IXGRP 010 +#define S_IRWXO 07 +#define S_IROTH 04 +#define S_IWOTH 02 +#define S_IXOTH 01 #endif /* S_IRWXG */ #ifdef __cplusplus diff -r 9b9420041d8e -r 378b5ab86f77 libidav/xml.c --- a/libidav/xml.c Tue Sep 12 21:07:54 2023 +0200 +++ b/libidav/xml.c Thu Sep 14 18:11:50 2023 +0200 @@ -397,9 +397,9 @@ attr->name = strdup(name); attr->value = strdup(value); - if(node->attributes) { - DavXmlAttr *last; + if(node->attributes) { DavXmlAttr *end = node->attributes; + DavXmlAttr* last = end; while(end) { last = end; end = end->next; diff -r 9b9420041d8e -r 378b5ab86f77 make/vs/dav-sync/dav-sync.vcxproj --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/make/vs/dav-sync/dav-sync.vcxproj Thu Sep 14 18:11:50 2023 +0200 @@ -0,0 +1,163 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 17.0 + Win32Proj + {961b8763-3587-4c28-9268-3970ed5fe106} + davsync + 10.0 + + + + Application + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + + Application + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + + + + + + + + + + + + + + + + + + + + $(SolutionDir)..\..\build\vs\$(Platform)\$(Configuration)\ + ..\..\..\build\vs\dav\$(Platform)\$(Configuration)\ + + + + Level3 + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + Level3 + false + _DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + true + ..\..\..\ucx;..\vcpkg_installed\x64-windows\x64-windows\include;..\..\..\;%(AdditionalIncludeDirectories) + stdc17 + + + Console + true + ..\vcpkg_installed\x64-windows\x64-windows\lib;%(AdditionalLibraryDirectories) + charset.lib;iconv.lib;libcurl.lib;libxml2.lib;lzma.lib;zlib.lib;pcreposix.lib;bcrypt.lib;%(AdditionalDependencies) + + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + + + + + + + + + + + + + {ca31756c-8ac2-4fdb-9513-c013c89cb628} + + + {c29c0378-6548-48e8-9426-31922515212a} + + + {27da0164-3475-43e2-a1a4-a5d07d305749} + + + + + + \ No newline at end of file diff -r 9b9420041d8e -r 378b5ab86f77 make/vs/dav-sync/dav-sync.vcxproj.filters --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/make/vs/dav-sync/dav-sync.vcxproj.filters Thu Sep 14 18:11:50 2023 +0200 @@ -0,0 +1,45 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + \ No newline at end of file diff -r 9b9420041d8e -r 378b5ab86f77 make/vs/dav.sln --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/make/vs/dav.sln Thu Sep 14 18:11:50 2023 +0200 @@ -0,0 +1,71 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.5.33530.505 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ucx", "ucx\ucx.vcxproj", "{27DA0164-3475-43E2-A1A4-A5D07D305749}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libidav", "libidav\libidav.vcxproj", "{C29C0378-6548-48E8-9426-31922515212A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "davcommon", "davcommon\davcommon.vcxproj", "{CA31756C-8AC2-4FDB-9513-C013C89CB628}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dav", "dav\dav.vcxproj", "{ADEB8E4D-9BD9-4BE9-8AB8-3E2DDCEAAFC4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dav-sync", "dav-sync\dav-sync.vcxproj", "{961B8763-3587-4C28-9268-3970ED5FE106}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {27DA0164-3475-43E2-A1A4-A5D07D305749}.Debug|x64.ActiveCfg = Debug|x64 + {27DA0164-3475-43E2-A1A4-A5D07D305749}.Debug|x64.Build.0 = Debug|x64 + {27DA0164-3475-43E2-A1A4-A5D07D305749}.Debug|x86.ActiveCfg = Debug|Win32 + {27DA0164-3475-43E2-A1A4-A5D07D305749}.Debug|x86.Build.0 = Debug|Win32 + {27DA0164-3475-43E2-A1A4-A5D07D305749}.Release|x64.ActiveCfg = Release|x64 + {27DA0164-3475-43E2-A1A4-A5D07D305749}.Release|x64.Build.0 = Release|x64 + {27DA0164-3475-43E2-A1A4-A5D07D305749}.Release|x86.ActiveCfg = Release|Win32 + {27DA0164-3475-43E2-A1A4-A5D07D305749}.Release|x86.Build.0 = Release|Win32 + {C29C0378-6548-48E8-9426-31922515212A}.Debug|x64.ActiveCfg = Debug|x64 + {C29C0378-6548-48E8-9426-31922515212A}.Debug|x64.Build.0 = Debug|x64 + {C29C0378-6548-48E8-9426-31922515212A}.Debug|x86.ActiveCfg = Debug|Win32 + {C29C0378-6548-48E8-9426-31922515212A}.Debug|x86.Build.0 = Debug|Win32 + {C29C0378-6548-48E8-9426-31922515212A}.Release|x64.ActiveCfg = Release|x64 + {C29C0378-6548-48E8-9426-31922515212A}.Release|x64.Build.0 = Release|x64 + {C29C0378-6548-48E8-9426-31922515212A}.Release|x86.ActiveCfg = Release|Win32 + {C29C0378-6548-48E8-9426-31922515212A}.Release|x86.Build.0 = Release|Win32 + {CA31756C-8AC2-4FDB-9513-C013C89CB628}.Debug|x64.ActiveCfg = Debug|x64 + {CA31756C-8AC2-4FDB-9513-C013C89CB628}.Debug|x64.Build.0 = Debug|x64 + {CA31756C-8AC2-4FDB-9513-C013C89CB628}.Debug|x86.ActiveCfg = Debug|Win32 + {CA31756C-8AC2-4FDB-9513-C013C89CB628}.Debug|x86.Build.0 = Debug|Win32 + {CA31756C-8AC2-4FDB-9513-C013C89CB628}.Release|x64.ActiveCfg = Release|x64 + {CA31756C-8AC2-4FDB-9513-C013C89CB628}.Release|x64.Build.0 = Release|x64 + {CA31756C-8AC2-4FDB-9513-C013C89CB628}.Release|x86.ActiveCfg = Release|Win32 + {CA31756C-8AC2-4FDB-9513-C013C89CB628}.Release|x86.Build.0 = Release|Win32 + {ADEB8E4D-9BD9-4BE9-8AB8-3E2DDCEAAFC4}.Debug|x64.ActiveCfg = Debug|x64 + {ADEB8E4D-9BD9-4BE9-8AB8-3E2DDCEAAFC4}.Debug|x64.Build.0 = Debug|x64 + {ADEB8E4D-9BD9-4BE9-8AB8-3E2DDCEAAFC4}.Debug|x86.ActiveCfg = Debug|Win32 + {ADEB8E4D-9BD9-4BE9-8AB8-3E2DDCEAAFC4}.Debug|x86.Build.0 = Debug|Win32 + {ADEB8E4D-9BD9-4BE9-8AB8-3E2DDCEAAFC4}.Release|x64.ActiveCfg = Release|x64 + {ADEB8E4D-9BD9-4BE9-8AB8-3E2DDCEAAFC4}.Release|x64.Build.0 = Release|x64 + {ADEB8E4D-9BD9-4BE9-8AB8-3E2DDCEAAFC4}.Release|x86.ActiveCfg = Release|Win32 + {ADEB8E4D-9BD9-4BE9-8AB8-3E2DDCEAAFC4}.Release|x86.Build.0 = Release|Win32 + {961B8763-3587-4C28-9268-3970ED5FE106}.Debug|x64.ActiveCfg = Debug|x64 + {961B8763-3587-4C28-9268-3970ED5FE106}.Debug|x64.Build.0 = Debug|x64 + {961B8763-3587-4C28-9268-3970ED5FE106}.Debug|x86.ActiveCfg = Debug|Win32 + {961B8763-3587-4C28-9268-3970ED5FE106}.Debug|x86.Build.0 = Debug|Win32 + {961B8763-3587-4C28-9268-3970ED5FE106}.Release|x64.ActiveCfg = Release|x64 + {961B8763-3587-4C28-9268-3970ED5FE106}.Release|x64.Build.0 = Release|x64 + {961B8763-3587-4C28-9268-3970ED5FE106}.Release|x86.ActiveCfg = Release|Win32 + {961B8763-3587-4C28-9268-3970ED5FE106}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {CDB68A19-0E5A-43E2-8620-0BF8EB2A0EF3} + EndGlobalSection +EndGlobal diff -r 9b9420041d8e -r 378b5ab86f77 make/vs/dav/dav.vcxproj --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/make/vs/dav/dav.vcxproj Thu Sep 14 18:11:50 2023 +0200 @@ -0,0 +1,161 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 17.0 + Win32Proj + {adeb8e4d-9bd9-4be9-8ab8-3e2ddceaafc4} + dav + 10.0 + + + + Application + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + + Application + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + + + + + + + + + + + + + + + + + + + + $(SolutionDir)..\..\build\vs\$(Platform)\$(Configuration)\ + ..\..\..\build\vs\dav\$(Platform)\$(Configuration)\ + + + + Level3 + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + Level3 + false + _DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + true + ..\..\..\ucx;..\vcpkg_installed\x64-windows\x64-windows\include;..\..\..\;%(AdditionalIncludeDirectories) + stdc17 + + + Console + true + ..\vcpkg_installed\x64-windows\x64-windows\lib;%(AdditionalLibraryDirectories) + charset.lib;iconv.lib;libcurl.lib;libxml2.lib;lzma.lib;zlib.lib;bcrypt.lib;%(AdditionalDependencies) + + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + {ca31756c-8ac2-4fdb-9513-c013c89cb628} + + + {c29c0378-6548-48e8-9426-31922515212a} + + + {27da0164-3475-43e2-a1a4-a5d07d305749} + + + + + + + + + + + + + + + + \ No newline at end of file diff -r 9b9420041d8e -r 378b5ab86f77 make/vs/dav/dav.vcxproj.filters --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/make/vs/dav/dav.vcxproj.filters Thu Sep 14 18:11:50 2023 +0200 @@ -0,0 +1,39 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + \ No newline at end of file diff -r 9b9420041d8e -r 378b5ab86f77 make/vs/davcommon/davcommon.vcxproj --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/make/vs/davcommon/davcommon.vcxproj Thu Sep 14 18:11:50 2023 +0200 @@ -0,0 +1,168 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 17.0 + Win32Proj + {ca31756c-8ac2-4fdb-9513-c013c89cb628} + davcommon + 10.0 + + + + Application + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + + StaticLibrary + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + + + + + + + + + + + + + + + + + + + + $(SolutionDir)..\..\build\vs\$(Platform)\$(Configuration)\ + ..\..\..\build\vs\davcommon\$(Platform)\$(Configuration)\ + + + true + + + + Level3 + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + Level3 + false + _DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + true + ..\..\..\ucx;..\vcpkg_installed\x64-windows\x64-windows\include;..\..\..\;%(AdditionalIncludeDirectories) + stdc17 + + + Console + true + + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r 9b9420041d8e -r 378b5ab86f77 make/vs/davcommon/davcommon.vcxproj.filters --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/make/vs/davcommon/davcommon.vcxproj.filters Thu Sep 14 18:11:50 2023 +0200 @@ -0,0 +1,90 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + \ No newline at end of file diff -r 9b9420041d8e -r 378b5ab86f77 make/vs/libidav/libidav.vcxproj --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/make/vs/libidav/libidav.vcxproj Thu Sep 14 18:11:50 2023 +0200 @@ -0,0 +1,176 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 16.0 + Win32Proj + {c29c0378-6548-48e8-9426-31922515212a} + libidav + 10.0 + + + + Application + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + + StaticLibrary + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + + + + + + + + + + + + + + + + + + + + .dll + $(SolutionDir)..\..\build\vs\$(Platform)\$(Configuration)\ + ..\..\..\build\vs\libidav\$(Platform)\$(Configuration)\ + + + true + + + + Level3 + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + Level3 + true + _DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + true + stdc11 + ..\..\..\ucx;..\vcpkg_installed\x64-windows\x64-windows\include + + + Console + true + ..\vcpkg_installed\x64-windows\x64-windows\lib;%(AdditionalLibraryDirectories) + charset.lib;iconv.lib;libcurl.lib;libxml2.lib;lzma.lib;zlib.lib;bcrypt.lib;%(AdditionalDependencies) + + + xcopy /y $(SolutionDir)vcpkg_installed\x64-windows\x64-windows\bin\*.dll $(SolutionDir)..\..\build\vs\$(Platform)\$(Configuration)\ + + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {27da0164-3475-43e2-a1a4-a5d07d305749} + + + + + + \ No newline at end of file diff -r 9b9420041d8e -r 378b5ab86f77 make/vs/libidav/libidav.vcxproj.filters --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/make/vs/libidav/libidav.vcxproj.filters Thu Sep 14 18:11:50 2023 +0200 @@ -0,0 +1,81 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + \ No newline at end of file diff -r 9b9420041d8e -r 378b5ab86f77 make/vs/ucx/ucx.vcxproj --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/make/vs/ucx/ucx.vcxproj Thu Sep 14 18:11:50 2023 +0200 @@ -0,0 +1,170 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 16.0 + Win32Proj + {27da0164-3475-43e2-a1a4-a5d07d305749} + ucx + 10.0 + + + + Application + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + + StaticLibrary + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + + + + + + + + + + + + + + + + + + + + $(SolutionDir)..\..\build\vs\$(Platform)\$(Configuration)\ + ..\..\..\build\vs\ucx\$(Platform)\$(Configuration)\ + + + + Level3 + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + Level3 + false + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + stdc17 + + + Console + true + + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r 9b9420041d8e -r 378b5ab86f77 make/vs/ucx/ucx.vcxproj.filters --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/make/vs/ucx/ucx.vcxproj.filters Thu Sep 14 18:11:50 2023 +0200 @@ -0,0 +1,108 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + \ No newline at end of file diff -r 9b9420041d8e -r 378b5ab86f77 make/vs/vcpkg.json --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/make/vs/vcpkg.json Thu Sep 14 18:11:50 2023 +0200 @@ -0,0 +1,10 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", + "name": "libidav", + "dependencies": [ + "libxml2", + "curl", + "pcre" + ], + "builtin-baseline": "2c401863dd54a640aeb26ed736c55489c079323b" +}