Changeset 8fc0f47c in mainline

Timestamp:

2012-08-21T10:48:03Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2ee05261

Parents:

67edca6

Message:

Clean Bithenge headers namespace

Move headers into <bithenge/>, put sources into src/.

Location:

uspace

Files:

• app/bithenge/Makefile (modified) (1 diff)
• app/bithenge/test.c (modified) (1 diff)
• lib/bithenge/Makefile (modified) (1 diff)
• lib/bithenge/include/bithenge/blob.h (moved) (moved from uspace/lib/bithenge/blob.h )
• lib/bithenge/include/bithenge/compound.h (moved) (moved from uspace/lib/bithenge/compound.h )
• lib/bithenge/include/bithenge/expression.h (moved) (moved from uspace/lib/bithenge/expression.h )
• lib/bithenge/include/bithenge/file.h (moved) (moved from uspace/lib/bithenge/file.h )
• lib/bithenge/include/bithenge/helenos/os.h (moved) (moved from uspace/lib/bithenge/helenos/os.h )
• lib/bithenge/include/bithenge/linux/os.h (moved) (moved from uspace/lib/bithenge/linux/os.h )
• lib/bithenge/include/bithenge/os.h (moved) (moved from uspace/lib/bithenge/os.h )
• lib/bithenge/include/bithenge/print.h (moved) (moved from uspace/lib/bithenge/print.h )
• lib/bithenge/include/bithenge/script.h (moved) (moved from uspace/lib/bithenge/script.h )
• lib/bithenge/include/bithenge/sequence.h (moved) (moved from uspace/lib/bithenge/sequence.h )
• lib/bithenge/include/bithenge/source.h (moved) (moved from uspace/lib/bithenge/source.h )
• lib/bithenge/include/bithenge/transform.h (moved) (moved from uspace/lib/bithenge/transform.h )
• lib/bithenge/include/bithenge/tree.h (moved) (moved from uspace/lib/bithenge/tree.h )
• lib/bithenge/src/blob.c (moved) (moved from uspace/lib/bithenge/blob.c ) (1 diff)
• lib/bithenge/src/compound.c (moved) (moved from uspace/lib/bithenge/compound.c ) (1 diff)
• lib/bithenge/src/expression.c (moved) (moved from uspace/lib/bithenge/expression.c ) (1 diff)
• lib/bithenge/src/failure.c (moved) (moved from uspace/lib/bithenge/failure.c ) (1 diff)
• lib/bithenge/src/failure.h (moved) (moved from uspace/lib/bithenge/failure.h )
• lib/bithenge/src/file.c (moved) (moved from uspace/lib/bithenge/file.c ) (1 diff)
• lib/bithenge/src/helenos/block.c (moved) (moved from uspace/lib/bithenge/helenos/block.c ) (1 diff)
• lib/bithenge/src/helenos/block.h (moved) (moved from uspace/lib/bithenge/helenos/block.h ) (1 diff)
• lib/bithenge/src/print.c (moved) (moved from uspace/lib/bithenge/print.c ) (1 diff)
• lib/bithenge/src/script.c (moved) (moved from uspace/lib/bithenge/script.c ) (1 diff)
• lib/bithenge/src/sequence.c (moved) (moved from uspace/lib/bithenge/sequence.c ) (1 diff)
• lib/bithenge/src/source.c (moved) (moved from uspace/lib/bithenge/source.c ) (1 diff)
• lib/bithenge/src/transform.c (moved) (moved from uspace/lib/bithenge/transform.c ) (1 diff)
• lib/bithenge/src/tree.c (moved) (moved from uspace/lib/bithenge/tree.c ) (1 diff)

uspace/app/bithenge/Makefile

@@ -29 +29 @@
 USPACE_PREFIX = ../..
 LIBS = $(LIBBITHENGE_PREFIX)/libbithenge.a $(LIBBLOCK_PREFIX)/libblock.a
-EXTRA_CFLAGS = -I$(LIBBITHENGE_PREFIX) -D__HELENOS__
+EXTRA_CFLAGS = -I$(LIBBITHENGE_PREFIX)/include -D__HELENOS__
 BINARY = bithenge
 

uspace/app/bithenge/test.c

@@ -39 +39 @@
 #include <stdlib.h>
 #include <sys/types.h>
-#include "blob.h"
-#include "source.h"
-#include "print.h"
-#include "script.h"
-#include "transform.h"
-#include "tree.h"
+#include <bithenge/blob.h>
+#include <bithenge/source.h>
+#include <bithenge/print.h>
+#include <bithenge/script.h>
+#include <bithenge/transform.h>
+#include <bithenge/tree.h>
 
 int main(int argc, char *argv[])

uspace/lib/bithenge/Makefile

@@ -29 +29 @@
 USPACE_PREFIX = ../..
 LIBRARY = libbithenge
-EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -D__HELENOS__
+EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -D__HELENOS__ -Iinclude
 
 SOURCES = \
