encounter / dtk-template

Project template for decomp-toolkit
Creative Commons Zero v1.0 Universal
15 stars 13 forks source link

Support specifying a dtk binary #14

Closed ribbanya closed 6 months ago

ribbanya commented 6 months ago

From doldecomp/melee#1335.

encounter commented 6 months ago

For consistency with the other arguments, let's rename this to just --dtk

ribbanya commented 6 months ago

How's this?

❯ ./configure.py --help
usage: configure.py [-h] [--version VERSION] [--build-dir BUILD_DIR] [--compilers DIR] [--map] [--debug]
                    [--wrapper BINARY] [--dtk BINARY | SOURCE_DIR] [--sjiswrap SJISWRAP] [--verbose]
                    [mode]

positional arguments:
  mode                  configure or progress (default: configure)

options:
  -h, --help            show this help message and exit
  --version VERSION     version to build (GAMEID)
  --build-dir BUILD_DIR
                        base build directory (default: build)
  --compilers DIR       path to compilers (optional)
  --map                 generate map file(s)
  --debug               build with debug info (non-matching)
  --wrapper BINARY      path to wibo or wine (optional)
  --dtk BINARY | SOURCE_DIR
                        path to decomp-toolkit source or binary (optional)
  --sjiswrap SJISWRAP   path to sjiswrap.exe (optional)
  --verbose             print verbose output
ribbanya commented 6 months ago

Missed a metavar.

❯ ./configure.py --help
usage: configure.py [-h] [--version VERSION] [--build-dir BUILD_DIR] [--compilers DIR] [--map] [--debug]
                    [--wrapper BINARY] [--dtk BINARY | SOURCE_DIR] [--sjiswrap EXE] [--verbose]
                    [mode]

positional arguments:
  mode                  configure or progress (default: configure)

options:
  -h, --help            show this help message and exit
  --version VERSION     version to build (GAMEID)
  --build-dir BUILD_DIR
                        base build directory (default: build)
  --compilers DIR       path to compilers (optional)
  --map                 generate map file(s)
  --debug               build with debug info (non-matching)
  --wrapper BINARY      path to wibo or wine (optional)
  --dtk BINARY | SOURCE_DIR
                        path to decomp-toolkit source or binary (optional)
  --sjiswrap EXE        path to sjiswrap.exe (optional)
  --verbose             print verbose output
ribbanya commented 6 months ago

Seems good to me now.

❯ ./configure.py --help
usage: configure.py [-h] [--version {GAMEID,GAMEI2}] [--build-dir DIR] [--binutils BINARY] [--compilers DIR]
                    [--map] [--debug] [--wrapper BINARY] [--dtk BINARY | DIR] [--sjiswrap EXE] [--verbose]
                    [{configure,progress}]

positional arguments:
  {configure,progress}  script mode (default: configure)

options:
  -h, --help            show this help message and exit
  --version {GAMEID,GAMEI2}
                        version to build
  --build-dir DIR       base build directory (default: build)
  --binutils BINARY     path to binutils (optional)
  --compilers DIR       path to compilers (optional)
  --map                 generate map file(s)
  --debug               build with debug info (non-matching)
  --wrapper BINARY      path to wibo or wine (optional)
  --dtk BINARY | DIR    path to decomp-toolkit binary or source (optional)
  --sjiswrap EXE        path to sjiswrap.exe (optional)
  --verbose             print verbose output
ribbanya commented 6 months ago

I think I'm done committing for real now.

❯ ./configure.py --help             
usage: configure.py [-h] [--version {GAMEID}] [--build-dir DIR] [--binutils BINARY] [--compilers DIR] [--map]
                    [--debug] [--wrapper BINARY] [--dtk BINARY | DIR] [--sjiswrap EXE] [--verbose]
                    [{configure,progress}]

positional arguments:
  {configure,progress}  script mode (default: configure)

options:
  -h, --help            show this help message and exit
  --version {GAMEID}    version to build
  --build-dir DIR       base build directory (default: build)
  --binutils BINARY     path to binutils (optional)
  --compilers DIR       path to compilers (optional)
  --map                 generate map file(s)
  --debug               build with debug info (non-matching)
  --wrapper BINARY      path to wibo or wine (optional)
  --dtk BINARY | DIR    path to decomp-toolkit binary or source (optional)
  --sjiswrap EXE        path to sjiswrap.exe (optional)
  --verbose             print verbose output
encounter commented 6 months ago

Looks great! I just caused you another merge conflict, sorry 🙃

ribbanya commented 6 months ago

Resolved.