From 35662787f479b93b3205310934574132609461cc Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 8 Nov 2011 12:36:25 +0200
Subject: Get rid of special tracer database
The include, types, and pragma tests have been moved to the common/
directory while the object test has been merged into common/lifecycle.
The transaction test will be re-implemented as common/ test as soon
as SQL statement tracing support is merged.
---
tracer/include/driver.cxx | 41 ---------------------
tracer/include/makefile | 90 -----------------------------------------------
tracer/include/obj1.hxx | 27 --------------
tracer/include/obj2.hxx | 27 --------------
tracer/include/obj3.hxx | 27 --------------
tracer/include/objs1.hxx | 15 --------
tracer/include/objs2.hxx | 15 --------
tracer/include/objs3.hxx | 13 -------
tracer/include/objs4.hxx | 13 -------
tracer/include/test.std | 0
tracer/include/test1.hxx | 18 ----------
tracer/include/test2.hxx | 17 ---------
tracer/include/test3.hxx | 14 --------
tracer/include/test4.hxx | 14 --------
14 files changed, 331 deletions(-)
delete mode 100644 tracer/include/driver.cxx
delete mode 100644 tracer/include/makefile
delete mode 100644 tracer/include/obj1.hxx
delete mode 100644 tracer/include/obj2.hxx
delete mode 100644 tracer/include/obj3.hxx
delete mode 100644 tracer/include/objs1.hxx
delete mode 100644 tracer/include/objs2.hxx
delete mode 100644 tracer/include/objs3.hxx
delete mode 100644 tracer/include/objs4.hxx
delete mode 100644 tracer/include/test.std
delete mode 100644 tracer/include/test1.hxx
delete mode 100644 tracer/include/test2.hxx
delete mode 100644 tracer/include/test3.hxx
delete mode 100644 tracer/include/test4.hxx
(limited to 'tracer/include')
diff --git a/tracer/include/driver.cxx b/tracer/include/driver.cxx
deleted file mode 100644
index f2f9382..0000000
--- a/tracer/include/driver.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-// file : tracer/include/driver.cxx
-// author : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
-// license : GNU GPL v2; see accompanying LICENSE file
-
-// Test inclusion of -odb files (compilation test).
-//
-// The setup of this test is as follows: the ODB compiler has two
-// additional include directories in its search path: .. and ../..
-// while the C++ compiler has only ../.. . This way, if a ..-based
-// path is used in the generated code, the C++ compilation will
-// fail.
-//
-
-#include <memory>
-#include <cassert>
-#include <iostream>
-
-#include <odb/exceptions.hxx>
-#include <odb/transaction.hxx>
-#include <odb/tracer/database.hxx>
-
-#include "test1.hxx"
-#include "test1-odb.hxx"
-
-#include "test2.hxx"
-#include "test2-odb.hxx"
-
-#include "test3.hxx"
-#include "test3-odb.hxx"
-
-#include "test4.hxx"
-#include "test4-odb.hxx"
-
-using namespace std;
-using namespace odb::core;
-
-int
-main ()
-{
-}
diff --git a/tracer/include/makefile b/tracer/include/makefile
deleted file mode 100644
index a7f7089..0000000
--- a/tracer/include/makefile
+++ /dev/null
@@ -1,90 +0,0 @@
-# file : tracer/include/makefile
-# author : Boris Kolpackov <boris@codesynthesis.com>
-# copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
-# license : GNU GPL v2; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
-
-cxx_tun := driver.cxx
-odb_hdr := obj1.hxx obj2.hxx obj3.hxx test1.hxx test2.hxx test3.hxx test4.hxx
-cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o) $(odb_hdr:.hxx=-odb.o))
-cxx_od := $(cxx_obj:.o=.o.d)
-
-driver := $(out_base)/driver
-dist := $(out_base)/.dist
-test := $(out_base)/.test
-clean := $(out_base)/.clean
-
-# Import.
-#
-$(call import,\
- $(scf_root)/import/odb/stub.make,\
- odb: odb,odb-rules: odb_rules)
-
-$(call import,\
- $(scf_root)/import/libodb/stub.make,\
- l: odb.l,cpp-options: odb.l.cpp-options)
-
-$(call import,\
- $(scf_root)/import/libodb-tracer/stub.make,\
- l: odb_tracer.l,cpp-options: odb_tracer.l.cpp-options)
-
-# Build.
-#
-$(driver): $(cxx_obj) $(odb_tracer.l) $(odb.l)
-$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base) \
--I$(out_base)/../.. -I$(src_base)/../..
-$(cxx_obj) $(cxx_od): $(odb_tracer.l.cpp-options) $(odb.l.cpp-options)
-
-genf := $(foreach f,$(odb_hdr:.hxx=-odb),$(addprefix $f,.hxx .ixx .cxx))
-gen := $(addprefix $(out_base)/,$(genf))
-
-$(gen): $(odb)
-$(gen): odb := $(odb)
-$(gen): odb_options += --database tracer
-$(gen): cpp_options := -I$(out_base) -I$(src_base)/.. -I$(src_base)/../..
-$(gen): $(odb_tracer.l.cpp-options) $(odb.l.cpp-options)
-
-$(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
-
-# Alias for default target.
-#
-$(out_base)/: $(driver)
-
-# Dist: not supported.
-#
-$(dist):
-
-# Test.
-#
-$(test): $(driver) $(src_base)/test.std
- $(call message,test $<,$< >$(out_base)/test.out)
- $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
- $(call message,,rm -f $(out_base)/test.out)
-
-# Clean.
-#
-$(clean): \
- $(driver).o.clean \
- $(addsuffix .cxx.clean,$(cxx_obj)) \
- $(addsuffix .cxx.clean,$(cxx_od)) \
- $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
- $(call message,,rm -f $(out_base)/test.out)
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver $(genf)
-$(clean): $(out_base)/.gitignore.clean
-
-$(call include,$(bld_root)/git/gitignore.make)
-endif
-
-# How to.
-#
-$(call include,$(odb_rules))
-$(call include,$(bld_root)/cxx/cxx-d.make)
-$(call include,$(bld_root)/cxx/cxx-o.make)
-$(call include,$(bld_root)/cxx/o-e.make)
diff --git a/tracer/include/obj1.hxx b/tracer/include/obj1.hxx
deleted file mode 100644
index ef2429b..0000000
--- a/tracer/include/obj1.hxx
+++ /dev/null
@@ -1,27 +0,0 @@
-// file : tracer/include/obj1.hxx
-// author : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
-// license : GNU GPL v2; see accompanying LICENSE file
-
-#ifndef OBJ1_HXX
-#define OBJ1_HXX
-
-#include <odb/core.hxx>
-
-#pragma db object
-struct object1
-{
- object1 (unsigned long id)
- : id_ (id)
- {
- }
-
- object1 ()
- {
- }
-
- #pragma db id
- unsigned long id_;
-};
-
-#endif // OBJ1_HXX
diff --git a/tracer/include/obj2.hxx b/tracer/include/obj2.hxx
deleted file mode 100644
index 71018a8..0000000
--- a/tracer/include/obj2.hxx
+++ /dev/null
@@ -1,27 +0,0 @@
-// file : tracer/include/obj2.hxx
-// author : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
-// license : GNU GPL v2; see accompanying LICENSE file
-
-#ifndef OBJ2_HXX
-#define OBJ2_HXX
-
-#include <odb/core.hxx>
-
-#pragma db object
-struct object2
-{
- object2 (unsigned long id)
- : id_ (id)
- {
- }
-
- object2 ()
- {
- }
-
- #pragma db id
- unsigned long id_;
-};
-
-#endif // OBJ2_HXX
diff --git a/tracer/include/obj3.hxx b/tracer/include/obj3.hxx
deleted file mode 100644
index 92bdc0b..0000000
--- a/tracer/include/obj3.hxx
+++ /dev/null
@@ -1,27 +0,0 @@
-// file : tracer/include/obj3.hxx
-// author : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
-// license : GNU GPL v2; see accompanying LICENSE file
-
-#ifndef OBJ3_HXX
-#define OBJ3_HXX
-
-#include <odb/core.hxx>
-
-#pragma db object
-struct object3
-{
- object3 (unsigned long id)
- : id_ (id)
- {
- }
-
- object3 ()
- {
- }
-
- #pragma db id
- unsigned long id_;
-};
-
-#endif // OBJ3_HXX
diff --git a/tracer/include/objs1.hxx b/tracer/include/objs1.hxx
deleted file mode 100644
index 98c0f2f..0000000
--- a/tracer/include/objs1.hxx
+++ /dev/null
@@ -1,15 +0,0 @@
-// file : tracer/include/objs1.hxx
-// author : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
-// license : GNU GPL v2; see accompanying LICENSE file
-
-#ifndef OBJS1_HXX
-#define OBJS1_HXX
-
-#ifdef ODB_COMPILER
-# include <include/obj1.hxx>
-# include <include/obj2.hxx>
-# include <include/obj3.hxx>
-#endif
-
-#endif // OBJS1_HXX
diff --git a/tracer/include/objs2.hxx b/tracer/include/objs2.hxx
deleted file mode 100644
index c19811a..0000000
--- a/tracer/include/objs2.hxx
+++ /dev/null
@@ -1,15 +0,0 @@
-// file : tracer/include/objs2.hxx
-// author : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
-// license : GNU GPL v2; see accompanying LICENSE file
-
-#ifndef OBJS2_HXX
-#define OBJS2_HXX
-
-#ifdef ODB_COMPILER
-# include "include/obj1.hxx"
-# include "include/obj2.hxx"
-# include "include/obj3.hxx"
-#endif
-
-#endif // OBJS2_HXX
diff --git a/tracer/include/objs3.hxx b/tracer/include/objs3.hxx
deleted file mode 100644
index b8828de..0000000
--- a/tracer/include/objs3.hxx
+++ /dev/null
@@ -1,13 +0,0 @@
-// file : tracer/include/objs3.hxx
-// author : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
-// license : GNU GPL v2; see accompanying LICENSE file
-
-#ifndef OBJS3_HXX
-#define OBJS3_HXX
-
-#include "../include/obj1.hxx"
-#include "../include/obj2.hxx"
-#include "../include/obj3.hxx"
-
-#endif // OBJS3_HXX
diff --git a/tracer/include/objs4.hxx b/tracer/include/objs4.hxx
deleted file mode 100644
index 7f76aea..0000000
--- a/tracer/include/objs4.hxx
+++ /dev/null
@@ -1,13 +0,0 @@
-// file : tracer/include/objs1.hxx
-// author : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
-// license : GNU GPL v2; see accompanying LICENSE file
-
-#ifndef OBJS4_HXX
-#define OBJS4_HXX
-
-#include <tracer/include/obj1.hxx>
-#include <tracer/include/obj2.hxx>
-#include <tracer/include/obj3.hxx>
-
-#endif // OBJS4_HXX
diff --git a/tracer/include/test.std b/tracer/include/test.std
deleted file mode 100644
index e69de29..0000000
diff --git a/tracer/include/test1.hxx b/tracer/include/test1.hxx
deleted file mode 100644
index 6f08900..0000000
--- a/tracer/include/test1.hxx
+++ /dev/null
@@ -1,18 +0,0 @@
-// file : tracer/include/test1.hxx
-// author : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
-// license : GNU GPL v2; see accompanying LICENSE file
-
-#ifndef TEST1_HXX
-#define TEST1_HXX
-
-// Test include directive parsing.
-//
-#include"obj1.hxx"
-
- # include \
- <tracer/include/obj2.hxx>
-
-/*comment*/ # /*comment*/ include /* comment */ "obj3.hxx" // comment
-
-#endif // TEST1_HXX
diff --git a/tracer/include/test2.hxx b/tracer/include/test2.hxx
deleted file mode 100644
index 74623d4..0000000
--- a/tracer/include/test2.hxx
+++ /dev/null
@@ -1,17 +0,0 @@
-// file : tracer/include/test2.hxx
-// author : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
-// license : GNU GPL v2; see accompanying LICENSE file
-
-#ifndef TEST2_HXX
-#define TEST2_HXX
-
-// Test preference of includes from the main file.
-//
-#include "objs1.hxx"
-
-#include "obj1.hxx"
-#include "obj2.hxx"
-#include "obj3.hxx"
-
-#endif // TEST2_HXX
diff --git a/tracer/include/test3.hxx b/tracer/include/test3.hxx
deleted file mode 100644
index 3f1b762..0000000
--- a/tracer/include/test3.hxx
+++ /dev/null
@@ -1,14 +0,0 @@
-// file : tracer/include/test3.hxx
-// author : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
-// license : GNU GPL v2; see accompanying LICENSE file
-
-#ifndef TEST3_HXX
-#define TEST3_HXX
-
-// Test preference of longer (more qualified) paths.
-//
-#include "objs2.hxx"
-#include "objs3.hxx"
-
-#endif // TEST3_HXX
diff --git a/tracer/include/test4.hxx b/tracer/include/test4.hxx
deleted file mode 100644
index 8ea681a..0000000
--- a/tracer/include/test4.hxx
+++ /dev/null
@@ -1,14 +0,0 @@
-// file : tracer/include/test3.hxx
-// author : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
-// license : GNU GPL v2; see accompanying LICENSE file
-
-#ifndef TEST3_HXX
-#define TEST3_HXX
-
-// Test preference of <> over "".
-//
-#include "objs2.hxx"
-#include "objs4.hxx"
-
-#endif // TEST3_HXX
--
cgit v1.1