Commit 4ecd3ed4 authored by jds2's avatar jds2

Jamfiles now only install lib, headers, and docs.


git-svn-id: http://svn.code.sf.net/p/cunit/code/trunk@37 f00e6729-6848-4c17-8bfb-678c97c00071
parent 78aedd46
......@@ -21,7 +21,7 @@
SubDir TOP CUnit Headers ;
InstallCUnitFile $(INSTALL_SRC_DIR)$(SLASH)Headers :
CU_HEADERS =
Automated.h
Console.h
CUnit.h
......@@ -30,8 +30,10 @@ InstallCUnitFile $(INSTALL_SRC_DIR)$(SLASH)Headers :
MyMem.h
TestDB.h
TestRun.h
Util.h
<$(SOURCE_GRIST)>Jamfile
<$(SOURCE_GRIST)>Makefile.am
<$(SOURCE_GRIST)>Makefile.in ;
Util.h ;
if $(INSTALL_INC_DIR)
{
InstallFile $(INSTALL_INC_DIR) : $(CU_HEADERS) ;
}
......@@ -60,14 +60,10 @@ else if $(NT)
Library $(CUNIT_LIB_NAME) : $(SOURCES) ;
MakeLocate $(CUNIT_LIB_NAME)$(SUFLIB) : $(BUILD_DIR) ;
InstallLib $(INSTALL_LIB_DIR) : $(CUNIT_LIB_NAME)$(SUFLIB) ;
InstallCUnitFile $(INSTALL_SRC_DIR) :
<$(SOURCE_GRIST)>CUnit.dsp
<$(SOURCE_GRIST)>Jamfile
<$(SOURCE_GRIST)>Makefile.am
<$(SOURCE_GRIST)>Makefile.in ;
if $(INSTALL_LIB_DIR)
{
InstallLib $(INSTALL_LIB_DIR) : $(CUNIT_LIB_NAME)$(SUFLIB) ;
}
SubInclude TOP CUnit Headers ;
SubInclude TOP CUnit Sources ;
* Wed 18-Aug-2004 Jerry St.Clair <jds2@users.sourceforge.net>
- Jamfiles now only install lib, headers, and docs.
* Sun 1-Aug-2004 Jerry St.Clair <jds2@users.sourceforge.net>
- Added Jamfile set for building with jam
(ftjam preferred: http://www.freetype.org/jam/index.html)
* Sat Jul 26 2003 Anil Kumar <aksaharan@yahoo.com>
- Applied a patch for correct XML output for first/last group display.
......
......@@ -37,11 +37,4 @@ if $(NT) && ($(BCCROOT) || ($(TOOLSET) = BORLANDC))
MakeLocate AutomatedTest$(SUFEXE) : $(BUILD_DIR) ;
InstallCUnitFile $(INSTALL_EXAM_DIR)$(SLASH)AutomatedTest :
AutomatedTest.c
AutomatedTest.dsp
<$(SOURCE_GRIST)>Jamfile
<$(SOURCE_GRIST)>Makefile.am
<$(SOURCE_GRIST)>Makefile.in
<$(SOURCE_GRIST)>README ;
......@@ -38,11 +38,3 @@ if $(NT) && ($(BCCROOT) || ($(TOOLSET) = BORLANDC))
MakeLocate ConsoleTest$(SUFEXE) : $(BUILD_DIR) ;
InstallCUnitFile $(INSTALL_EXAM_DIR)$(SLASH)ConsoleTest :
ConsoleTest.c
ConsoleTest.dsp
<$(SOURCE_GRIST)>Jamfile
<$(SOURCE_GRIST)>Makefile.am
<$(SOURCE_GRIST)>Makefile.in
<$(SOURCE_GRIST)>README ;
......@@ -37,11 +37,3 @@ if $(NT) && ($(BCCROOT) || ($(TOOLSET) = BORLANDC))
LINKFLAGS on CursesTest$(SUFEXE) += -L$(STDLIBPATH) -tW ;
}
InstallCUnitFile $(INSTALL_EXAM_DIR)$(SLASH)CursesTest :
CursesTest.c
<$(SOURCE_GRIST)>Jamfile
<$(SOURCE_GRIST)>Makefile.am
<$(SOURCE_GRIST)>Makefile.in
<$(SOURCE_GRIST)>README ;
......@@ -35,11 +35,6 @@ else if $(NT)
NOTFILE examples ;
InstallCUnitFile $(INSTALL_EXAM_DIR) :
<$(SOURCE_GRIST)>Jamfile
<$(SOURCE_GRIST)>Makefile.am
<$(SOURCE_GRIST)>Makefile.in ;
SubInclude TOP Examples AutomatedTest ;
SubInclude TOP Examples ConsoleTest ;
......
......@@ -37,11 +37,3 @@ if $(NT) && ($(BCCROOT) || ($(TOOLSET) = BORLANDC))
MakeLocate WinTest$(SUFEXE) : $(BUILD_DIR) ;
InstallCUnitFile $(INSTALL_EXAM_DIR)$(SLASH)WinTest :
<$(SOURCE_GRIST)>Jamfile
<$(SOURCE_GRIST)>ReadMe.txt
StdAfx.cpp
StdAfx.h
WinTest.cpp
WinTest.dsp ;
......@@ -21,32 +21,6 @@
SubDir TOP ;
InstallCUnitFile $(INSTALL_ROOT_DIR) :
aclocal.m4
AUTHORS
ChangeLog
config.h.in
configure
configure.in
COPYING
CUnit.dsw
CUnit.spec.in
depcomp
INSTALL
install-sh
Jamfile
Jamrules
Makefile.am
Makefile.in
missing
mkinstalldirs
NEWS
PACKAGE
README
stamp-h.in
TODO
VERSION ;
SubInclude TOP CUnit ;
SubInclude TOP Examples ;
SubInclude TOP Man ;
......
......@@ -19,15 +19,16 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#---------------------------------------------------------------------------
# Until this is under configure, need to set install locations manually:
INSTALL_ROOT_DIR = C:\\tools\\CUnit_1.1.1 ;
INSTALL_LIB_DIR = $(INSTALL_ROOT_DIR)$(SLASH)lib ;
INSTALL_INC_DIR = $(INSTALL_ROOT_DIR)$(SLASH)include ;
INSTALL_SRC_DIR = $(INSTALL_ROOT_DIR)$(SLASH)CUnit ;
INSTALL_DOC_DIR = $(INSTALL_ROOT_DIR)$(SLASH)doc ;
INSTALL_MAN_DIR = $(INSTALL_DOC_DIR)$(SLASH)man ;
INSTALL_SHARE_DIR = $(INSTALL_ROOT_DIR)$(SLASH)share ;
INSTALL_EXAM_DIR = $(INSTALL_ROOT_DIR)$(SLASH)Examples ;
# location of ncurses library for CursesTest (ignored on Windows)
SYS_LIB_DIR = /usr/lib ;
# configure will set install locations
# comment out to not install that class of file
prefix = C:\\tools\\CUnit_1.1.1 ;
INSTALL_LIB_DIR = $(prefix)$(SLASH)lib ;
INSTALL_INC_DIR = $(prefix)$(SLASH)include ;
INSTALL_MAN_DIR = $(prefix)$(SLASH)man ;
INSTALL_SHARE_DIR = $(prefix)$(SLASH)share ;
# Comment to compile with debugging enabled
#NODEBUG = 1 ;
......@@ -92,7 +93,6 @@ if $(NT)
else if $(UNIX)
{
USR_LIB_DIR = /usr/lib ;
}
CCFLAGS += $(USE_MEMTRACE) $(CCWARN) $(CCDEBUG) ;
......@@ -100,45 +100,4 @@ CCFLAGS += $(USE_MEMTRACE) $(CCWARN) $(CCDEBUG) ;
#----------------------------------------------------------------------
# CUnit-specific rules & actions
#----------------------------------------------------------------------
# If anyone can figure out a better way, good for you
# (and let me (jds) know)! Here's the problem...
# The built-in Jam install rules all convert the grist of
# the source file to (:G=installed). As a result, they
# seem unable to handle files having the same name in
# different directories. If we want to install such files
# as the Jamfile's or Makefile.am's or README's, the built-ins
# can't handle it (in my hands, anyway). As a workaround,
# we define a new rule which does not monkey with the grist
# in this way. Duplicate file names will need to explicitly
# use grist so Jam knows the difference, but the standard
# <$(SOURCE_GRIST)> works in most cases.
#
rule InstallCUnitFile
{
local i t ;
t = $(>:D=$(<)) ;
DEPENDS install : $(t) ;
DEPENDS $(t) : $(>) ;
SEARCH on $(>) = $(SEARCH_SOURCE) ;
MakeLocate $(t) : $(<) ;
# Arrange for jam uninstall
Clean uninstall : $(t) ;
for i in $(>)
{
Install $(i:D=$(<)) : $(i) ;
}
Chmod $(t) ;
if $(UNIX)
{
if $(OWNER) { Chown $(t) ; OWNER on $(t) = $(OWNER) ; }
if $(GROUP) { Chgrp $(t) ; GROUP on $(t) = $(GROUP) ; }
}
}
......@@ -21,21 +21,20 @@
SubDir TOP Man man3 ;
InstallCUnitFile $(INSTALL_MAN_DIR)$(SLASH)man3 :
automated_run_tests.3
add_test_case.3
add_test_group.3
ASSERT.3
automated_run_tests.3
cleanup_registry.3
console_run_tests.3
curses_run_tests.3
get_error.3
get_registry.3
initialize_registry.3
set_output_filename.3
set_registry.3
<$(SOURCE_GRIST)>Jamfile
<$(SOURCE_GRIST)>Makefile.am
<$(SOURCE_GRIST)>Makefile.in ;
if $(INSTALL_MAN_DIR)
{
InstallMan $(INSTALL_MAN_DIR) :
automated_run_tests.3
add_test_case.3
add_test_group.3
ASSERT.3
automated_run_tests.3
cleanup_registry.3
console_run_tests.3
curses_run_tests.3
get_error.3
get_registry.3
initialize_registry.3
set_output_filename.3
set_registry.3
}
......@@ -21,9 +21,7 @@
SubDir TOP Man man8 ;
InstallCUnitFile $(INSTALL_MAN_DIR)$(SLASH)man8 :
CUnit.8
<$(SOURCE_GRIST)>Jamfile
<$(SOURCE_GRIST)>Makefile.am
<$(SOURCE_GRIST)>Makefile.in ;
if $(INSTALL_MAN_DIR)
{
InstallMan $(INSTALL_MAN_DIR) : CUnit.8 ;
}
......@@ -21,14 +21,13 @@
SubDir TOP Share ;
InstallCUnitFile $(INSTALL_SHARE_DIR) :
CUnit-List.dtd
CUnit-List.xsl
CUnit-Run.dtd
CUnit-Run.xsl
Memory-Dump.dtd
Memory-Dump.xsl
<$(SOURCE_GRIST)>Jamfile
<$(SOURCE_GRIST)>Makefile.am
<$(SOURCE_GRIST)>Makefile.in ;
if $(INSTALL_SHARE_DIR)
{
InstallFile $(INSTALL_SHARE_DIR) :
CUnit-List.dtd
CUnit-List.xsl
CUnit-Run.dtd
CUnit-Run.xsl
Memory-Dump.dtd
Memory-Dump.xsl ;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment