Skip to content

Commit f559404

Browse files
committed
Remove hx-download and hx-select
Use hx download / hx select instead
1 parent 0983a21 commit f559404

File tree

8 files changed

+5
-184
lines changed

8 files changed

+5
-184
lines changed

.github/workflows/main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
echo "Check Haxe version"
5555
haxe --version
5656
echo "Switch to dev"
57-
hx-select dev
57+
hx select dev
5858
echo "Check Haxe version"
5959
haxe --version
6060
echo "Switch to 4.3.4"
@@ -126,7 +126,7 @@ jobs:
126126
echo "Check Haxe version"
127127
haxe --version
128128
echo "Switch to dev"
129-
hx-select dev
129+
hx select dev
130130
echo "Check Haxe version"
131131
haxe --version
132132
echo "Switch to 4.3.4"

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
.haxelib
21
releases/
32
versions/
43
builds/

extra/hx-download

-138
This file was deleted.

extra/hx-download.bat

-8
This file was deleted.

extra/hx-select

-16
This file was deleted.

extra/hx-select.bat

-8
This file was deleted.

install.bat

+1-5
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,13 @@ REM Install base tools
1111
ECHO F | XCOPY /S /Q /Y /F "extra/haxe.bat" "bin/haxe.bat"
1212
ECHO F | XCOPY /S /Q /Y /F "extra/haxelib.bat" "bin/haxelib.bat"
1313
ECHO F | XCOPY /S /Q /Y /F "extra/hx.bat" "bin/hx.bat"
14-
ECHO F | XCOPY /S /Q /Y /F "extra/hx-download.bat" "bin/hx-download.bat"
15-
ECHO F | XCOPY /S /Q /Y /F "extra/hx-select.bat" "bin/hx-select.bat"
1614

1715
REM Setup included Haxe version
1816
MKLINK /D "versions/5.0.0-alpha.1+%HAXE_VER%" "%ROOT%/build/windows64_%HAXE_VER%"
1917
MKLINK /D "current" "%ROOT%/build/windows64_%HAXE_VER%"
2018

21-
REM Prebuild tools
19+
REM Prebuild cli
2220
%ROOT%/build/windows64_%HAXE_VER%/haxe.exe --cwd %ROOT% build-hx.hxml
23-
%ROOT%/build/windows64_%HAXE_VER%/haxe.exe --cwd %ROOT% build-select.hxml
24-
%ROOT%/build/windows64_%HAXE_VER%/haxe.exe --cwd %ROOT% build-download.hxml
2521

2622
ECHO "Please add %ROOT%/bin to your PATH"
2723
ECHO "Please set HAXE_STD_PATH to %ROOT%/current/std"

install.sh

+2-6
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@ mkdir -p "$ROOT/releases"
77
mkdir -p "$ROOT/versions"
88
mkdir -p "$ROOT/bin"
99

10-
# Install base tools
10+
# Install cli launcher
1111
cp extra/hx bin/
12-
cp extra/hx-download bin/
13-
cp extra/hx-select bin/
1412

1513
BUILD_OS="linux64"
1614
if [[ "$OSTYPE" == "darwin"* ]]; then
@@ -36,10 +34,8 @@ if ! [ -e "bin/haxelib" ]; then
3634
ln -s ../current/haxelib bin/haxelib
3735
fi
3836

39-
# Prebuild tools
37+
# Prebuild cli
4038
HAXE_STD_PATH="$ROOT/build/${BUILD_OS}_${HAXE_VER}/std/" "$ROOT/build/${BUILD_OS}_${HAXE_VER}/haxe" --cwd "$ROOT" build-hx.hxml
41-
HAXE_STD_PATH="$ROOT/build/${BUILD_OS}_${HAXE_VER}/std/" "$ROOT/build/${BUILD_OS}_${HAXE_VER}/haxe" --cwd "$ROOT" build-select.hxml
42-
HAXE_STD_PATH="$ROOT/build/${BUILD_OS}_${HAXE_VER}/std/" "$ROOT/build/${BUILD_OS}_${HAXE_VER}/haxe" --cwd "$ROOT" build-download.hxml
4339

4440
echo "Please add $ROOT/bin to your PATH"
4541
echo "Please set HAXE_STD_PATH to $ROOT/current/std"

0 commit comments

Comments
 (0)