Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openbis
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
sispub
openbis
Commits
d01b209e
Commit
d01b209e
authored
11 years ago
by
felmer
Browse files
Options
Downloads
Patches
Plain Diff
SP-940, SWE-22: fix some path problems in compileInstaller task.
SVN: 29995
parent
83255eab
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
installation/build.gradle
+3
-3
3 additions, 3 deletions
installation/build.gradle
with
3 additions
and
3 deletions
installation/build.gradle
+
3
−
3
View file @
d01b209e
...
...
@@ -46,7 +46,7 @@ println "installerDir:${installerDistDir}"
println
"buildDir:${buildDir}"
println
"installer:${project.projectDir}/resource/installer"
task
copyResources
(
type:
Copy
,
dependsOn:
[
compileJava
,
':openbis_standard_technologies:
build
'
])
{
task
copyResources
(
type:
Copy
,
dependsOn:
[
compileJava
,
':openbis_standard_technologies:
zip'
,
':openbis_standard_technologies:zipDss
'
])
{
from
"${project.projectDir}/resource/installer"
from
"${project.projectDir}/../openbis_standard_technologies/dist/tarball/installer"
from
zipTree
(
project
(
':openbis_standard_technologies'
).
zipDss
.
archivePath
)
...
...
@@ -123,7 +123,7 @@ task(compileInstaller) << {
def
compression
=
'default'
def
kind
=
'standard'
def
basedir
=
project
.
projectDir
.
path
def
input
=
'resource/installer/install.xml'
def
input
=
'
../installation/
resource/installer/install.xml'
def
compressionLevel
=
-
1
def
compilerData
=
new
com
.
izforge
.
izpack
.
compiler
.
data
.
CompilerData
(
compression
,
kind
,
input
,
null
,
basedir
,
izPackJar
,
compressionLevel
)
...
...
@@ -133,7 +133,7 @@ task(compileInstaller) << {
compilerContainer
.
addComponent
(
compilerData
.
class
,
compilerData
)
def
compilerConfig
=
compilerContainer
.
getComponent
(
com
.
izforge
.
izpack
.
compiler
.
CompilerConfig
.
class
)
def
propertyManager
=
compilerContainer
.
getComponent
(
com
.
izforge
.
izpack
.
compiler
.
data
.
PropertyManager
.
class
)
propertyManager
.
addProperty
(
'installer.dist.dir'
,
installerDistDir
)
propertyManager
.
addProperty
(
'installer.dist.dir'
,
'../installation/'
+
installerDistDir
)
propertyManager
.
addProperty
(
'version.number'
,
versionNumber
)
propertyManager
.
addProperty
(
'revision.number'
,
revisionNumber
)
compilerConfig
.
executeCompiler
()
...
...
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