From 908cf4bd7b8cebbdf722c2781b3896c1e6e87b2f Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Mon, 7 Feb 2011 08:00:20 +0000 Subject: [PATCH] ENHANCEMENT Adding new paths for sapphire/docs git-svn-id: http://svn.silverstripe.com/projects/ss2doc/branches/v2@116059 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- Makefile | 9 ++++++++- mysite/_config.php | 6 ++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index ab1793c..2332007 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,14 @@ # update: - if [ -d $(CURDIR)/src/github ]; then cd $(CURDIR)/src/github; git pull; else git clone git://github.com/chillu/silverstripe-doc-restructuring.git $(CURDIR)/src/github; fi + # sapphire master + if [ -d $(CURDIR)/src/sapphire_master ]; then cd $(CURDIR)/src/sapphire_master; git pull; else git clone git://github.com/silverstripe/sapphire.git $(CURDIR)/src/sapphire_master; fi + # sapphire 2.4 + if [ -d $(CURDIR)/src/sapphire_2.4 ]; then cd $(CURDIR)/src/sapphire_2.4; git pull; else git clone --branch 2.4 git://github.com/silverstripe/sapphire.git $(CURDIR)/src/sapphire_2.4; fi + # sapphire 2.3 + if [ -d $(CURDIR)/src/sapphire_2.3 ]; then cd $(CURDIR)/src/sapphire_2.3; git pull; else git clone --branch 2.3 git://github.com/silverstripe/sapphire.git $(CURDIR)/src/sapphire_2.3; fi + + # build index cd $(CURDIR); php sapphire/cli-script.php dev/tasks/RebuildLuceneDocsIndex flush=1 test: diff --git a/mysite/_config.php b/mysite/_config.php index 03c543c..81fd096 100644 --- a/mysite/_config.php +++ b/mysite/_config.php @@ -40,8 +40,10 @@ if(!$isRunningTest) { DocumentationService::set_automatic_registration(false); DocumentationSearch::enable(); -try{ - DocumentationService::register("sapphire", BASE_PATH ."/src/github/master/sapphire/docs/", '2.4'); +try{ + DocumentationService::register("sapphire", BASE_PATH ."/src/sapphire_2.4/docs/", '2.4'); + // DocumentationService::register("sapphire", BASE_PATH ."/src/sapphire_2.3/docs/", '2.3'); + // DocumentationService::register("sapphire", BASE_PATH ."/src/sapphire_master/docs/", 'master'); } catch(InvalidArgumentException $e) { } // Silence if path is not found (for CI environment)