Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dm-docs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
hammonds
dm-docs
Commits
ed3c84d8
Commit
ed3c84d8
authored
10 years ago
by
sveseli
Browse files
Options
Downloads
Patches
Plain Diff
fix generic build
parent
92ed9237
No related branches found
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/java/DmWebPortal/Makefile
+8
-5
8 additions, 5 deletions
src/java/DmWebPortal/Makefile
with
8 additions
and
5 deletions
src/java/DmWebPortal/Makefile
+
8
−
5
View file @
ed3c84d8
...
@@ -8,16 +8,19 @@ all install: dist
...
@@ -8,16 +8,19 @@ all install: dist
clean clean-all clean-install distclean
:
ant-clean
clean clean-all clean-install distclean
:
ant-clean
.PHONY
:
propertiesFile
propertiesFile
:
if
[
!
-f
$(
BUILD_PROPERTIES_FILE
)
]
;
then
cmd
=
"cat
$(
GENERIC_BUILD_PROPERTIES_FILE
)
| sed 's?DM_GLASSFISH_DIR?
$${
DM_GLASSFISH_DIR
}
?g' >
$(
BUILD_PROPERTIES_FILE
)
"
&&
eval
$$
cmd
;
fi
.PHONY
:
ant-clean
.PHONY
:
ant-clean
ant-clean
:
ant-clean
:
propertiesFile
$(
ANT
)
$(
ANT_ARGS
)
clean
$(
ANT
)
$(
ANT_ARGS
)
clean
# For compiling from command line, we have to use generic build properties file
# For compiling from command line, we have to use generic build properties file
.PHONY
:
dist
.PHONY
:
dist
dist
:
dist
:
propertiesFile
mv
$(
BUILD_PROPERTIES_FILE
)
$(
BUILD_PROPERTIES_FILE
)
.orig
if
[
-f
$(
BUILD_PROPERTIES_FILE
)
]
;
then
mv
$(
BUILD_PROPERTIES_FILE
)
$(
BUILD_PROPERTIES_FILE
)
.orig
;
fi
cmd
=
"cat
$(
GENERIC_BUILD_PROPERTIES_FILE
)
| sed 's?DM_GLASSFISH_DIR?
$${
DM_GLASSFISH_DIR
}
?g' >
$(
BUILD_PROPERTIES_FILE
)
"
&&
eval
$$
cmd
cmd
=
"cat
$(
GENERIC_BUILD_PROPERTIES_FILE
)
| sed 's?DM_GLASSFISH_DIR?
$${
DM_GLASSFISH_DIR
}
?g' >
$(
BUILD_PROPERTIES_FILE
)
"
&&
eval
$$
cmd
$(
ANT
)
$(
ANT_ARGS
)
dist
$(
ANT
)
$(
ANT_ARGS
)
dist
mv
$(
BUILD_PROPERTIES_FILE
)
.orig
$(
BUILD_PROPERTIES_FILE
)
if
[
-f
$(
BUILD_PROPERTIES_FILE
)
.orig
]
;
then
mv
$(
BUILD_PROPERTIES_FILE
)
.orig
$(
BUILD_PROPERTIES_FILE
);
fi
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