Skip to content

Commit 49cec58

Browse files
committed
Remove old extra/ tools, merge build/ and extra/ into res/
1 parent 14f80a5 commit 49cec58

File tree

7,681 files changed

+43
-286
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

7,681 files changed

+43
-286
lines changed

.github/workflows/main.yml

-5
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,6 @@ jobs:
7070
hx current --name
7171
hx current --full
7272
73-
- name: Install extra tools
74-
run: |
75-
sh ./extra/install-all.sh
76-
ls -Al bin/
77-
7873
test-windows:
7974
strategy:
8075
fail-fast: false

.gitignore

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
bin/
2+
builds/
3+
data/
14
releases/
5+
res/*.hxb
26
versions/
3-
builds/
47
current
5-
data/
6-
bin/
7-
build/*.hxb

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
.SILENT:
22

33
build-tools:
4-
extra/build-tools.sh
4+
res/build-tools.sh

README.md

+2-43
Original file line numberDiff line numberDiff line change
@@ -78,51 +78,10 @@ Switch to Haxe version specified in `.haxerc` with `hx rc`. Alternatively, one-o
7878
operations can be done with `hx with rc [haxe compiler args]` without altering
7979
currently selected Haxe version.
8080

81+
### `haxe_libraries`
82+
8183
Install libraries as defined in lix's `haxe_libraries` folder: `hx lix-libs`
8284

8385
Alternatively, generate a `install.hxml` file (to be used with
8486
`haxelib state load install.hxml`) by running `hx lix-to-install install.hxml`
8587

86-
## Included tools
87-
88-
`extra/` folder contains optional tools you can install individually with their
89-
`install.sh` script or all at once with `install-all.sh`.
90-
91-
Note that those have been written when Haxe Manager was unix only and probably
92-
can't work at all on Windows.
93-
94-
### `++haxe`
95-
96-
Note if you're using Haxe >= 4.3.0: this is not useful anymore, since
97-
[pretty errors](https://github.com/HaxeFoundation/haxe/pull/10863) were added there.
98-
99-
Wraps `haxe` with a nodejs wrapper that parses and pretty prints Haxe errors,
100-
trying to guess the error hierarchy and displaying highlighted sources instead
101-
of just positions.
102-
103-
Usage: `++haxe <args you would pass to haxe>`
104-
105-
### `make-haxe`
106-
107-
Mostly useful for bisecting or when building and switching haxe versions often.
108-
109-
Wraps Haxe repository's `make haxe` with some cache that will be applied when
110-
git state is clean (or when you pass `--force-cache`). Build result (`haxe` and
111-
`haxelib` binaries) are stored in haxe-manager cache to avoid building next time.
112-
113-
### `hx-mklocal`
114-
115-
Save your current binaries + std from your local Haxe repository as a named
116-
version that you can use with haxe-manager.
117-
118-
Usage: from your Haxe repository, `hx-mklocal . custom-4.4.0` (replace `.` with
119-
the path to your repository if you're executing from somewhere else)
120-
121-
### `hx-upgrade`
122-
123-
Update your local (git) copy of haxe-manager.
124-
125-
### `rofi-haxe`
126-
127-
[rofi](https://github.com/davatorium/rofi) wrapper to `hx` command, to graphically select a Haxe version.
128-

extra/++haxe/++haxe.sh

-13
This file was deleted.

extra/++haxe/install.sh

-15
This file was deleted.

extra/++haxe/package.json

-8
This file was deleted.

extra/++haxe/parse.js

-27
This file was deleted.

extra/hx.bat

-12
This file was deleted.

extra/install-all.sh

-9
This file was deleted.

extra/local/hx-mklocal.sh

-39
This file was deleted.

extra/local/install.sh

-12
This file was deleted.

extra/make-haxe/install.sh

-14
This file was deleted.

extra/make-haxe/make-haxe.sh

-27
This file was deleted.

extra/rofi/install.sh

-11
This file was deleted.

extra/rofi/rofi-haxe.sh

-3
This file was deleted.

extra/upgrade/hx-upgrade.sh

-7
This file was deleted.

extra/upgrade/install.sh

-12
This file was deleted.

install.bat

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
@ECHO OFF
22

33
SET ROOT=%~dp0
4-
REM TODO: from build/.current
4+
REM TODO: from res/.current
55
SET HAXE_VER=5e4e368
66

77
MKDIR "releases"
88
MKDIR "versions"
99
MKDIR "bin"
1010

1111
REM Install base tools
12-
ECHO F | XCOPY /S /Q /Y /F "extra/haxe.bat" "bin/haxe.bat"
13-
ECHO F | XCOPY /S /Q /Y /F "extra/haxelib.bat" "bin/haxelib.bat"
14-
ECHO F | XCOPY /S /Q /Y /F "extra/hx.bat" "bin/hx.bat"
15-
ECHO F | XCOPY /S /Q /Y /F "extra/hxlib.bat" "bin/hxlib.bat"
12+
ECHO F | XCOPY /S /Q /Y /F "res/haxe.bat" "bin/haxe.bat"
13+
ECHO F | XCOPY /S /Q /Y /F "res/haxelib.bat" "bin/haxelib.bat"
14+
ECHO F | XCOPY /S /Q /Y /F "res/hx.bat" "bin/hx.bat"
15+
ECHO F | XCOPY /S /Q /Y /F "res/hxlib.bat" "bin/hxlib.bat"
1616

1717
REM Setup included Haxe version
18-
MKLINK /D "versions/5.0.0-alpha.1+%HAXE_VER%" "%ROOT%/build/windows64_%HAXE_VER%"
19-
MKLINK /D "current" "%ROOT%/build/windows64_%HAXE_VER%"
18+
MKLINK /D "versions/5.0.0-alpha.1+%HAXE_VER%" "%ROOT%/res/windows64_%HAXE_VER%"
19+
MKLINK /D "current" "%ROOT%/res/windows64_%HAXE_VER%"
2020

2121
REM Prebuild cli
22-
%ROOT%/build/windows64_%HAXE_VER%/haxe.exe --cwd %ROOT% build.hxml --hxb build/hx.hxb
22+
%ROOT%/res/windows64_%HAXE_VER%/haxe.exe --cwd %ROOT% build.hxml --hxb res/hx.hxb
2323

2424
ECHO "Please add %ROOT%/bin to your PATH"
2525
ECHO "Please set HAXE_STD_PATH to %ROOT%/current/std"

install.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
#!/bin/bash
22

33
ROOT=$(dirname $(readlink -f $0))
4-
HAXE_VER=$(cat $ROOT/build/.current)
4+
HAXE_VER=$(cat $ROOT/res/.current)
55

66
mkdir -p "$ROOT/releases"
77
mkdir -p "$ROOT/versions"
88
mkdir -p "$ROOT/bin"
99

1010
# Install cli launcher
11-
cp extra/hx bin/
12-
cp extra/hxlib bin/
11+
cp res/hx bin/
12+
cp res/hxlib bin/
1313

1414
BUILD_OS="linux64"
1515
if [[ "$OSTYPE" == "darwin"* ]]; then
@@ -19,10 +19,10 @@ fi
1919

2020
# Setup included Haxe version
2121
if ! [ -L "versions/5.0.0-alpha.1+$HAXE_VER" ]; then
22-
ln -s "$ROOT/build/${BUILD_OS}_$HAXE_VER" "versions/5.0.0-alpha.1+$HAXE_VER"
22+
ln -s "$ROOT/res/${BUILD_OS}_$HAXE_VER" "versions/5.0.0-alpha.1+$HAXE_VER"
2323
fi
2424
if ! [ -L "current" ]; then
25-
ln -s "$ROOT/build/${BUILD_OS}_${HAXE_VER}" "current"
25+
ln -s "$ROOT/res/${BUILD_OS}_${HAXE_VER}" "current"
2626
fi
2727

2828
# Expose haxe command
@@ -36,7 +36,7 @@ if ! [ -L "bin/haxelib" ]; then
3636
fi
3737

3838
# Prebuild cli
39-
HAXE_STD_PATH="$ROOT/build/${BUILD_OS}_${HAXE_VER}/std/" "$ROOT/build/${BUILD_OS}_${HAXE_VER}/haxe" --cwd "$ROOT" build.hxml --hxb build/hx.hxb
39+
HAXE_STD_PATH="$ROOT/res/${BUILD_OS}_${HAXE_VER}/std/" "$ROOT/res/${BUILD_OS}_${HAXE_VER}/haxe" --cwd "$ROOT" build.hxml --hxb res/hx.hxb
4040

4141
echo "Please add $ROOT/bin to your PATH"
4242
echo "Please set HAXE_STD_PATH to $ROOT/current/std"

build/.current res/.current

File renamed without changes.

extra/build-tools.sh res/build-tools.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
66
BUILD_OS="mac"
77
fi
88

9-
HAXE_VER=$(cat $ROOT/build/.current)
9+
HAXE_VER=$(cat $ROOT/res/.current)
1010
VERSION="${BUILD_OS}_${HAXE_VER}"
1111

12-
HAXE_STD_PATH=$ROOT/build/$VERSION/std/ $ROOT/build/$VERSION/haxe --cwd $ROOT build.hxml --hxb build/hx.hxb
12+
HAXE_STD_PATH=$ROOT/res/$VERSION/std/ $ROOT/res/$VERSION/haxe --cwd $ROOT build.hxml --hxb res/hx.hxb
File renamed without changes.

extra/haxe.bat res/haxe.bat

File renamed without changes.

extra/haxelib.bat res/haxelib.bat

File renamed without changes.

0 commit comments

Comments
 (0)