diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2004-12-16 16:07:21 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2004-12-16 16:07:21 +0000 |
| commit | 5bd032844d4cc5ab755fff248ea1a8488571af53 (patch) | |
| tree | 4b3a7f82ac1469adf22208d755e6ad6b1baa940a | |
| parent | 23a5dfc81fbb97c9a8fd0764e7a2163fca8cdc56 (diff) | |
| download | ATCD-5bd032844d4cc5ab755fff248ea1a8488571af53.tar.gz | |
ChangeLogTag: Thu Dec 16 10:06:10 2004 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/templates/gnu.mpd | 15 |
2 files changed, 20 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index a8610e07837..a5cf228f37d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Thu Dec 16 10:06:10 2004 Chad Elliott <elliott_c@ociweb.com> + + * bin/MakeProjectCreator/templates/gnu.mpd: + + Check for multiple places for the test executable. Some Linux + installations don't have /bin/test, but do have /usr/bin/test. + This will allow more parallel building to occur. + Thu Dec 16 16:00:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> * ace/OS_NS_Thread.h: diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd index 6d195ccb491..31c58d75205 100644 --- a/bin/MakeProjectCreator/templates/gnu.mpd +++ b/bin/MakeProjectCreator/templates/gnu.mpd @@ -411,6 +411,15 @@ avoid_warning: <%endif%> <%if(custom_types)%> +## Some OS's have /bin/test others only have /usr/bin/test +ifeq ($(wildcard /bin/test), /bin/test) + TEST_EXE = /bin/test +else +ifeq ($(wildcard /usr/bin/test), /usr/bin/test) + TEST_EXE = /usr/bin/test +endif +endif + <%foreach(custom_types)%> <%if(custom_types->libpath)%> DYLD_LIBRARY_PATH := $(DYLD_LIBRARY_PATH):<%custom_type->libpath%> @@ -435,11 +444,11 @@ OBJS_DEPEND_ON_GENERATED = 1 ## the case, then we don't need this special rule. ifeq ($(wildcard $(GENERATED_DIRTY)), $(GENERATED_DIRTY)) ## If we can find /bin/test, then we will continue - ifeq ($(wildcard /bin/test), /bin/test) + ifneq ($(TEST_EXE),) ## If all of the generated files are there, then we need to check ## and make sure that the generated files are up-to-date. If they are not ## then we need the special rule. - ifneq ($(shell<%foreach(custom_type->input_file->output_files)%> /bin/test <%custom_type->input_file%> -nt <%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>/<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%> 2> /dev/null &&<%endfor%> echo 0),) + ifneq ($(shell<%foreach(custom_type->input_file->output_files)%> $(TEST_EXE) <%custom_type->input_file%> -nt <%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>/<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%> 2> /dev/null &&<%endfor%> echo 0),) .NOTPARALLEL: <%if(custom_type->dependent)%> else @@ -447,7 +456,7 @@ ifeq ($(wildcard $(GENERATED_DIRTY)), $(GENERATED_DIRTY)) ## with respect to the source file. Now we need to make sure that ## they are up-to-date with respect to the generation tool. If the tool ## is newer than the generated files, then we need the special rule. - ifneq ($(shell<%foreach(custom_type->input_file->output_files)%> /bin/test <%custom_type->dependent%> -nt <%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>/<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%> 2> /dev/null &&<%endfor%> echo 0),) + ifneq ($(shell<%foreach(custom_type->input_file->output_files)%> $(TEST_EXE) <%custom_type->dependent%> -nt <%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>/<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%> 2> /dev/null &&<%endfor%> echo 0),) .NOTPARALLEL: endif <%endif%> |