Commit Graph

76 Commits

Author SHA1 Message Date
Andrew Johnson
43ea188385 Merge 3.15 branch into 3.16
# Conflicts:
#	configure/CONFIG_BASE
#	configure/RULES_BUILD
2017-05-18 17:10:40 -05:00
Andrew Johnson
0b3e44747e Merge 3.14 branch into 3.15
# Conflicts:
#	configure/RULES.Db
#	configure/RULES_ARCHS
#	configure/RULES_BUILD
#	documentation/RELEASE_NOTES.html
2017-05-18 17:07:41 -05:00
Andrew Johnson
b7b3dd2b37 Support for 'make junitfiles' target.
The Perl XML::Generator module must be installed to use this.
2017-05-18 16:31:43 -05:00
Ralph Lange
26a4e1489f Make compilation inside Base USE_TYPED_RSET 2017-03-30 14:30:53 +02:00
Andrew Johnson
8fea0117ae Clean up build rules, remove CapFast & dbst support 2016-03-02 14:20:53 -06:00
Andrew Johnson
1e68f3899d Merged gen-vcs-version branch 2015-07-10 14:02:01 -05:00
Andrew Johnson
837111296e Updates to build rules and genVersionHeader.pl script
Added -q (quiet) flag, renamed INSTALL_QUIETLY build variable.
Moved GENVERSION variables into normal locations.
Changed from :: rule to : rule with FORCE dependency.
Removed use of --git-dir, only works when CWD is TOP.
Simplified some parts, more perlish.
Added VCS used to generated output file.
Expanded on the -v (verbose) output.
2015-07-10 12:09:37 -05:00
Andrew Johnson
9577615bba Merged changes from 3.14 branch up to revno 12564 2015-03-11 16:08:29 -05:00
Andrew Johnson
84e74d0924 Fix 'Can't find convertRelease.pl' problem 2015-03-09 11:33:50 -05:00
Andrew Johnson
5b6dce2681 Fix Windows builds
The windows shell doesn't like commands that start ../
Those commands are all found using TOOLS, so by making that
an absolute path we fix that problem.
However GNUmake doesn't recognize targets with relative paths
as being the same as their absolute path, so we have to fix up
some places that were using TOOLS in dependencies.
2014-12-10 17:40:40 -06:00
Andrew Johnson
e886022343 Deprecate and remove all uses of PATH_FILTER 2014-12-10 13:35:15 -06:00
Andrew Johnson
d1481b23d9 Use msi for dependency rules generation
Added -D command, modified RULES.Db to use it.
2014-12-10 12:09:34 -06:00
Andrew Johnson
5554dfd66d Make shared library version numbers use 3 components 2014-11-11 12:57:00 -06:00
Andrew Johnson
657f726527 Fix FIND_TOOL 2015-03-09 14:24:44 -05:00
Andrew Johnson
8a28858ada Merged changes from 3.14 branch. 2013-07-10 16:18:18 -05:00
Andrew Johnson
98deef5004 configure: Added FULLPATHNAME tool variable
Changed os/CONFIG files where we use the fullPathName.pl script.
2013-07-10 14:07:51 -05:00
Andrew Johnson
01272dc73f More changes needed for Cygwin. 2012-07-18 16:30:54 -05:00
Andrew Johnson
42ebafd6ae merged msi-join branch 2012-06-22 17:53:33 -05:00
Andrew Johnson
5d5aa57d72 tools: Add -q (quiet) flag to installEpics.pl
The -q flag now gets used when the GNUmake '-s' flag is provided.
This change also includes a cleanup of the installEpics.pl script.
2012-04-04 12:30:27 -05:00
Ralph Lange
6b6de69f1d build: Point default MSI to the base version. 2010-08-23 15:08:24 -04:00
Andrew Johnson
ce43b9faf8 Reorganized files, configure to use new versions.
* Moved Readfile and macLib into tools/EPICS
* dbHost/Getopts was a duplicate
* Added (c) headers
* Build in the dbHost dir
* Switch build system to use Perl versions.
2010-04-13 17:05:59 -05:00
Michael Davidsaver
f242a27dea Merge std/*
Combine recIoc and softDevIoc libraries into dbRecStd

Move base.dbd from ioc/misc/ to std/softIoc/

Generate stdRecords.dbd from the std/rec/Makefile list of record
types instead of hard-coding it in base.dbd
2011-02-26 18:24:51 -06:00
Michael Davidsaver
e463793bc3 Merge ioc/*.
Merge miscIoc rsrvIoc dbtoolsIoc asIoc dbIoc registryIoc dbStaticIoc
into dbCore.

Move ioc/misc/asSubRecordFunctions.c to std/dev/asSubRecordFunctions.c
since it depends on the subRecord type.

Extracted ioc variable definitions from base.dbd into dbCore.dbd
2011-02-25 23:56:51 -06:00
Michael Davidsaver
f7fc564556 Fold antelope/flex and asHost into libCom
Build lexer and parser from libCom/Makefile.
Since libCom now includes asLib.c and asLib_lex.c we must build
antelope and flex without linking them to Com.  This works because
they only need epicsTempFile anyway.  However make doesn't like a
subdirectory with the same name as a target object, so the antelope
source directory is now called yacc.  The two main.c files were also
renamed to avoid other build problems.

Merge asHost into Com and remove mentions in CONFIG_BASE

Lots of noise since SRCS must be renamed to Com_SRCS
2011-02-25 15:39:44 -06:00
Michael Davidsaver
128b730c71 libasIoc no longer includes asHost 2010-12-17 13:33:35 -05:00
Janet B. Anderson
5e9b59707c Base does not need to execute convertRelease.pl 2008-08-29 21:07:04 +00:00
Janet B. Anderson
0485bc7838 Moved configure/tools perl tools to src/tools directory. 2008-03-24 22:03:42 +00:00
Andrew Johnson
deb26d7ea7 Oops, missed this; libiocsh doesn't exist any more. 2007-03-20 16:06:44 +00:00
Andrew Johnson
577b65a67f Return libraries to original order and re-add registryIoc, in case it matters. 2006-11-30 18:23:35 +00:00
Andrew Johnson
514bb7f897 Created an iocshHost library, added it to EPICS_BASE_HOST_LIBS 2006-11-30 18:09:15 +00:00
Janet B. Anderson
d3069f12bc Removed iocsh and registryIoc from EPICS_BASE_HOST_LIBS. 2006-11-29 19:25:27 +00:00
Janet B. Anderson
d43342f06f Moved definitions INSTALL_LOCATION and CONFIG. 2006-03-28 21:31:58 +00:00
Janet B. Anderson
dc2fb8bb5c Added registryIoc library to EPICS_BASE_HOST_LIBS definition. 2004-11-03 22:35:57 +00:00
Janet B. Anderson
29d605faaf Use tools in $(EPICS_BASE_BIN) for HOST builds.
Use tools in $(EPICS_BASE_HOST_BIN) for CROSS builds.
2004-10-15 18:29:14 +00:00
Marty Kraimer
5c99cf24f1 OSITHREAD_USE_DEFAULT_STACK YES 2004-10-07 13:27:16 +00:00
Andrew Johnson
5ecb0738c5 Removed testDevIoc from base link libraries, only used by the mrkSoftTest application 2004-05-26 17:31:56 +00:00
Ralph Lange
ccd94cd911 Added PATH_FILTER to calls of tools (allows building in DOS-Box) 2003-07-07 08:24:53 +00:00
Janet B. Anderson
d29ba4b4dc Updated Comment 2003-04-02 20:26:09 +00:00
Marty Kraimer
5517c055da name should not include lib 2003-03-24 16:43:06 +00:00
Marty Kraimer
57a22dab4d LIBRARIES=>LIBS 2003-03-21 19:36:40 +00:00
Janet B. Anderson
be94e275cd Added EPICS_BASE_HOST_LIBRARIES definition. 2003-03-21 15:12:09 +00:00
Janet B. Anderson
6021e84957 Changes for shared libraries and os consistancy. 2003-03-18 22:45:03 +00:00
Janet B. Anderson
93b0bf478d Updated license comments. 2002-07-12 21:35:43 +00:00
Janet B. Anderson
3295a93762 Moved tool definitons. Changed EPICS_BASE_CPPFLAGS to BASE_CPPFLAGS. 2002-02-06 17:11:08 +00:00
Andrew Johnson
c5084f15cc Removed EPICS_EXTENSIONS dependencies as this causes problems with the
RELEASE file checker.  Now users of msi, sch2edif, e2db or dbst must
have these in their path, or define a variable pointing to the binary
in their application configure/RELEASE files.  Capfast users may also
want to add the definition CAPFAST_TEMPLATES pointing to their EPICS
symbols, originally found via (EPICS_EXTENSIONS)/templates/capfast
2001-09-20 20:26:38 +00:00
Janet B. Anderson
29e4cd9f61 Added definitions needed by base build. 2001-09-13 22:06:05 +00:00
Janet B. Anderson
01e185e1fa Added RELEASE_INCLUDES and RELEASE_DBDFLAGS.
Removed base/configure defs, put defs in app/ext CONFIG_APP_INCLUDE file.
2001-09-13 21:43:53 +00:00
Janet B. Anderson
c1ae00ab21 Removed references to MAKEDBDEPENDS and MAKEDBDDEPENDS. 2001-09-13 19:12:38 +00:00
Janet B. Anderson
5b6f17f7db Find R3.13 tools in HOST_ARCH directory. 2001-08-29 15:00:56 +00:00
Janet B. Anderson
16f3eff801 Added mkmf tool definition. 2001-08-23 18:49:03 +00:00