From 52f4c8ae8f94071560874f419d4f8512392f9121 Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Mon, 23 Aug 2010 14:48:43 -0400 Subject: [PATCH] dbtools: shuffle files towards a reasonable layout, keep test files in test dir --- src/dbtools/Makefile | 13 +++--- src/dbtools/{msi => }/msi.c | 0 src/dbtools/{msi => }/msi.html | 0 src/dbtools/msi/LICENSE | 64 ---------------------------- src/dbtools/msi/Makefile | 22 ---------- src/dbtools/msi/README.1st | 2 - src/dbtools/{msi => test}/pattern | 0 src/dbtools/{msi => test}/substitute | 0 src/dbtools/{msi => test}/template | 0 src/dbtools/{msi => test}/testfile | 0 src/dbtools/{msi => test}/testfile1 | 0 11 files changed, 8 insertions(+), 93 deletions(-) rename src/dbtools/{msi => }/msi.c (100%) rename src/dbtools/{msi => }/msi.html (100%) delete mode 100644 src/dbtools/msi/LICENSE delete mode 100644 src/dbtools/msi/Makefile delete mode 100644 src/dbtools/msi/README.1st rename src/dbtools/{msi => test}/pattern (100%) rename src/dbtools/{msi => test}/substitute (100%) rename src/dbtools/{msi => test}/template (100%) rename src/dbtools/{msi => test}/testfile (100%) rename src/dbtools/{msi => test}/testfile1 (100%) diff --git a/src/dbtools/Makefile b/src/dbtools/Makefile index 38ed52c9e..036f2afc7 100644 --- a/src/dbtools/Makefile +++ b/src/dbtools/Makefile @@ -14,17 +14,20 @@ include $(TOP)/configure/CONFIG INC += dbLoadTemplate.h INC += dbtoolsIocRegister.h -LIB_SRCS += dbLoadTemplate.c -LIB_SRCS += dbtoolsIocRegister.c - LIBRARY_IOC = dbtoolsIoc +LIB_SRCS += dbLoadTemplate.c +LIB_SRCS += dbtoolsIocRegister.c dbtoolsIoc_LIBS = dbIoc dbStaticIoc Com - dbtoolsIoc_RCS = dbtoolsIoc.rc - HTMLS += dbLoadTemplate.html +PROD_HOST = msi + +msi_SRCS = msi.c +msi_LIBS += Com +HTMLS = msi.html + # For R3.13 compatibility only ifeq ($(strip $(COMPAT_313)),YES) OBJLIB_vxWorks=dbtoolsIoc diff --git a/src/dbtools/msi/msi.c b/src/dbtools/msi.c similarity index 100% rename from src/dbtools/msi/msi.c rename to src/dbtools/msi.c diff --git a/src/dbtools/msi/msi.html b/src/dbtools/msi.html similarity index 100% rename from src/dbtools/msi/msi.html rename to src/dbtools/msi.html diff --git a/src/dbtools/msi/LICENSE b/src/dbtools/msi/LICENSE deleted file mode 100644 index 9f03a0c48..000000000 --- a/src/dbtools/msi/LICENSE +++ /dev/null @@ -1,64 +0,0 @@ -Copyright (c) 2002 University of Chicago. All rights reserved. - -msi is distributed subject to the following license conditions: - - SOFTWARE LICENSE AGREEMENT - Software: Macro Substitution and Include Tool (msi) - - 1. The "Software", below, refers to msi (in either source code, or - binary form and accompanying documentation). Each licensee is - addressed as "you" or "Licensee." - - 2. The copyright holders shown above and their third-party licensors - hereby grant Licensee a royalty-free nonexclusive license, subject to - the limitations stated herein and U.S. Government license rights. - - 3. You may modify and make a copy or copies of the Software for use - within your organization, if you meet the following conditions: - a. Copies in source code must include the copyright notice and this - Software License Agreement. - b. Copies in binary form must include the copyright notice and this - Software License Agreement in the documentation and/or other - materials provided with the copy. - - 4. You may modify a copy or copies of the Software or any portion of it, - thus forming a work based on the Software, and distribute copies of - such work outside your organization, if you meet all of the following - conditions: - a. Copies in source code must include the copyright notice and this - Software License Agreement; - b. Copies in binary form must include the copyright notice and this - Software License Agreement in the documentation and/or other - materials provided with the copy; - c. Modified copies and works based on the Software must carry - prominent notices stating that you changed specified portions of - the Software. - - 5. Portions of the Software resulted from work developed under a U.S. - Government contract and are subject to the following license: the - Government is granted for itself and others acting on its behalf a - paid-up, nonexclusive, irrevocable worldwide license in this computer - software to reproduce, prepare derivative works, and perform publicly - and display publicly. - - 6. WARRANTY DISCLAIMER. THE SOFTWARE IS SUPPLIED "AS IS" WITHOUT WARRANTY - OF ANY KIND. THE COPYRIGHT HOLDERS, THEIR THIRD PARTY LICENSORS, THE - UNITED STATES, THE UNITED STATES DEPARTMENT OF ENERGY, AND THEIR - EMPLOYEES: (1) DISCLAIM ANY WARRANTIES, EXPRESS OR IMPLIED, INCLUDING - BUT NOT LIMITED TO ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS - FOR A PARTICULAR PURPOSE, TITLE OR NON-INFRINGEMENT, (2) DO NOT ASSUME - ANY LEGAL LIABILITY OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, - OR USEFULNESS OF THE SOFTWARE, (3) DO NOT REPRESENT THAT USE OF THE - SOFTWARE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS, (4) DO NOT WARRANT - THAT THE SOFTWARE WILL FUNCTION UNINTERRUPTED, THAT IT IS ERROR-FREE - OR THAT ANY ERRORS WILL BE CORRECTED. - - 7. LIMITATION OF LIABILITY. IN NO EVENT WILL THE COPYRIGHT HOLDERS, THEIR - THIRD PARTY LICENSORS, THE UNITED STATES, THE UNITED STATES DEPARTMENT - OF ENERGY, OR THEIR EMPLOYEES: BE LIABLE FOR ANY INDIRECT, INCIDENTAL, - CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF ANY KIND OR NATURE, - INCLUDING BUT NOT LIMITED TO LOSS OF PROFITS OR LOSS OF DATA, FOR ANY - REASON WHATSOEVER, WHETHER SUCH LIABILITY IS ASSERTED ON THE BASIS OF - CONTRACT, TORT (INCLUDING NEGLIGENCE OR STRICT LIABILITY), OR - OTHERWISE, EVEN IF ANY OF SAID PARTIES HAS BEEN WARNED OF THE - POSSIBILITY OF SUCH LOSS OR DAMAGES. diff --git a/src/dbtools/msi/Makefile b/src/dbtools/msi/Makefile deleted file mode 100644 index 5ab39416a..000000000 --- a/src/dbtools/msi/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -#************************************************************************* -# Copyright (c) 2002 The University of Chicago, as Operator of Argonne -# National Laboratory. -# Copyright (c) 2002 The Regents of the University of California, as -# Operator of Los Alamos National Laboratory. -# This file is distributed subject to a Software License Agreement found -# in the file LICENSE that is included with this distribution. -#************************************************************************* -# -# $Id$ -# -TOP = ../.. - -include $(TOP)/configure/CONFIG - -PROD_HOST = msi -HTMLS = msi.html - -msi_SRCS = msi.c -PROD_LIBS += Com - -include $(TOP)/configure/RULES diff --git a/src/dbtools/msi/README.1st b/src/dbtools/msi/README.1st deleted file mode 100644 index 60ebbddde..000000000 --- a/src/dbtools/msi/README.1st +++ /dev/null @@ -1,2 +0,0 @@ -The extension distribution file should be unziped and untared -in the extensions/src directory. diff --git a/src/dbtools/msi/pattern b/src/dbtools/test/pattern similarity index 100% rename from src/dbtools/msi/pattern rename to src/dbtools/test/pattern diff --git a/src/dbtools/msi/substitute b/src/dbtools/test/substitute similarity index 100% rename from src/dbtools/msi/substitute rename to src/dbtools/test/substitute diff --git a/src/dbtools/msi/template b/src/dbtools/test/template similarity index 100% rename from src/dbtools/msi/template rename to src/dbtools/test/template diff --git a/src/dbtools/msi/testfile b/src/dbtools/test/testfile similarity index 100% rename from src/dbtools/msi/testfile rename to src/dbtools/test/testfile diff --git a/src/dbtools/msi/testfile1 b/src/dbtools/test/testfile1 similarity index 100% rename from src/dbtools/msi/testfile1 rename to src/dbtools/test/testfile1