Commit e2666ea7 authored by Ubbo Veentjer's avatar Ubbo Veentjer
Browse files

Merge branch 'develop' into release/3.3

parents 5d877d4e 8d7420c5
......@@ -26,3 +26,8 @@
path = dictionaries
url = git://git.projects.gwdg.de/dariah-de/tg/textgrid-laboratory/dictionaries.git
branch = release/3.3
[submodule "bundled-jre"]
path = bundled-jre
url = https://github.com/DARIAH-DE/bundled-jre
branch = develop
base @ 31ab3d34
Subproject commit 3fdf1ca379bc4e4ef11f484b4372b874fdf41d7c
Subproject commit 31ab3d34ab2b38372d3b85419b8dc90af09aa3c6
......@@ -8,7 +8,7 @@
# CONFIGURATION
#
# The projects to build. Order is significant!
PROJECTS="${PROJECTS-textgridlab-dependencies core help xmleditor linkeditor dictionaries base}"
PROJECTS="${PROJECTS-textgridlab-dependencies bundled-jre core help xmleditor linkeditor dictionaries base}"
#
# repository root
REPO="${REPO-repo}"
......@@ -60,6 +60,8 @@ 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
rm bundled-jre
ln -s -f -T -v ../bundled-jre/updatesite/target/repository bundled-jre
cd "$oldpwd"
......
Subproject commit 09ebbd2f5d53471a0744418eb4602a71ce45c661
linkeditor @ 191a216a
Subproject commit 8b819eb9bd2b6356cb27d507c8de102549795f69
Subproject commit 191a216a68487a901124ffe7a6bf8a7353c1402b
......@@ -14,13 +14,14 @@
<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>https://ci.de.dariah.eu/p2/lab-nightly/dependencies</lab.repository.dependencies>
<lab.repository.root>https://ci.de.dariah.eu/p2/lab-nightly</lab.repository.root>
<lab.repository.dependencies>https://ci.de.dariah.eu/p2/nightly/dependencies</lab.repository.dependencies>
<lab.repository.root>https://ci.de.dariah.eu/p2/nightly</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>
<lab.repository.bundled-jre>${lab.repository.root}/bundled-jre</lab.repository.bundled-jre>
</properties>
<repositories>
......
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