Commit 6125dca3 authored by thorsten.vitt's avatar thorsten.vitt
Browse files

Merge branch 'release/3.2'

parents 359b6c75 a7eadd41
#!/bin/bash
#
# find and copy new or changed translation files from collect dir to origin location
# use after collect_translation.sh
COLLECT_DIR=translations
SLASH_REPLACE=_._
SCRIPT=$(readlink -f "$0")
DIR=$(dirname "$SCRIPT")
OLDDIR=`pwd`
if [ ! -d $DIR/$COLLECT_DIR ]; then
echo "no dir $DIR/$COLLECT_DIR found"
exit
fi
cd $DIR/$COLLECT_DIR
for propfile in *; do
fileloc=$DIR/${propfile//_._/\/}
#echo $fileloc
if [ ! -e $fileloc ]; then
echo -e "[new file] $propfile \ncopying to $fileloc\n---"
cp $propfile $fileloc
elif ! diff -q $propfile $fileloc > /dev/null; then
echo -e "[changed file] $propfile \ncopying to $fileloc\n---"
cp $propfile $fileloc
fi
done
cd $OLDDIR
base @ 2f0a4529
Subproject commit 0448aa289656dd9bfa76632b8e0b3a9569fcbfcd
Subproject commit 2f0a4529486da5f9658fa144eead1eb0d20ee6d6
......@@ -14,10 +14,10 @@ PROJECTS="${PROJECTS-textgridlab-dependencies core help xmleditor linkeditor dic
REPO="${REPO-repo}"
#
# maven executable
MVN="${MVN-mvn3}"
MVN="${MVN-mvn}"
#
# maven default args, augmented by command line and repo path
MVN_ARGS="clean package"
MVN_ARGS="${MVN_ARGS-clean package}"
#
#############################################################################
......
#!/bin/bash
#
# collect all translation files in one dir
#
# preparation: (https://projects.gwdg.de/projects/textgrid-laboratory?jump=welcome)
#
# git clone --recursive git://git.projects.gwdg.de/textgrid-laboratory.git
# cd textgrid-laboratory
# git checkout develop
# git submodule update --remote
PROPFILE_MATCH="bundle*.properties plugin*.properties messages*.properties about*.properties"
COLLECT_DIR=translations
SLASH_REPLACE=_._
SCRIPT=$(readlink -f "$0")
DIR=$(dirname "$SCRIPT")
OLDDIR=`pwd`
cd $DIR
if [ ! -d $COLLECT_DIR ]; then
echo "creating dir $COLLECT_DIR"
mkdir $COLLECT_DIR
fi
for prm in $PROPFILE_MATCH; do
echo "collecting with pattern ${prm}"
propfiles=`find . -name $prm`
for propfile in $propfiles; do
if [[ $propfile == *$SLASH_REPLACE* ]]; then
echo "origin $propfile contains replacement pattern in path, you should change the variable SLASH_REPLACE"
else
newname=${propfile:2}
newname=${newname//\//$SLASH_REPLACE}
cp $propfile $COLLECT_DIR/$newname &> /dev/null
fi
done
done
cd $OLDDIR
echo "all translation files collected in directory $DIR/$COLLECT_DIR"
core @ 3c23aba9
Subproject commit ee197e6098d40610a6324ccb2b97d36c456091db
Subproject commit 3c23aba9c9063e88a8830938b9d3dae37d26bf2b
dictionaries @ ac10581b
Subproject commit 3b5faff386e0ad68992d7b38a4beca357fa476d1
Subproject commit ac10581b35fe9be78bf11b4f62557f15d7b4c6ce
help @ 4b85b89d
Subproject commit e417b1349384ec6c6e93c6d170791f2dca02da06
Subproject commit 4b85b89d67bf82c15ecce07fc02886cfa53a6386
linkeditor @ ba75ee7d
Subproject commit b2be5ca4ee0377fa4f46587478394bc7a071bcce
Subproject commit ba75ee7dddbd56e5139442c56abc8e2f31db30ff
......@@ -4,15 +4,16 @@
<modelVersion>4.0.0</modelVersion>
<groupId>info.textgrid.lab</groupId>
<artifactId>parent</artifactId>
<version>3.0.1-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</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>
<tycho-version>0.22.0</tycho-version>
<tycho-extras-version>0.22.0</tycho-extras-version>
<java-version>1.7</java-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tycho.disableP2Mirrors>true</tycho.disableP2Mirrors>
<lab.repository.eclipse>http://download.eclipse.org/releases/luna</lab.repository.eclipse>
<lab.repository.dependencies>http://download.digital-humanities.de/updates/repository</lab.repository.dependencies>
......@@ -35,7 +36,7 @@
<!-- TODO remove this as soon as the TP works -->
<id>babel</id>
<layout>p2</layout>
<url>http://download.eclipse.org/technology/babel/update-site/R0.12.1/luna</url>
<url>http://archive.eclipse.org/technology/babel/update-site/R0.12.1/luna/</url>
</repository>
<repository>
<!-- TODO remove this as soon as the TP works -->
......
......@@ -10,7 +10,7 @@
<parent>
<groupId>info.textgrid.lab</groupId>
<artifactId>parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
......
textgridlab-dependencies @ cc318020
Subproject commit 728ed5ee0a1e900f84dc02a93b9b7734d4a3db78
Subproject commit cc31802004add9b06e0a077cadcf01c3c591374b
xmleditor @ 9657debd
Subproject commit a4bfb91aa4336dc61c1483fdabf78c216d3eaca0
Subproject commit 9657debd414f401a6bd6a7aded20c2d37141e0c6
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