Skip to content

GitLab

Commit e0892035 authored by thorsten.vitt's avatar thorsten.vitt
Browse files

Merge branch 'release/2.1'

parents 0581e31b acce7ee3
Hide whitespace changes
Inline Side-by-side
.gitmodules 0 → 100644
View file @ e0892035
[submodule "textgridlab-dependencies"]
path = textgridlab-dependencies
url = git@git.projects.gwdg.de:textgridlab-dependencies.git
branch = master
[submodule "core"]
path = core
url = git@git.projects.gwdg.de:lab-core.git
branch = master
[submodule "base"]
path = base
url = git@git.projects.gwdg.de:lab-base.git
branch = master
[submodule "xmleditor"]
path = xmleditor
url = git@git.projects.gwdg.de:xmleditor.git
branch = master
[submodule "help"]
path = help
url = git@git.projects.gwdg.de:help.git
branch = master
[submodule "linkeditor"]
path = linkeditor
url = git@git.projects.gwdg.de:linkeditor.git
branch = master
[submodule "dictionaries"]
path = dictionaries
url = git@git.projects.gwdg.de:dictionaries.git
branch = master
base @ 02e0e174
Subproject commit 02e0e174b6e49ad08f89be35e7970f1475c431bb
build-locally.sh 0 → 100755
View file @ e0892035
#!/bin/bash
#
# This script can be used to build a bunch of projects locally. Normally, the
# base lab will be built. The script is just a wrapper that calls maven a
# bunch of times
#
#############################################################################
# CONFIGURATION
#
# The projects to build. Order is significant!
PROJECTS="${PROJECTS-textgridlab-dependencies core help xmleditor linkeditor dictionaries base}"
#
# repository root
REPO="${REPO-repo}"
#
# maven executable
MVN="${MVN-mvn3}"
#
# maven default args, augmented by command line and repo path
MVN_ARGS="clean package"
#
#############################################################################
if [ -t 1 ]
then
bold=`tput bold`
boldoff=`tput sgr0`
else
bold=
boldoff=
fi
# WARNING NOT SAFE
repo_url="file:/`pwd`/$REPO"
cmdline="$MVN -Dlab.repository.root=${repo_url} -Dlab.repository.dependencies=${repo_url}/textgridlab-dependencies $MVN_ARGS $@"
cat <<EOF
$bold
Build Projects: $PROJECTS
Command Line: $cmdline
$boldoff
EOF
# Prepare repo
oldpwd="`pwd`"
mkdir -p "$REPO"
cd "$REPO"
for project in $PROJECTS
do
ln -s -f -T -v ../$project/${project}-repository/target/repository $project
done
### Fix the dependency repo which is unfortunately named p2repository :-(
rm textgridlab-dependencies
ln -s -f -T -v ../textgridlab-dependencies/p2repository/target/repository textgridlab-dependencies
cd "$oldpwd"
for project in $PROJECTS
do
(
echo "Building $project ..."
cd $project
$cmdline || break
echo
)
done
exit $?
core @ ee565df4
Subproject commit ee565df446b284f5fcb37f536c882352dc2f4daf
create-pom-property.sh 0 → 100755
View file @ e0892035
#!/bin/bash
script="`dirname \"$0\"`/create-pom-property.xsl"
if [ $# -lt 3 ]
then
cat <<EOHELP
Error: At least 3 arguments required ($@)
Usage: $0 property value pomfiles ...
Creates the property <property> with the value <value> in each of the given
pom files. Replaces all text nodes beginning with <value> with a reference to
the property. If the property already exists, it is changed (and a warning
written to stdout)
EOHELP
exit 1
fi
property="$1"
shift
value="$1"
shift
echo "Replacing value $value with property $property: " >&2
for f in "$@"; do
echo " in $f"
tmp="`mktemp -t XXXXXXXXXX.pom.xml`"
saxon "-s:$f" "-o:$tmp" "-xsl:$script" "property=${property}" "value=${value}"
mv -b "$tmp" "$f"
done
create-pom-property.xsl 0 → 100644
View file @ e0892035
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xpath-default-namespace="http://maven.apache.org/POM/4.0.0" exclude-result-prefixes="xs xsi"
version="2.0">
<xsl:output method="xml" indent="yes"/>
<xsl:param name="value" required="yes"/>
<xsl:param name="property" required="yes"/>
<xsl:template match="node()|@*">
<xsl:copy>
<xsl:apply-templates mode="#current"/>
</xsl:copy>
</xsl:template>
<!-- no properties element yet -->
<xsl:template match="project[not(properties)]">
<xsl:copy>
<xsl:apply-templates select="@*"/>
<properties>
<xsl:call-template name="generate-property-element"/>
</properties>
<xsl:apply-templates select="node()"/>
</xsl:copy>
</xsl:template>
<!-- properties element exists, $property is not defined yet -->
<xsl:template match="properties[not(*[local-name() eq $property])]">
<xsl:copy>
<xsl:apply-templates select="@*"/>
<xsl:call-template name="generate-property-element"/>
<xsl:apply-templates select="node()"/>
</xsl:copy>
</xsl:template>
<!-- $property is defined. -->
<xsl:template match="*[local-name() eq $property]">
<xsl:copy>
<xsl:value-of select="$value"/>
</xsl:copy>
<xsl:message>Warning: Changing <xsl:value-of select="$property"/> from <xsl:value-of
select="."/> to <xsl:value-of select="$value"/>. </xsl:message>
</xsl:template>
<!-- replace value with $property -->
<xsl:template match="text()[starts-with(normalize-space(.), normalize-space($value))]">
<xsl:value-of select="replace(., $value, concat('\${', $property,'}'))"/>
</xsl:template>
<xsl:template name="generate-property-element">
<xsl:element name="{$property}">
<xsl:value-of select="$value"/>
</xsl:element>
</xsl:template>
</xsl:stylesheet>
dictionaries @ 61d3eee2
Subproject commit 61d3eee2f912f791eda595a7d7534704fa39cb25
help @ b89e76a4
Subproject commit b89e76a4ebfa89a5c6ca97eaf97765d9b8ed3e5e
linkeditor @ ea55f269
Subproject commit ea55f2698e3ac6da192e5839b7acb72ce4457599
parent/.gitignore 0 → 100644
View file @ e0892035
.project
.settings
parent/pom.xml 0 → 100644
View file @ e0892035
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>info.textgrid.lab</groupId>
<artifactId>parent</artifactId>
<version>2.1.0</version>
<packaging>pom</packaging>
<properties>
<tycho-version>0.21.0</tycho-version>
<tycho-extras-version>0.21.0</tycho-extras-version>
<java-version>1.6</java-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<lab.repository.eclipse>http://download.eclipse.org/releases/indigo</lab.repository.eclipse>
<lab.repository.dependencies>http://download.digital-humanities.de/updates/repository</lab.repository.dependencies>
<lab.repository.root>http://download.digital-humanities.de/updates/textgridlab</lab.repository.root>
<lab.repository.core>${lab.repository.root}/core</lab.repository.core>
<lab.repository.xmleditor>${lab.repository.root}/xmleditor</lab.repository.xmleditor>
<lab.repository.help>${lab.repository.root}/help</lab.repository.help>
<lab.repository.linkeditor>${lab.repository.root}/linkeditor</lab.repository.linkeditor>
<lab.repository.dictionaries>${lab.repository.root}/dictionaries</lab.repository.dictionaries>
</properties>
<!-- <repositories> <repository> <id>swt-patch</id> <layout>p2</layout>
<url>http://textgridlab.org/updates/swt-patch</url> </repository> <repository>
<id>lab-core</id> <layout>p2</layout> <url>${lab.repository.core}</url> </repository>
<repository> <id>lab-xmleditor</id> <layout>p2</layout> <url>${lab.repository.xmleditor}</url>
</repository> <repository> <id>lab-help</id> <layout>p2</layout> <url>${lab.repository.help}</url>
</repository> <repository> <id>lab-linkeditor</id> <layout>p2</layout> <url>${lab.repository.linkeditor}</url>
</repository> <repository> <id>lab-dictionaries</id> <layout>p2</layout>
<url>${lab.repository.dictionaries}</url> </repository> <repository> <id>indigo</id>
<layout>p2</layout> <url>${lab.repository.eclipse}</url> </repository> <repository>
<id>babel</id> <layout>p2</layout> <url>http://download.eclipse.org/technology/babel/update-site/R0.11.1/indigo</url>
</repository> <repository> <id>textgridlab-dependencies</id> <layout>p2</layout>
<url>${lab.repository.dependencies}</url> </repository> <repository> <id>guava-osgi</id>
<layout>p2</layout> <url>${lab.repository.dependencies}</url> </repository>
<repository> <id>orbit</id> <layout>p2</layout> <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20120119162704/repository/</url>
</repository> </repositories> -->
<distributionManagement>
<repository>
<id>internal</id>
<url>http://dev.digital-humanities.de/nexus/content/repositories/releases/</url>
</repository>
<snapshotRepository>
<id>snapshots</id>
<url>http://dev.digital-humanities.de/nexus/content/repositories/snapshots/</url>
</snapshotRepository>
</distributionManagement>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
<version>${tycho-version}</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
<resolver>p2</resolver>
<ignoreTychoRepositories>false</ignoreTychoRepositories>
<environments>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86</arch>
</environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86</arch>
</environment>
<environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>macosx</os>
<ws>cocoa</ws>
<arch>x86_64</arch>
</environment>
</environments>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<source>${java-version}</source>
<target>${java-version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
<id>plugin-source</id>
<goals>
<goal>plugin-source</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-source-feature-plugin</artifactId>
<version>${tycho-extras-version}</version>
<configuration>
<labelSuffix> SDK</labelSuffix>
</configuration>
<executions>
<execution>
<id>source-feature</id>
<phase>package</phase>
<goals>
<goal>source-feature</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
<id>attach-p2-metadata</id>
<phase>package</phase>
<goals>
<goal>p2-metadata</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-repository-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<includeAllDependencies>true</includeAllDependencies>
<compress>false</compress>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId>
<version>${tycho-version}</version>
<dependencies>
<dependency>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-buildtimestamp-jgit</artifactId>
<version>${tycho-extras-version}</version>
</dependency>
</dependencies>
<configuration>
<timestampProvider>jgit</timestampProvider>
<jgit.ignore>
pom.xml
</jgit.ignore>
<jgit.dirtyWorkingTree>warning</jgit.dirtyWorkingTree>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<baselineRepositories>
<repository>
<url>http://textgridlab.org/updates/stable</url>
<url>http://textgridlab.org/updates/beta</url>
<!--url>http://textgridlab.org/updates/nightly</url-->
</repository>
</baselineRepositories>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
<profiles>
<profile>
<id>sign</id>
<activation>
<property>
<name>jarsigner.alias</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jarsigner-plugin</artifactId>
<version>1.2</version>
<executions>
<execution>
<id>sign</id>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>javadoc</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.8.1</version>
<configuration>
<additionnalDependencies>
<!-- Without this, javadoc would fail with the test plugins -->
<additionnalDependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8</version>
</additionnalDependency>
</additionnalDependencies>
<links>
<link>http://help.eclipse.org/indigo/topic/org.eclipse.platform.doc.isv/reference/api</link>
</links>
<packagesheader>TextGridLab Core</packagesheader>
<!-- There are still some errors that I don't understand yet but that don't really break javadoc generation -->
<failOnError>false</failOnError>
</configuration>
<executions>
<execution>
<id>aggregate</id>
<goals>
<goal>aggregate</goal>
</goals>
<phase>generate-resources</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<name>TextGrid Parent POM</name>
<url>http://www.textgrid.de/</url>
<inceptionYear>2006</inceptionYear>
</project>
set-version.sh
View file @ e0892035
......@@ -7,8 +7,8 @@ then
fi
version="$1"
echo Checking current svn state ...
svn diff | colordiff
echo Checking current SCM state ...
( cd base && git diff )
echo "Do you wish to set the TextGridLab version number to $version?"
echo -n "You shouldn't if there is output above. [Enter \"yes\" to continue] >"
read cont
......@@ -23,6 +23,5 @@ xmlstarlet ed -P -L -N m=http://maven.apache.org/POM/4.0.0 -u //m:archiveFileNam
xmlstarlet ed -P -L -u /product/@version -v "${version}.qualifier" base/base-repository/info.textgrid.lab.core.application.base_product.product
sed -i -e "s/parent.setTextContent(\"TextGridLab Version \([0-9]\+\.[0-9]\+\.[0-9]\+\)/parent.setTextContent(\"TextGridLab Version ${version}/" base/info.textgrid.lab.welcome/src/info/textgrid/lab/welcome/IntroXHTMLContentProvider.java
svn diff | colordiff | less -R
( cd base && git diff )
echo '"svn revert -R ." to revert, "svn commit" to commit'
textgridlab-dependencies @ aa9d2e20
Subproject commit aa9d2e2033aa5b08b01f028cfecf2bbf3e7ba2ce
unify-project-names 0 → 100755
View file @ e0892035
#!/bin/sh
# Unifies Eclipse project name, maven artifactId and subdirectory name
# cf. https://develop.sub.uni-goettingen.de/jira/browse/TG-1868
fixdir () {
basedir="$1"
oldpwd="`pwd`"
cd "$basedir"
echo ">>> Processing $basedir ..."
for project in */.project
do
dir=`dirname $project`
pom=$dir/pom.xml
if [ -r $pom ]
then
artifactId=`xmlstarlet sel -N m=http://maven.apache.org/POM/4.0.0 -t -m m:project -v m:artifactId $pom`
oldProject=`xmlstarlet sel -t -m projectDescription -v name $project`
echo "(info) basedir=$basedir, project=$project, dir=$dir, pom=$pom, artifactId=$artifactId, oldProject=$oldProject"
if [ -z "$artifactId" ]
then
echo "ERROR artifactId is empty, cannot continue."
return 1
fi
if [ "$artifactId" != "$oldProject" ]
then
xmlstarlet ed -P -L -u /projectDescription/name -v $artifactId $project
echo "project Changed project name from $oldProject to $artifactId in $dir."
else
echo " project name ($oldProject) in $dir already matches the artifactId."
fi
if [ "$artifactId" != "$dir" ]
then
svn mv -q "$dir" "$artifactId"
echo "svn Moved $dir to $artifactId"
xmlstarlet ed -P -L -N m=http://maven.apache.org/POM/4.0.0 \
-u "/m:project/m:modules/m:module[. = '$dir']" -v "$artifactId" pom.xml
echo "pom Changed submodule to $artifactId"
fi
else
echo " Skipping $dir: No readable pom.xml"
fi
done
cd "$oldpwd"
}
while [ $# -gt 0 ]
do
fixdir "$1"
shift
echo
done
xmleditor @ cce52bae
Subproject commit cce52baee555be610f5643c1fd32bae0648efb78
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment