I think it would be preferable to deprecate the campaignion_dist project and add make files to the campaignion starterkit instead.

Having makes files would bring benefits as

* No more code duplication: currently you seem to commit all other projects into campaignion_dist
* Stop violation of "All files checked into the repository (code and assets) must be licensed under GNU/GPL version 2 and later" and "DO NOT include code from a non-Drupal project in the repository" from the Drupal Git Repository Usage policy https://drupal.org/node/1001544

Comments

torotil’s picture

Hi,

we're using dbuild.py because drush make didn't meet our needs. There is no problem in having it generate make-files though (after all it's build-files contain the same information).

The point in having a distribution is to provide a way to install campaignion for people that are not (yet) apt to use drush.

torotil’s picture

… so perhaps we're going to do something like https://drupal.org/developing/distributions/drupalorg :) -- The documentation on drupal.org about "What is a distribution" just stated that it should include the whole drupal tree - without a pointer to drupal.org-specific make-files.

dasjo’s picture

ah right, i figured you must be using some packaging mechanism, would be nice to have it documented.

as stated, committing non-GPL code isn't allowed for d.o repositories, so if you want to continue to offer packaged versions you would have to provide .make files as far as i know.

otherwise you could of course just link to a packaged version on your homepage, i'd prefer having everything packaged on drupal.org though

klausi’s picture

A distribution release should include all drupal + core files (which is assembled by drush make), but the git repository should only contain the drush make files.

torotil’s picture

Status: Active » Fixed

That "but" was missing in the documentation.

I've already replaced the included files in the repository with make-files. This leaves the distribution disfunctional for now since it has an impossible-to-resolve hard dependency on modernizr. Perhaps I'll bring out a release with additional instructions on how to download modernizr manually.

I've also withdrawn 7.x-1.0-beta1. That should solve this issue.

klausi’s picture

Modernizr is on the white list and it should be possible to include it with drush make: https://drupal.org/packaging-whitelist?title=modernizr

Something like this should do the job, right?

libraries[modernizr][download][type] = "get"
libraries[modernizr][download][url] = "https://github.com/Modernizr/Modernizr/archive/v2.7.0.tar.gz"
torotil’s picture

The modernizr releases don't include a version that's usable right away. Such a version can be built by either using grunt or their website. Neither one can be done by just using drush.

dasjo’s picture

How about including the full, white-listed modernizr build in the drush make and add instructions how to replace with a custom one for optimization?
Also see #2161445: Make it possible to download modernizr in a drush make file

Status: Fixed » Closed (fixed)

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