diff --git a/build.ps1 b/build.ps1 index e547b53..932a5f3 100644 --- a/build.ps1 +++ b/build.ps1 @@ -1,17 +1,18 @@ param( - [ValidateSet("run","build","debug","test","clean")] + [ValidateSet("run","build","debug","test","clean", "golib")] [string]$Command = "build" ) $src = "." +$outtest = "bin\test.exe" $out = "bin\server.exe" switch ($Command) { - "run" { odin run $src } + "run" { odin run $src -out:$outtest } "build" { odin build $src -out:$out -o:speed } "debug" { odin build $src -out:$out -debug } "test" { odin test .\tests\ -all-packages } "clean" { Remove-Item -Recurse -Force bin -ErrorAction SilentlyContinue } - "golib" { go build -buildmode=c-shared -o libgoldmark.dll parser.go } + "golib" { go build -buildmode=c-shared -o parser/libgoldmark.dll parser/parser.go } "libc" { lib /def:libgoldmark.def /out:libgoldmark.lib /machine:x64 } } diff --git a/ols.json b/ols.json index 4866a27..90e2150 100644 --- a/ols.json +++ b/ols.json @@ -3,4 +3,4 @@ "enable_document_symbols": true, "enable_hover": true, "enable_snippets": true -} +} \ No newline at end of file diff --git a/go.mod b/parser/go.mod similarity index 100% rename from go.mod rename to parser/go.mod diff --git a/go.sum b/parser/go.sum similarity index 100% rename from go.sum rename to parser/go.sum diff --git a/libgoldmark.def b/parser/libgoldmark.def similarity index 100% rename from libgoldmark.def rename to parser/libgoldmark.def diff --git a/libgoldmark.dll b/parser/libgoldmark.dll similarity index 99% rename from libgoldmark.dll rename to parser/libgoldmark.dll index 44fb79f..444891a 100644 Binary files a/libgoldmark.dll and b/parser/libgoldmark.dll differ diff --git a/libgoldmark.exp b/parser/libgoldmark.exp similarity index 100% rename from libgoldmark.exp rename to parser/libgoldmark.exp diff --git a/libgoldmark.h b/parser/libgoldmark.h similarity index 100% rename from libgoldmark.h rename to parser/libgoldmark.h diff --git a/libgoldmark.lib b/parser/libgoldmark.lib similarity index 100% rename from libgoldmark.lib rename to parser/libgoldmark.lib diff --git a/parser.go b/parser/parser.go similarity index 100% rename from parser.go rename to parser/parser.go diff --git a/server.odin b/server.odin index 3e556de..f6680c4 100644 --- a/server.odin +++ b/server.odin @@ -8,7 +8,7 @@ import "core:path/filepath" import "core:strings" import http "submodules/odin-http" -foreign import goldmark "libgoldmark.lib" +foreign import goldmark "parser/libgoldmark.lib" foreign goldmark { MarkdownToHTML :: proc(source: cstring) -> cstring --- @@ -26,7 +26,6 @@ state := State { } main :: proc() { - markdown, err1 := os.read_entire_file_from_path("test.markdown", context.temp_allocator) src_c := strings.clone_to_cstring(string(markdown))