diff options
| -rw-r--r-- | ChangeLog | 31 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 31 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 31 | ||||
| -rw-r--r-- | ace/config-win32-borland.h | 18 | ||||
| -rw-r--r-- | include/makeinclude/ace_flags.bor | 4 | ||||
| -rw-r--r-- | include/makeinclude/build_core_exe.bor | 2 | ||||
| -rw-r--r-- | include/makeinclude/build_core_library.bor | 2 | ||||
| -rw-r--r-- | include/makeinclude/build_dll.bor | 6 | ||||
| -rw-r--r-- | include/makeinclude/build_exe.bor | 19 | ||||
| -rw-r--r-- | include/makeinclude/build_lib.bor | 6 | ||||
| -rw-r--r-- | include/makeinclude/clean.bor | 12 | ||||
| -rw-r--r-- | include/makeinclude/make_flags.bor | 20 | ||||
| -rw-r--r-- | include/makeinclude/recurse.bor | 6 |
13 files changed, 169 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog index aff24f525b3..40fab2aeba8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,34 @@ +Tue Mar 27 05:35:38 2001 Christopher Kohlhoff <chris@kohlhoff.com> + + * include/makeinclude/make_flags.bor: + Prevent PASCAL build by default with BCB5 since it is not required. + Since both VCL and non-VCL applications share a common run-time + library you can simply link your VCL code with a non-PASCAL build + of the ACE+TAO libraries. This behaviour can be overridden by + defining the FORCE_PASCAL flag. + + * include/makeinclude/build_core_exe.bor: + * include/makeinclude/build_core_library.bor: + * include/makeinclude/build_dll.bor: + * include/makeinclude/build_exe.bor: + * include/makeinclude/build_lib.bor: + * include/makeinclude/clean.bor: + Build all executables into a directory below the source directory. + Core executables are then copied to the common bin directory. This + is to allow the test scripts to assume all executables can be + found relative to the source directory. + + * include/makeinclude/recurse.bor: + Removed definition of OBJFILES since Borland make doesn't seem to + support recursive macro expansion. + + * ace/config-win32-borland.h: + * include/makeinclude/ace_flags.bor: + Always explicitly define __ACE_INLINE__, with it defaulting to 1. + This change will allow the same compiler flags to be used in user + applications regardless of whether a debug or non-debug build of + ACE is being used. + Tue Mar 27 09:48:33 2001 Johnny Willemsen <jwillemsen@remedy.nl> * include/makeinclude/ace_flags.bor diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index aff24f525b3..40fab2aeba8 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,34 @@ +Tue Mar 27 05:35:38 2001 Christopher Kohlhoff <chris@kohlhoff.com> + + * include/makeinclude/make_flags.bor: + Prevent PASCAL build by default with BCB5 since it is not required. + Since both VCL and non-VCL applications share a common run-time + library you can simply link your VCL code with a non-PASCAL build + of the ACE+TAO libraries. This behaviour can be overridden by + defining the FORCE_PASCAL flag. + + * include/makeinclude/build_core_exe.bor: + * include/makeinclude/build_core_library.bor: + * include/makeinclude/build_dll.bor: + * include/makeinclude/build_exe.bor: + * include/makeinclude/build_lib.bor: + * include/makeinclude/clean.bor: + Build all executables into a directory below the source directory. + Core executables are then copied to the common bin directory. This + is to allow the test scripts to assume all executables can be + found relative to the source directory. + + * include/makeinclude/recurse.bor: + Removed definition of OBJFILES since Borland make doesn't seem to + support recursive macro expansion. + + * ace/config-win32-borland.h: + * include/makeinclude/ace_flags.bor: + Always explicitly define __ACE_INLINE__, with it defaulting to 1. + This change will allow the same compiler flags to be used in user + applications regardless of whether a debug or non-debug build of + ACE is being used. + Tue Mar 27 09:48:33 2001 Johnny Willemsen <jwillemsen@remedy.nl> * include/makeinclude/ace_flags.bor diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index aff24f525b3..40fab2aeba8 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,34 @@ +Tue Mar 27 05:35:38 2001 Christopher Kohlhoff <chris@kohlhoff.com> + + * include/makeinclude/make_flags.bor: + Prevent PASCAL build by default with BCB5 since it is not required. + Since both VCL and non-VCL applications share a common run-time + library you can simply link your VCL code with a non-PASCAL build + of the ACE+TAO libraries. This behaviour can be overridden by + defining the FORCE_PASCAL flag. + + * include/makeinclude/build_core_exe.bor: + * include/makeinclude/build_core_library.bor: + * include/makeinclude/build_dll.bor: + * include/makeinclude/build_exe.bor: + * include/makeinclude/build_lib.bor: + * include/makeinclude/clean.bor: + Build all executables into a directory below the source directory. + Core executables are then copied to the common bin directory. This + is to allow the test scripts to assume all executables can be + found relative to the source directory. + + * include/makeinclude/recurse.bor: + Removed definition of OBJFILES since Borland make doesn't seem to + support recursive macro expansion. + + * ace/config-win32-borland.h: + * include/makeinclude/ace_flags.bor: + Always explicitly define __ACE_INLINE__, with it defaulting to 1. + This change will allow the same compiler flags to be used in user + applications regardless of whether a debug or non-debug build of + ACE is being used. + Tue Mar 27 09:48:33 2001 Johnny Willemsen <jwillemsen@remedy.nl> * include/makeinclude/ace_flags.bor diff --git a/ace/config-win32-borland.h b/ace/config-win32-borland.h index 68faa754021..d2cafc805e6 100644 --- a/ace/config-win32-borland.h +++ b/ace/config-win32-borland.h @@ -19,10 +19,20 @@ # if (__BORLANDC__ == 0x540) // The linker in C++Builder 4 has trouble with the large number of DLL -// function exports created when you compile without inline -// functions. Therefore we will use inline functions by default with -// this version of the compiler. -# if ! defined (__ACE_INLINE__) +// function exports created when you compile without inline functions. +// Therefore we will always use inline functions with this version of +// the compiler. +# if defined (__ACE_INLINE__) +# undef __ACE_INLINE__ +# endif /* __ACE_INLINE__ */ +# define __ACE_INLINE__ 1 +# else /* __BORLANDC__ == 0x540 */ +// In later versions of C++Builder we will prefer inline functions by +// default. The debug configuration of ACE is built with functions +// out-of-line, so when linking your application against a debug ACE +// build, you can choose to use the out-of-line functions by adding +// __ACE_INLINE__=0 to your project settings. +# if !defined (__ACE_INLINE__) # define __ACE_INLINE__ 1 # endif /* __ACE_INLINE__ */ # endif /* __BORLANDC__ == 0x540 */ diff --git a/include/makeinclude/ace_flags.bor b/include/makeinclude/ace_flags.bor index a20c594fb91..cf5087c5b31 100644 --- a/include/makeinclude/ace_flags.bor +++ b/include/makeinclude/ace_flags.bor @@ -14,7 +14,11 @@ DLL_NAME=dll # # Compiler flags # +!ifdef DEBUG +ACE_CFLAGS = -I$(ACE_ROOT) -DACE_HAS_DLL=$(DLL_FLAG) -DACE_OS_HAS_DLL=$(DLL_FLAG) -D__ACE_INLINE__=0 +!else ACE_CFLAGS = -I$(ACE_ROOT) -DACE_HAS_DLL=$(DLL_FLAG) -DACE_OS_HAS_DLL=$(DLL_FLAG) +!endif !ifdef SSL_ROOT SSL_CFLAGS = -I$(SSL_ROOT)\inc32 -DACE_HAS_SSL=1 !endif diff --git a/include/makeinclude/build_core_exe.bor b/include/makeinclude/build_core_exe.bor index a39571e42ac..79353a42cd3 100644 --- a/include/makeinclude/build_core_exe.bor +++ b/include/makeinclude/build_core_exe.bor @@ -4,8 +4,6 @@ # is, you would pick it up and take it to another computer. # -BINDIR = $(CORE_BINDIR) - INSTALL_THIS_TARGET = 1 !include <$(ACE_ROOT)\include\makeinclude\build_exe.bor> diff --git a/include/makeinclude/build_core_library.bor b/include/makeinclude/build_core_library.bor index 8196c247def..3e9f2dbfdd1 100644 --- a/include/makeinclude/build_core_library.bor +++ b/include/makeinclude/build_core_library.bor @@ -4,8 +4,6 @@ # is, you would pick it up and take it to another computer. # -BINDIR = $(CORE_BINDIR) - INSTALL_THIS_TARGET = 1 !include <$(ACE_ROOT)\include\makeinclude\build_library.bor> diff --git a/include/makeinclude/build_dll.bor b/include/makeinclude/build_dll.bor index eae45eb5f41..205f45aedfe 100644 --- a/include/makeinclude/build_dll.bor +++ b/include/makeinclude/build_dll.bor @@ -12,13 +12,19 @@ # DEBUG - if defined means building with debug information # +!ifdef INSTALL_THIS_TARGET +BINDIR = $(CORE_BINDIR) +!endif + !include <$(ACE_ROOT)\include\makeinclude\decorator.bor> !include <$(ACE_ROOT)\include\makeinclude\outputdir.bor> !include <$(ACE_ROOT)\include\makeinclude\compiler.bor> !ifdef NAME +!ifndef TARGET TARGET = $(BINDIR)\$(NAME)$(LIB_DECORATOR).dll !endif +!endif all: $(TARGET) @echo Do nothing >NUL diff --git a/include/makeinclude/build_exe.bor b/include/makeinclude/build_exe.bor index a0e1ba3b948..3e601e8f61d 100644 --- a/include/makeinclude/build_exe.bor +++ b/include/makeinclude/build_exe.bor @@ -18,10 +18,19 @@ !include <$(ACE_ROOT)\include\makeinclude\compiler.bor> !ifdef NAME +!ifndef TARGET TARGET = $(BINDIR)\$(NAME).exe !endif +!ifdef INSTALL_THIS_TARGET +# We use a separate CORE_TARGET to copy the executable to the +# core bin directory. This is so there will be a copy of the +# exe file left in the local directory for the test scripts +# to use. +CORE_TARGET = $(CORE_BINDIR)\$(NAME).exe +!endif +!endif -all: $(TARGET) +all: $(TARGET) $(CORE_TARGET) @echo Do nothing >NUL !ifdef TARGET @@ -37,7 +46,15 @@ $(TARGET): $(OBJFILES) $(RESOURCE) !ifndef DEBUG @del $(TARGET:.exe=.tds) !endif +!ifdef CORE_TARGET +$(CORE_TARGET): $(TARGET) + @copy $(TARGET) $(CORE_TARGET) >NUL +!ifdef DEBUG + @copy $(TARGET:.exe=.tds) $(CORE_TARGET:.exe=.tds) >NUL +!endif !endif +!endif + !include <$(ACE_ROOT)\include\makeinclude\clean.bor> diff --git a/include/makeinclude/build_lib.bor b/include/makeinclude/build_lib.bor index 4877ac0512b..e0a3dd9762d 100644 --- a/include/makeinclude/build_lib.bor +++ b/include/makeinclude/build_lib.bor @@ -12,13 +12,19 @@ # DEBUG - if defined means building with debug information # +!ifdef INSTALL_THIS_TARGET +BINDIR = $(CORE_BINDIR) +!endif + !include <$(ACE_ROOT)\include\makeinclude\decorator.bor> !include <$(ACE_ROOT)\include\makeinclude\outputdir.bor> !include <$(ACE_ROOT)\include\makeinclude\compiler.bor> !ifdef NAME +!ifndef TARGET TARGET = $(BINDIR)\$(NAME)$(LIB_DECORATOR).lib !endif +!endif all: $(TARGET) @echo Do nothing >NUL diff --git a/include/makeinclude/clean.bor b/include/makeinclude/clean.bor index f6fe28d4542..7e2dd6162fd 100644 --- a/include/makeinclude/clean.bor +++ b/include/makeinclude/clean.bor @@ -50,10 +50,14 @@ realclean: @del ) $(IDLFILES:.idl=Ser_T.h ^ @del ) $(IDLFILES:.idl=Ser_T.i ^ @del ) $(RESOURCE) -@del ) $(TARGET) -@del ) $(TARGET:.exe=.tds) -@del ) $(TARGET:.dll=.tds) -@del ) $(TARGET:.dll=.lib) ! realclean_$(NAME)~.bat 1> NUL -@realclean_$(NAME)~.bat 2> NUL @del realclean_$(NAME)~.bat + -@del $(TARGET) 2>NUL + -@del $(TARGET:.exe=.tds) 2>NUL + -@del $(TARGET:.dll=.tds) 2>NUL + -@del $(TARGET:.dll=.lib) 2>NUL +!ifdef CORE_TARGET + -@del $(CORE_TARGET) 2>NUL + -@del $(CORE_TARGET:.exe=.tds) 2>NUL +!endif diff --git a/include/makeinclude/make_flags.bor b/include/makeinclude/make_flags.bor index 55b19d3ecd3..1850247563b 100644 --- a/include/makeinclude/make_flags.bor +++ b/include/makeinclude/make_flags.bor @@ -12,6 +12,26 @@ STATIC_FLAG = -DSTATIC !ifdef PASCAL PASCAL_FLAG = -DPASCAL +!if $(BCBVER) != 4 +!ifndef FORCE_PASCAL +!message +!message ------------------------------------------------------------- +!message The PASCAL build configuration is *not* required for use with +!message Borland C++Builder 5. +!message +!message Since both VCL and non-VCL applications share a common run- +!message time library (i.e. cc3250mt.dll), you can simply link your +!message VCL code with a non-PASCAL build of the ACE+TAO libraries. +!message +!message If you still really want to build a PASCAL configuration, add +!message -DFORCE_PASCAL to your make command. +!message ------------------------------------------------------------- +!message +!error Aborting build +!else +PASCAL_FLAG = -DPASCAL -DFORCE_PASCAL +!endif +!endif !endif !ifdef CODEGUARD diff --git a/include/makeinclude/recurse.bor b/include/makeinclude/recurse.bor index 39da3de86fe..8ef992d43e9 100644 --- a/include/makeinclude/recurse.bor +++ b/include/makeinclude/recurse.bor @@ -208,10 +208,4 @@ $(NAMES_INSTALL): # Set the name of the current target. NAME = $(TARGET_NAME) -# The list of object files defaults to the contents of a macro based on the -# target name. -!ifndef OBJFILES -OBJFILES = $($(NAME)_OBJFILES) -!endif - !endif |