Remove old extra/ tools, merge build/ and extra/ into res/

Author: kLabz

.github/workflows/main.yml

@@ -70,11 +70,6 @@ jobs:
           hx current --name
           hx current --full
 
-      - name: Install extra tools
-        run: |
-          sh ./extra/install-all.sh
-          ls -Al bin/
-
   test-windows:
     strategy:
       fail-fast: false

.gitignore

@@ -1,7 +1,7 @@
+bin/
+builds/
+data/
 releases/
+res/*.hxb
 versions/
-builds/
 current
-data/
-bin/
-build/*.hxb

Makefile

@@ -1,4 +1,4 @@
 .SILENT:
 
 build-tools:
-	extra/build-tools.sh
+	res/build-tools.sh

README.md

@@ -78,51 +78,10 @@ Switch to Haxe version specified in `.haxerc` with `hx rc`. Alternatively, one-o
 operations can be done with `hx with rc [haxe compiler args]` without altering
 currently selected Haxe version.
 
+### `haxe_libraries`
+
 Install libraries as defined in lix's `haxe_libraries` folder: `hx lix-libs`
 
 Alternatively, generate a `install.hxml` file (to be used with
 `haxelib state load install.hxml`) by running `hx lix-to-install install.hxml`
 
-## Included tools
-
-`extra/` folder contains optional tools you can install individually with their
-`install.sh` script or all at once with `install-all.sh`.
-
-Note that those have been written when Haxe Manager was unix only and probably
-can't work at all on Windows.
-
-### `++haxe`
-
-Note if you're using Haxe >= 4.3.0: this is not useful anymore, since
-[pretty errors](https://github.com/HaxeFoundation/haxe/pull/10863) were added there.
-
-Wraps `haxe` with a nodejs wrapper that parses and pretty prints Haxe errors,
-trying to guess the error hierarchy and displaying highlighted sources instead
-of just positions.
-
-Usage: `++haxe <args you would pass to haxe>`
-
-### `make-haxe`
-
-Mostly useful for bisecting or when building and switching haxe versions often.
-
-Wraps Haxe repository's `make haxe` with some cache that will be applied when
-git state is clean (or when you pass `--force-cache`). Build result (`haxe` and
-`haxelib` binaries) are stored in haxe-manager cache to avoid building next time.
-
-### `hx-mklocal`
-
-Save your current binaries + std from your local Haxe repository as a named
-version that you can use with haxe-manager.
-
-Usage: from your Haxe repository, `hx-mklocal . custom-4.4.0` (replace `.` with
-the path to your repository if you're executing from somewhere else)
-
-### `hx-upgrade`
-
-Update your local (git) copy of haxe-manager.
-
-### `rofi-haxe`
-
-[rofi](https://github.com/davatorium/rofi) wrapper to `hx` command, to graphically select a Haxe version.
-

extra/++haxe/++haxe.sh

@@ -1,25 +1,25 @@
 @ECHO OFF
 
 SET ROOT=%~dp0
-REM TODO: from build/.current
+REM TODO: from res/.current
 SET HAXE_VER=5e4e368
 
 MKDIR "releases"
 MKDIR "versions"
 MKDIR "bin"
 
 REM Install base tools
-ECHO F | XCOPY /S /Q /Y /F "extra/haxe.bat" "bin/haxe.bat"
-ECHO F | XCOPY /S /Q /Y /F "extra/haxelib.bat" "bin/haxelib.bat"
-ECHO F | XCOPY /S /Q /Y /F "extra/hx.bat" "bin/hx.bat"
-ECHO F | XCOPY /S /Q /Y /F "extra/hxlib.bat" "bin/hxlib.bat"
+ECHO F | XCOPY /S /Q /Y /F "res/haxe.bat" "bin/haxe.bat"
+ECHO F | XCOPY /S /Q /Y /F "res/haxelib.bat" "bin/haxelib.bat"
+ECHO F | XCOPY /S /Q /Y /F "res/hx.bat" "bin/hx.bat"
+ECHO F | XCOPY /S /Q /Y /F "res/hxlib.bat" "bin/hxlib.bat"
 
 REM Setup included Haxe version
-MKLINK /D "versions/5.0.0-alpha.1+%HAXE_VER%" "%ROOT%/build/windows64_%HAXE_VER%"
-MKLINK /D "current" "%ROOT%/build/windows64_%HAXE_VER%"
+MKLINK /D "versions/5.0.0-alpha.1+%HAXE_VER%" "%ROOT%/res/windows64_%HAXE_VER%"
+MKLINK /D "current" "%ROOT%/res/windows64_%HAXE_VER%"
 
 REM Prebuild cli
-%ROOT%/build/windows64_%HAXE_VER%/haxe.exe --cwd %ROOT% build.hxml --hxb build/hx.hxb
+%ROOT%/res/windows64_%HAXE_VER%/haxe.exe --cwd %ROOT% build.hxml --hxb res/hx.hxb
 
 ECHO "Please add %ROOT%/bin to your PATH"
 ECHO "Please set HAXE_STD_PATH to %ROOT%/current/std"

extra/++haxe/install.sh

@@ -1,15 +1,15 @@
 #!/bin/bash
 
 ROOT=$(dirname $(readlink -f $0))
-HAXE_VER=$(cat $ROOT/build/.current)
+HAXE_VER=$(cat $ROOT/res/.current)
 
 mkdir -p "$ROOT/releases"
 mkdir -p "$ROOT/versions"
 mkdir -p "$ROOT/bin"
 
 # Install cli launcher
-cp extra/hx bin/
-cp extra/hxlib bin/
+cp res/hx bin/
+cp res/hxlib bin/
 
 BUILD_OS="linux64"
 if [[ "$OSTYPE" == "darwin"* ]]; then
@@ -19,10 +19,10 @@ fi
 
 # Setup included Haxe version
 if ! [ -L "versions/5.0.0-alpha.1+$HAXE_VER" ]; then
-	ln -s "$ROOT/build/${BUILD_OS}_$HAXE_VER" "versions/5.0.0-alpha.1+$HAXE_VER"
+	ln -s "$ROOT/res/${BUILD_OS}_$HAXE_VER" "versions/5.0.0-alpha.1+$HAXE_VER"
 fi
 if ! [ -L "current" ]; then
-	ln -s "$ROOT/build/${BUILD_OS}_${HAXE_VER}" "current"
+	ln -s "$ROOT/res/${BUILD_OS}_${HAXE_VER}" "current"
 fi
 
 # Expose haxe command
@@ -36,7 +36,7 @@ if ! [ -L "bin/haxelib" ]; then
 fi
 
 # Prebuild cli
-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
+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
 
 echo "Please add $ROOT/bin to your PATH"
 echo "Please set HAXE_STD_PATH to $ROOT/current/std"

extra/++haxe/package.json

@@ -6,7 +6,7 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
 	BUILD_OS="mac"
 fi
 
-HAXE_VER=$(cat $ROOT/build/.current)
+HAXE_VER=$(cat $ROOT/res/.current)
 VERSION="${BUILD_OS}_${HAXE_VER}"
 
-HAXE_STD_PATH=$ROOT/build/$VERSION/std/ $ROOT/build/$VERSION/haxe --cwd $ROOT build.hxml --hxb build/hx.hxb
+HAXE_STD_PATH=$ROOT/res/$VERSION/std/ $ROOT/res/$VERSION/haxe --cwd $ROOT build.hxml --hxb res/hx.hxb