Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HaikuDepot: Fix build of unit tests after last commit.

Browse Source
This commit is contained in:
Augustin Cavalier 2019-01-24 13:29:45 -05:00
parent 81dab2139e
commit 23bdc3d636
2 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/apps/haikudepot/Jamfile
View File

@ -5,22 +5,22 @@ include [ FDirName $(HAIKU_TOP) src apps haikudepot build jam
UsePrivateHeaders interface kernel net package shared storage support ;
local generatedTargetDirectory = $(TARGET_COMMON_DEBUG_LOCATE_TARGET) ;
HAIKUDEPOT_GENERATED_SOURCES_DIRECTORY = $(TARGET_COMMON_DEBUG_LOCATE_TARGET) ;
# During the build process, some sources are generated into directories. These
# are the directories.
local dumpExportRepositoryBulkListerTargetDirectory =
[ FDirName $(TARGET_COMMON_DEBUG_LOCATE_TARGET)
[ FDirName $(HAIKUDEPOT_GENERATED_SOURCES_DIRECTORY)
dumpexportrepositorybulklistener ] ;
local dumpExportPkgBulkListenerTargetDirectory =
[ FDirName $(TARGET_COMMON_DEBUG_LOCATE_TARGET)
[ FDirName $(HAIKUDEPOT_GENERATED_SOURCES_DIRECTORY)
dumpexportpkgbulklistener ] ;
local dumpExportPkgModelTargetDirectory =
[ FDirName $(TARGET_COMMON_DEBUG_LOCATE_TARGET)
[ FDirName $(HAIKUDEPOT_GENERATED_SOURCES_DIRECTORY)
dumpexportpkgmodel ] ;
local dumpExportRepositoryModelTargetDirectory =
[ FDirName $(TARGET_COMMON_DEBUG_LOCATE_TARGET)
[ FDirName $(HAIKUDEPOT_GENERATED_SOURCES_DIRECTORY)
dumpexportrepositorymodel ] ;
# During the build process, some sources are generated into a directory. In
@ -69,6 +69,7 @@ local textDocumentSources =
EditManager.cpp
EditStack.cpp
UndoableEdit.cpp
# textview
Bullet.cpp
BulletData.cpp
@ -147,7 +148,7 @@ local applicationSources =
TarArchiveHeader.cpp
TarArchiveService.cpp
#util
# util
AppUtils.cpp
DataIOUtils.cpp
RepositoryUrlUtils.cpp
@ -180,21 +181,6 @@ local generatedRepositoryParserSourceFiles =
DumpExportRepositoryJsonListener.cpp
;
local generatedSourceFiles =
# network + server - model
DumpExportPkg.cpp
DumpExportPkgCategory.cpp
DumpExportPkgScreenshot.cpp
DumpExportPkgVersion.cpp
DumpExportRepository.cpp
DumpExportRepositorySource.cpp
DumpExportRepositorySourceMirror.cpp
# network + server - parser
DumpExportPkgJsonListener.cpp
DumpExportRepositoryJsonListener.cpp
;
Application HaikuDepot
: $(applicationSources) $(textDocumentSources)
$(generatedPkgModelSourceFiles) $(generatedRepositoryModelSourceFiles)

5
src/tests/apps/haikudepot/Jamfile
View File

@ -18,11 +18,16 @@ local sourceDir ;
for sourceDir in $(sourceDirs) {
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src apps haikudepot $(sourceDir) ] ;
}
SEARCH_SOURCE += [ FDirName $(HAIKUDEPOT_GENERATED_SOURCES_DIRECTORY)
dumpexportrepositorybulklistener ] ;
SEARCH_SOURCE += [ FDirName $(HAIKUDEPOT_GENERATED_SOURCES_DIRECTORY)
dumpexportrepositorymodel ] ;
UnitTestLib haikudepottest.so :
HaikuDepotTestAddon.cpp
DumpExportRepositorySource.cpp
DumpExportRepositorySourceMirror.cpp
DumpExportRepository.cpp
DumpExportRepositoryJsonListener.cpp
DumpExportRepositoryJsonListenerTest.cpp