From 41e7a2a081a8bc123cd22d598f5213f45aa6ab6b Mon Sep 17 00:00:00 2001 From: Will Rossiter Date: Sat, 10 Nov 2012 11:52:40 +1300 Subject: [PATCH] Migrated to composer for managing dependancies --- .gitignore | 1 + README.md | 10 ++-- composer.json | 9 +++ composer.lock | 150 ++++++++++++++++++++++++++++++++++++++++++++++++++ docsviewer | 1 + framework | 1 + 6 files changed, 168 insertions(+), 4 deletions(-) create mode 100644 composer.json create mode 100644 composer.lock create mode 160000 docsviewer create mode 160000 framework diff --git a/.gitignore b/.gitignore index b8b91b0..610acdd 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ src/ .DS_Store silverstripe-cache assets +vendor/ diff --git a/README.md b/README.md index 2c6bf4c..cdb13ab 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,19 @@ # doc.silverstripe.org This is the source code powering http://doc.silverstripe.org. It primarily -consists of: +consists of the SilverStripe framework and [docsviewer](https://github.com/silverstripe/silverstripe-docsviewer) +module with minimal configuration. - * SilverStripe 3.0 framework - * The [docsviewer](https://github.com/silverstripe/silverstripe-docsviewer) - module. +For adding functionality or editing the style of the documentation see the +[docsviewer](http://github.com/silverstripe/silverstripe-docsviewer) module. ## Development To set up a test instance: * Clone this repository to a LAMP server. + * Install [Composer](http://doc.silverstripe.org/framework/en/installation/composer) + * After installing composer run `composer install --prefer-source` to grab the modules. * Run "make update" to check out the repositories from which is builds the docs (this will take a while the first time) diff --git a/composer.json b/composer.json new file mode 100644 index 0000000..28594b2 --- /dev/null +++ b/composer.json @@ -0,0 +1,9 @@ +{ + "name": "silverstripe/doc.silverstripe.org", + "description": "The source code behind doc.silverstripe.org", + "require": { + "php": ">=5.3.2", + "silverstripe/docsviewer": "dev-master", + "silverstripe/docsviewer": "dev-master" + } +} \ No newline at end of file diff --git a/composer.lock b/composer.lock new file mode 100644 index 0000000..3712098 --- /dev/null +++ b/composer.lock @@ -0,0 +1,150 @@ +{ + "hash": "f8c055a5490c58630ed620238e413022", + "packages": [ + { + "name": "composer/installers", + "version": "v1.0.0", + "source": { + "type": "git", + "url": "https://github.com/composer/installers", + "reference": "v1.0.0" + }, + "dist": { + "type": "zip", + "url": "https://github.com/composer/installers/zipball/v1.0.0", + "reference": "v1.0.0", + "shasum": "" + }, + "replace": { + "shama/baton": "*" + }, + "require-dev": { + "composer/composer": "1.0.*@dev" + }, + "time": "2012-09-07 21:17:33", + "type": "composer-installer", + "extra": { + "class": "Composer\\Installers\\Installer" + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "Composer\\Installers\\": "src/" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kyle Robinson Young", + "email": "kyle@dontkry.com", + "homepage": "https://github.com/shama", + "role": "Developer" + } + ], + "description": "A multi-framework Composer library installer", + "homepage": "http://composer.github.com/installers/", + "keywords": [ + "symfony", + "installer", + "zend", + "wordpress", + "cakephp", + "codeigniter", + "fuelphp", + "drupal", + "lithium", + "li3", + "joomla", + "laravel", + "phpbb", + "ppi", + "silverstripe", + "kohana", + "mako" + ] + }, + { + "name": "silverstripe/docsviewer", + "version": "dev-master", + "source": { + "type": "git", + "url": "git@github.com:silverstripe/silverstripe-docsviewer.git", + "reference": "9aaeadd7ffb8f5eca3f6bdccc28c8a2f009429b6" + }, + "dist": { + "type": "zip", + "url": "https://github.com/silverstripe/silverstripe-docsviewer/archive/9aaeadd7ffb8f5eca3f6bdccc28c8a2f009429b6.zip", + "reference": "9aaeadd7ffb8f5eca3f6bdccc28c8a2f009429b6", + "shasum": "" + }, + "require": { + "silverstripe/framework": "3.*" + }, + "time": "1352499150", + "type": "silverstripe-module", + "installation-source": "source", + "authors": [ + { + "name": "Will Rossiter", + "email": "will@fullscreen.io" + } + ], + "description": "Documentation viewer module for SilverStripe", + "keywords": [ + "documentation", + "silverstripe" + ] + }, + { + "name": "silverstripe/framework", + "version": "3.0.2.1", + "source": { + "type": "git", + "url": "https://github.com/silverstripe/sapphire", + "reference": "3.0.2.1" + }, + "dist": { + "type": "zip", + "url": "https://github.com/silverstripe/sapphire/archive/3.0.2.1.zip", + "reference": "3.0.2.1", + "shasum": "" + }, + "require": { + "php": ">=5.3.2", + "composer/installers": "*" + }, + "time": "2012-11-03 02:41:00", + "type": "silverstripe-module", + "installation-source": "dist", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "SilverStripe", + "homepage": "http://silverstripe.com" + }, + { + "name": "The SilverStripe Community", + "homepage": "http://silverstripe.org" + } + ], + "description": "The SilverStripe framework", + "homepage": "http://silverstripe.org", + "keywords": [ + "framework", + "silverstripe" + ] + } + ], + "packages-dev": null, + "aliases": [ + + ], + "minimum-stability": "stable", + "stability-flags": { + "silverstripe/docsviewer": 20 + } +} diff --git a/docsviewer b/docsviewer new file mode 160000 index 0000000..6a6b168 --- /dev/null +++ b/docsviewer @@ -0,0 +1 @@ +Subproject commit 6a6b168da7e0e30f5f422f7c1c976148c1fae113 diff --git a/framework b/framework new file mode 160000 index 0000000..24114a5 --- /dev/null +++ b/framework @@ -0,0 +1 @@ +Subproject commit 24114a590492dbb6092b67795d0e2d243c67d4a8