diff --git a/src/makeBaseApp/iocAppBuildSRcontrol.html b/src/makeBaseApp/iocAppBuildSRcontrol.html index 546dc9766..b752aa285 100644 --- a/src/makeBaseApp/iocAppBuildSRcontrol.html +++ b/src/makeBaseApp/iocAppBuildSRcontrol.html @@ -17,7 +17,7 @@ Source Release Control

Marty Kraimer and Janet Anderson 
Argonne National Laboratory, Advanced Photon Source 
-April 28, 1998 
+May 29, 1998 
EPICS Release 3.13.0.beta12

@@ -26,8 +26,8 @@ Acknowledgements
Between release 3.13.0.beta11 and 3.13.0.beta12 makeBase App was changed from one very long perl script to a four page perl script plus template files. In addition other improvements were made including support for capfast. -The following people contributed to this effort: Rozelle Wright (LANL, -Ralph Lange (BESSY), and Thomas Birke (BESSY). +The following people contributed to this effort: Ralph Lange (BESSY),  +Rozelle Wright (LANL, and Thomas Birke (BESSY).

Quick Start

@@ -35,24 +35,7 @@ If you are new to EPICS or are trying a new release, then follow the instruction in section Quick Start. Look at all the files that are generated. They give examples of how to manage each of the IOC components. -
-

-FUTURE WORK

-The procedures described in this document use soft links in two places. -Since soft links are not supported on winXX some changes will be necessary -to use the procedures on winXX. - -

This document discusses template files. In the future these will no -longer be used. Our intention is to let makeBaseApp evolve such that template -files are no longer necessary. For now the template files can be obtained -via the WWW APS software distribution system. - -

Currently two versions of makeBaseApp exist: A bourne shell version -and a perl version. For beta11, the bourne shell version is the primary -version. In the next release of base only the perl version will be supported. -Starting soon the perl version will be made available via the WWW as a -separate product. Thus new versions can be distributed without waiting -for new versions of base. +
 

Index

@@ -119,7 +102,7 @@ State Notation Programs. New record types, device support, drivers.
  • -Access security configuration files
    • +Access security configuration files.
  • Other code to be executed in an IOC.
    • @@ -156,15 +139,17 @@ by operations. The ascf directory MUST reside in the same directory as the <top> areas that use it.
  • -Each application developer makes changes in a private copy of a subset -of the directories, normally located in the developer's home directory.
    • +Each application developer makes changes in a private copy of one or more +<top> areas.
  • cvs and gnumake are the only tools users execute to build applications.
  • -Template makefiles are provided for creating new application directories.
    • +Template are provided for creating new application directories. EPICS base +provides two sets of templates: simple and example. Additional templates +can be created.

    @@ -217,7 +202,8 @@ Create example Application

    Execute the commands: 
    mkdir <top>
 cd <top>
-<base>/bin/<arch>/makeBaseApp.pl -e
    +<base>/bin/<arch>/makeBaseApp.pl -t example example +<base>/bin/<arch>/makeBaseApp.pl -i -t example example where:

    <top> - Is any directory name you chose @@ -228,7 +214,8 @@ where: 

    cd
 mkdir myapp
 cd myapp
-/usr/local/epics/baseR3.13.0.beta11/bin/solaris/makeBaseApp.pl -e
    +/usr/local/epics/baseR3.13.0.beta11/bin/solaris/makeBaseApp.pl -t example example +/usr/local/epics/baseR3.13.0.beta11/bin/solaris/makeBaseApp.pl -i -t example example

    Inspect Files

    @@ -253,7 +240,7 @@ for details. 
    boot device          : xxx
 processor number     : 0
 host name            : xxx
-file name            : <top>/iocBoot/iocexample/vxWorks
+file name            : <top>/bin/<target_arch>/vxWorks
 inet on ethernet (e) : xxx.xxx.xxx.xxx:<netmask>
 inet on backplane (b):
 host inet (h)        : xxx.xxx.xxx.xxx
@@ -262,14 +249,8 @@ user (u)            
 ftp password (pw) (blank = use rsh): xxx
 flags (f)            : 0x0
 target name (tn)     : <hostid for channel access security>
-startup script (s)   : st.cmd
+startup script (s)   : <top>/iocBoot/iocexample/st.cmd
 other (o)            :
    -NOTE: For a winXX host the following are needed: -
    file name            : <top>/bin/<target_arch>/vxWorks
    - -
    ...
    - -
    startup script (s)   : <top>/iocBoot/iocexample/st.cmd
    The actual values for each field are site and IOC dependent. Consult your EPICS system manager for help. Two fields that you can change at will are the vxWorks boot image and the location of the startup script. @@ -409,12 +390,16 @@ The application directory structure appears as follows:             config/             xxxApp/                 src/ +                xxxSrc/ +                ... +                Db/                 xxxDb/ +                ...             xxxApp/             ...             iocBoot/                 iocxxx/ -                iocxxx/ +                ... Each <top> area is a separately managed set of applications. Separately managed means that each <top> can be using it's own release of software obtained from outside the application, e.g. a release @@ -544,6 +529,8 @@ Structure             RULES_ARCHS             RULES_DIRS             RULES_TOP +            makeIoccdcmds.pl +            makeNfsCommands.pl         xxxApp/             src/ or xxxSrc                 Makefile @@ -579,7 +566,7 @@ Structure **      lib/ **      man/ Files marked with an "*" are user created and/or edited. Each such file -is discussed in this chapter. +is discussed in this section.

    Files marked with "**" are directories created by gnumake. Since gnumake uninstall removes all files in these directories, no permanent files @@ -604,23 +591,22 @@ appended to the name because Makefile looks for it.

    -src or xxxSrc
    +xxxsrc or  xxxSrc
    Directory containing source files. An arbitrary number of source directories -can appear under each xxxApp. The names must be src or end in -Src. A source directory is where C code, sequence programs, scripts, -etc. are created and built.
    +can appear under each xxxApp. The names must have the suffix src +or Src. A source directory is where C code, sequence programs, +scripts, etc. are created and built.
    -xxxDb
    +xxxdb or xxxDb
    Directory containing record instance files. An arbitrary number of Db directories -can exist under each xxxApp, but each must have Db appended to the name -because the Makefile looks for it. Each Db directory can contain record -instance, template, and substitution files. The name Db, without any suffix, -is also permitted.
    +can exist under each xxxApp. The name must have the suffix db or +Db. Each Db directory can contain record instance, template, and substitution +files.
    @@ -698,9 +684,9 @@ overriding this variables saves build time. CONFIG_APP
    -You should not edit this file unless you are using external products besides -epics_base,and  share. If you are using additional -external products follow the model used by the template file share/config/CONFIG_APP.
    +This file contains definitions for external products such as epics base +and share. You should edit this file if you are using external products +besides epics_base,and  share.
    RELEASE
    diff --git a/src/makeBaseApp/makeBaseApp.pl b/src/makeBaseApp/makeBaseApp.pl index bd8712591..3657ce333 100755 --- a/src/makeBaseApp/makeBaseApp.pl +++ b/src/makeBaseApp/makeBaseApp.pl @@ -214,7 +214,7 @@ sub get_commandline_opts { #no args # sub ListAppTypes { # no args print "Valid application types are:\n"; - find(\&Fapp_types, "$top/"); + find(\&Fapp_types, "$top"); for $type (keys %Types) { printf "%-15s %-15s\n", $TypeNameA{$type}, $TypeNameE{$type}; } @@ -277,22 +277,14 @@ sub Cleanup { # (return-code [ messsage-line1, line 2, ... ]) print <