Skip to content

Commit dad565e

Browse files
committed
changed directory structure of scripts/
1 parent d7be982 commit dad565e

10 files changed

Lines changed: 25 additions & 25 deletions

File tree

.github/workflows/macos.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ jobs:
6363
submodules: recursive
6464

6565
- name: Build
66-
run: ./scripts/dev-build-all.sh --no-pause
66+
run: ./scripts/dev/build/unix-makefiles/dev-build-all.sh --no-pause
6767

6868
- name: Test
6969
run: |
70-
./scripts/run-internal-tests.sh --no-pause
71-
./scripts/run-external-tests.sh --no-pause
70+
./scripts/dev/test/unix-makefiles/run-internal-tests.sh --no-pause
71+
./scripts/dev/test/unix-makefiles/run-external-tests.sh --no-pause

.github/workflows/ubuntu.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ jobs:
6363
submodules: recursive
6464

6565
- name: Build
66-
run: ./scripts/dev-build-all.sh --no-pause
66+
run: ./scripts/dev/build/unix-makefiles/dev-build-all.sh --no-pause
6767

6868
- name: Test
6969
run: |
70-
./scripts/run-internal-tests.sh --no-pause
71-
./scripts/run-external-tests.sh --no-pause
70+
./scripts/dev/test/unix-makefiles/run-internal-tests.sh --no-pause
71+
./scripts/dev/test/unix-makefiles/run-external-tests.sh --no-pause

.github/workflows/windows.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ jobs:
5353
submodules: recursive
5454

5555
- name: Build
56-
run: ./scripts/dev-build-all.bat --no-pause
56+
run: ./scripts/dev/build/vs2017/dev-build-all.bat --no-pause
5757

5858
- name: Test
5959
run: |
60-
./scripts/run-internal-tests.bat --no-pause
61-
./scripts/run-external-tests.bat --no-pause
60+
./scripts/dev/test/vs2017/run-internal-tests.bat --no-pause
61+
./scripts/dev/test/vs2017/run-external-tests.bat --no-pause

README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -198,23 +198,23 @@ git submodule update --init --recursive
198198
#### Windows
199199
- Double-click or use your favourite terminal to run
200200
```
201-
scripts\dev-build-all.bat
201+
scripts\dev\build\vs2017\dev-build-all.bat
202202
```
203-
**NOTE: you may have to run `./scripts/dev-build-all.bat` or `.\scripts\dev-build-all.bat` instead (depending on your shell).**
203+
**NOTE: you may have to run `./scripts/dev/build/vs2017/dev-build-all.bat` or `.\scripts\dev\build\vs2017\dev-build-all.bat` instead (depending on your shell).**
204204
#### Linux/macOS
205205
- Use your favourite terminal to run
206206
```
207-
./scripts/dev-build-all.sh
207+
./scripts/dev/build/unix-makefiles/dev-build-all.sh
208208
```
209209
**NOTE: executing this way defaults to using `bash`.**
210210
- If for some reason the script is non-executable, then run the script through an interpreter (only `bash` and `dash` are tested, but you can try others)...
211211
```
212-
bash scripts/dev-build-all.sh
212+
bash scripts/dev/build/unix-makefiles/dev-build-all.sh
213213
```
214214
- or, add executable permission and then run...
215215
```
216-
chmod +x scripts/dev-build-all.sh
217-
./scripts/dev-build-all.sh
216+
chmod +x scripts/dev/build/unix-makefiles/dev-build-all.sh
217+
./scripts/dev/build/unix-makefiles/dev-build-all.sh
218218
```
219219

220220
---
@@ -245,15 +245,15 @@ make -j$(($(nproc)+1))
245245
- Single config:
246246
- `./project-name --dt-exit=true --dt-no-run=false`
247247
- All configs:
248-
- `./scripts/run-internal-tests.bat` (Windows)
249-
- `./scripts/run-internal-tests.sh` (Linux/macOS)
248+
- `./scripts/dev/test/vs2017/run-internal-tests.bat` (Windows)
249+
- `./scripts/dev/test/unix-makefiles/run-internal-tests.sh` (Linux/macOS)
250250
- External Tests:
251251
- Single config:
252252
- `./project-name-external-tests`
253253
- or, set the `StartUp Project` to `project-name-external-tests` and run directly in the IDE as usual (Visual Studio only)
254254
- All configs:
255-
- `./scripts/run-external-tests.bat` (Windows)
256-
- `./scripts/run-external-tests.sh` (Linux/macOS)
255+
- `./scripts/dev/test/vs2017/run-external-tests.bat` (Windows)
256+
- `./scripts/dev/test/unix-makefiles/run-external-tests.sh` (Linux/macOS)
257257

