From 162f62c3e0405c2190d10233c1a1bb992acf0576 Mon Sep 17 00:00:00 2001 From: Marton Kiss Date: Wed, 12 Oct 2016 18:17:24 +0200 Subject: [PATCH] Upgrade Drupal Commons to 3.39 Add recent commons as a separate project, upgrade to version 3.39 and provide separate patches in commons.make file. This changeset also introduce profile inheritance, so groups profile inherit the entire commons stack. The installation profile is refactored and duplicates were removed. Change-Id: Idc4e4ab24680fa6e1b045350c1dc1c66cad9e5e7 --- commons.make | 9 + drupal-org-core.make | 7 + drupal-org.make | 545 +----------------- groups.info | 1 + groups.install | 15 +- groups.profile | 64 +- ...commons-libraries-search-paths-alter.patch | 15 + .../0006-commons-apachesolr-user-patch.patch | 13 + patches/0007-commons-message.patch | 25 + ...8-core-profile-duplicated-hook-group.patch | 16 + patches/0009-commons-flag-v3.patch | 21 + scripts/dev-build.sh | 10 +- 12 files changed, 167 insertions(+), 574 deletions(-) create mode 100644 commons.make create mode 100644 patches/0005-commons-libraries-search-paths-alter.patch create mode 100644 patches/0006-commons-apachesolr-user-patch.patch create mode 100644 patches/0007-commons-message.patch create mode 100644 patches/0008-core-profile-duplicated-hook-group.patch create mode 100644 patches/0009-commons-flag-v3.patch diff --git a/commons.make b/commons.make new file mode 100644 index 0000000..431a0c5 --- /dev/null +++ b/commons.make @@ -0,0 +1,9 @@ +api = 2 +core = 7.x + +; Download the Commons install profile and recursively build all its dependencies. +projects[commons][type] = "profile" +projects[commons][version] = "3.39" +projects[commons][patch][] = "patches/0005-commons-libraries-search-paths-alter.patch" +projects[commons][patch][] = "patches/0004-accomodate-flag-v3.patch" +projects[commons][patch][] = "patches/0009-commons-flag-v3.patch" \ No newline at end of file diff --git a/drupal-org-core.make b/drupal-org-core.make index ed51f59..c11de6b 100644 --- a/drupal-org-core.make +++ b/drupal-org-core.make @@ -26,3 +26,10 @@ projects[drupal][patch][] = https://drupal.org/files/issues/node_access_grants-s ; File_get_file_references is slow and buggy ; https://drupal.org/node/1805690#comment-8734045 projects[drupal][patch][] = https://drupal.org/files/issues/1805690_11.patch + +; Enables multi-profile inheritance with deep dependency checking. +; https://www.drupal.org/node/2067229 +projects[drupal][patch][] = https://www.drupal.org/files/issues/allow_install_profiles-2067229-76.patch + +; Multi profile inheritance provides duplicated hook entries. +projects[drupal][patch][] = "patches/0008-core-profile-duplicated-hook-group.patch" diff --git a/drupal-org.make b/drupal-org.make index 36bdba3..add46fb 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -3,358 +3,6 @@ core = 7.x ; Contributed modules. -projects[addressfield][type] = "module" -projects[addressfield][subdir] = "contrib" -projects[addressfield][version] = "1.0" - -projects[addressfield_tokens][type] = "module" -projects[addressfield_tokens][subdir] = "contrib" -projects[addressfield_tokens][version] = "1.5" - -projects[admin_icons][type] = "module" -projects[admin_icons][subdir] = "contrib" -projects[admin_icons][download][type] = "git" -projects[admin_icons][download][url] = "http://git.drupal.org/project/admin_icons.git" -projects[admin_icons][download][branch] = "7.x-1.x" -projects[admin_icons][download][revision] = "60d9f28801533fecc92216a60d444d89d80e7611" - -projects[apachesolr][type] = "module" -projects[apachesolr][subdir] = "contrib" -projects[apachesolr][version] = "1.7" - -projects[apachesolr_og][type] = "module" -projects[apachesolr_og][subdir] = "contrib" -projects[apachesolr_og][download][type] = "git" -projects[apachesolr_og][download][url] = "http://git.drupal.org/project/apachesolr_og.git" -projects[apachesolr_og][download][branch] = "7.x-1.x" -projects[apachesolr_og][download][revision] = "49820b4a4fcff7c1c4efe449da033fb6d8711ac5" - -; Check the user object before trying to display a result. -; https://drupal.org/node/2077281#comment-7807937 -projects[apachesolr_og][patch][] = "https://drupal.org/files/issues/apachesolr_og-check-for-anonymous.patch" - -projects[apachesolr_proximity][type] = "module" -projects[apachesolr_proximity][subdir] = "contrib" -projects[apachesolr_proximity][version] = "1.0-rc1" - -projects[apachesolr_user][type] = "module" -projects[apachesolr_user][subdir] = "contrib" -projects[apachesolr_user][download][type] = "git" -projects[apachesolr_user][download][url] = "http://git.drupal.org/project/apachesolr_user.git" -projects[apachesolr_user][download][branch] = "7.x-1.x" -projects[apachesolr_user][download][revision] = "a86c5aebfceaf4a3fc53544762a36ca1b70809d5" - -; Check the user object before trying to display a result. -; https://drupal.org/node/2077281#comment-7807937 -projects[apachesolr_user][patch][] = "http://drupal.org/files/2077281-apache-solr-user-check-3.patch" - -projects[breakpoints][type] = "module" -projects[breakpoints][subdir] = "contrib" -projects[breakpoints][version] = "1.3" - -projects[connector][type] = "module" -projects[connector][subdir] = "contrib" -projects[connector][version] = "1.0-beta2" - -projects[ckeditor][type] = "module" -projects[ckeditor][subdir] = "contrib" -projects[ckeditor][version] = "1.16" - -; Accomodate latest Media changes. -; https://drupal.org/node/2159403 -projects[ckeditor][patch][] = "https://drupal.org/files/issues/make_ckeditor_plugin-2159403-141.patch" - -projects[ctools][type] = "module" -projects[ctools][subdir] = "contrib" -projects[ctools][version] = "1.9" - -projects[custom_search][type] = "module" -projects[custom_search][subdir] = "contrib" -projects[custom_search][version] = "1.18" - -projects[date][type] = "module" -projects[date][subdir] = "contrib" -projects[date][version] = "2.8" - -projects[date_facets][type] = "module" -projects[date_facets][subdir] = "contrib" -projects[date_facets][version] = "1.0-beta2" - -; Keeping this to the latest version, since it should only be used for development. -projects[devel][version] = "1.x-dev" -projects[devel][type] = "module" -projects[devel][subdir] = "contrib" - -projects[diff][type] = "module" -projects[diff][subdir] = "contrib" -projects[diff][version] = "3.2" - -; Profile has no recommended release. -projects[edit_profile][type] = "module" -projects[edit_profile][subdir] = "contrib" -projects[edit_profile][version] = "1.0-beta2" - -projects[elements][type] = "module" -projects[elements][subdir] = "contrib" -projects[elements][version] = "1.4" - -projects[elysia_cron][type] = "module" -projects[elysia_cron][subdir] = "contrib" -projects[elysia_cron][version] = "2.1" - -projects[email_registration][type] = "module" -projects[email_registration][subdir] = "contrib" -projects[email_registration][download][type] = "git" -projects[email_registration][download][url] = "http://git.drupal.org/project/email_registration.git" -projects[email_registration][download][branch] = "7.x-1.x" -projects[email_registration][download][revision] = "1656416" - -projects[entity][type] = "module" -projects[entity][subdir] = "contrib" -projects[entity][version] = "1.6" -; Translatable fields: Not overriding language-none values with empty default-language values -; https://www.drupal.org/node/1782134 -projects[entity][patch][] = "https://www.drupal.org/files/entity-translatable_fields_not_overriding_und_with_empty_values-1782134-5.patch" - -projects[entitycache][type] = "module" -projects[entitycache][subdir] = "contrib" -projects[entitycache][version] = "1.2" - -; Fix core translation support. -; http://drupal.org/node/1349566#comment-7781063 -projects[entitycache][patch][] = "http://drupal.org/files/add-translation-information-on-each-request-1349566-12.patch" - -projects[entity_embed][version] = "1.x-dev" -projects[entity_embed][type] = "module" -projects[entity_embed][subdir] = "contrib" -projects[entity_embed][download][type] = "git" -projects[entity_embed][download][revision] = "dcd4bac" -projects[entity_embed][download][branch] = "7.x-1.x" - -projects[entityreference][type] = "module" -projects[entityreference][subdir] = "contrib" -projects[entityreference][version] = "1.1" - -projects[entityreference_prepopulate][type] = "module" -projects[entityreference_prepopulate][subdir] = "contrib" -projects[entityreference_prepopulate][version] = "1.5" - -; Entityreference prepopulate overwrites field instance custom default value functions. -; https://drupal.org/node/2304301#comment-8973459 -projects[entityreference_prepopulate][patch][] = "https://drupal.org/files/issues/check-for-default-value-function-2304301-1.patch" - -projects[entity_translation][type] = "module" -projects[entity_translation][subdir] = "contrib" -projects[entity_translation][version] = "1.0-beta4" - -projects[facetapi][type] = "module" -projects[facetapi][subdir] = "contrib" -projects[facetapi][version] = "1.5" - -projects[features][type] = "module" -projects[features][subdir] = "contrib" -projects[features][version] = "2.10" - -projects[file_entity][type] = "module" -projects[file_entity][subdir] = "contrib" -projects[file_entity][download][type] = "git" -projects[file_entity][download][url] = "http://git.drupal.org/project/file_entity.git" -projects[file_entity][download][branch] = "7.x-2.x" -projects[file_entity][download][revision] = "b610413" - -projects[flag][type] = "module" -projects[flag][subdir] = "contrib" -projects[flag][version] = "3.9" - -projects[flag_abuse][type] = "module" -projects[flag_abuse][subdir] = "contrib" -projects[flag_abuse][version] = "2.0" - -projects[google_analytics][type] = "module" -projects[google_analytics][subdir] = "contrib" -projects[google_analytics][version] = "2.3" - -projects[gravatar][type] = "module" -projects[gravatar][subdir] = "contrib" -projects[gravatar][download][type] = "git" -projects[gravatar][download][url] = "http://git.drupal.org/project/gravatar.git" -projects[gravatar][download][branch] = "7.x-1.x" -projects[gravatar][download][revision] = "bb2f81e6" - -projects[http_client][type] = "module" -projects[http_client][subdir] = "contrib" -projects[http_client][version] = "2.4" - -projects[i18n][type] = "module" -projects[i18n][subdir] = "contrib" -projects[i18n][version] = "1.12" - -projects[i18nviews][type] = "module" -projects[i18nviews][subdir] = "contrib" -projects[i18nviews][download][type] = "git" -projects[i18nviews][download][url] = "http://git.drupal.org/project/i18nviews.git" -projects[i18nviews][download][branch] = "7.x-3.x" -projects[i18nviews][download][revision] = "27e9809" - -projects[kissmetrics][type] = "module" -projects[kissmetrics][subdir] = "contrib" -projects[kissmetrics][version] = "1.0-rc3" - -projects[l10n_update][type] = "module" -projects[l10n_update][subdir] = "contrib" -projects[l10n_update][version] = "1.1" - -projects[libraries][type] = "module" -projects[libraries][subdir] = "contrib" -projects[libraries][version] = "2.2" - -projects[lingotek][type] = "module" -projects[lingotek][subdir] = "contrib" -projects[lingotek][version] = "6.01" - -projects[link][type] = "module" -projects[link][subdir] = "contrib" -projects[link][version] = "1.3" - -projects[media][type] = "module" -projects[media][subdir] = "contrib" -projects[media][download][type] = "git" -projects[media][download][url] = "http://git.drupal.org/project/media.git" -projects[media][download][branch] = "7.x-2.x" -projects[media][download][revision] = "7d9671f" - -projects[media_oembed][type] = "module" -projects[media_oembed][subdir] = "contrib" -projects[media_oembed][version] = "2.2" - -projects[memcache][type] = "module" -projects[memcache][subdir] = "contrib" -projects[memcache][version] = "1.5" - -projects[menu_attributes][type] = "module" -projects[menu_attributes][subdir] = "contrib" -projects[menu_attributes][version] = "1.0-rc3" - -projects[message][type] = "module" -projects[message][subdir] = "contrib" -projects[message][download][type] = "git" -projects[message][download][url] = "http://git.drupal.org/project/message.git" -projects[message][download][branch] = "7.x-1.x" -projects[message][download][revision] = "3bbdd5e6" - -; Make message access alterable. -; https://drupal.org/node/1920560#comment-7080942 -projects[message][patch][] = "https://drupal.org/files/1920560-message-access-alterable.patch" - -; Add support for the undefined language. -; https://drupal.org/node/2006702#comment-7842259 -projects[message][patch][] = "https://drupal.org/files/message_field_undefined-lang.2006702-14.patch" - -; Fix Undefined index: message_type in _field_ui on field listings -; https://drupal.org/node/1391442 -projects[message][patch][] = "https://drupal.org/files/issues/message-entity_info_hook_notice_undefined_index-1391442-34.patch" - -projects[message_notify][type] = "module" -projects[message_notify][subdir] = "contrib" -projects[message_notify][version] = "2.5" - -projects[message_subscribe][type] = "module" -projects[message_subscribe][subdir] = "contrib" -projects[message_subscribe][version] = "1.0-rc2" - -; Message Subscribe sends emails regardless of context -; https://www.drupal.org/node/1828184 -projects[message_subscribe][patch][] = "https://drupal.org/files/issues/group-context-1828184-53.patch" - -; By default, don't notify blocked users -; https://www.drupal.org/node/2184567 -projects[message_subscribe][patch][] = "https://drupal.org/files/issues/2184567-message-subscribe-blocked-users-23.patch" - -projects[metatag][type] = "module" -projects[metatag][subdir] = "contrib" -projects[metatag][version] = "1.4" - -projects[module_filter][type] = "module" -projects[module_filter][subdir] = "contrib" -projects[module_filter][version] = "2.0" - -projects[mollom][type] = "module" -projects[mollom][subdir] = "contrib" -projects[mollom][version] = "2.13" - -projects[navbar][type] = "module" -projects[navbar][subdir] = "contrib" -projects[navbar][version] = "1.6" - -projects[oauth][type] = "module" -projects[oauth][subdir] = "contrib" -projects[oauth][version] = "3.2" - -projects[oauthconnector][type] = "module" -projects[oauthconnector][subdir] = "contrib" -projects[oauthconnector][download][type] = "git" -projects[oauthconnector][download][url] = "http://git.drupal.org/project/oauthconnector.git" -projects[oauthconnector][download][branch] = "7.x-1.x" -projects[oauthconnector][download][revision] = "42c6f66" - -projects[oembed][type] = "module" -projects[oembed][subdir] = "contrib" -projects[oembed][download][type] = "git" -projects[oembed][download][url] = "http://git.drupal.org/project/oembed.git" -projects[oembed][download][branch] = "7.x-1.x" -projects[oembed][download][revision] = "9aa5303" - -; Remove the media submodule as it conflicts with the Media: oEmbed module. -; https://drupal.org/node/2269745#comment-8796261 -projects[oembed][patch][] = "https://drupal.org/files/issues/remove-media-submodule-2269745-2.patch" - -projects[og][type] = "module" -projects[og][subdir] = "contrib" -projects[og][version] = "2.9" - -; Auto-assign role to group manager broken on groups with overridden roles. -; https://drupal.org/node/2005800#comment-7684873 -projects[og][patch][] = "https://drupal.org/files/issues/og-default-role-member-2005800-25.patch" - -; og_ui should give users the theme, not admin ui when creating groups. -; https://drupal.org/node/1800208 -projects[og][patch][] = "https://drupal.org/files/og_ui-group_node_add_theme-1800208-5.patch" - -; Missing permissions when installing a new site. -; https://drupal.org/node/2301831 -projects[og][patch][] = "https://drupal.org/files/issues/og-missing-permission-roles-2301831-1.patch" - -; Missing permissions when reverting features. -; https://drupal.org/node/2021673 -projects[og][patch][] = "https://drupal.org/files/og-Do_not_export_nonexisting_roles-2021673-1.patch" - -projects[panelizer][type] = "module" -projects[panelizer][subdir] = "contrib" -projects[panelizer][version] = "3.4" - -projects[panels][type] = "module" -projects[panels][subdir] = "contrib" -projects[panels][version] = "3.6" - -projects[paranoia][type] = "module" -projects[paranoia][subdir] = "contrib" -projects[paranoia][version] = "1.4" - -projects[pathauto][type] = "module" -projects[pathauto][subdir] = "contrib" -projects[pathauto][version] = "1.2" -; Add drush commands for bulk alias updating/deleting -; https://www.drupal.org/node/867578 -projects[pathauto][patch][] = "https://www.drupal.org/files/pathauto-add-drush-support-867578-42.patch" - -projects[picture][type] = "module" -projects[picture][subdir] = "contrib" -projects[picture][version] = "1.5" - -projects[pm_existing_pages][type] = "module" -projects[pm_existing_pages][subdir] = "contrib" -projects[pm_existing_pages][version] = "1.4" - projects[privatemsg][type] = "module" projects[privatemsg][subdir] = "contrib" projects[privatemsg][version] = "1.4" @@ -371,133 +19,24 @@ projects[privatemsg_notify_sender][type] = "module" projects[privatemsg_notify_sender][subdir] = "contrib" projects[privatemsg_notify_sender][version] = "1.1" -projects[quicktabs][type] = "module" -projects[quicktabs][subdir] = "contrib" -projects[quicktabs][version] = "3.6" -projects[quicktabs][patch][] = "http://drupal.org/files/2104643-revert-qt-487518-5.patch" +projects[elysia_cron][type] = "module" +projects[elysia_cron][subdir] = "contrib" +projects[elysia_cron][version] = "2.1" -projects[r4032login][type] = "module" -projects[r4032login][subdir] = "contrib" -projects[r4032login][version] = "1.8" +projects[google_analytics][type] = "module" +projects[google_analytics][subdir] = "contrib" +projects[google_analytics][version] = "2.3" -projects[radioactivity][type] = "module" -projects[radioactivity][subdir] = "contrib" -projects[radioactivity][version] = "2.9" +projects[oembed][type] = "module" +projects[oembed][subdir] = "contrib" +projects[oembed][download][type] = "git" +projects[oembed][download][url] = "http://git.drupal.org/project/oembed.git" +projects[oembed][download][branch] = "7.x-1.x" +projects[oembed][download][revision] = "9aa5303" -projects[rate][type] = "module" -projects[rate][subdir] = "contrib" -projects[rate][version] = "1.7" - -; Add widget to node/comment $links. -; http://drupal.org/node/947516#comment-6979780 -projects[rate][patch][] = "http://drupal.org/files/947516-rate-node-links-15.patch" - -; Only load CSS when necessary. -; https://drupal.org/node/2180853 -projects[rate][patch][] = "https://drupal.org/files/issues/attach-rate-css-2180853-3.patch" - -projects[realname][type] = "module" -projects[realname][subdir] = "contrib" -projects[realname][version] = "1.2" - -; Realname entityreference autocomplete API update -; https://drupal.org/node/2225889 -projects[realname][patch][] = "https://drupal.org/files/issues/2225889-realname-correct-menu-3.patch" - -projects[redirect][type] = "module" -projects[redirect][subdir] = "contrib" -projects[redirect][version] = "1.0-rc1" - -projects[registration][subdir] = "contrib" -projects[registration][type] = "module" -projects[registration][version] = "1.6" - -projects[rich_snippets][type] = "module" -projects[rich_snippets][subdir] = "contrib" -projects[rich_snippets][version] = "1.0-beta4" - -projects[rules][type] = "module" -projects[rules][subdir] = "contrib" -projects[rules][version] = "2.9" - -projects[schemaorg][type] = "module" -projects[schemaorg][subdir] = "contrib" -projects[schemaorg][version] = "1.0-rc1" - -projects[search_facetapi][type] = "module" -projects[search_facetapi][subdir] = "contrib" -projects[search_facetapi][version] = "1.0-beta2" - -projects[sharethis][type] = "module" -projects[sharethis][subdir] = "contrib" -projects[sharethis][version] = "2.10" - -projects[smartcrop][type] = "module" -projects[smartcrop][subdir] = "contrib" -projects[smartcrop][version] = "1.0-beta2" - -projects[strongarm][type] = "module" -projects[strongarm][subdir] = "contrib" -projects[strongarm][download][type] = "git" -projects[strongarm][download][url] = "http://git.drupal.org/project/strongarm.git" -projects[strongarm][download][branch] = "7.x-2.x" -projects[strongarm][download][revision] = "5a2326ba67e59923ecce63d9bb5e0ed6548abdf8" - -projects[timeago][type] = "module" -projects[timeago][subdir] = "contrib" -projects[timeago][version] = "2.3" - -; Provide a dedicated date type. -; https://drupal.org/node/1427226#comment-6638836 -projects[timeago][patch][] = "https://drupal.org/files/issues/1427226-timeago-date-type-6.patch" - -projects[title][type] = "module" -projects[title][subdir] = "contrib" -projects[title][version] = "1.0-alpha7" - -projects[token][type] = "module" -projects[token][subdir] = "contrib" -projects[token][version] = "1.6" - -projects[translation_helpers][type] = "module" -projects[translation_helpers][subdir] = "contrib" -projects[translation_helpers][version] = "1.0" - -projects[variable][type] = "module" -projects[variable][subdir] = "contrib" -projects[variable][version] = "2.5" - -projects[views][type] = "module" -projects[views][subdir] = "contrib" -projects[views][version] = "3.14" - -; Update Views Content access filter per core performance improvements. -; https://drupal.org/comment/8516039#comment-8516039 -projects[views][patch][] = "https://drupal.org/files/issues/views-content_access_filter_per_core_performance-2204257-4_0.patch" - -projects[views_bulk_operations][type] = "module" -projects[views_bulk_operations][subdir] = "contrib" -projects[views_bulk_operations][version] = "3.3" - -projects[views_field_view][type] = "module" -projects[views_field_view][subdir] = "contrib" -projects[views_field_view][version] = "1.1" - -projects[views_litepager][type] = "module" -projects[views_litepager][subdir] = "contrib" -projects[views_litepager][version] = "3.0" - -projects[views_load_more][type] = "module" -projects[views_load_more][subdir] = "contrib" -projects[views_load_more][version] = "1.5" - -projects[votingapi][type] = "module" -projects[votingapi][subdir] = "contrib" -projects[votingapi][version] = "2.12" - -projects[voting_rules][type] = "module" -projects[voting_rules][subdir] = "contrib" -projects[voting_rules][version] = "1.0-alpha1" +; Remove the media submodule as it conflicts with the Media: oEmbed module. +; https://drupal.org/node/2269745#comment-8796261 +projects[oembed][patch][] = "https://drupal.org/files/issues/remove-media-submodule-2269745-2.patch" projects[geophp][version] = "1.7" projects[geophp][type] = "module" @@ -593,70 +132,16 @@ projects[zen][type] = "theme" projects[zen][subdir] = "contrib" projects[zen][version] = "5.5" -projects[adaptivetheme][type] = "theme" -projects[adaptivetheme][subdir] = "contrib" -projects[adaptivetheme][download][type] = "git" -projects[adaptivetheme][download][url] = "http://git.drupal.org/project/adaptivetheme.git" -projects[adaptivetheme][download][branch] = "7.x-3.x" -projects[adaptivetheme][download][revision] = "18693ff59db7cb3171f282a982d04fe6544b63a1" - -projects[ember][type] = "theme" -projects[ember][subdir] = "contrib" -projects[ember][version] = "2.0-alpha3" - -projects[sky][type] = "theme" -projects[sky][subdir] = "contrib" -projects[sky][version] = "3.0" - projects[bootstrap][type] = "theme" projects[bootstrap][subdir] = "contrib" projects[bootstrap][version] = "3.0" ; Libraries. ; NOTE: These need to be listed in http://drupal.org/packaging-whitelist. - -libraries[backbone][download][type] = "get" -libraries[backbone][type] = "libraries" -libraries[backbone][download][url] = "https://github.com/jashkenas/backbone/archive/1.1.0.tar.gz" - -libraries[ckeditor][download][type] = "get" -libraries[ckeditor][download][url] = "http://download.cksource.com/CKEditor/CKEditor/CKEditor%204.4.7/ckeditor_4.4.7_full.zip" -libraries[ckeditor][type] = "libraries" - -libraries[ckeditor_lineutils][download][type] = "get" -libraries[ckeditor_lineutils][download][url] = "http://download.ckeditor.com/lineutils/releases/lineutils_4.4.7.zip" -libraries[ckeditor_lineutils][type] = "libraries" -libraries[ckeditor_lineutils][subdir] = "ckeditor/plugins" -libraries[ckeditor_lineutils][directory_name] = "lineutils" - -libraries[ckeditor_widget][download][type] = "get" -libraries[ckeditor_widget][download][url] = "http://download.ckeditor.com/widget/releases/widget_4.3.4.zip" -libraries[ckeditor_widget][type] = "libraries" -libraries[ckeditor_widget][subdir] = "ckeditor/plugins" -libraries[ckeditor_widget][directory_name] = "widget" - -libraries[ckeditor_widget][download][type] = "get" -libraries[ckeditor_widget][download][url] = "http://download.ckeditor.com/widget/releases/widget_4.4.7.zip" -libraries[ckeditor_widget][type] = "libraries" -libraries[ckeditor_widget][subdir] = "ckeditor/plugins" -libraries[ckeditor_widget][directory_name] = "widget" - -libraries[modernizr][download][type] = "get" -libraries[modernizr][type] = "libraries" -libraries[modernizr][download][url] = "https://github.com/Modernizr/Modernizr/archive/v2.7.1.tar.gz" - libraries[placeholder][download][type] = "get" libraries[placeholder][type] = "libraries" libraries[placeholder][download][url] = "https://github.com/mathiasbynens/jquery-placeholder/archive/v2.0.7.tar.gz" -libraries[timeago][download][type] = "get" -libraries[timeago][type] = "libraries" -libraries[timeago][download][url] = "https://raw.github.com/rmm5t/jquery-timeago/v1.4.1/jquery.timeago.js" - -libraries[underscore][download][type] = "get" -libraries[underscore][type] = "libraries" -libraries[underscore][download][url] = "https://github.com/jashkenas/underscore/archive/1.5.2.zip" - libraries[leaflet][download][type] = "get" libraries[leaflet][type] = "libraries" libraries[leaflet][download][url] = "http://cdn.leafletjs.com/downloads/leaflet-0.7.3.zip" diff --git a/groups.info b/groups.info index ffac530..e6e39e1 100644 --- a/groups.info +++ b/groups.info @@ -2,6 +2,7 @@ name = OpenStack User Groups project = groups distribution_name = "OpenStack User Groups" description = Ready-to-use solution for managing OpenStack communities. +base profile = commons core = 7.x php_memory_limit = 192M diff --git a/groups.install b/groups.install index 94cdb5f..8a55da1 100644 --- a/groups.install +++ b/groups.install @@ -68,19 +68,6 @@ function groups_install() { ); menu_link_save($item); - $search_block = array( - 'module' => 'search', - 'delta' => 'form', - 'theme' => 'openstack', - 'visibility' => 0, - 'region' => 'header', - 'status' => 1, - 'pages' => '', - 'weight' => 2, - 'title' => '', - ); - drupal_write_record('block', $search_block); - _groups_enable_default_languages(); _groups_add_language_selector_block(); @@ -445,4 +432,4 @@ function _groups_add_markdown_filter() { } } } -} \ No newline at end of file +} diff --git a/groups.profile b/groups.profile index 52eca16..ba5d9c8 100644 --- a/groups.profile +++ b/groups.profile @@ -3,7 +3,9 @@ /** * Define minimum execution time required to operate. */ -define('DRUPAL_MINIMUM_MAX_EXECUTION_TIME', 120); +if (!defined('DRUPAL_MINIMUM_MAX_EXECUTION_TIME')) { + define('DRUPAL_MINIMUM_MAX_EXECUTION_TIME', 120); +} /** * Implements hook_hook_info(). @@ -19,33 +21,6 @@ function groups_hook_info() { return array_fill_keys($hooks, array('group' => 'commons')); } -/** - * Get Commons entity integration information. - * - * @param $entity_type - * (optional) The entity type to load, e.g. node or user. - * - * @return - * An associative array of entity integrations whose keys define the entity - * type for each integration and whose values contain the bundles which have - * been integrated. Each bundle is itself an associative array, whose keys - * define the type of integration to enable and whose values contain the - * status of the integration. TRUE = enabled, FALSE = disabled. - */ -function commons_entity_integration_info($entity_type = NULL) { - $info = &drupal_static(__FUNCTION__); - if (!$info) { - $info = module_invoke_all('commons_entity_integration'); - drupal_alter('commons_entity_integration', $info); - } - if ($entity_type) { - return isset($info[$entity_type]) ? $info[$entity_type] : array(); - } - else { - return $info; - } -} - /** * Implements hook_admin_paths_alter(). */ @@ -61,6 +36,12 @@ function groups_admin_paths_alter(&$paths) { function groups_install_tasks_alter(&$tasks, $install_state) { global $install_state; + // Remove commons profile install tasks + $commons_tasks = commons_install_tasks(); + foreach ($commons_tasks as $k => $v) { + unset($tasks[$k]); + } + // Skip profile selection step. $tasks['install_select_profile']['display'] = FALSE; @@ -166,7 +147,8 @@ function groups_set_language_negotiation() { function groups_install_finished(&$install_state) { // BEGIN copy/paste from install_finished(). // Remove the bookmarks flag - include_once DRUPAL_ROOT . '/profiles/groups/modules/contrib/flag/includes/flag.admin.inc'; + // include_once DRUPAL_ROOT . '/profiles/groups/modules/contrib/flag/includes/flag.admin.inc'; + module_load_include('inc', 'flag', 'includes/flag.admin'); $flag = flag_get_flag('bookmarks'); if($flag) { $flag->delete(); @@ -200,6 +182,30 @@ function groups_install_finished(&$install_state) { ->condition('theme', 'adaptivetheme_admin') ->execute(); + // disable main menu on admin theme + db_update('block') + ->fields(array('status' => 0)) + ->condition('delta', 'main-menu') + ->condition('module', 'system') + ->condition('theme', 'adaptivetheme_admin') + ->execute(); + + // disable search form on admin theme + db_update('block') + ->fields(array('status' => 0)) + ->condition('delta', 'form') + ->condition('module', 'search') + ->condition('theme', 'adaptivetheme_admin') + ->execute(); + + // disable main-menu on openstack_bootstrap theme + db_update('block') + ->fields(array('status' => 0)) + ->condition('delta', 'main-menu') + ->condition('module', 'system') + ->condition('theme', 'openstack_bootstrap') + ->execute(); + // Cache a fully-built schema. drupal_get_schema(NULL, TRUE); diff --git a/patches/0005-commons-libraries-search-paths-alter.patch b/patches/0005-commons-libraries-search-paths-alter.patch new file mode 100644 index 0000000..1a493cd --- /dev/null +++ b/patches/0005-commons-libraries-search-paths-alter.patch @@ -0,0 +1,15 @@ +diff --git a/drupal-org.make.orig b/drupal-org.make +index 1833c7e..0676541 100644 +--- a/drupal-org.make.orig ++++ b/drupal-org.make +@@ -212,6 +212,10 @@ projects[libraries][type] = "module" + projects[libraries][subdir] = "contrib" + projects[libraries][version] = "2.3" + ++; Allow modules to alter libraries search paths ++; https://www.drupal.org/files/issues/2081579-7-libraries-search-paths-alter.patch ++projects[libraries][patch][] = "https://www.drupal.org/files/issues/2081579-7-libraries-search-paths-alter.patch" ++ + projects[lingotek][type] = "module" + projects[lingotek][subdir] = "contrib" + projects[lingotek][version] = "6.02" \ No newline at end of file diff --git a/patches/0006-commons-apachesolr-user-patch.patch b/patches/0006-commons-apachesolr-user-patch.patch new file mode 100644 index 0000000..673a222 --- /dev/null +++ b/patches/0006-commons-apachesolr-user-patch.patch @@ -0,0 +1,13 @@ +diff --git a/drupal-org.make.orig b/drupal-org.make +index e4e0fa5..ad9fffd 100644 +--- a/drupal-org.make.orig ++++ b/drupal-org.make +@@ -58,7 +58,7 @@ projects[apachesolr_user][download]revision] = "a86c5aebfceaf4a3fc53544762a36ca1 + + ; Check the user object before trying to display a result. + ; https://drupal.org/node/2077281#comment-7807937 +-projects[apachesolr_user][patch][] = "https://drupal.org/files/2077281-apache-solr-user-check-3.patch" ++;projects[apachesolr_user][patch][] = "https://drupal.org/files/2077281-apache-solr-user-check-3.patch" + + projects[breakpoints][type] = "module" + projects[breakpoints][subdir] = "contrib" diff --git a/patches/0007-commons-message.patch b/patches/0007-commons-message.patch new file mode 100644 index 0000000..72e950a --- /dev/null +++ b/patches/0007-commons-message.patch @@ -0,0 +1,25 @@ +--- a/drupal-org.make.orig ++++ b/drupal-org.make +@@ -254,10 +254,7 @@ projects[menu_attributes][version] = "1.0-rc3" + + projects[message][type] = "module" + projects[message][subdir] = "contrib" +-projects[message][download][type] = "git" +-projects[message][download][url] = "http://git.drupal.org/project/message.git" +-projects[message][download][branch] = "7.x-1.x" +-projects[message][download][revision] = "3bbdd5e6" ++projects[message][version] = "1.12" + + ; Make message access alterable. + ; https://drupal.org/node/1920560#comment-7080942 +@@ -267,10 +264,6 @@ projects[message][patch][] = "https://drupal.org/files/1920560-message-access-al + ; https://drupal.org/node/2006702#comment-7842259 + projects[message][patch][] = "https://drupal.org/files/message_field_undefined-lang.2006702-14.patch" + +-; Fix Undefined index: message_type in _field_ui on field listings +-; https://drupal.org/node/1391442 +-projects[message][patch][] = "https://drupal.org/files/issues/message-entity_info_hook_notice_undefined_index-1391442-34.patch" +- + projects[message_notify][type] = "module" + projects[message_notify][subdir] = "contrib" + projects[message_notify][version] = "2.5" diff --git a/patches/0008-core-profile-duplicated-hook-group.patch b/patches/0008-core-profile-duplicated-hook-group.patch new file mode 100644 index 0000000..398a605 --- /dev/null +++ b/patches/0008-core-profile-duplicated-hook-group.patch @@ -0,0 +1,16 @@ +diff --git a/includes/module.inc.orig b/includes/module.inc +index 2e25108..d05ff2b 100644 +--- a/includes/module.inc.orig ++++ b/includes/module.inc +@@ -773,6 +773,11 @@ function module_implements($hook, $sort = FALSE, $reset = FALSE) { + $implementations[$hook] = array(); + $list = module_list(FALSE, FALSE, $sort); + foreach ($list as $module) { ++ // profile inheritance results duplicated hook group entries, so it ++ // must be converted from array to string. ++ if ((isset($hook_info[$hook]['group'])) && (is_array($hook_info[$hook]['group']))) { ++ $hook_info[$hook]['group'] = reset($hook_info[$hook]['group']); ++ } + $include_file = isset($hook_info[$hook]['group']) && module_load_include('inc', $module, $module . '.' . $hook_info[$hook]['group']); + // Since module_hook() may needlessly try to load the include file again, + // function_exists() is used directly here. diff --git a/patches/0009-commons-flag-v3.patch b/patches/0009-commons-flag-v3.patch new file mode 100644 index 0000000..3a3a0c7 --- /dev/null +++ b/patches/0009-commons-flag-v3.patch @@ -0,0 +1,21 @@ +diff --git a/drupal-org.make.orig b/drupal-org.make +index 0676541..16b6c53 100644 +--- a/drupal-org.make.orig ++++ b/drupal-org.make +@@ -163,15 +163,7 @@ projects[file_entity][version] = "2.0-beta3" + + projects[flag][type] = "module" + projects[flag][subdir] = "contrib" +-projects[flag][version] = "2.2" +- +-; Issue #1965760: Manually set taxonomy term flag types because its different. +-; https://drupal.org/node/1965760 +-projects[flag][patch][] = "https://drupal.org/files/issues/1965760.29.flag_.entity-tokens.patch" +- +-; Provide a hook to allow default flag definitions to be altered. +-; https://drupal.org/node/2027091#comment-8012263 +-projects[flag][patch][] = "https://drupal.org/files/flag-default-flags-alter-hook-2027091-03.patch" ++projects[flag][version] = "3.9" + + projects[flag_abuse][type] = "module" + projects[flag_abuse][subdir] = "contrib" diff --git a/scripts/dev-build.sh b/scripts/dev-build.sh index d26c12a..ac51962 100755 --- a/scripts/dev-build.sh +++ b/scripts/dev-build.sh @@ -11,7 +11,15 @@ if [ ! -z "$1" ]; then TARGET_DIR=$1 fi +# build core drush make drupal-org-core.make $TARGET_DIR + +# build drupal commons +drush make --no-core --no-cache commons.make $TARGET_DIR.commons +rsync -a $TARGET_DIR.commons/* $TARGET_DIR/ +rm -rf $TARGET_DIR.commons + +# build groups custom modules mkdir -p $TARGET_DIR/profiles/$PROFILE_NAME rsync -a --exclude=$TARGET_DIR --exclude=drush . $TARGET_DIR/profiles/$PROFILE_NAME/ drush make --no-core --no-cache --contrib-destination=profiles/$PROFILE_NAME drupal-org.make $TARGET_DIR.contrib @@ -24,7 +32,7 @@ cd $TARGET_DIR/profiles/$PROFILE_NAME/themes/$THEME_NAME if [ -f Gemfile ]; then mkdir .bundled_gems export GEM_HOME=`pwd`/.bundled_gems - gem install bundler --no-rdoc --no-ri --verbose + gem install bundler --no-rdoc --no-ri $GEM_HOME/bin/bundle install $GEM_HOME/bin/bundle exec compass compile # cleanup