This patch makes three changes to the drupalorg_testing.make file:

1. Adds a patch to the apachesolr.make file, as explained in #1227910: Fix apachesolr.make for recursive use. n.b. YOU MUST APPLY THE PATCH AT #1206340: introduce an options array in the root level of the makefile TO YOUR COPY OF drush_make, OR THIS WILL NOT WORK.

2. versioncontrol 6.x-2.x is selected instead of versioncontrol master; master is now an empty branch in the versioncontrol project, as explained in #1204682: makefile isn't getting versioncontrol module.

3. The patch to views_litepager is removed, as this patch has already been applied in this project.

It might be desirable to wait for drush_make to get the "options" feature first, before committing this patch, and then change the instructions on the project page to use a patched version of drush_make.

CommentFileSizeAuthor
drupalorg_testing.patch1.44 KBgreg.1.anderson

Comments

jhedstrom’s picture

jhedstrom
Primary language English
Location Portland, OR
commented

This patch worked perfectly.

hunmonk’s picture

hunmonk commented
Title: Fixes to drupalorg_testing.make to allow it to work again per instructions on project page » Module dependency fixes to drupalorg_testing.make
Status: Needs review » Postponed (maintainer needs more info)

i've committed #2 and #3 from the original issue post. however, #1 is a bit confusing to me. the drush make build using drupalorg_testing.make.bootstrap works fine w/o the adjustment to the apachesolr.make file -- the only problem is that it puts the SolrPhpClient library downloaded from apachesolr.make in profiles/drupalorg_testing instead of profiles/drupalorg_testing/modules/apachesolr as is desired. i'm not sure how the approach in #1 would solve this problem?

greg.1.anderson’s picture

greg.1.anderson commented
Status: Postponed (maintainer needs more info) » Fixed

Thanks for committing #2 and #3. I don't think that #1 is necessary at this time; the makefile works as-is with drush_make-2.x. So, I think we can let the remaining issue work itself out at #1206340: introduce an options array in the root level of the makefile.

The issue you bring up with the download location of the client library is an unrelated problem.

Status: Fixed » Closed (fixed)

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