Remove libraries module from make file and load new version GeSHi-1.0.8.11 [#1948852]

I load geshifilter in a panopoly distibrution. Panopoly loads already the libraries module in modules/contrib/, geshifilter is loading the libraries module in modules/
Result is that I have 2 libraries modules, and the Fatal Error:
PHP Fatal error: Cannot redeclare libraries_drush_command() (previously declared in /home/frans/workspace/fk.nl/builds/20130320-172713/profiles/panopoly/modules/contrib/libraries/libraries.drush.inc:11) in /home/frans/workspace/fk.nl/builds/20130320-172713/profiles/panopoly/modules/libraries/libraries.drush.inc on line 25

Tha patch removes the libraries module from the make file.

While I was at it, I also updated the GeSHi library to version 1.0.8.11, the latest 1.0.x version.

Comment	File	Size	Author
#3	1948852_make_example_3.patch	1.1 KB	dasjo
#3
	geshifilter-make-file-0.patch	782 bytes	franskuipers

Support from Acquia helps fund testing for Drupal Acquia logo

Comments

Comment #1

soxofaan CreditAttribution: soxofaan commented 30 March 2013 at 22:11

(disclaimer: I'm not so familiar with drush makefiles)

I'm not sure this is the right fix for the problem.
It fixes your problem, but creates problems for users that don't already have the libraries module as a dependency somewhere, right?

Comment #2

franskuipers CreditAttribution: franskuipers commented 13 April 2013 at 14:47

Yes, it creates a problem for users without libraries...
... but now the make file in this module creates problems to include it in distributions.

I am afraid almost no-one who downloads the module will use the drush make file. It is not mentioned in the README.txt file under INSTALLATION or on the project page.

Another possible solution is to rename the geshifilter.make file to geshifilter.dmake. This will not be execute it when included in an distribution, but people can still make the libraries module & geshi filter files by invoking:

$ drush make --no-core sites/all/modules/geshifilter/geshifilter.dmake .

This could be documented in the README.txt file and the project page.

Comment #3

dasjo

he/him

German

Zurich

CreditAttribution: dasjo commented 1 July 2013 at 10:46

File	Size
1948852_make_example_3.patch	1.1 KB

the attached patch just renames the .make file into .make.example as appears to be the best practice for make files to not interfere with people's workflow.