258258
---
259259

scripts/dev-build-all.sh renamed to scripts/dev/build/unix-makefiles/dev-build-all.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ set -eu
1818
# note: there are flaws such as not handling symlinks or newline characters at end of directory names (very rare)
1919
path_to_script_dir="$( cd "$( dirname "$0" )" >/dev/null 2>&1 && pwd )"
2020
echo "PATH TO SCRIPT DIRECTORY = $path_to_script_dir"
21-
path_to_project_root_dir="$path_to_script_dir/.."
21+
path_to_project_root_dir="$path_to_script_dir/../../../.."
2222
echo "PATH TO PROJECT ROOT DIRECTORY = $path_to_project_root_dir"
2323
# execute rest of script from project root directory...
2424
cd "$path_to_project_root_dir"

scripts/dev-build-all.bat renamed to scripts/dev/build/vs2017/dev-build-all.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ title DEV-BUILD-ALL
1818
:: get the path to the directory containing this script
1919
set "path_to_script_dir=%~dp0"
2020
echo PATH TO SCRIPT DIRECTORY = %path_to_script_dir%
21-
set "path_to_project_root_dir=%path_to_script_dir%.."
21+
set "path_to_project_root_dir=%path_to_script_dir%..\..\..\.."
2222
echo PATH TO PROJECT ROOT DIRECTORY = %path_to_project_root_dir%
2323
:: execute rest of script from project root directory...
2424
:: note: /D allows changing the current drive (if needed)

scripts/run-external-tests.sh renamed to scripts/dev/test/unix-makefiles/run-external-tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ set -eu
1616
# note: there are flaws such as not handling symlinks or newline characters at end of directory names (very rare)
1717
path_to_script_dir="$( cd "$( dirname "$0" )" >/dev/null 2>&1 && pwd )"
1818
echo "PATH TO SCRIPT DIRECTORY = $path_to_script_dir"
19-
path_to_project_root_dir="$path_to_script_dir/.."
19+
path_to_project_root_dir="$path_to_script_dir/../../../.."
2020
echo "PATH TO PROJECT ROOT DIRECTORY = $path_to_project_root_dir"
2121
# execute rest of script from project root directory...
2222
cd "$path_to_project_root_dir"

scripts/run-internal-tests.sh renamed to scripts/dev/test/unix-makefiles/run-internal-tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ set -eu
1616
# note: there are flaws such as not handling symlinks or newline characters at end of directory names (very rare)
1717
path_to_script_dir="$( cd "$( dirname "$0" )" >/dev/null 2>&1 && pwd )"
1818
echo "PATH TO SCRIPT DIRECTORY = $path_to_script_dir"
19-
path_to_project_root_dir="$path_to_script_dir/.."
19+
path_to_project_root_dir="$path_to_script_dir/../../../.."
2020
echo "PATH TO PROJECT ROOT DIRECTORY = $path_to_project_root_dir"
2121
# execute rest of script from project root directory...
2222
cd "$path_to_project_root_dir"

scripts/run-external-tests.bat renamed to scripts/dev/test/vs2017/run-external-tests.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ title RUN-EXTERNAL-TESTS
1010
:: get the path to the directory containing this script
1111
set "path_to_script_dir=%~dp0"
1212
echo PATH TO SCRIPT DIRECTORY = %path_to_script_dir%
13-
set "path_to_project_root_dir=%path_to_script_dir%.."
13+
set "path_to_project_root_dir=%path_to_script_dir%..\..\..\.."
1414
echo PATH TO PROJECT ROOT DIRECTORY = %path_to_project_root_dir%
1515
:: execute rest of script from project root directory...
1616
:: note: /D allows changing the current drive (if needed)

scripts/run-internal-tests.bat renamed to scripts/dev/test/vs2017/run-internal-tests.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ title RUN-INTERNAL-TESTS
1010
:: get the path to the directory containing this script
1111
set "path_to_script_dir=%~dp0"
1212
echo PATH TO SCRIPT DIRECTORY = %path_to_script_dir%
13-
set "path_to_project_root_dir=%path_to_script_dir%.."
13+
set "path_to_project_root_dir=%path_to_script_dir%..\..\..\.."
1414
echo PATH TO PROJECT ROOT DIRECTORY = %path_to_project_root_dir%
1515
:: execute rest of script from project root directory...
1616
:: note: /D allows changing the current drive (if needed)

0 commit comments

Comments
 (0)