core/containers: Move set into the containers/ directory
This patch also creates the containers/ directory Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
This commit is contained in:
parent
3b630a0e78
commit
f02853e9c7
|
@ -1,7 +1,5 @@
|
|||
#!/usr/bin/python
|
||||
Import("env")
|
||||
|
||||
env.UsePackage("taglib_c")
|
||||
|
||||
res = Glob("*.cpp") + Glob("*.c") + SConscript("tags/Sconscript")
|
||||
res = Glob("*.cpp") + Glob("*.c")
|
||||
res += SConscript("tags/Sconscript")
|
||||
res += SConscript("containers/Sconscript")
|
||||
Return("res")
|
||||
|
|
|
@ -0,0 +1,3 @@
|
|||
#!/usr/bin/python
|
||||
res = Glob("*.c")
|
||||
Return("res")
|
|
@ -2,7 +2,7 @@
|
|||
* Copyright 2015 (c) Anna Schumaker.
|
||||
*/
|
||||
|
||||
#include <core/set.h>
|
||||
#include <core/containers/set.h>
|
||||
|
||||
void set_copy(const struct set *lhs, struct set *rhs)
|
||||
{
|
|
@ -1,3 +1,6 @@
|
|||
#!/usr/bin/python
|
||||
Import("env")
|
||||
|
||||
env.UsePackage("taglib_c")
|
||||
res = Glob("*.cpp") + Glob("*.c")
|
||||
Return("res")
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
/*
|
||||
* Copyright 2015 (c) Anna Schumaker.
|
||||
*/
|
||||
#ifndef OCARINA_CORE_SET_H
|
||||
#define OCARINA_CORE_SET_H
|
||||
#ifndef OCARINA_CORE_CONTAINERS_SET_H
|
||||
#define OCARINA_CORE_CONTAINERS_SET_H
|
||||
|
||||
#include <core/file.h>
|
||||
#include <glib.h>
|
||||
|
@ -88,4 +88,4 @@ static inline void set_iter_init(const struct set *set, struct set_iter *it)
|
|||
#define set_for_each(set, it) \
|
||||
for (set_iter_init(set, it); set_iter_next(it); )
|
||||
|
||||
#endif /* OCARINA_CORE_SET_H */
|
||||
#endif /* OCARINA_CORE_CONTAINERS_SET_H */
|
|
@ -7,7 +7,7 @@
|
|||
#ifndef OCARINA_CORE_FILTER_H
|
||||
#define OCARINA_CORE_FILTER_H
|
||||
|
||||
#include <core/set.h>
|
||||
#include <core/containers/set.h>
|
||||
|
||||
/* Called to initialize the filter index. */
|
||||
void filter_init();
|
||||
|
|
|
@ -7,8 +7,8 @@
|
|||
#ifndef OCARINA_CORE_INDEX_H
|
||||
#define OCARINA_CORE_INDEX_H
|
||||
|
||||
#include <core/containers/set.h>
|
||||
#include <core/database.h>
|
||||
#include <core/set.h>
|
||||
|
||||
|
||||
struct index_entry {
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
#define OCARINA_GUI_QUEUE_WINDOW_H
|
||||
|
||||
extern "C" {
|
||||
#include <core/set.h>
|
||||
#include <core/containers/set.h>
|
||||
}
|
||||
#include <gui/queue/model.h>
|
||||
#include <gtkmm.h>
|
||||
|
|
|
@ -18,7 +18,8 @@ res += [ CoreTest("string", "string.c") ]
|
|||
res += [ CoreTest("random", "random.c") ]
|
||||
res += [ CoreTest("file", "file.c") ]
|
||||
res += [ CoreTest("date", "date.c") ]
|
||||
res += [ CoreTest("set", "set.c") ]
|
||||
|
||||
res += SConscript("containers/Sconscript")
|
||||
res += [ CoreTest("database", "database.c") ]
|
||||
res += [ CoreTest("index", "index.c") ]
|
||||
res += [ CoreTest("filter", "filter.c") ]
|
||||
|
|
|
@ -0,0 +1,16 @@
|
|||
#!/usr/bin/python
|
||||
import os
|
||||
Import("env", "UnitTest", "core_objs")
|
||||
|
||||
def ContainerTest(name, source):
|
||||
global core_objs
|
||||
if os.path.exists("../../../core/containers/%s" % source):
|
||||
core_objs += [ env.Object("../../../core/containers/%s" % source) ]
|
||||
run = UnitTest("core/containers/%s" % name, [ source ] + core_objs)
|
||||
Alias("tests/core", run)
|
||||
Alias("tests/core/containers", run)
|
||||
return run
|
||||
|
||||
res = [ ContainerTest("set", "set.c") ]
|
||||
|
||||
Return("res")
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* Copyright 2015 (c) Anna Schumaker.
|
||||
*/
|
||||
#include <core/set.h>
|
||||
#include <core/containers/set.h>
|
||||
#include <tests/test.h>
|
||||
|
||||
|
Loading…
Reference in New Issue