diff --git a/.gitignore b/.gitignore index cb95e054f..2c4591789 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ # Generated build files -building +build # Generated files mods/noita-mp/luacov.stats.out diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 7e20625e5..e1cc99960 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -74,40 +74,42 @@ "problemMatcher": [] }, { - "label": "eNet & lua-enet: Clean builds", + "label": "lua-enet: 1. Clean builds", "type": "shell", "windows": { - "command": "cd ${workspaceFolder} && if exist building rd /s building /q" + "command": "echo '1.' && cd ${workspaceFolder} && IF EXIST build (rd /s build /q) ELSE (echo 'No clean builds necessary') && mkdir build" }, "problemMatcher": [] }, { - "label": "eNet: create and run build", + "label": "lua-enet: 2. Add or update lua-enet dependency", "type": "shell", - "dependsOrder": "sequence", - "dependsOn": ["eNet & lua-enet: Clean builds"], "windows": { - "command": "cd ${workspaceFolder} && if not exist building mkdir building && cd building && git clone --depth 1 --branch v1.3.17-add-ons https://github.com/Ismoh/enet.git && cd enet && if not exist build mkdir build && cmake -S . -B build && cmake --build build --config Release && cmake --build build --config Debug" + "command": "echo '2.' && cd ${workspaceFolder}\\build && git clone --depth 1 --branch master https://github.com/Ismoh/lua-enet.git && cd lua-enet && gh release download v2.3.6 --repo zpl-c/enet --clobber" }, "problemMatcher": [] }, { - "label": "lua-enet: pre-build", + "label": "lua-enet: 3. pre-build", "type": "shell", "dependsOrder": "sequence", - "dependsOn": ["eNet: create and run build", "Compile LuaJIT-2.1.0-beta3"], + "dependsOn": ["Compile LuaJIT-2.1.0-beta3"], "windows": { - "command": "cd ${workspaceFolder} && cd building && git clone --depth 1 --branch master https://github.com/Ismoh/lua-enet.git && cd ${workspaceFolder} && xcopy LuaJIT-2.1.0-beta3\\bin building\\lua-enet\\luajit2.1\\bin\\ /E/H && xcopy LuaJIT-2.1.0-beta3\\include building\\lua-enet\\luajit2.1\\include\\ /E/H && xcopy building\\enet\\build\\CMakeFiles\\enet.dir building\\lua-enet\\build\\CMakeFiles\\enet.dir\\ /E/H && xcopy building\\enet\\include\\enet building\\lua-enet\\enet\\ && xcopy building\\enet\\build\\enet.lib building\\lua-enet\\enet\\ /E/H" + "command": "echo '3.' && cd ${workspaceFolder} && xcopy LuaJIT-2.1.0-beta3\\bin build\\lua-enet\\luajit2.1\\bin\\ /E/H && xcopy LuaJIT-2.1.0-beta3\\include build\\lua-enet\\luajit2.1\\include\\ /E/H" }, "problemMatcher": [] }, { - "label": "lua-enet: create and run build", + "label": "lua-enet: 0. create and run build (automated / one-click solution)", "type": "shell", "dependsOrder": "sequence", - "dependsOn": ["eNet & lua-enet: Clean builds", "eNet: create and run build", "Compile LuaJIT-2.1.0-beta3", "lua-enet: pre-build"], + "dependsOn": [ + "lua-enet: 1. Clean builds", + "lua-enet: 2. Add or update lua-enet dependency", + "lua-enet: 3. pre-build" + ], "windows": { - "command": "cd ${workspaceFolder} && cd building && cd lua-enet && cmake -S . -B build && cmake --build build --config Release && cmake --build build --config Debug" + "command": "echo '0.' && cd ${workspaceFolder} && cd build && cd lua-enet && cmake -S . -B build && cmake --build build --config Release && cmake --build build --config Debug" }, "problemMatcher": [] }