Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RFC: Pluggable Engines #2 (No Python, just evolution of current configure shell and make code) #375

Merged
merged 14 commits into from Nov 26, 2013

Commits on Nov 24, 2013

  1. BUILD: Split configure.engines down to a single file per engine.

    This is the first part of allowing engines to be added dynamically.
    They are placed into a folder in engines/ which must contain a file
    named "configure.engine" to add the engine, which is pulled into the
    top level configure script automatically.
    digitall committed Nov 24, 2013
    Configuration menu
    Copy the full SHA
    aa947c9 View commit details
    Browse the repository at this point in the history
  2. BUILD: Split engines.mk down to a single file per engine.

    This is the second part of allowing engines to be added dynamically.
    Each folder in engines/ which must contain a file named "engine.mk"
    containing the make definitions for that engine.
    digitall committed Nov 24, 2013
    Configuration menu
    Copy the full SHA
    d77cf95 View commit details
    Browse the repository at this point in the history
  3. BUILD: Split engines/plugins_table header down to a file per engine.

    This is the third and final commit enabling fully pluggable engines.
    
    Now providing an engine folder contains a configure.engine, engine.mk
    and engine-plugin.h file, it will be picked up automatically by the
    configure script.
    digitall committed Nov 24, 2013
    Configuration menu
    Copy the full SHA
    00c27a2 View commit details
    Browse the repository at this point in the history
  4. BUILD: Remove need for engine-plugin.h in engines.

    This is now generated automatically by the configure script from the
    engine directory names.
    digitall committed Nov 24, 2013
    Configuration menu
    Copy the full SHA
    1ac01d2 View commit details
    Browse the repository at this point in the history
  5. BUILD: Remove need for engine.mk in each engine directory.

    Each engine now only has to provide a single configure.engine file
    adding the engine into the configure script, which then produces the
    required other files automatically.
    digitall committed Nov 24, 2013
    Configuration menu
    Copy the full SHA
    ef85456 View commit details
    Browse the repository at this point in the history
  6. DEVTOOLS: Adapt create_project for new configure.engine files.

    I could not try any generated project files since I do not have access to
    the IDEs.
    Johannes Schickel authored and digitall committed Nov 24, 2013
    Configuration menu
    Copy the full SHA
    6e29e1a View commit details
    Browse the repository at this point in the history
  7. BUILD: Add engines/plugins_table.h to git in the ideprojects target.

    Johannes Schickel authored and digitall committed Nov 24, 2013
    Configuration menu
    Copy the full SHA
    100e45e View commit details
    Browse the repository at this point in the history
  8. BUILD: Partial solution for parallel make issue.

    This is due to the multiple outputs produced by the configure rule,
    which cause multiple invocations of configure when make is run in
    parallel. Various solutions are detailed in the Multiple-Outputs
    section of the GNU automake manual which apply generally to makefiles.
    
    This solution is a simpler one, but should solve the problem, though it
    can fail on "mutilated" trees ie. where some of the configure outputs
    are present, but not all... but this situation is not common, tends to
    be due to an error in configure and should be recoverable by a
    "make clean && ./configure" call.
    digitall committed Nov 24, 2013
    Configuration menu
    Copy the full SHA
    9c02552 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    19a20ad View commit details
    Browse the repository at this point in the history
  10. DEVTOOLS: Factor out function to create directories in create_project.

    Johannes Schickel authored and digitall committed Nov 24, 2013
    Configuration menu
    Copy the full SHA
    c00ab00 View commit details
    Browse the repository at this point in the history
  11. DEVTOOLS: Adapt create_project to create engines/ dir if necessary

    Johannes Schickel authored and digitall committed Nov 24, 2013
    Configuration menu
    Copy the full SHA
    8b3fc99 View commit details
    Browse the repository at this point in the history
  12. BUILD: Add code to maintain ordering of engines in generated files.

    This is mainly "cosmetic" to keep the SCUMM engine and subengines at
    the top of the various files, but probably a good idea to prevent any
    subtle regressions associated with changing the order.
    digitall committed Nov 24, 2013
    Configuration menu
    Copy the full SHA
    ffce805 View commit details
    Browse the repository at this point in the history
  13. DEVTOOLS: Make create_project sort SCUMM as first engine.

    This makes create_project output consistent with configure output again.
    Johannes Schickel authored and digitall committed Nov 24, 2013
    Configuration menu
    Copy the full SHA
    80136c1 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2013

  1. DEVTOOLS: Add project file directory to include path in generated pro…

    …ject files.
    Johannes Schickel authored and digitall committed Nov 25, 2013
    Configuration menu
    Copy the full SHA
    6b0f111 View commit details
    Browse the repository at this point in the history