reorganize kiss into its own directory

This commit is contained in:
2020-12-05 18:35:09 -07:00
parent cebe5c23a6
commit 7ff7bab555
38 changed files with 21 additions and 21 deletions

View File

@@ -1,5 +1,5 @@
-lib hscript
-lib uuid
-lib tink_macro
-cp src
-cp kiss/src
-D analyzer-optimize

View File

@@ -0,0 +1,3 @@
-lib hxcpp
-cpp bin/cpp/test
-cmd bash kiss/build-scripts/cpp/test-cpp.sh

View File

View File

@@ -0,0 +1,2 @@
--python bin/py/test.py
--cmd bash kiss/build-scripts/py/test-py.sh

View File

@@ -1,4 +1,4 @@
-cp src
-cp kiss/src
-lib hscript
-lib uuid
-lib tink_macro

4
kiss/src/kiss/Main.hx Normal file
View File

@@ -0,0 +1,4 @@
package kiss;
@:build(kiss.Kiss.build("kiss/src/kiss/Main.kiss"))
class Main {}

View File

@@ -7,7 +7,7 @@ import kiss.List;
using StringTools;
@:build(kiss.Kiss.build("src/test/cases/BasicTestCase.kiss"))
@:build(kiss.Kiss.build("kiss/src/test/cases/BasicTestCase.kiss"))
class BasicTestCase extends Test {
function testStaticVar() {
Assert.equals("Howdy", BasicTestCase.message);

View File

@@ -4,7 +4,7 @@ import utest.Test;
import utest.Assert;
import kiss.Prelude;
@:build(kiss.Kiss.build("src/test/cases/ReaderMacroTestCase.kiss"))
@:build(kiss.Kiss.build("kiss/src/test/cases/ReaderMacroTestCase.kiss"))
class ReaderMacroTestCase extends Test {
function testReadBang() {
Assert.equals("String that takes the rest of the line", ReaderMacroTestCase.myLine());

View File

@@ -1,4 +1,4 @@
#! /bin/bash
haxelib dev kiss ../../
haxelib dev kiss ../../kiss
haxe build.hxml

View File

@@ -1,6 +1,6 @@
#! /bin/bash
haxelib dev kiss ../../
haxelib dev kiss ../../kiss
echo "" > test-output.txt
expected=$'hey\nhey\nhey'
if [[ $(uname) == *"MINGW"* ]] || [ $TRAVIS_OS_NAME = "windows" ]; then

View File

@@ -3,5 +3,5 @@
if [ ! -z "$TRAVIS_OS_NAME" ]; then
npm install pdf-lib
fi
haxelib dev kiss ../../
haxelib dev kiss ../../kiss
haxe build.hxml

View File

@@ -1,3 +0,0 @@
-lib hxcpp
-cpp bin/cpp/test
-cmd bash src/build-scripts/cpp/test-cpp.sh

View File

@@ -1,2 +0,0 @@
--python bin/py/test.py
--cmd bash src/build-scripts/py/test-py.sh

View File

@@ -1,4 +0,0 @@
package kiss;
@:build(kiss.Kiss.build("src/kiss/Main.kiss"))
class Main {}

View File

@@ -4,12 +4,12 @@
# Dependencies won't be installed first
# Test the Kiss compiler on every target language:
TEST_FILES=src/build-scripts/**/test.hxml
TEST_FILES=kiss/build-scripts/**/test.hxml
for TEST_FILE in $TEST_FILES
do
echo $TEST_FILE
haxe src/build-scripts/common-args.hxml src/build-scripts/common-test-args.hxml $TEST_FILE
haxe kiss/build-scripts/common-args.hxml kiss/build-scripts/common-test-args.hxml $TEST_FILE
if [ ! $? -eq 0 ]
then
exit 1

View File

@@ -10,9 +10,9 @@ else
# For CI tests, force install the dependencies
if [ ! -z "$TRAVIS_OS_NAME" ]
then
(cd src/build-scripts && haxelib install all --always)
(cd src/build-scripts/$KISS_TARGET && haxelib install all --always)
(cd kiss/build-scripts && haxelib install all --always)
(cd kiss/build-scripts/$KISS_TARGET && haxelib install all --always)
fi
haxe src/build-scripts/common-args.hxml src/build-scripts/common-test-args.hxml src/build-scripts/$KISS_TARGET/test.hxml
haxe kiss/build-scripts/common-args.hxml kiss/build-scripts/common-test-args.hxml kiss/build-scripts/$KISS_TARGET/test.hxml
fi