Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
SADE-Project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
fontane-notizbuecher
SADE-Project
Commits
76f405a7
Commit
76f405a7
authored
6 years ago
by
Mathias Goebel
Browse files
Options
Downloads
Plain Diff
Merge branch 'release/2.9.0'
parents
97e3e964
c306aac8
No related branches found
No related tags found
No related merge requests found
Pipeline
#80635
failed
6 years ago
Stage: deploy
Changes
5
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
.gitlab-ci.yml
+2
-3
2 additions, 3 deletions
.gitlab-ci.yml
build.properties
+3
-5
3 additions, 5 deletions
build.properties
build.xml
+3
-1
3 additions, 1 deletion
build.xml
expath-pkg.xml.tmpl
+2
-2
2 additions, 2 deletions
expath-pkg.xml.tmpl
master.build.properties
+1
-0
1 addition, 0 deletions
master.build.properties
with
11 additions
and
11 deletions
.gitlab-ci.yml
+
2
−
3
View file @
76f405a7
...
...
@@ -14,11 +14,10 @@ build-develop:
build-master
:
only
:
-
master
-
tags
stage
:
build
script
:
-
echo "sade.name=http://textgrid.de/ns/SADE" >
local.build.properties
-
ant master complete
-Dproject.name=http://textgrid.de/exist/fontane
-
cp master.build.properties
local.build.properties
-
ant master complete
artifacts
:
paths
:
-
build/*.xar
...
...
This diff is collapsed.
Click to expand it.
build.properties
+
3
−
5
View file @
76f405a7
project.version
=
2.
5.7
project.name
=
http://textgrid.de/exist/fontane
-develop
project.version
=
2.
9.0
project.name
=
http://textgrid.de/exist/fontane
project.abbrev
=
fontane
# dependencies
sade.name
=
http://textgrid.de/ns/SADE-develop
project.title
=
[Fontane] SADE-Project
# xslt is used to prepare for master
master.xslt
=
config.master.xslt
This diff is collapsed.
Click to expand it.
build.xml
+
3
−
1
View file @
76f405a7
...
...
@@ -12,13 +12,15 @@
<filter
token=
"project.version"
value=
"${project.version}"
/>
<filter
token=
"project.name"
value=
"${project.name}"
/>
<filter
token=
"project.abbrev"
value=
"${project.abbrev}"
/>
<filter
token=
"project.title"
value=
"${project.title}"
/>
<filter
token=
"sade.name"
value=
"${sade.name}"
/>
</filterset>
</copy>
<mkdir
dir=
"${build.dir}"
/>
<!-- create the XAR package -->
<zip
basedir=
"."
destfile=
"${build.dir}/
SADE-
project
-develop
.xar"
<zip
basedir=
"."
destfile=
"${build.dir}/
${
project
.name}-${project.version}
.xar"
excludes=
"expath-pkg.xml.tmpl,${build.dir},${build.dir}/**,*.zip"
/>
<delete
file=
"expath-pkg.xml"
/>
</target>
...
...
This diff is collapsed.
Click to expand it.
expath-pkg.xml.tmpl
+
2
−
2
View file @
76f405a7
<?xml version="1.0" encoding="UTF-8"?>
<package
xmlns=
"http://expath.org/ns/pkg"
name=
"@project.name@"
abbrev=
"@project.abbrev@"
version=
"@project.version@"
spec=
"1.0"
>
<title>
SADE project
collection for Fontane Notizbücher
</title>
<title>
[Fontane]
SADE project
</title>
<dependency
package=
"http://exist-db.org/apps/shared"
/>
<dependency
package=
"
@sade.name@
"
/>
<dependency
package=
"
http://textgrid.de/exist/SADE-fontane
"
/>
<dependency
package=
"http://textgrid.de/exist/textgrid-connect"
/>
<dependency
package=
"http://textgrid.de/exist/fontane-lucene-exist-module"
/>
<dependency
package=
"http://xqilla.sourceforge.net/pkg/xqjson"
/>
...
...
This diff is collapsed.
Click to expand it.
master.build.properties
0 → 100644
+
1
−
0
View file @
76f405a7
project.abbrev
=
fontane-master
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment