The makefile is could do with a bit of a cleanup to make it more readable.

Changes proposed (and included in upcoming patch);

  • Removal of unnecessary quotation marks.
  • Removal of Git repo path if hosted on D.o.
  • Sectioning of types (Aegir core, Aegir golden, contrib, etc)
  • Alphabetisation of sections.
  • Addition of types for modules (sometime needed, depending on Drush).
  • Addition of subdir for contrib (this will have to be dealt with in upgrade process).
Support from Acquia helps fund testing for Drupal Acquia logo

Comments

Deciphered’s picture

Status: Active » Needs review
FileSize
6.64 KB
Deciphered’s picture

FileSize
6.67 KB

Minor update.

helmo’s picture

Status: Needs review » Fixed

What would we have to do for 'Addition of subdir for contrib' in terms of upgrade path? It's a new platform being build ... please reopen if I'm missing something.

ergonlogic’s picture

Status: Fixed » Needs work

While I'm fine with putting contrib dependencies in an isolated directory, I'd prefer that the Aegir modules, and probably "golden contrib", live in their own sub-directories.

ergonlogic’s picture

Does anyone know off-hand whether this would work in drupal-org.make?

defaults[projects][subdir] = "contrib"
defaults[projects][type] = "module"
ergonlogic’s picture

Status: Needs work » Needs review

In 480f36a I added the defaults, and moved Aegir components into their own subdir. If the packaging scripts freak out, feel free to roll it back.

ergonlogic’s picture

Status: Needs review » Fixed

I ran the newly updated makefile through the drupalorg_drush 'validate-makefile', and it appears to pass using the defaults.

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.