From 1ffb7c1f23bf606b3fa4e6f497cc4cf528606b5b Mon Sep 17 00:00:00 2001
From: thewilkybarkid <chriswilkinson84@gmail.com>
Date: Fri, 4 Oct 2013 11:33:37 +0100
Subject: [PATCH] Move shared dependencies to a shared make file

---
 src/cambridge/cambridge.make           |  2 +-
 src/cambridge_base.make                | 57 ++++++++++++++++++++++++++
 src/cambridge_lite/cambridge_lite.make | 55 +------------------------
 3 files changed, 59 insertions(+), 55 deletions(-)
 create mode 100644 src/cambridge_base.make

diff --git a/src/cambridge/cambridge.make b/src/cambridge/cambridge.make
index bdb924b..1eb631e 100644
--- a/src/cambridge/cambridge.make
+++ b/src/cambridge/cambridge.make
@@ -1,7 +1,7 @@
 api = 2
 core = 7.x
 
-includes[cambridge_lite] = "../cambridge_lite/cambridge_lite.make"
+includes[cambridge_base] = "../cambridge_base.make"
 
 ; contrib
 
diff --git a/src/cambridge_base.make b/src/cambridge_base.make
new file mode 100644
index 0000000..c8b619f
--- /dev/null
+++ b/src/cambridge_base.make
@@ -0,0 +1,57 @@
+api = 2
+core = 7.x
+
+defaults[projects][subdir] = "contrib"
+
+; theme
+
+projects[cambridge_theme][type] = "theme"
+projects[cambridge_theme][download][type] = "file"
+projects[cambridge_theme][download][url] = "https://github.com/misd-service-development/drupal-cambridge-theme/archive/master.tar.gz"
+projects[cambridge_theme][subdir] = ""
+
+; contrib
+
+projects[ctools] = "1.3"
+projects[features][version] = "2.0-rc3"
+projects[features][subdir] = "contrib"
+projects[imagecrop][version] = "1.0-rc3"
+projects[imagecrop][subdir] = "patched"
+projects[imagecrop][patch][] = "https://gist.github.com/thewilkybarkid/6241365/raw/fccdba35efbd5ec106d8b92a8af98f71172e1870/imagecrop_query_string.patch"
+projects[imagecrop][patch][] = "https://gist.github.com/thewilkybarkid/6351355/raw/a34c91e4480aa7c4c0b79644e13aeeec914c1726/imagecrop_theme.patch"
+projects[libraries] = "2.1"
+projects[link] = "1.1"
+projects[menu_block] = "2.3"
+projects[pathauto] = "1.2"
+projects[raven][type] = "module"
+projects[raven][download][type] = "file"
+projects[raven][download][url] = "https://github.com/misd-service-development/drupal-raven/archive/master.tar.gz"
+projects[token] = "1.5"
+projects[views] = "3.7"
+
+; features
+
+projects[cambridge_carousel][type] = "module"
+projects[cambridge_carousel][download][type] = "file"
+projects[cambridge_carousel][download][url] = "https://github.com/misd-service-development/drupal-feature-carousel/archive/master.tar.gz"
+projects[cambridge_carousel][subdir] = "features"
+
+projects[cambridge_image_styles][type] = "module"
+projects[cambridge_image_styles][download][type] = "file"
+projects[cambridge_image_styles][download][url] = "https://github.com/misd-service-development/drupal-feature-image-styles/archive/master.tar.gz"
+projects[cambridge_image_styles][subdir] = "features"
+
+projects[cambridge_link][type] = "module"
+projects[cambridge_link][download][type] = "file"
+projects[cambridge_link][download][url] = "https://github.com/misd-service-development/drupal-feature-link/archive/master.tar.gz"
+projects[cambridge_link][subdir] = "features"
+
+projects[cambridge_related_links][type] = "module"
+projects[cambridge_related_links][download][type] = "file"
+projects[cambridge_related_links][download][url] = "https://github.com/misd-service-development/drupal-feature-related-links/archive/master.tar.gz"
+projects[cambridge_related_links][subdir] = "features"
+
+projects[cambridge_teasers][type] = "module"
+projects[cambridge_teasers][download][type] = "file"
+projects[cambridge_teasers][download][url] = "https://github.com/misd-service-development/drupal-feature-teasers/archive/master.tar.gz"
+projects[cambridge_teasers][subdir] = "features"
diff --git a/src/cambridge_lite/cambridge_lite.make b/src/cambridge_lite/cambridge_lite.make
index c8b619f..a3a364c 100644
--- a/src/cambridge_lite/cambridge_lite.make
+++ b/src/cambridge_lite/cambridge_lite.make
@@ -1,57 +1,4 @@
 api = 2
 core = 7.x
 
