From 28950c63ae0c2a748765300455e4850559c0a64a Mon Sep 17 00:00:00 2001 From: Nat Quayle Nelson Date: Sun, 15 Oct 2023 11:41:18 -0600 Subject: [PATCH] move project folder to repo root --- .gitignore | 6 ++-- .gitmodules | 6 ---- .../kiss-vscode/.haxerc => .haxerc | 0 .../.vscode => .vscode}/launch.json | 0 .../.vscode => .vscode}/tasks.json | 0 .../.vscodeignore => .vscodeignore | 0 ...figuration.json => Kiss.configuration.json | 0 README.md | 16 +++++------ .../kiss-vscode/build.hxml => build.hxml | 0 .../haxe-strings.hxml | 0 .../hscript.hxml | 0 .../hxnodejs.hxml | 0 .../kiss-tools.hxml | 0 .../kiss-vscode-api.hxml | 0 .../kiss.hxml | 0 .../re-flex.hxml | 0 .../tink_core.hxml | 0 .../tink_json.hxml | 0 .../tink_macro.hxml | 0 .../tink_priority.hxml | 0 .../tink_syntaxhub.hxml | 0 .../tink_typecrawler.hxml | 0 .../uuid.hxml | 0 .../vscode.hxml | 0 .../package-lock.json => package-lock.json | 0 .../kiss-vscode/package.json => package.json | 0 projects/_standalone/kiss-vscode/.gitignore | 3 -- projects/_standalone/kiss-vscode/README.md | 13 --------- projects/_standalone/kiss-vscode/test.sh | 3 -- push-subtrees.sh | 14 ---------- .../kiss-vscode/src => src}/Main.hx | 0 .../kiss-vscode/src => src}/Main.kiss | 0 .../src => src}/commands/ExtensionTools.kiss | 0 .../src => src}/commands/KissTools.kiss | 0 .../src => src}/commands/Lines.kiss | 0 .../commands/_deprecated/EmacsPorts.kiss | 0 .../syntaxes => syntaxes}/codeblock.json | 0 .../syntaxes => syntaxes}/kiss.tmLanguage | 0 test-project.sh | 12 -------- test.sh | 28 +------------------ 40 files changed, 11 insertions(+), 90 deletions(-) delete mode 100644 .gitmodules rename projects/_standalone/kiss-vscode/.haxerc => .haxerc (100%) rename {projects/_standalone/kiss-vscode/.vscode => .vscode}/launch.json (100%) rename {projects/_standalone/kiss-vscode/.vscode => .vscode}/tasks.json (100%) rename projects/_standalone/kiss-vscode/.vscodeignore => .vscodeignore (100%) rename projects/_standalone/kiss-vscode/Kiss.configuration.json => Kiss.configuration.json (100%) rename projects/_standalone/kiss-vscode/build.hxml => build.hxml (100%) rename {projects/_standalone/kiss-vscode/haxe_libraries => haxe_libraries}/haxe-strings.hxml (100%) rename {projects/_standalone/kiss-vscode/haxe_libraries => haxe_libraries}/hscript.hxml (100%) rename {projects/_standalone/kiss-vscode/haxe_libraries => haxe_libraries}/hxnodejs.hxml (100%) rename {projects/_standalone/kiss-vscode/haxe_libraries => haxe_libraries}/kiss-tools.hxml (100%) rename {projects/_standalone/kiss-vscode/haxe_libraries => haxe_libraries}/kiss-vscode-api.hxml (100%) rename {projects/_standalone/kiss-vscode/haxe_libraries => haxe_libraries}/kiss.hxml (100%) rename {projects/_standalone/kiss-vscode/haxe_libraries => haxe_libraries}/re-flex.hxml (100%) rename {projects/_standalone/kiss-vscode/haxe_libraries => haxe_libraries}/tink_core.hxml (100%) rename {projects/_standalone/kiss-vscode/haxe_libraries => haxe_libraries}/tink_json.hxml (100%) rename {projects/_standalone/kiss-vscode/haxe_libraries => haxe_libraries}/tink_macro.hxml (100%) rename {projects/_standalone/kiss-vscode/haxe_libraries => haxe_libraries}/tink_priority.hxml (100%) rename {projects/_standalone/kiss-vscode/haxe_libraries => haxe_libraries}/tink_syntaxhub.hxml (100%) rename {projects/_standalone/kiss-vscode/haxe_libraries => haxe_libraries}/tink_typecrawler.hxml (100%) rename {projects/_standalone/kiss-vscode/haxe_libraries => haxe_libraries}/uuid.hxml (100%) rename {projects/_standalone/kiss-vscode/haxe_libraries => haxe_libraries}/vscode.hxml (100%) rename projects/_standalone/kiss-vscode/package-lock.json => package-lock.json (100%) rename projects/_standalone/kiss-vscode/package.json => package.json (100%) delete mode 100644 projects/_standalone/kiss-vscode/.gitignore delete mode 100644 projects/_standalone/kiss-vscode/README.md delete mode 100755 projects/_standalone/kiss-vscode/test.sh delete mode 100755 push-subtrees.sh rename {projects/_standalone/kiss-vscode/src => src}/Main.hx (100%) rename {projects/_standalone/kiss-vscode/src => src}/Main.kiss (100%) rename {projects/_standalone/kiss-vscode/src => src}/commands/ExtensionTools.kiss (100%) rename {projects/_standalone/kiss-vscode/src => src}/commands/KissTools.kiss (100%) rename {projects/_standalone/kiss-vscode/src => src}/commands/Lines.kiss (100%) rename {projects/_standalone/kiss-vscode/src => src}/commands/_deprecated/EmacsPorts.kiss (100%) rename {projects/_standalone/kiss-vscode/syntaxes => syntaxes}/codeblock.json (100%) rename {projects/_standalone/kiss-vscode/syntaxes => syntaxes}/kiss.tmLanguage (100%) delete mode 100755 test-project.sh diff --git a/.gitignore b/.gitignore index 56d3cbed..9a4e1f73 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ bin/ -externLog.txt -*.memoized -.temp/ -*.pyc +*.vsix +node_modules/ \ No newline at end of file diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 28138c65..00000000 --- a/.gitmodules +++ /dev/null @@ -1,6 +0,0 @@ -[submodule "projects/_deprecated/godot-squash-the-creeps-3d/addons/haxe"] - path = projects/_deprecated/godot-squash-the-creeps-3d/addons/haxe - url = https://github.com/HaxeGodot/editor-plugin.git -[submodule "projects/_standalone/nat-godot-playground/addons/haxe"] - path = projects/_standalone/nat-godot-playground/addons/haxe - url = https://github.com/HaxeGodot/editor-plugin.git diff --git a/projects/_standalone/kiss-vscode/.haxerc b/.haxerc similarity index 100% rename from projects/_standalone/kiss-vscode/.haxerc rename to .haxerc diff --git a/projects/_standalone/kiss-vscode/.vscode/launch.json b/.vscode/launch.json similarity index 100% rename from projects/_standalone/kiss-vscode/.vscode/launch.json rename to .vscode/launch.json diff --git a/projects/_standalone/kiss-vscode/.vscode/tasks.json b/.vscode/tasks.json similarity index 100% rename from projects/_standalone/kiss-vscode/.vscode/tasks.json rename to .vscode/tasks.json diff --git a/projects/_standalone/kiss-vscode/.vscodeignore b/.vscodeignore similarity index 100% rename from projects/_standalone/kiss-vscode/.vscodeignore rename to .vscodeignore diff --git a/projects/_standalone/kiss-vscode/Kiss.configuration.json b/Kiss.configuration.json similarity index 100% rename from projects/_standalone/kiss-vscode/Kiss.configuration.json rename to Kiss.configuration.json diff --git a/README.md b/README.md index 8754c821..459b0760 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ -# Kiss +# kiss-vscode README +Experimental Kiss support for VSCode -*A type-safe, compiled Lisp for Haxe programs* +## Features -[README](kiss/README.md) +* Syntax highlighting for .kiss files +* Commands for editing kiss code -## Monorepo +## Extension Settings -This repo contains subtrees for every project in the kiss-lang organization. +## Known Issues -All contributions should be made through this repo. - -All CI is handled through this repo. \ No newline at end of file +## Release Notes \ No newline at end of file diff --git a/projects/_standalone/kiss-vscode/build.hxml b/build.hxml similarity index 100% rename from projects/_standalone/kiss-vscode/build.hxml rename to build.hxml diff --git a/projects/_standalone/kiss-vscode/haxe_libraries/haxe-strings.hxml b/haxe_libraries/haxe-strings.hxml similarity index 100% rename from projects/_standalone/kiss-vscode/haxe_libraries/haxe-strings.hxml rename to haxe_libraries/haxe-strings.hxml diff --git a/projects/_standalone/kiss-vscode/haxe_libraries/hscript.hxml b/haxe_libraries/hscript.hxml similarity index 100% rename from projects/_standalone/kiss-vscode/haxe_libraries/hscript.hxml rename to haxe_libraries/hscript.hxml diff --git a/projects/_standalone/kiss-vscode/haxe_libraries/hxnodejs.hxml b/haxe_libraries/hxnodejs.hxml similarity index 100% rename from projects/_standalone/kiss-vscode/haxe_libraries/hxnodejs.hxml rename to haxe_libraries/hxnodejs.hxml diff --git a/projects/_standalone/kiss-vscode/haxe_libraries/kiss-tools.hxml b/haxe_libraries/kiss-tools.hxml similarity index 100% rename from projects/_standalone/kiss-vscode/haxe_libraries/kiss-tools.hxml rename to haxe_libraries/kiss-tools.hxml diff --git a/projects/_standalone/kiss-vscode/haxe_libraries/kiss-vscode-api.hxml b/haxe_libraries/kiss-vscode-api.hxml similarity index 100% rename from projects/_standalone/kiss-vscode/haxe_libraries/kiss-vscode-api.hxml rename to haxe_libraries/kiss-vscode-api.hxml diff --git a/projects/_standalone/kiss-vscode/haxe_libraries/kiss.hxml b/haxe_libraries/kiss.hxml similarity index 100% rename from projects/_standalone/kiss-vscode/haxe_libraries/kiss.hxml rename to haxe_libraries/kiss.hxml diff --git a/projects/_standalone/kiss-vscode/haxe_libraries/re-flex.hxml b/haxe_libraries/re-flex.hxml similarity index 100% rename from projects/_standalone/kiss-vscode/haxe_libraries/re-flex.hxml rename to haxe_libraries/re-flex.hxml diff --git a/projects/_standalone/kiss-vscode/haxe_libraries/tink_core.hxml b/haxe_libraries/tink_core.hxml similarity index 100% rename from projects/_standalone/kiss-vscode/haxe_libraries/tink_core.hxml rename to haxe_libraries/tink_core.hxml diff --git a/projects/_standalone/kiss-vscode/haxe_libraries/tink_json.hxml b/haxe_libraries/tink_json.hxml similarity index 100% rename from projects/_standalone/kiss-vscode/haxe_libraries/tink_json.hxml rename to haxe_libraries/tink_json.hxml diff --git a/projects/_standalone/kiss-vscode/haxe_libraries/tink_macro.hxml b/haxe_libraries/tink_macro.hxml similarity index 100% rename from projects/_standalone/kiss-vscode/haxe_libraries/tink_macro.hxml rename to haxe_libraries/tink_macro.hxml diff --git a/projects/_standalone/kiss-vscode/haxe_libraries/tink_priority.hxml b/haxe_libraries/tink_priority.hxml similarity index 100% rename from projects/_standalone/kiss-vscode/haxe_libraries/tink_priority.hxml rename to haxe_libraries/tink_priority.hxml diff --git a/projects/_standalone/kiss-vscode/haxe_libraries/tink_syntaxhub.hxml b/haxe_libraries/tink_syntaxhub.hxml similarity index 100% rename from projects/_standalone/kiss-vscode/haxe_libraries/tink_syntaxhub.hxml rename to haxe_libraries/tink_syntaxhub.hxml diff --git a/projects/_standalone/kiss-vscode/haxe_libraries/tink_typecrawler.hxml b/haxe_libraries/tink_typecrawler.hxml similarity index 100% rename from projects/_standalone/kiss-vscode/haxe_libraries/tink_typecrawler.hxml rename to haxe_libraries/tink_typecrawler.hxml diff --git a/projects/_standalone/kiss-vscode/haxe_libraries/uuid.hxml b/haxe_libraries/uuid.hxml similarity index 100% rename from projects/_standalone/kiss-vscode/haxe_libraries/uuid.hxml rename to haxe_libraries/uuid.hxml diff --git a/projects/_standalone/kiss-vscode/haxe_libraries/vscode.hxml b/haxe_libraries/vscode.hxml similarity index 100% rename from projects/_standalone/kiss-vscode/haxe_libraries/vscode.hxml rename to haxe_libraries/vscode.hxml diff --git a/projects/_standalone/kiss-vscode/package-lock.json b/package-lock.json similarity index 100% rename from projects/_standalone/kiss-vscode/package-lock.json rename to package-lock.json diff --git a/projects/_standalone/kiss-vscode/package.json b/package.json similarity index 100% rename from projects/_standalone/kiss-vscode/package.json rename to package.json diff --git a/projects/_standalone/kiss-vscode/.gitignore b/projects/_standalone/kiss-vscode/.gitignore deleted file mode 100644 index 9a4e1f73..00000000 --- a/projects/_standalone/kiss-vscode/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -bin/ -*.vsix -node_modules/ \ No newline at end of file diff --git a/projects/_standalone/kiss-vscode/README.md b/projects/_standalone/kiss-vscode/README.md deleted file mode 100644 index 459b0760..00000000 --- a/projects/_standalone/kiss-vscode/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# kiss-vscode README -Experimental Kiss support for VSCode - -## Features - -* Syntax highlighting for .kiss files -* Commands for editing kiss code - -## Extension Settings - -## Known Issues - -## Release Notes \ No newline at end of file diff --git a/projects/_standalone/kiss-vscode/test.sh b/projects/_standalone/kiss-vscode/test.sh deleted file mode 100755 index 0ee8ae95..00000000 --- a/projects/_standalone/kiss-vscode/test.sh +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/bash - -haxe build.hxml \ No newline at end of file diff --git a/push-subtrees.sh b/push-subtrees.sh deleted file mode 100755 index bd3262a6..00000000 --- a/push-subtrees.sh +++ /dev/null @@ -1,14 +0,0 @@ - -#! /bin/bash -# - -git subtree push --prefix=kiss git@github.com:kiss-lang/kiss.git main - -libs=$(ls libraries) - -for lib in $libs; do - if [ $lib = "_deprecated" ]; then continue; fi - if [ $lib = "_standalone" ]; then continue; fi - - git subtree push --prefix=projects/$lib git@github.com:kiss-lang/$lib.git main -done diff --git a/projects/_standalone/kiss-vscode/src/Main.hx b/src/Main.hx similarity index 100% rename from projects/_standalone/kiss-vscode/src/Main.hx rename to src/Main.hx diff --git a/projects/_standalone/kiss-vscode/src/Main.kiss b/src/Main.kiss similarity index 100% rename from projects/_standalone/kiss-vscode/src/Main.kiss rename to src/Main.kiss diff --git a/projects/_standalone/kiss-vscode/src/commands/ExtensionTools.kiss b/src/commands/ExtensionTools.kiss similarity index 100% rename from projects/_standalone/kiss-vscode/src/commands/ExtensionTools.kiss rename to src/commands/ExtensionTools.kiss diff --git a/projects/_standalone/kiss-vscode/src/commands/KissTools.kiss b/src/commands/KissTools.kiss similarity index 100% rename from projects/_standalone/kiss-vscode/src/commands/KissTools.kiss rename to src/commands/KissTools.kiss diff --git a/projects/_standalone/kiss-vscode/src/commands/Lines.kiss b/src/commands/Lines.kiss similarity index 100% rename from projects/_standalone/kiss-vscode/src/commands/Lines.kiss rename to src/commands/Lines.kiss diff --git a/projects/_standalone/kiss-vscode/src/commands/_deprecated/EmacsPorts.kiss b/src/commands/_deprecated/EmacsPorts.kiss similarity index 100% rename from projects/_standalone/kiss-vscode/src/commands/_deprecated/EmacsPorts.kiss rename to src/commands/_deprecated/EmacsPorts.kiss diff --git a/projects/_standalone/kiss-vscode/syntaxes/codeblock.json b/syntaxes/codeblock.json similarity index 100% rename from projects/_standalone/kiss-vscode/syntaxes/codeblock.json rename to syntaxes/codeblock.json diff --git a/projects/_standalone/kiss-vscode/syntaxes/kiss.tmLanguage b/syntaxes/kiss.tmLanguage similarity index 100% rename from projects/_standalone/kiss-vscode/syntaxes/kiss.tmLanguage rename to syntaxes/kiss.tmLanguage diff --git a/test-project.sh b/test-project.sh deleted file mode 100755 index 402ad0dc..00000000 --- a/test-project.sh +++ /dev/null @@ -1,12 +0,0 @@ -#! /bin/bash - -KISS_PROJECT=${KISS_PROJECT:-$1} -KISS_PROJECT=${KISS_PROJECT:-bad-nlp} - -if [ -n "$CI_OS_NAME" ]; then - if [ ! -d projects/$KISS_PROJECT ]; then - (cd projects && git clone https://github.com/kiss-lang/$KISS_PROJECT) - fi - (cd projects/$KISS_PROJECT && lix download) -fi -(cd projects/$KISS_PROJECT && ./test.sh "${@:2}") \ No newline at end of file diff --git a/test.sh b/test.sh index b8b900e5..0ee8ae95 100755 --- a/test.sh +++ b/test.sh @@ -1,29 +1,3 @@ #! /bin/bash -KISS_TARGET=${KISS_TARGET:-$1} -KISS_TARGET=${KISS_TARGET:-interp} - -# Test projects with test-project.sh -if [ -n "$KISS_PROJECT" ] -then - ./test-project.sh -# Test Kiss with utest cases in kiss/src/test/cases -else - # If CI is running tests, basic dependencies need to be installed - if [ -n "$CI_OS_NAME" ] - then - git clone https://github.com/kiss-lang/kiss - (cd kiss && lix download) - if [ "$KISS_TARGET" = cpp ]; then - (cd kiss && lix install haxelib:hxcpp) - elif [ "$KISS_TARGET" = nodejs ]; then - (cd kiss && lix install haxelib:hxnodejs) - fi - fi - - if [ ! -z "$2" ]; then - (cd kiss && haxe -D cases=$2 build-scripts/common-args.hxml build-scripts/common-test-args.hxml build-scripts/$KISS_TARGET/test.hxml) - else - (cd kiss && haxe build-scripts/common-args.hxml build-scripts/common-test-args.hxml build-scripts/$KISS_TARGET/test.hxml) - fi -fi +haxe build.hxml \ No newline at end of file