CommonTestApp has been moved. Adjusted the Jamfile accordingly.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@616 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
cb19e5d278
commit
e3d41cfac6
@ -1,23 +1,35 @@
|
||||
SubDir OBOS_TOP src tests kits app bapplication testapps ;
|
||||
|
||||
SubDirHdrs [ FDirName $(OBOS_TOP) src tests kits app common ] ;
|
||||
|
||||
local commonObjects = <src!tests!kits!app!common>CommonTestApp$(SUFOBJ) ;
|
||||
|
||||
rule SimpleBAppTestApp
|
||||
{
|
||||
# SimpleBAppTestApp <sources> : <resources> ;
|
||||
# SimpleBAppTestApp <sources> : <resources> : <use objects> ;
|
||||
local sources = $(1) ;
|
||||
local resources = $(2) ;
|
||||
local useObjects = $(3) ;
|
||||
local name = $(sources[1]) ;
|
||||
name = $(name:B) ;
|
||||
SimpleBAppTestApp2 $(name) : $(sources) : $(resources) ;
|
||||
SimpleBAppTestApp2 $(name) : $(sources) : $(resources) : $(useObjects) ;
|
||||
}
|
||||
|
||||
rule SimpleBAppTestApp2
|
||||
{
|
||||
# SimpleBAppTestApp <name> : <sources> : <resources> ;
|
||||
# SimpleBAppTestApp <name> : <sources> : <resources> : <use objects> ;
|
||||
local name = $(1) ;
|
||||
local sources = $(2) ;
|
||||
local resources = $(3) ;
|
||||
local useObjects = $(4) ;
|
||||
local r5name = $(name)_r5 ;
|
||||
|
||||
local useR5Objects ;
|
||||
local object ;
|
||||
for object in $(useObjects) {
|
||||
useR5Objects += $(object:B=$(object:B)_r5) ;
|
||||
}
|
||||
|
||||
if $(resources) {
|
||||
AddResources $(name) : $(resources) ;
|
||||
AddResources $(r5name) : $(resources) ;
|
||||
@ -25,8 +37,8 @@ rule SimpleBAppTestApp2
|
||||
CommonUnitTest $(name)
|
||||
: $(sources)
|
||||
: kits app
|
||||
: <boot!home!config!lib>libopenbeos.so be stdc++.r4
|
||||
: be stdc++.r4
|
||||
: <boot!home!config!lib>libopenbeos.so be stdc++.r4 $(useObjects)
|
||||
: be stdc++.r4 $(useR5Objects)
|
||||
: app support
|
||||
;
|
||||
}
|
||||
@ -72,17 +84,20 @@ SimpleBAppTestApp BApplicationTestApp5b.cpp : BApplicationTestApp5.rsrc ;
|
||||
# BApplication::Run() test apps
|
||||
#
|
||||
|
||||
SimpleBAppTestApp AppRunTestApp1.cpp CommonTestApp.cpp : AppRunTestApp1.rsrc ;
|
||||
SimpleBAppTestApp2 AppRunTestApp2 : AppRunTestApp1.o CommonTestApp.o
|
||||
: AppRunTestApp2.rsrc ;
|
||||
SimpleBAppTestApp2 AppRunTestApp3 : AppRunTestApp1.o CommonTestApp.o
|
||||
: AppRunTestApp3.rsrc ;
|
||||
SimpleBAppTestApp2 AppRunTestApp4 : AppRunTestApp1.o CommonTestApp.o
|
||||
: AppRunTestApp4.rsrc ;
|
||||
SimpleBAppTestApp2 AppRunTestApp5 : AppRunTestApp1.o CommonTestApp.o
|
||||
: AppRunTestApp5.rsrc ;
|
||||
SimpleBAppTestApp2 AppRunTestApp6 : AppRunTestApp1.o CommonTestApp.o
|
||||
: AppRunTestApp6.rsrc ;
|
||||
local runTestApp1 = [ FGristFiles AppRunTestApp1$(SUFOBJ) ] ;
|
||||
|
||||
SimpleBAppTestApp AppRunTestApp1.cpp : AppRunTestApp1.rsrc
|
||||
: $(commonObjects) ;
|
||||
SimpleBAppTestApp2 AppRunTestApp2 : $(runTestApp1) : AppRunTestApp2.rsrc
|
||||
: $(commonObjects) ;
|
||||
SimpleBAppTestApp2 AppRunTestApp3 : $(runTestApp1) : AppRunTestApp3.rsrc
|
||||
: $(commonObjects) ;
|
||||
SimpleBAppTestApp2 AppRunTestApp4 : $(runTestApp1) : AppRunTestApp4.rsrc
|
||||
: $(commonObjects) ;
|
||||
SimpleBAppTestApp2 AppRunTestApp5 : $(runTestApp1) : AppRunTestApp5.rsrc
|
||||
: $(commonObjects) ;
|
||||
SimpleBAppTestApp2 AppRunTestApp6 : $(runTestApp1) : AppRunTestApp6.rsrc
|
||||
: $(commonObjects) ;
|
||||
|
||||
CopyBAppTestApp AppRunTestApp3a : AppRunTestApp3 ;
|
||||
CopyBAppTestApp AppRunTestApp4a : AppRunTestApp4 ;
|
||||
@ -93,13 +108,13 @@ CopyBAppTestApp AppRunTestApp6a : AppRunTestApp6 ;
|
||||
# BApplication::Quit() test apps
|
||||
#
|
||||
|
||||
SimpleBAppTestApp AppQuitTestApp1.cpp CommonTestApp.o ;
|
||||
SimpleBAppTestApp AppQuitTestApp2.cpp CommonTestApp.o ;
|
||||
SimpleBAppTestApp AppQuitTestApp3.cpp CommonTestApp.o ;
|
||||
SimpleBAppTestApp AppQuitTestApp4.cpp CommonTestApp.o ;
|
||||
SimpleBAppTestApp AppQuitTestApp1.cpp : : $(commonObjects) ;
|
||||
SimpleBAppTestApp AppQuitTestApp2.cpp : : $(commonObjects) ;
|
||||
SimpleBAppTestApp AppQuitTestApp3.cpp : : $(commonObjects) ;
|
||||
SimpleBAppTestApp AppQuitTestApp4.cpp : : $(commonObjects) ;
|
||||
|
||||
|
||||
# BApplication::QuitRequested() test apps
|
||||
#
|
||||
|
||||
SimpleBAppTestApp AppQuitRequestedTestApp1.cpp CommonTestApp.o ;
|
||||
SimpleBAppTestApp AppQuitRequestedTestApp1.cpp : : $(commonObjects) ;
|
||||
|
Loading…
Reference in New Issue
Block a user