-defaults[projects][subdir] = "contrib"
-
-; theme
-
-projects[cambridge_theme][type] = "theme"
-projects[cambridge_theme][download][type] = "file"
-projects[cambridge_theme][download][url] = "https://github.com/misd-service-development/drupal-cambridge-theme/archive/master.tar.gz"
-projects[cambridge_theme][subdir] = ""
-
-; contrib
-
-projects[ctools] = "1.3"
-projects[features][version] = "2.0-rc3"
-projects[features][subdir] = "contrib"
-projects[imagecrop][version] = "1.0-rc3"
-projects[imagecrop][subdir] = "patched"
-projects[imagecrop][patch][] = "https://gist.github.com/thewilkybarkid/6241365/raw/fccdba35efbd5ec106d8b92a8af98f71172e1870/imagecrop_query_string.patch"
-projects[imagecrop][patch][] = "https://gist.github.com/thewilkybarkid/6351355/raw/a34c91e4480aa7c4c0b79644e13aeeec914c1726/imagecrop_theme.patch"
-projects[libraries] = "2.1"
-projects[link] = "1.1"
-projects[menu_block] = "2.3"
-projects[pathauto] = "1.2"
-projects[raven][type] = "module"
-projects[raven][download][type] = "file"
-projects[raven][download][url] = "https://github.com/misd-service-development/drupal-raven/archive/master.tar.gz"
-projects[token] = "1.5"
-projects[views] = "3.7"
-
-; features
-
-projects[cambridge_carousel][type] = "module"
-projects[cambridge_carousel][download][type] = "file"
-projects[cambridge_carousel][download][url] = "https://github.com/misd-service-development/drupal-feature-carousel/archive/master.tar.gz"
-projects[cambridge_carousel][subdir] = "features"
-
-projects[cambridge_image_styles][type] = "module"
-projects[cambridge_image_styles][download][type] = "file"
-projects[cambridge_image_styles][download][url] = "https://github.com/misd-service-development/drupal-feature-image-styles/archive/master.tar.gz"
-projects[cambridge_image_styles][subdir] = "features"
-
-projects[cambridge_link][type] = "module"
-projects[cambridge_link][download][type] = "file"
-projects[cambridge_link][download][url] = "https://github.com/misd-service-development/drupal-feature-link/archive/master.tar.gz"
-projects[cambridge_link][subdir] = "features"
-
-projects[cambridge_related_links][type] = "module"
-projects[cambridge_related_links][download][type] = "file"
-projects[cambridge_related_links][download][url] = "https://github.com/misd-service-development/drupal-feature-related-links/archive/master.tar.gz"
-projects[cambridge_related_links][subdir] = "features"
-
-projects[cambridge_teasers][type] = "module"
-projects[cambridge_teasers][download][type] = "file"
-projects[cambridge_teasers][download][url] = "https://github.com/misd-service-development/drupal-feature-teasers/archive/master.tar.gz"
-projects[cambridge_teasers][subdir] = "features"
+includes[cambridge_base] = "../cambridge_base.make"
-- 
GitLab