From 9b0b9cb306f79584263eb7eef2d3e0d280e9dff0 Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Fri, 19 Jun 2015 17:22:44 +1200 Subject: [PATCH] Updated docs for 3.2 --- app/_config.php | 13 ++++++----- app/_config/docsviewer.yml | 8 ++++++- bin/update.sh | 48 +++++++++++++++++--------------------- composer.lock | 31 +++++++++++------------- 4 files changed, 49 insertions(+), 51 deletions(-) diff --git a/app/_config.php b/app/_config.php index e73a135..72e0f4a 100644 --- a/app/_config.php +++ b/app/_config.php @@ -28,11 +28,7 @@ MySQLDatabase::set_connection_charset('utf8'); SSViewer::set_theme('docs'); -if(Director::isDev() && @$_GET['db'] == "sqlite3") { - global $databaseConfig; - $databaseConfig['type'] = 'SQLite3Database'; -} - +Config::inst()->update('DocumentationManifest', 'automatic_registration', false); Config::inst()->update('DocumentationViewer', 'link_base', ''); Config::inst()->update('DocumentationViewer', 'check_permission', false); @@ -64,5 +60,10 @@ if(file_exists(BASE_PATH . '/.lucene-index')) { Config::inst()->update('DocumentationSearch', 'index_location', BASE_PATH . '/.lucene-index'); } - +// Fix invalid character in iconv +// see http://stackoverflow.com/questions/4723135/invalid-characters-for-lucene-text-search +Zend_Search_Lucene_Search_QueryParser::setDefaultEncoding('utf-8'); +Zend_Search_Lucene_Analysis_Analyzer::setDefault( + new Zend_Search_Lucene_Analysis_Analyzer_Common_Utf8_CaseInsensitive () +); diff --git a/app/_config/docsviewer.yml b/app/_config/docsviewer.yml index 225e33b..086148d 100644 --- a/app/_config/docsviewer.yml +++ b/app/_config/docsviewer.yml @@ -18,9 +18,15 @@ DocumentationManifest: - Path: "src/framework_3/docs/" Title: "Framework" - Version: "3.2" + Version: "3.3" Branch: "3" DefaultEntity: true + - + Path: "src/framework_3.2/docs/" + Title: "Framework" + Version: "3.2" + Stable: true + DefaultEntity: true - Path: "src/framework_3.1/docs/" Title: "Framework" diff --git a/bin/update.sh b/bin/update.sh index c9a0225..b505a1d 100755 --- a/bin/update.sh +++ b/bin/update.sh @@ -1,3 +1,12 @@ +#!/bin/bash + +dir=$1 + +if [ ! "$dir" ]; then + echo "Usage: $0 /base/folder/to/docs" + exit 1 +fi + #=== FUNCTION ================================================================ # NAME: checkout # DESCRIPTION: Checks out a specific branch of a module into a folder. Not @@ -12,44 +21,29 @@ # #=============================================================================== # Parameters: github path -dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -dir="$(dirname "${dir}" )" - function checkout { - if [ ! -d $dir/src/$2 ]; then - echo "Cloning $1 " + # Create dirs + if [ ! -d $dir/src ]; then mkdir $dir/src - cd $dir/src - git clone --depth=100 -q git://github.com/$1 $2 --quiet - cd $2 - git checkout -q origin/master - else - cd $dir/src/$2 - git pull -q origin master - git checkout -q origin/master fi - if [ $# == 3 ]; then - echo "Checking out $2 from $1 into $2_$3" - - if [ -d $dir/src/$2_$3 ]; then - cd $dir/src/$2_$3 - else - cp -R $dir/src/$2 $dir/src/$2_$3 - cd $dir/src/$2_$3 - fi - - git reset --hard -q - git checkout $3 -q - git pull -q + if [ ! -d $dir/src/$2_$3 ]; then + echo "Cloning $1 branch $3" + cd $dir/src + git clone -b $3 --depth=100 git://github.com/$1 $dir/src/$2_$3 --quiet else - echo "Checking out $2 from $1 into $2" + echo "Updating $2 from branch $3" + cd $dir/src/$2_$3 + git reset --hard -q + git fetch origin -q + git pull -q origin $3 fi } # core checkout 'silverstripe/silverstripe-framework.git' 'framework' 'master' checkout 'silverstripe/silverstripe-framework.git' 'framework' '3' +checkout 'silverstripe/silverstripe-framework.git' 'framework' '3.2' checkout 'silverstripe/silverstripe-framework.git' 'framework' '3.1' checkout 'silverstripe/silverstripe-framework.git' 'framework' '3.0' checkout 'silverstripe/silverstripe-framework.git' 'framework' '2.4' diff --git a/composer.lock b/composer.lock index deb071e..216ee0f 100644 --- a/composer.lock +++ b/composer.lock @@ -12,12 +12,12 @@ "source": { "type": "git", "url": "https://github.com/composer/installers.git", - "reference": "a66f93a541c2214b4865161426b077e2b7d951de" + "reference": "e420b539e8d7b38b7c6f3f99dccc0386bd3dfe41" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/installers/zipball/a66f93a541c2214b4865161426b077e2b7d951de", - "reference": "a66f93a541c2214b4865161426b077e2b7d951de", + "url": "https://api.github.com/repos/composer/installers/zipball/e420b539e8d7b38b7c6f3f99dccc0386bd3dfe41", + "reference": "e420b539e8d7b38b7c6f3f99dccc0386bd3dfe41", "shasum": "" }, "replace": { @@ -99,7 +99,7 @@ "zend", "zikula" ], - "time": "2015-04-21 19:54:55" + "time": "2015-06-13 15:30:38" }, { "name": "erusev/parsedown", @@ -518,16 +518,16 @@ }, { "name": "phpunit/php-timer", - "version": "1.0.5", + "version": "1.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c" + "reference": "83fe1bdc5d47658b727595c14da140da92b3d66d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/19689d4354b295ee3d8c54b4f42c3efb69cbc17c", - "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/83fe1bdc5d47658b727595c14da140da92b3d66d", + "reference": "83fe1bdc5d47658b727595c14da140da92b3d66d", "shasum": "" }, "require": { @@ -536,13 +536,10 @@ "type": "library", "autoload": { "classmap": [ - "PHP/" + "src/" ] }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], "license": [ "BSD-3-Clause" ], @@ -558,7 +555,7 @@ "keywords": [ "timer" ], - "time": "2013-08-02 07:42:54" + "time": "2015-06-13 07:35:30" }, { "name": "phpunit/php-token-stream", @@ -746,12 +743,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/Yaml.git", - "reference": "2396832f6f9ab2b8f62f00b5d3f2e722fc773d65" + "reference": "a15e132f00e258c2da4cb409eec86d65ea2eabcb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Yaml/zipball/2396832f6f9ab2b8f62f00b5d3f2e722fc773d65", - "reference": "2396832f6f9ab2b8f62f00b5d3f2e722fc773d65", + "url": "https://api.github.com/repos/symfony/Yaml/zipball/a15e132f00e258c2da4cb409eec86d65ea2eabcb", + "reference": "a15e132f00e258c2da4cb409eec86d65ea2eabcb", "shasum": "" }, "require": { @@ -787,7 +784,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2015-05-12 15:16:46" + "time": "2015-06-18 16:14:27" } ], "aliases": [],