ready for debian packaging now

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..43f47a4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+*~
+*#
+build/

diff --git a/Makefile b/Makefile
new file mode 100644 (file)
index 0000000..95cd0ab
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,25 @@
+#!/usr/bin/make
+
+INSTALL         := install
+INSTALL_DATA    := install -m 644
+INSTALL_PROGRAM := install -m 755
+INSTALL_DIR     := install -m 755 -d
+
+PYTHON_OPTS      =
+ifneq ($(DESTDIR),)
+PYTHON_OPTS     += --root $(DESTDIR)
+endif
+
+all: test
+
+clean:
+       $(RM) -r build
+       $(RM) -r tiramisu.egg-info/
+       
+test: clean
+       py.test
+       
+install:
+       python setup.py install --no-compile $(PYTHON_OPTS)
+
+.PHONY: all clean test install

diff --git a/report/disabled_test_config_big_example.py b/report/disabled_test_config_big_example.py
new file mode 100644 (file)
index 0000000..3a93273
--- /dev/null
+++ b/report/disabled_test_config_big_example.py
@@ -0,0 +1,27 @@
+# coding: utf-8
+from tiramisu.config import *
+from tiramisu.option import *
+
+all_modules = ['amon', 'sphynx', 'zephir']
+
+gcoption = ChoiceOption('name', 'GC name', ['ref', 'framework'], 'ref')
+gcdummy = BoolOption('dummy', 'dummy', default=False)
+objspaceoption = ChoiceOption('objspace', 'Object space',
+                            ['std', 'thunk'], 'std')
+booloption = BoolOption('bool', 'Test boolean option', default=True)
+intoption = IntOption('int', 'Test int option', default=0)
+floatoption = FloatOption('float', 'Test float option', default=2.3)
+stroption = StrOption('str', 'Test string option', default="abc")
+boolop = BoolOption('boolop', 'Test boolean option op', default=True)
+wantref_option = BoolOption('wantref', 'Test requires', default=False)
+wantframework_option = BoolOption('wantframework', 'Test requires',
+                                  default=False)
+
+gcgroup = OptionDescription('gc', 'doc pour gc', [gcoption, gcdummy, floatoption])
+descr = OptionDescription('essai', 'une éééééé doc pour essai', [gcgroup, booloption, objspaceoption,
+                                       wantref_option, stroption,
+                                       wantframework_option,
+                                       intoption, boolop])
+
+def get_example_config():
+    return Config(descr)

diff --git a/report/test_config_big_example.py b/report/test_config_big_example.py
deleted file mode 100644 (file)
index 3a93273..0000000
--- a/report/test_config_big_example.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# coding: utf-8
-from tiramisu.config import *
-from tiramisu.option import *
-
-all_modules = ['amon', 'sphynx', 'zephir']
-
-gcoption = ChoiceOption('name', 'GC name', ['ref', 'framework'], 'ref')
-gcdummy = BoolOption('dummy', 'dummy', default=False)
-objspaceoption = ChoiceOption('objspace', 'Object space',
-                            ['std', 'thunk'], 'std')
-booloption = BoolOption('bool', 'Test boolean option', default=True)
-intoption = IntOption('int', 'Test int option', default=0)
-floatoption = FloatOption('float', 'Test float option', default=2.3)
-stroption = StrOption('str', 'Test string option', default="abc")
-boolop = BoolOption('boolop', 'Test boolean option op', default=True)
-wantref_option = BoolOption('wantref', 'Test requires', default=False)
-wantframework_option = BoolOption('wantframework', 'Test requires',
-                                  default=False)
-
-gcgroup = OptionDescription('gc', 'doc pour gc', [gcoption, gcdummy, floatoption])
-descr = OptionDescription('essai', 'une éééééé doc pour essai', [gcgroup, booloption, objspaceoption,
-                                       wantref_option, stroption,
-                                       wantframework_option,
-                                       intoption, boolop])
-
-def get_example_config():
-    return Config(descr)

diff --git a/setup.py b/setup.py
new file mode 100644 (file)
index 0000000..b523bb8
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,14 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+from distutils.core import setup
+
+setup(
+    author='Gwenaël Rémond',
+    author_email='gremond@cadoles.com',
+    name='tiramisu',
+    version='1.0',
+    description='configuration management tool',
+    url='http://labs.libre-entreprise.org/projects/tiramisu',
+    package_dir = {'tiramisu':'src'},
+    packages=['tiramisu']
+)

diff --git a/src/autolib.py b/src/autolib.py
index febc172..988a6b2 100644 (file)
--- a/src/autolib.py
+++ b/src/autolib.py
@@ -19,7 +19,7 @@
 # the whole pypy projet is under MIT licence
 # ____________________________________________________________
 "enables us to carry out a calculation and return an option's value"
-from tiramisu.error import DisabledOptionError, SpecialOwnersError
+from error import DisabledOptionError, SpecialOwnersError
 # ____________________________________________________________
 # automatic Option object
 special_owners = ['auto', 'fill']

diff --git a/test/autopath.py b/test/autopath.py
index bc2ddff..8d98985 100644 (file)
--- a/test/autopath.py
+++ b/test/autopath.py
@@ -8,6 +8,7 @@ from os.path import dirname, abspath, join, normpath
 import sys
 
 HERE = dirname(abspath(__file__))
-PATH = normpath(join(HERE, '..'))
+PATH = normpath(join(HERE, '..', 'src'))
 if PATH not in sys.path:
     sys.path.insert(1, PATH)
+