Skip to content

Commit

Permalink
Enable all targets except swf
Browse files Browse the repository at this point in the history
  • Loading branch information
mandel59 committed Jul 21, 2020
1 parent 1530dd2 commit c3bc6b8
Show file tree
Hide file tree
Showing 12 changed files with 67 additions and 42 deletions.
2 changes: 1 addition & 1 deletion .haxerc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"version": "33d1186",
"version": "4.1.2",
"resolveLibs": "scoped"
}
10 changes: 10 additions & 0 deletions build.cpp.hxml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
-lib hx3compat

-dce full
-D eval-stack
-D analyzer-optimize

-main test.Main

-cpp test/test_cpp
-cmd test/test_cpp/Main
5 changes: 2 additions & 3 deletions build.cs.hxml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@

-main test.Main

--each

-cs test/test_cs
-cs test/test_cs
-cmd mono test/test_cs/bin/Main.exe
2 changes: 0 additions & 2 deletions build.eval.hxml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,4 @@

-main test.Main

--each

--interp
2 changes: 0 additions & 2 deletions build.java.hxml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

-main test.Main

--each

#-D jvm
-java test/test_java
-cmd java -jar test/test_java/Main.jar
11 changes: 11 additions & 0 deletions build.jvm.hxml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
-lib hx3compat

-dce full
-D eval-stack
-D analyzer-optimize

-main test.Main

-D jvm
-java test/test_java
-cmd java -jar test/test_java/Main.jar
10 changes: 10 additions & 0 deletions build.lua.hxml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
-lib hx3compat

-dce full
-D eval-stack
-D analyzer-optimize

-main test.Main

-lua test/test.lua
-cmd lua test/test.lua
19 changes: 12 additions & 7 deletions compile-test.hxml
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,23 @@

#--next
#-swf test/test.swf
#
#--next
#-java test/test_java
#-cmd java -jar test/test_java/Main.jar

--next
-java test/test_java
-cmd java -jar test/test_java/Main.jar

--next
-java test/test_jvm
-D jvm
-cmd java -jar test/test_jvm/Main.jar

--next
-cpp test/test_cpp
-cmd test/test_cpp/Main

#--next
#-cs test/test_cs
#-cmd mono test/test_cs/bin/Main.exe
--next
-cs test/test_cs
-cmd mono test/test_cs/bin/Main.exe

--next
-python test/test.py
Expand Down
4 changes: 2 additions & 2 deletions haxe_libraries/hx3compat.hxml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
-D hx3compat=1.0.3
# @install: lix --silent download "gh://github.com/haxefoundation/hx3compat#3dc168cdf9460312e79485ae8fb9dcca4f8c6b8a" into hx3compat/1.0.3/github/3dc168cdf9460312e79485ae8fb9dcca4f8c6b8a
-cp ${HAXE_LIBCACHE}/hx3compat/1.0.3/github/3dc168cdf9460312e79485ae8fb9dcca4f8c6b8a/std
# @install: lix --silent download "gh://github.com/haxefoundation/hx3compat#91edf63bfd82d0d110a51c96028905b962c7968e" into hx3compat/1.0.3/github/91edf63bfd82d0d110a51c96028905b962c7968e
-cp ${HAXE_LIBCACHE}/hx3compat/1.0.3/github/91edf63bfd82d0d110a51c96028905b962c7968e/std
4 changes: 4 additions & 0 deletions haxe_libraries/hxcpp.hxml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# @install: lix --silent download "haxelib:/hxcpp#4.1.15" into hxcpp/4.1.15/haxelib
# @run: haxelib run-dir hxcpp ${HAXE_LIBCACHE}/hxcpp/4.1.15/haxelib
-cp ${HAXE_LIBCACHE}/hxcpp/4.1.15/haxelib/
-D hxcpp=4.1.15
2 changes: 1 addition & 1 deletion run-test-on-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ dir="$(dirname "$(readlink -f "$0")")"

docker build -t mandel59/unifill-test-runner -f unifill-test-runner.dockerfile .
mkdir -p "$dir/test"
docker run --volume "$dir/test:/opt/unifill/test" mandel59/unifill-test-runner haxe compile-test.hxml
docker run --volume "$dir/test:/opt/unifill/test" mandel59/unifill-test-runner lix compile-test.hxml
38 changes: 14 additions & 24 deletions unifill-test-runner.dockerfile
Original file line number Diff line number Diff line change
@@ -1,32 +1,22 @@
FROM ubuntu:20.04

RUN apt-get update \
&& apt-get install -y software-properties-common \
&& add-apt-repository -y ppa:haxe/releases \
&& apt-get update \
&& apt-get install -y \
php php-mbstring \
python3 python-is-python3 \
lua5.1 luarocks \
haxe \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

RUN apt-get update
RUN apt-get install -y mono-devel
RUN apt-get install -y openjdk-11-jdk
RUN apt-get install -y g++
RUN apt-get install -y python3 python-is-python3
RUN apt-get install -y php php-mbstring
RUN apt-get install -y lua5.1 luarocks
RUN luarocks install luautf8 && luarocks install bit32

RUN mkdir /opt/haxelib \
&& haxelib setup /opt/haxelib \
&& haxelib install hx3compat

ADD https://deb.nodesource.com/setup_14.x /opt/setup_node_14.x
RUN bash /opt/setup_node_14.x
RUN apt-get install -y nodejs
RUN npm install --global lix

RUN bash /opt/setup_node_14.x && apt-get install -y nodejs

RUN apt-get update && apt-get install -y g++
WORKDIR /opt/unifill

RUN haxelib install hxcpp
ADD .haxerc /opt/unifill/.haxerc
ADD haxe_libraries /opt/unifill/haxe_libraries
RUN lix download

ADD . /opt/unifill

WORKDIR /opt/unifill

0 comments on commit c3bc6b8

Please sign in to comment.