AwesomeAdam54321/inweb-bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/ganelson/inweb

Browse source
This commit is contained in:
Graham Nelson 2021-04-19 09:21:14 +01:00
commit 679345805f
2 changed files with 86 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Materials/windows-make-settings.mk
View file

@ -5,16 +5,16 @@ INTEST = intest/Tangled/intest
INWEB = inweb/Tangled/inweb
# Use the MinGW x64 clang compiler
CC = x86_64-w64-mingw32-clang -std=c99 -c $(MANYWARNINGS) $(CCOPTS) -g
INDULGENTCC = x86_64-w64-mingw32-clang -std=c99 -c $(FEWERWARNINGS) $(CCOPTS) -g
CC = x86_64-w64-mingw32-clang -std=c99 -c $(MANYWARNINGS) $(CCOPTS)
INDULGENTCC = x86_64-w64-mingw32-clang -std=c99 -c $(FEWERWARNINGS) $(CCOPTS)
# Define the Windows platform preprocessor symbol
CCOPTS = -DPLATFORM_WINDOWS=1 -D_WIN32_WINNT=0x0600
MANYWARNINGS = -Weverything -Wno-pointer-arith -Wno-unused-macros -Wno-shadow -Wno-cast-align -Wno-variadic-macros -Wno-missing-noreturn -Wno-missing-prototypes -Wno-unused-parameter -Wno-padded -Wno-missing-variable-declarations -Wno-unreachable-code-break -Wno-class-varargs -Wno-format-nonliteral -Wno-cast-qual -Wno-double-promotion -Wno-comma -Wno-strict-prototypes -Wno-extra-semi-stmt -Wno-used-but-marked-unused -ferror-limit=1000
FEWERWARNINGS = -Wno-implicit-int -Wno-dangling-else -Wno-pointer-sign -Wno-format-extra-args -Wno-tautological-compare -Wno-deprecated-declarations -Wno-logical-op-parentheses -Wno-format -Wno-extra-semi-stmt
LINK = x86_64-w64-mingw32-clang $(CCOPTS) -g
LINKEROPTS =
LINK = x86_64-w64-mingw32-clang $(CCOPTS)
LINKEROPTS = -lshlwapi
# Set the standard Windows executable file extension
EXEEXTENSION = .exe
@ -22,3 +22,4 @@ ARTOOL = ar -r
INFORM6OS = PC_WIN32
GLULXEOS = OS_WIN32

82
foundation-module/Chapter 1/Windows Platform.w
View file

@ -24,7 +24,9 @@ on a POSIX operating system.
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <shellapi.h>
#include <shlobj.h>
#include <shlwapi.h>
#undef IN
#undef OUT
@ -201,8 +203,86 @@ void Platform::closedir(void *D) {
@h Sync.
=
void Platform::path_add(const char* base, const char* add, char* path) {
strcpy(path, base);
PathAppendA(path, add);
}
void Platform::rsync(char *transcoded_source, char *transcoded_dest) {
printf("Platform::rsync() is not yet implemented!\n");
CreateDirectoryA(transcoded_dest, 0);
char srcPath[MAX_PATH], destPath[MAX_PATH];
WIN32_FIND_DATA findData = { 0 };
Platform::path_add(transcoded_dest, "*", destPath);
HANDLE findHandle = FindFirstFileA(destPath, &findData);
if (findHandle != INVALID_HANDLE_VALUE) {
do {
if ((strcmp(findData.cFileName, ".") == 0) || (strcmp(findData.cFileName, "..") == 0))
continue;
Platform::path_add(transcoded_source, findData.cFileName, srcPath);
int remove = 1;
{
DWORD srcAttrs = GetFileAttributesA(srcPath);
if (srcAttrs != INVALID_FILE_ATTRIBUTES) {
if ((findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == (srcAttrs & FILE_ATTRIBUTE_DIRECTORY))
remove = 0;
}
}
if (remove) {
Platform::path_add(transcoded_dest, findData.cFileName, destPath);
if (findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
destPath[strlen(destPath) + 1] = 0;
SHFILEOPSTRUCTA oper = { 0 };
oper.wFunc = FO_DELETE;
oper.pFrom = destPath;
oper.fFlags = FOF_NO_UI;
SHFileOperationA(&oper);
}
else DeleteFileA(destPath);
}
}
while (FindNextFileA(findHandle, &findData) != 0);
FindClose(findHandle);
}
Platform::path_add(transcoded_source, "*", srcPath);
findHandle = FindFirstFileA(srcPath, &findData);
if (findHandle != INVALID_HANDLE_VALUE) {
do {
if ((strcmp(findData.cFileName, ".") == 0) || (strcmp(findData.cFileName, "..") == 0))
continue;
Platform::path_add(transcoded_source, findData.cFileName, srcPath);
Platform::path_add(transcoded_dest, findData.cFileName, destPath);
if (findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
CreateDirectoryA(destPath, 0);
Platform::rsync(srcPath, destPath);
} else {
int needCopy = 1;
{
WIN32_FIND_DATA destFindData = { 0 };
HANDLE destFindHandle = FindFirstFileA(destPath, &destFindData);
if (destFindHandle != INVALID_HANDLE_VALUE) {
if ((findData.nFileSizeLow == destFindData.nFileSizeLow) && (findData.nFileSizeHigh == destFindData.nFileSizeHigh)) {
if (CompareFileTime(&(findData.ftLastWriteTime), &(destFindData.ftLastWriteTime)) == 0)
needCopy = 0;
}
FindClose(destFindHandle);
}
}
if (needCopy)
CopyFileA(srcPath, destPath, 0);
}
}
while (FindNextFileA(findHandle, &findData) != 0);
FindClose(findHandle);
}
}
@h Sleep. The Windows |Sleep| call measures time in milliseconds, whereas