Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
Openfire
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Openfire
Commits
d643c5f0
Commit
d643c5f0
authored
Jun 17, 2016
by
Dave Cridland
Committed by
GitHub
Jun 17, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #595 from max-allan-surevine/master
Forced set of JAVA_HOME
parents
8bdfc856
3d95570d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
build.xml
build/build.xml
+1
-1
rules
build/debian/rules
+1
-1
No files found.
build/build.xml
View file @
d643c5f0
...
@@ -104,7 +104,7 @@
...
@@ -104,7 +104,7 @@
<property
name=
"copy.dbscripts"
value=
"true"
/>
<property
name=
"copy.dbscripts"
value=
"true"
/>
<property
name=
"overwrite"
value=
"true"
/>
<property
name=
"overwrite"
value=
"true"
/>
<property
name=
"installer.install4j.home"
value=
"/home/
j2ee-bamboo/install4j.5.1.11
"
/>
<property
name=
"installer.install4j.home"
value=
"/home/
bamboo/install4j.6.0.4
"
/>
<property
name=
"installer.src"
value=
"${basedir}/build/installer"
/>
<property
name=
"installer.src"
value=
"${basedir}/build/installer"
/>
<property
name=
"installer.dest.dir"
value=
"${release.dest.dir}"
/>
<property
name=
"installer.dest.dir"
value=
"${release.dest.dir}"
/>
<property
name=
"installer.install4j.srcfile"
value=
"${installer.src}/openfire.install4j"
/>
<property
name=
"installer.install4j.srcfile"
value=
"${installer.src}/openfire.install4j"
/>
...
...
build/debian/rules
View file @
d643c5f0
...
@@ -13,7 +13,7 @@ ETCDIR := $(DEST)/etc/openfire
...
@@ -13,7 +13,7 @@ ETCDIR := $(DEST)/etc/openfire
LOGDIR := $(DEST)/var/log/openfire
LOGDIR := $(DEST)/var/log/openfire
VARDIR := $(DEST)/var/lib/openfire
VARDIR := $(DEST)/var/lib/openfire
JAVA_HOME
?
= /usr/lib/jvm/java-8-openjdk-amd64
JAVA_HOME
:
= /usr/lib/jvm/java-8-openjdk-amd64
DEB_ANT_BUILDFILE := build/build.xml
DEB_ANT_BUILDFILE := build/build.xml
DEB_ANT_CLEAN_TARGET := clean
DEB_ANT_CLEAN_TARGET := clean
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment