Skip to content

Commit

Permalink
Put shared flags into each.hxml
Browse files Browse the repository at this point in the history
  • Loading branch information
tobil4sk committed Aug 26, 2024
1 parent fbf0d0a commit dcedcdb
Show file tree
Hide file tree
Showing 12 changed files with 20 additions and 42 deletions.
12 changes: 6 additions & 6 deletions Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ run.n:
COPY .git .git
COPY src src
COPY hx3compat hx3compat
COPY client.hxml haxelib.json .
COPY client.hxml each.hxml haxelib.json .
RUN haxe client.hxml
SAVE ARTIFACT run.n AS LOCAL run.n

Expand All @@ -214,7 +214,7 @@ haxelib-binary:
COPY .git .git
COPY src src
COPY hx3compat hx3compat
COPY client_cpp.hxml haxelib.json .
COPY client_cpp.hxml each.hxml haxelib.json .
RUN haxe client_cpp.hxml
SAVE ARTIFACT haxelib AS LOCAL haxelib

Expand Down Expand Up @@ -359,7 +359,7 @@ haxelib-server-builder:

haxelib-server-legacy:
FROM +haxelib-server-builder
COPY server_legacy.hxml server_each.hxml .
COPY server_legacy.hxml server_each.hxml each.hxml .
COPY src src
COPY hx3compat hx3compat
COPY www/legacy www/legacy
Expand All @@ -368,7 +368,7 @@ haxelib-server-legacy:

haxelib-server-website:
FROM +haxelib-server-builder
COPY server_website.hxml server_each.hxml .
COPY server_website.hxml server_each.hxml each.hxml .
COPY src src
COPY hx3compat hx3compat
RUN haxe server_website.hxml
Expand All @@ -382,15 +382,15 @@ haxelib-server-website-highlighter:

haxelib-server-tasks:
FROM +haxelib-server-builder
COPY server_tasks.hxml server_each.hxml .
COPY server_tasks.hxml server_each.hxml each.hxml .
COPY src src
COPY hx3compat hx3compat
RUN haxe server_tasks.hxml
SAVE ARTIFACT www/tasks.n

haxelib-server-api:
FROM +haxelib-server-builder
COPY server_api.hxml server_each.hxml .
COPY server_api.hxml server_each.hxml each.hxml .
COPY src src
COPY hx3compat hx3compat
RUN haxe server_api.hxml
Expand Down
5 changes: 1 addition & 4 deletions client.hxml
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
-cp src
-cp hx3compat/std
-cp hx4compat/std
-cp crypto/src
each.hxml
-neko run.n
-main haxelib.client.Main
7 changes: 2 additions & 5 deletions client_cpp.hxml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
-cp src
-cp hx3compat/std
-cp hx4compat/std
-cp crypto/src
each.hxml
--cpp bin/cpp
-main haxelib.client.Main
--main haxelib.client.Main
-D destination=../../haxelib{EXESUFFIX}
--dce full
-D analyzer-optimize
5 changes: 1 addition & 4 deletions client_legacy.hxml
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
-cp src
-cp hx3compat/std
-cp hx4compat/std
-cp crypto/src
each.hxml
-neko bin/legacyhaxelib.n
-main legacyhaxelib.Main
5 changes: 1 addition & 4 deletions client_tests.hxml
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
-p src
each.hxml
-p test
-p hx3compat/std
-p hx4compat/std
-p crypto/src
--main HaxelibTests
--debug
--neko bin/test.n
4 changes: 4 additions & 0 deletions each.hxml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-cp src
-cp hx3compat/std
-cp hx4compat/std
-cp crypto/src
7 changes: 2 additions & 5 deletions integration_tests.hxml
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
-cp src
-cp test
-lib hx3compat
-cp hx4compat/std
-cp crypto/src
each.hxml
-p test
-main IntegrationTests
-neko bin/integration_tests.n
5 changes: 1 addition & 4 deletions package.hxml
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
-cp src
-cp hx3compat/std
-cp hx4compat/std
-cp crypto/src
-p src
--run Package
5 changes: 1 addition & 4 deletions server_each.hxml
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
-cp src
-cp hx3compat/std
-cp hx4compat/std
-cp crypto/src
each.hxml
-lib ufront
-lib ufront-mail:1.0.0-rc.4
-lib ufront-ufadmin
Expand Down
5 changes: 1 addition & 4 deletions server_gitrepo.hxml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
--class-path src
each.hxml
--class-path lib/dts2hx-generated
--class-path lib/node-sys-db
--class-path hx3compat/std
--class-path hx4compat/std
--class-path crypto/src
--library hxnodejs
--library record-macros
--js gitrepo.js
Expand Down
1 change: 0 additions & 1 deletion server_legacy.hxml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
server_each.hxml
-cp src
-neko www/legacy/index.n
-main legacyhaxelib.Site
-lib hx2compat
Expand Down
1 change: 0 additions & 1 deletion src/Package.hx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import haxe.zip.Tools;

import sys.io.File;
import sys.FileSystem;
import haxelib.client.Main.VERSION;
import haxelib.Data.Infos;

using StringTools;
Expand Down

0 comments on commit dcedcdb

Please sign in to comment.