From b6de5bb71206cd2e6c64a87f7fc8c1f44200560c Mon Sep 17 00:00:00 2001 From: Caroline Joy Bell Date: Mon, 9 Jan 2023 08:57:09 -0800 Subject: [PATCH 1/8] Create tasks.json Enables Visual Studio code integration with Waf for configure and build. --- .vscode/tasks.json | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 .vscode/tasks.json diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 00000000..5fa3b6e3 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,42 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "Configure Waf for host OS: x86", + "type": "shell", + "problemMatcher": [], + "command": "./waf configure -T release --prefix=out/", + "windows": { + "command": "./waf.bat configure -T release --prefix=out/" + } + }, + { + "label": "Configure Waf for host OS: x86_64", + "type": "shell", + "problemMatcher": [], + "command": "./waf configure -T release --64bits --prefix=out/", + "windows": { + "command": "./waf.bat configure -T release --64bits --prefix=out/" + } + }, + { + "label": "Configure Waf for outdated Android", + "type": "shell", + "problemMatcher": [], + "command": "./waf configure -T release --android=armeabi-v7a-hard,4.9,21", + "windows": { + "command": "echo \"Not supported on Windows.\"" + } + }, + { + "label": "Build", + "type": "shell", + "problemMatcher": [], + "command": "./waf install", + "group": { + "kind": "build", + "isDefault": true + } + } + ] +} From edb08661f26936dcac08eeca08e56910db181d26 Mon Sep 17 00:00:00 2001 From: Caroline Joy Bell Date: Thu, 12 Jan 2023 21:15:42 -0800 Subject: [PATCH 2/8] Update tasks.json Addresses some comments by @exstrim401. These changes were made through GitHub's editor, they have not been tested. --- .vscode/tasks.json | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 5fa3b6e3..d4f801a0 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -2,28 +2,28 @@ "version": "2.0.0", "tasks": [ { - "label": "Configure Waf for host OS: x86", + "label": "Configure Waf for Debug 32-bit", "type": "shell", + "command": "./waf configure -T debug --prefix=out/", "problemMatcher": [], - "command": "./waf configure -T release --prefix=out/", "windows": { - "command": "./waf.bat configure -T release --prefix=out/" + "command": "./waf.bat configure -T debug --prefix=out/" } }, { - "label": "Configure Waf for host OS: x86_64", + "label": "Configure Waf for Debug 64-bit", "type": "shell", + "command": "./waf configure -T debug --64bits --prefix=out/", "problemMatcher": [], - "command": "./waf configure -T release --64bits --prefix=out/", "windows": { - "command": "./waf.bat configure -T release --64bits --prefix=out/" + "command": "./waf.bat configure -T debug --64bits --prefix=out/" } }, { - "label": "Configure Waf for outdated Android", + "label": "Configure Waf for Debug on outdated Android", "type": "shell", - "problemMatcher": [], "command": "./waf configure -T release --android=armeabi-v7a-hard,4.9,21", + "problemMatcher": [], "windows": { "command": "echo \"Not supported on Windows.\"" } @@ -31,11 +31,21 @@ { "label": "Build", "type": "shell", - "problemMatcher": [], "command": "./waf install", + "problemMatcher": { + "base": "$gcc", + "fileLocation": ["relative", "${workspaceFolder}/build"] + }, "group": { "kind": "build", "isDefault": true + }, + "windows": { + "command": "./waf.bat install", + "problemMatcher": { + "base": "$msCompile", + "fileLocation": ["relative", "${workspaceFolder}/build"] + } } } ] From ef9f4b2965fee47234a033b0f9e8d453b558da41 Mon Sep 17 00:00:00 2001 From: Caroline Joy Bell Date: Thu, 12 Jan 2023 21:34:29 -0800 Subject: [PATCH 3/8] Update tasks.json Adds macOS-specific commands --- .vscode/tasks.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index d4f801a0..c045c688 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -8,6 +8,9 @@ "problemMatcher": [], "windows": { "command": "./waf.bat configure -T debug --prefix=out/" + }, + "osx": { + "command": "python3 waf configure -T debug --prefix=out/" } }, { @@ -17,6 +20,9 @@ "problemMatcher": [], "windows": { "command": "./waf.bat configure -T debug --64bits --prefix=out/" + }, + "osx": { + "command": "python3 waf configure -T debug --64bits --prefix=out/" } }, { @@ -46,6 +52,9 @@ "base": "$msCompile", "fileLocation": ["relative", "${workspaceFolder}/build"] } + }, + "osx": { + "command": "python3 waf install" } } ] From 02c60cf2c7bb44d9eb25affd960b331230305467 Mon Sep 17 00:00:00 2001 From: Caroline Joy Bell Date: Thu, 12 Jan 2023 21:38:45 -0800 Subject: [PATCH 4/8] Update tasks.json Adding commands for Android build on Windows and macOS just in case it's now supported. This will just result in an error if it's not supported anyway. --- .vscode/tasks.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index c045c688..0e74f0cb 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -31,7 +31,10 @@ "command": "./waf configure -T release --android=armeabi-v7a-hard,4.9,21", "problemMatcher": [], "windows": { - "command": "echo \"Not supported on Windows.\"" + "command": "./waf.bat configure -T release --android=armeabi-v7a-hard,4.9,21" + }, + "osx": { + "command": "python3 waf configure -T release --android=armeabi-v7a-hard,4.9,21" } }, { From ecfe257da2b470c1d67ab7b357a27a6b661c562a Mon Sep 17 00:00:00 2001 From: Caroline Joy Bell Date: Fri, 13 Jan 2023 07:50:03 -0800 Subject: [PATCH 5/8] Update tasks.json --- .vscode/tasks.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 0e74f0cb..5b236400 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -26,7 +26,7 @@ } }, { - "label": "Configure Waf for Debug on outdated Android", + "label": "Configure Waf for Debug on Android (NDK r10e)", "type": "shell", "command": "./waf configure -T release --android=armeabi-v7a-hard,4.9,21", "problemMatcher": [], From d7a2277804cb0d992b1a1c6dfd050064b16d4fec Mon Sep 17 00:00:00 2001 From: Caroline Joy Bell Date: Fri, 13 Jan 2023 08:00:04 -0800 Subject: [PATCH 6/8] Update tasks.json --- .vscode/tasks.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 5b236400..8dc70c0c 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -7,22 +7,22 @@ "command": "./waf configure -T debug --prefix=out/", "problemMatcher": [], "windows": { - "command": "./waf.bat configure -T debug --prefix=out/" + "command": "./waf.bat configure -T debug --prefix=build/out/" }, "osx": { - "command": "python3 waf configure -T debug --prefix=out/" + "command": "python3 waf configure -T debug --prefix=build/out/" } }, { "label": "Configure Waf for Debug 64-bit", "type": "shell", - "command": "./waf configure -T debug --64bits --prefix=out/", + "command": "./waf configure -T debug --64bits --prefix=build/out/", "problemMatcher": [], "windows": { - "command": "./waf.bat configure -T debug --64bits --prefix=out/" + "command": "./waf.bat configure -T debug --64bits --prefix=build/out/" }, "osx": { - "command": "python3 waf configure -T debug --64bits --prefix=out/" + "command": "python3 waf configure -T debug --64bits --prefix=build/out/" } }, { From de32c758c15f12508241e276056a73f6ceb99731 Mon Sep 17 00:00:00 2001 From: Caroline Joy Bell Date: Fri, 13 Jan 2023 21:02:02 -0800 Subject: [PATCH 7/8] Update tasks.json Thought I already did this --- .vscode/tasks.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 8dc70c0c..c1047249 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -28,13 +28,13 @@ { "label": "Configure Waf for Debug on Android (NDK r10e)", "type": "shell", - "command": "./waf configure -T release --android=armeabi-v7a-hard,4.9,21", + "command": "./waf configure -T debug --android=armeabi-v7a-hard,4.9,21", "problemMatcher": [], "windows": { - "command": "./waf.bat configure -T release --android=armeabi-v7a-hard,4.9,21" + "command": "./waf.bat configure -T debug --android=armeabi-v7a-hard,4.9,21" }, "osx": { - "command": "python3 waf configure -T release --android=armeabi-v7a-hard,4.9,21" + "command": "python3 waf configure -T debug --android=armeabi-v7a-hard,4.9,21" } }, { From 88cf25ff80004f20fe36c05991ec97be1cf43c67 Mon Sep 17 00:00:00 2001 From: Caroline Joy Bell Date: Mon, 16 Jan 2023 07:54:17 -0800 Subject: [PATCH 8/8] Update tasks.json --- .vscode/tasks.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index c1047249..3687eab4 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -4,7 +4,7 @@ { "label": "Configure Waf for Debug 32-bit", "type": "shell", - "command": "./waf configure -T debug --prefix=out/", + "command": "./waf configure -T debug --prefix=build/out/", "problemMatcher": [], "windows": { "command": "./waf.bat configure -T debug --prefix=build/out/"