[Libreoffice-commits] .: Branch 'opengrok' - bin/update-opengrok opengrok-config.xml patches/all-code.diff patches/select-all.diff
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Tue Aug 9 11:12:45 PDT 2011
bin/update-opengrok | 27 -
opengrok-config.xml | 691 +++++++++---------------------------------------
patches/all-code.diff | 2
patches/select-all.diff | 7
4 files changed, 141 insertions(+), 586 deletions(-)
New commits:
commit 78d874148a34c0075d8c7ffb32033089cf1b7ee0
Author: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>
Date: Tue Aug 9 20:12:08 2011 +0200
Switched opengrok to the OneGit repos
diff --git a/bin/update-opengrok b/bin/update-opengrok
index 93b7c8f..ae5e459 100755
--- a/bin/update-opengrok
+++ b/bin/update-opengrok
@@ -1,26 +1,11 @@
#!/bin/sh
SRC_ROOT=/srv/git
-REPOS="artwork
- base
- bootstrap
- calc
- components
- extensions
- extras
- filters
+REPOS="core
+ binfilter
help
- impress
- l10n
- libs-core
- libs-extern
- libs-extern-sys
- libs-gui
- postprocess
- sdk
- testing
- ure
- writer"
+ translations"
+
BASE_GIT_URL="git://anongit.freedesktop.org/libreoffice/"
for REPO in $REPOS
@@ -38,11 +23,7 @@ export JAVA_HOME=/usr/lib64/jvm/java
# Run opengrok index
export OPENGROK_INSTANCE_BASE=/var/opengrok
-export IGNORE_PATTERNS="-i binfilter"
export OPENGROK_REMOTE_REPOS=false
export SKIN="-L libreoffice"
export READ_XML_CONFIGURATION=~/opengrok-config.xml
QUIET="-w /" /usr/local/bin/opengrok index $SRC_ROOT
-
-# Update the fixed bugs log file
-/home/libreoffice/bin/extract-iz $SRC_ROOT >/srv/www/download.go-oo.org/iz/fixed-iz-bugs.log
diff --git a/opengrok-config.xml b/opengrok-config.xml
index 5d0a6a2..4ca52d4 100644
--- a/opengrok-config.xml
+++ b/opengrok-config.xml
@@ -1,557 +1,134 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<java version="1.6.0" class="java.beans.XMLDecoder">
- <object class="org.opensolaris.opengrok.configuration.Configuration">
- <void property="ctags">
- <string>/usr/bin/ctags</string>
- </void>
- <void property="dataRoot">
- <string>/var/opengrok/data</string>
- </void>
- <void property="ignoredNames">
- <void property="ignoredPatterns">
- <void method="add">
- <string>binfilter</string>
- </void>
- </void>
- </void>
- <void property="projects">
- <void method="add">
- <object class="org.opensolaris.opengrok.configuration.Project">
- <void property="description">
- <string>artwork</string>
- </void>
- <void property="path">
- <string>/artwork</string>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.opensolaris.opengrok.configuration.Project">
- <void property="description">
- <string>base</string>
- </void>
- <void property="path">
- <string>/base</string>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.opensolaris.opengrok.configuration.Project">
- <void property="description">
- <string>bootstrap</string>
- </void>
- <void property="path">
- <string>/bootstrap</string>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.opensolaris.opengrok.configuration.Project">
- <void property="description">
- <string>calc</string>
- </void>
- <void property="path">
- <string>/calc</string>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.opensolaris.opengrok.configuration.Project">
- <void property="description">
- <string>components</string>
- </void>
- <void property="path">
- <string>/components</string>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.opensolaris.opengrok.configuration.Project">
- <void property="description">
- <string>extensions</string>
- </void>
- <void property="path">
- <string>/extensions</string>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.opensolaris.opengrok.configuration.Project">
- <void property="description">
- <string>extras</string>
- </void>
- <void property="path">
- <string>/extras</string>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.opensolaris.opengrok.configuration.Project">
- <void property="description">
- <string>filters</string>
- </void>
- <void property="path">
- <string>/filters</string>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.opensolaris.opengrok.configuration.Project">
- <void property="description">
- <string>help</string>
- </void>
- <void property="path">
- <string>/help</string>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.opensolaris.opengrok.configuration.Project">
- <void property="description">
- <string>impress</string>
- </void>
- <void property="path">
- <string>/impress</string>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.opensolaris.opengrok.configuration.Project">
- <void property="description">
- <string>l10n</string>
- </void>
- <void property="path">
- <string>/l10n</string>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.opensolaris.opengrok.configuration.Project">
- <void property="description">
- <string>libs-core</string>
- </void>
- <void property="path">
- <string>/libs-core</string>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.opensolaris.opengrok.configuration.Project">
- <void property="description">
- <string>libs-extern</string>
- </void>
- <void property="path">
- <string>/libs-extern</string>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.opensolaris.opengrok.configuration.Project">
- <void property="description">
- <string>libs-extern-sys</string>
- </void>
- <void property="path">
- <string>/libs-extern-sys</string>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.opensolaris.opengrok.configuration.Project">
- <void property="description">
- <string>libs-gui</string>
- </void>
- <void property="path">
- <string>/libs-gui</string>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.opensolaris.opengrok.configuration.Project">
- <void property="description">
- <string>postprocess</string>
- </void>
- <void property="path">
- <string>/postprocess</string>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.opensolaris.opengrok.configuration.Project">
- <void property="description">
- <string>sdk</string>
- </void>
- <void property="path">
- <string>/sdk</string>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.opensolaris.opengrok.configuration.Project">
- <void property="description">
- <string>testing</string>
- </void>
- <void property="path">
- <string>/testing</string>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.opensolaris.opengrok.configuration.Project">
- <void property="description">
- <string>ure</string>
- </void>
- <void property="path">
- <string>/ure</string>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.opensolaris.opengrok.configuration.Project">
- <void property="description">
- <string>writer</string>
- </void>
- <void property="path">
- <string>/writer</string>
- </void>
- </object>
- </void>
- </void>
- <void property="repositories">
- <void method="add">
- <object class="org.opensolaris.opengrok.history.RepositoryInfo">
- <void property="datePattern">
- <string>EEE MMM dd hh:mm:ss yyyy ZZZZ</string>
- </void>
- <void property="directoryName">
- <string>/srv/git/artwork</string>
- </void>
- <void property="type">
- <string>git</string>
- </void>
- <void property="working">
- <boolean>true</boolean>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.opensolaris.opengrok.history.RepositoryInfo">
- <void property="datePattern">
- <string>EEE MMM dd hh:mm:ss yyyy ZZZZ</string>
- </void>
- <void property="directoryName">
- <string>/srv/git/base</string>
- </void>
- <void property="type">
- <string>git</string>
- </void>
- <void property="working">
- <boolean>true</boolean>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.opensolaris.opengrok.history.RepositoryInfo">
- <void property="datePattern">
- <string>EEE MMM dd hh:mm:ss yyyy ZZZZ</string>
- </void>
- <void property="directoryName">
- <string>/srv/git/bootstrap</string>
- </void>
- <void property="type">
- <string>git</string>
- </void>
- <void property="working">
- <boolean>true</boolean>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.opensolaris.opengrok.history.RepositoryInfo">
- <void property="datePattern">
- <string>EEE MMM dd hh:mm:ss yyyy ZZZZ</string>
- </void>
- <void property="directoryName">
- <string>/srv/git/calc</string>
- </void>
- <void property="type">
- <string>git</string>
- </void>
- <void property="working">
- <boolean>true</boolean>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.opensolaris.opengrok.history.RepositoryInfo">
- <void property="datePattern">
- <string>EEE MMM dd hh:mm:ss yyyy ZZZZ</string>
- </void>
- <void property="directoryName">
- <string>/srv/git/components</string>
- </void>
- <void property="type">
- <string>git</string>
- </void>
- <void property="working">
- <boolean>true</boolean>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.opensolaris.opengrok.history.RepositoryInfo">
- <void property="datePattern">
- <string>EEE MMM dd hh:mm:ss yyyy ZZZZ</string>
- </void>
- <void property="directoryName">
- <string>/srv/git/extensions</string>
- </void>
- <void property="type">
- <string>git</string>
- </void>
- <void property="working">
- <boolean>true</boolean>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.opensolaris.opengrok.history.RepositoryInfo">
- <void property="datePattern">
- <string>EEE MMM dd hh:mm:ss yyyy ZZZZ</string>
- </void>
- <void property="directoryName">
- <string>/srv/git/extras</string>
- </void>
- <void property="type">
- <string>git</string>
- </void>
- <void property="working">
- <boolean>true</boolean>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.opensolaris.opengrok.history.RepositoryInfo">
- <void property="datePattern">
- <string>EEE MMM dd hh:mm:ss yyyy ZZZZ</string>
- </void>
- <void property="directoryName">
- <string>/srv/git/filters</string>
- </void>
- <void property="type">
- <string>git</string>
- </void>
- <void property="working">
- <boolean>true</boolean>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.opensolaris.opengrok.history.RepositoryInfo">
- <void property="datePattern">
- <string>EEE MMM dd hh:mm:ss yyyy ZZZZ</string>
- </void>
- <void property="directoryName">
- <string>/srv/git/help</string>
- </void>
- <void property="type">
- <string>git</string>
- </void>
- <void property="working">
- <boolean>true</boolean>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.opensolaris.opengrok.history.RepositoryInfo">
- <void property="datePattern">
- <string>EEE MMM dd hh:mm:ss yyyy ZZZZ</string>
- </void>
- <void property="directoryName">
- <string>/srv/git/impress</string>
- </void>
- <void property="type">
- <string>git</string>
- </void>
- <void property="working">
- <boolean>true</boolean>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.opensolaris.opengrok.history.RepositoryInfo">
- <void property="datePattern">
- <string>EEE MMM dd hh:mm:ss yyyy ZZZZ</string>
- </void>
- <void property="directoryName">
- <string>/srv/git/libs-core</string>
- </void>
- <void property="type">
- <string>git</string>
- </void>
- <void property="working">
- <boolean>true</boolean>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.opensolaris.opengrok.history.RepositoryInfo">
- <void property="datePattern">
- <string>EEE MMM dd hh:mm:ss yyyy ZZZZ</string>
- </void>
- <void property="directoryName">
- <string>/srv/git/libs-gui</string>
- </void>
- <void property="type">
- <string>git</string>
- </void>
- <void property="working">
- <boolean>true</boolean>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.opensolaris.opengrok.history.RepositoryInfo">
- <void property="datePattern">
- <string>EEE MMM dd hh:mm:ss yyyy ZZZZ</string>
- </void>
- <void property="directoryName">
- <string>/srv/git/postprocess</string>
- </void>
- <void property="type">
- <string>git</string>
- </void>
- <void property="working">
- <boolean>true</boolean>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.opensolaris.opengrok.history.RepositoryInfo">
- <void property="datePattern">
- <string>EEE MMM dd hh:mm:ss yyyy ZZZZ</string>
- </void>
- <void property="directoryName">
- <string>/srv/git/sdk</string>
- </void>
- <void property="type">
- <string>git</string>
- </void>
- <void property="working">
- <boolean>true</boolean>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.opensolaris.opengrok.history.RepositoryInfo">
- <void property="datePattern">
- <string>EEE MMM dd hh:mm:ss yyyy ZZZZ</string>
- </void>
- <void property="directoryName">
- <string>/srv/git/testing</string>
- </void>
- <void property="type">
- <string>git</string>
- </void>
- <void property="working">
- <boolean>true</boolean>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.opensolaris.opengrok.history.RepositoryInfo">
- <void property="datePattern">
- <string>EEE MMM dd hh:mm:ss yyyy ZZZZ</string>
- </void>
- <void property="directoryName">
- <string>/srv/git/ure</string>
- </void>
- <void property="type">
- <string>git</string>
- </void>
- <void property="working">
- <boolean>true</boolean>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.opensolaris.opengrok.history.RepositoryInfo">
- <void property="datePattern">
- <string>EEE MMM dd hh:mm:ss yyyy ZZZZ</string>
- </void>
- <void property="directoryName">
- <string>/srv/git/writer</string>
- </void>
- <void property="type">
- <string>git</string>
- </void>
- <void property="working">
- <boolean>true</boolean>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.opensolaris.opengrok.history.RepositoryInfo">
- <void property="datePattern">
- <string>EEE MMM dd hh:mm:ss yyyy ZZZZ</string>
- </void>
- <void property="directoryName">
- <string>/srv/git/l10n</string>
- </void>
- <void property="type">
- <string>git</string>
- </void>
- <void property="working">
- <boolean>true</boolean>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.opensolaris.opengrok.history.RepositoryInfo">
- <void property="datePattern">
- <string>EEE MMM dd hh:mm:ss yyyy ZZZZ</string>
- </void>
- <void property="directoryName">
- <string>/srv/git/libs-extern</string>
- </void>
- <void property="type">
- <string>git</string>
- </void>
- <void property="working">
- <boolean>true</boolean>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.opensolaris.opengrok.history.RepositoryInfo">
- <void property="datePattern">
- <string>EEE MMM dd hh:mm:ss yyyy ZZZZ</string>
- </void>
- <void property="directoryName">
- <string>/srv/git/libs-extern-sys</string>
- </void>
- <void property="type">
- <string>git</string>
- </void>
- <void property="working">
- <boolean>true</boolean>
- </void>
- </object>
- </void>
- </void>
- <void property="sourceRoot">
- <string>/srv/git</string>
- </void>
- <void property="urlPrefix">
- <string>/s?</string>
- </void>
- <void property="webappLAF">
- <string>libreoffice</string>
- </void>
- <void property="bugPage">
- <string>https://bugs.freedesktop.org/show_bug.cgi?id=</string>
- </void>
- <void property="bugPattern">
- <string>(?:fdo#|#fdo)([123456789][0-9]+)</string>
- </void>
- </object>
-</java>
+<?xml version="1.0" encoding="UTF-8"?>
+<java version="1.6.0" class="java.beans.XMLDecoder">
+ <object class="org.opensolaris.opengrok.configuration.Configuration">
+ <void property="ctags">
+ <string>/usr/bin/ctags</string>
+ </void>
+ <void property="dataRoot">
+ <string>/var/opengrok/data</string>
+ </void>
+ <void property="projects">
+ <void method="add">
+ <object class="org.opensolaris.opengrok.configuration.Project">
+ <void property="description">
+ <string>binfilter</string>
+ </void>
+ <void property="path">
+ <string>/binfilter</string>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.opensolaris.opengrok.configuration.Project">
+ <void property="description">
+ <string>help</string>
+ </void>
+ <void property="path">
+ <string>/help</string>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.opensolaris.opengrok.configuration.Project">
+ <void property="description">
+ <string>core</string>
+ </void>
+ <void property="path">
+ <string>/core</string>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.opensolaris.opengrok.configuration.Project">
+ <void property="description">
+ <string>translations</string>
+ </void>
+ <void property="path">
+ <string>/translations</string>
+ </void>
+ </object>
+ </void>
+ </void>
+ <void property="repositories">
+ <void method="add">
+ <object class="org.opensolaris.opengrok.history.RepositoryInfo">
+ <void property="datePattern">
+ <string>EEE MMM dd hh:mm:ss yyyy ZZZZ</string>
+ </void>
+ <void property="directoryName">
+ <string>/srv/git/binfilter</string>
+ </void>
+ <void property="type">
+ <string>git</string>
+ </void>
+ <void property="working">
+ <boolean>true</boolean>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.opensolaris.opengrok.history.RepositoryInfo">
+ <void property="datePattern">
+ <string>EEE MMM dd hh:mm:ss yyyy ZZZZ</string>
+ </void>
+ <void property="directoryName">
+ <string>/srv/git/help</string>
+ </void>
+ <void property="type">
+ <string>git</string>
+ </void>
+ <void property="working">
+ <boolean>true</boolean>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.opensolaris.opengrok.history.RepositoryInfo">
+ <void property="datePattern">
+ <string>EEE MMM dd hh:mm:ss yyyy ZZZZ</string>
+ </void>
+ <void property="directoryName">
+ <string>/srv/git/core</string>
+ </void>
+ <void property="type">
+ <string>git</string>
+ </void>
+ <void property="working">
+ <boolean>true</boolean>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.opensolaris.opengrok.history.RepositoryInfo">
+ <void property="datePattern">
+ <string>EEE MMM dd hh:mm:ss yyyy ZZZZ</string>
+ </void>
+ <void property="directoryName">
+ <string>/srv/git/translations</string>
+ </void>
+ <void property="type">
+ <string>git</string>
+ </void>
+ <void property="working">
+ <boolean>true</boolean>
+ </void>
+ </object>
+ </void>
+ </void>
+ <void property="sourceRoot">
+ <string>/srv/git</string>
+ </void>
+ <void property="urlPrefix">
+ <string>/s?</string>
+ </void>
+ <void property="webappLAF">
+ <string>libreoffice</string>
+ </void>
+ <void property="bugPage">
+ <string>https://bugs.freedesktop.org/show_bug.cgi?id=</string>
+ </void>
+ <void property="bugPattern">
+ <string>(?:fdo#|#fdo)([123456789][0-9]+)</string>
+ </void>
+ </object>
+</java>
diff --git a/patches/all-code.diff b/patches/all-code.diff
index 07f1864..82158dc 100644
--- a/patches/all-code.diff
+++ b/patches/all-code.diff
@@ -12,7 +12,7 @@ diff -ur a/web/menu.jspf b/web/menu.jspf
- if ( $(this).attr("selected") ) { $(this).removeAttr("selected") }
- else { $(this).attr("selected","true"); }
+ var value = $(this).attr("value");
-+ if ( value == 'translations' || value == 'l10n' || value == 'testing' || value == 'help' ) {
++ if ( value == 'translations' || value == 'l10n' || value == 'help' ) {
+ $(this).removeAttr("selected")
+ }
}
diff --git a/patches/select-all.diff b/patches/select-all.diff
index 685f49c..b65244a 100644
--- a/patches/select-all.diff
+++ b/patches/select-all.diff
@@ -1,16 +1,13 @@
--- a/web/projects.jspf 2010-10-08 10:01:07.202553872 +0200
+++ b/web/projects.jspf 2010-10-08 14:16:37.494001297 +0200
-@@ -70,6 +70,16 @@
+@@ -70,6 +70,13 @@
Project defaultProject = env.getDefaultProject();
if (defaultProject != null && project.isEmpty()) {
project.add(defaultProject.getDescription());
+ } else if ( project.isEmpty()) {
+ // Make all projects default instead of none
+ for (Project p : projects) {
-+ if ( !p.getPath().endsWith( "/l10n" ) &&
-+ !p.getPath().endsWith( "/translations" ) &&
-+ !p.getPath().endsWith( "/help" ) &&
-+ !p.getPath().endsWith( "/testing" ) ) {
++ if ( p.getPath().endsWith( "/core" ) ) {
+ project.add(p.getDescription());
+ }
+ }
More information about the Libreoffice-commits
mailing list