Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
e3-require
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
Container 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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Anders Lindh Olsson
e3-require
Commits
08fe3697
Commit
08fe3697
authored
9 years ago
by
Dirk Zimoch
Browse files
Options
Downloads
Patches
Plain Diff
make sure version is built even if library only consists of other libraries but no local code
parent
5e855fdc
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
App/tools/driver.makefile
+11
-8
11 additions, 8 deletions
App/tools/driver.makefile
with
11 additions
and
8 deletions
App/tools/driver.makefile
+
11
−
8
View file @
08fe3697
...
@@ -123,13 +123,16 @@ BUILD_EPICS_VERSIONS = $(filter ${INSTALLED_EPICS_VERSIONS},${EPICS_VERSIONS})
...
@@ -123,13 +123,16 @@ BUILD_EPICS_VERSIONS = $(filter ${INSTALLED_EPICS_VERSIONS},${EPICS_VERSIONS})
$(
foreach
v,
$(
sort
$(
basename
${
BUILD_EPICS_VERSIONS
}))
,
$(
eval
EPICS_VERSIONS_
$v
=
$(
filter
$v
.%,
${
BUILD_EPICS_VERSIONS
})))
$(
foreach
v,
$(
sort
$(
basename
${
BUILD_EPICS_VERSIONS
}))
,
$(
eval
EPICS_VERSIONS_
$v
=
$(
filter
$v
.%,
${
BUILD_EPICS_VERSIONS
})))
#check only what is needed to build the lib? But what is that?
#check only what is needed to build the lib? But what is that?
VERSIONCHECKFILES
=
$(
filter-out /%
-none-
,
${
SOURCES
}
${
DBDS
}
${
TEMPLATES
}
${
SCRIPTS
}
$(
foreach v,3.13 3.14 3.15,
${
SOURCES_
$v
}
${
DBDS_
$v
}))
VERSIONCHECKFILES
=
$(
filter-out /%
-none-
,
$(
wildcard
*
makefile
*
*
Makefile
*
*
.db
*
.template
*
.subs
*
.dbd
*
.cmd
)
${
SOURCES
}
${
DBDS
}
${
TEMPLATES
}
${
SCRIPTS
}
$(
foreach v,3.13 3.14 3.15,
${
SOURCES_
$v
}
${
DBDS_
$v
}))
VERSIONCHECKCMD
=
${
MAKEHOME
}
/getVersion.tcl
${
VERSIONDEBUGFLAG
}
${
VERSIONCHECKFILES
}
VERSIONCHECKCMD
=
${
MAKEHOME
}
/getVersion.tcl
${
VERSIONDEBUGFLAG
}
${
VERSIONCHECKFILES
}
LIBVERSION
=
$(
or
$(
filter-out
test
,
$(
shell
${
VERSIONCHECKCMD
}
2>/dev/null
))
,
${
USER
}
,test
)
LIBVERSION
=
$(
or
$(
filter-out
test
,
$(
shell
${
VERSIONCHECKCMD
}
2>/dev/null
))
,
${
USER
}
,test
)
VERSIONDEBUGFLAG
=
$(
if
${
VERSIONDEBUG
}
,
-d
)
VERSIONDEBUGFLAG
=
$(
if
${
VERSIONDEBUG
}
,
-d
)
# Default
project
name is name of current directory.
# Default
module
name is name of current directory.
# But don't use "src" or "snl", go up directory tree instead.
# But don't use "src" or "snl", go up directory tree instead.
# Avoid using environment variables for MODULE or PROJECT
MODULE
=
PROJECT
=
PRJDIR
:=
$(
subst -,_,
$(
subst .,_,
$(
notdir
$(
patsubst %Lib,%,
$(
patsubst %/snl,%,
$(
patsubst %/src,%,
${
PWD
}))))))
PRJDIR
:=
$(
subst -,_,
$(
subst .,_,
$(
notdir
$(
patsubst %Lib,%,
$(
patsubst %/snl,%,
$(
patsubst %/src,%,
${
PWD
}))))))
PRJ
=
$(
or
${
MODULE
}
,
${
PROJECT
}
,
${
PRJDIR
})
PRJ
=
$(
or
${
MODULE
}
,
${
PROJECT
}
,
${
PRJDIR
})
export
PRJ
export
PRJ
...
@@ -603,11 +606,6 @@ LIBOBJS += $(if $(MODULEDBD), $(addsuffix $(OBJ),$(basename ${REGISTRYFILE} ${EX
...
@@ -603,11 +606,6 @@ LIBOBJS += $(if $(MODULEDBD), $(addsuffix $(OBJ),$(basename ${REGISTRYFILE} ${EX
endif
# both, 3.13 and 3.14 from here
endif
# both, 3.13 and 3.14 from here
# If we build a library, provide a version variable.
ifneq
($(MODULELIB),)
LIBOBJS
+=
$(
addsuffix
$(
OBJ
)
,
$(
basename
${
VERSIONFILE
}))
endif
# MODULELIB
# for backward compatibility
# for backward compatibility
# Provide a global symbol for every version with the same
# Provide a global symbol for every version with the same
# major and equal or smaller minor version number.
# major and equal or smaller minor version number.
...
@@ -692,6 +690,11 @@ ifneq ($(strip ${DBDFILES}),)
...
@@ -692,6 +690,11 @@ ifneq ($(strip ${DBDFILES}),)
MODULEDBD
=
${
PRJ
}
.dbd
MODULEDBD
=
${
PRJ
}
.dbd
endif
endif
# If we build a library, provide a version variable.
ifneq
($(MODULELIB),)
LIBOBJS
+=
$(
addsuffix
$(
OBJ
)
,
$(
basename
${
VERSIONFILE
}))
endif
# MODULELIB
debug
::
debug
::
@
echo
"BUILDCLASSES =
${
BUILDCLASSES
}
"
@
echo
"BUILDCLASSES =
${
BUILDCLASSES
}
"
@
echo
"OS_CLASS =
${
OS_CLASS
}
"
@
echo
"OS_CLASS =
${
OS_CLASS
}
"
...
@@ -790,7 +793,7 @@ debug::
...
@@ -790,7 +793,7 @@ debug::
@
echo
"INSTALL_CFG =
$(
INSTALL_CFG
)
"
@
echo
"INSTALL_CFG =
$(
INSTALL_CFG
)
"
@
echo
"INSTALL_CFGS =
$(
INSTALL_CFGS
)
"
@
echo
"INSTALL_CFGS =
$(
INSTALL_CFGS
)
"
INSTALLS
+=
${
INSTALL_CFGS
}
${
INSTALL_SCRS
}
${
INSTALL_HDRS
}
${
INSTALL_DBDS
}
${
INSTALL_DBS
}
${
INSTALL_LIBS
}
${
INSTALL_DEPS
}
${
INSTALL_CFGS
}
INSTALLS
+=
${
INSTALL_CFGS
}
${
INSTALL_SCRS
}
${
INSTALL_HDRS
}
${
INSTALL_DBDS
}
${
INSTALL_DBS
}
${
INSTALL_LIBS
}
${
INSTALL_DEPS
}
${INSTALLRULE}
${INSTALLS}
${INSTALLRULE}
${INSTALLS}
...
...
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