Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README6
-rw-r--r--addons/Makefile.am6
-rwxr-xr-xsetup.py1
-rw-r--r--tests/__init__.py0
-rw-r--r--tutorius/Makefile.am19
-rw-r--r--tutorius/uam/Makefile.am5
6 files changed, 5 insertions, 32 deletions
diff --git a/README b/README
index 64b2376..7d1359a 100644
--- a/README
+++ b/README
@@ -4,12 +4,14 @@ Requirements:
To run you need a recent build of sugar. We recommand builds from
sugar-jhbuild, but a distro packaged build may be fine too.
- Note however that some sugar files will need to be overwritten,
- so you may wish to use a separate build.
+ Note however that some sugar files will be patched,
+ so you may wish to use a separate installation.
Installation
1. Edit the setup.cfg file to point to your sugar installation prefix.
+ For packaged releases, this is probably /usr
+ For jhbuild, this is the 'install' folder
2. Run: python setup.py build
3. Run: python setup.py install
4. Start sugar and enjoy!
diff --git a/addons/Makefile.am b/addons/Makefile.am
deleted file mode 100644
index 3d1d18a..0000000
--- a/addons/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-sugardir = $(pythondir)/sugar/tutorius/addons
-sugar_PYTHON = \
- __init__.py \
- bubblemessage.py \
- gtkwidgeteventfilter.py \
- dialogmessage.py
diff --git a/setup.py b/setup.py
index 54d88a1..93471b5 100755
--- a/setup.py
+++ b/setup.py
@@ -77,6 +77,7 @@ setup(name='Tutorius',
license='GPLv3',
packages=[
'sugar.tutorius',
+ 'sugar.tutorius.uam',
'sugar.tutorius.addons',
'sugar.graphics',
'sugar.activity',
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/__init__.py
diff --git a/tutorius/Makefile.am b/tutorius/Makefile.am
deleted file mode 100644
index 072a119..0000000
--- a/tutorius/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-SUBDIRS = uam addons
-
-sugardir = $(pythondir)/sugar/tutorius
-sugar_PYTHON = \
- __init__.py \
- core.py \
- dialog.py \
- actions.py \
- gtkutils.py \
- filters.py \
- services.py \
- overlayer.py \
- editor.py \
- constraints.py \
- properties.py \
- creator.py \
- bundler.py \
- linear_creator.py \
- addon.py
diff --git a/tutorius/uam/Makefile.am b/tutorius/uam/Makefile.am
deleted file mode 100644
index 219291e..0000000
--- a/tutorius/uam/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-sugardir = $(pythondir)/sugar/tutorius/uam
-sugar_PYTHON = \
- gobjectparser.py \
- gtkparser.py \
- __init__.py