-        helenos/block.c \
-        blob.c \
-        compound.c \
-        expression.c \
-        file.c \
-        print.c \
-        script.c \
-        sequence.c \
-        source.c \
-        transform.c \
-        tree.c
+        src/helenos/block.c \
+        src/blob.c \
+        src/compound.c \
+        src/expression.c \
+        src/file.c \
+        src/print.c \
+        src/script.c \
+        src/sequence.c \
+        src/source.c \
+        src/transform.c \
+        src/tree.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/lib/bithenge/src/blob.c

@@ -38 +38 @@
 #include <errno.h>
 #include <stdlib.h>
-#include "blob.h"
-#include "os.h"
-#include "tree.h"
+#include <bithenge/blob.h>
+#include <bithenge/os.h>
+#include <bithenge/tree.h>
 
 /** Initialize a random access blob.

uspace/lib/bithenge/src/compound.c

@@ -36 +36 @@
 
 #include <stdlib.h>
-#include "compound.h"
-#include "expression.h"
-#include "os.h"
-#include "transform.h"
-#include "tree.h"
+#include <bithenge/compound.h>
+#include <bithenge/expression.h>
+#include <bithenge/os.h>
+#include <bithenge/transform.h>
+#include <bithenge/tree.h>
 
 

uspace/lib/bithenge/src/expression.c

@@ -38 +38 @@
 #include <errno.h>
 #include <stdlib.h>
-#include "blob.h"
-#include "expression.h"
-#include "os.h"
-#include "transform.h"
-#include "tree.h"
+#include <bithenge/blob.h>
+#include <bithenge/expression.h>
+#include <bithenge/os.h>
+#include <bithenge/transform.h>
+#include <bithenge/tree.h>
 
 /** Initialize a new expression.

uspace/lib/bithenge/src/failure.c

@@ -46 +46 @@
 #include <unistd.h>
 #define BITHENGE_FAILURE_DECLS_ONLY 1
-#include "failure.h"
+#include <bithenge/failure.h>
 #include "os.h"
 

uspace/lib/bithenge/src/file.c

@@ -44 +44 @@
 #include <sys/types.h>
 #include <unistd.h>
-#include "blob.h"
-#include "file.h"
-#include "os.h"
+#include <bithenge/blob.h>
+#include <bithenge/file.h>
+#include <bithenge/os.h>
 
 typedef struct {

uspace/lib/bithenge/src/helenos/block.c

@@ -42 +42 @@
 #include <macros.h>
 #include <stdlib.h>
-#include "../blob.h"
+#include <bithenge/blob.h>
 #include "block.h"
 

uspace/lib/bithenge/src/helenos/block.h

@@ -39 +39 @@
 
 #include <loc.h>
-#include "../blob.h"
+#include <bithenge/tree.h>
 
 int bithenge_new_block_blob(bithenge_node_t **, service_id_t);

uspace/lib/bithenge/src/print.c

@@ -40 +40 @@
 #include <stdarg.h>
 #include <stdio.h>
-#include "blob.h"
-#include "print.h"
-#include "tree.h"
+#include <bithenge/blob.h>
+#include <bithenge/print.h>
+#include <bithenge/tree.h>
 
 typedef struct {

uspace/lib/bithenge/src/script.c

@@ -38 +38 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include "compound.h"
-#include "expression.h"
-#include "os.h"
-#include "script.h"
-#include "sequence.h"
-#include "transform.h"
-#include "tree.h"
+#include <bithenge/compound.h>
+#include <bithenge/expression.h>
+#include <bithenge/os.h>
+#include <bithenge/script.h>
+#include <bithenge/sequence.h>
+#include <bithenge/transform.h>
+#include <bithenge/tree.h>
 
 /** @cond internal */

uspace/lib/bithenge/src/sequence.c

@@ -36 +36 @@
 
 #include <stdlib.h>
-#include "blob.h"
-#include "expression.h"
-#include "os.h"
-#include "sequence.h"
-#include "tree.h"
+#include <bithenge/blob.h>
+#include <bithenge/expression.h>
+#include <bithenge/os.h>
+#include <bithenge/sequence.h>
+#include <bithenge/tree.h>
 
 

uspace/lib/bithenge/src/source.c

@@ -37 +37 @@
 #include <errno.h>
 #include <stdlib.h>
-#include "blob.h"
-#include "file.h"
-#include "source.h"
+#include <bithenge/blob.h>
+#include <bithenge/file.h>
+#include <bithenge/source.h>
 
 #ifdef __HELENOS__

uspace/lib/bithenge/src/transform.c

@@ -39 +39 @@
 #include <stdarg.h>
 #include <stdlib.h>
-#include "blob.h"
-#include "os.h"
-#include "print.h"
-#include "transform.h"
+#include <bithenge/blob.h>
+#include <bithenge/os.h>
+#include <bithenge/print.h>
+#include <bithenge/transform.h>
 
 

uspace/lib/bithenge/src/tree.c

@@ -37 +37 @@
 #include <errno.h>
 #include <stdlib.h>
-#include "blob.h"
-#include "os.h"
-#include "tree.h"
+#include <bithenge/blob.h>
+#include <bithenge/os.h>
+#include <bithenge/tree.h>
 
 static void blob_destroy(bithenge_node_t *base)