using new format

2 files changed, 35 insertions, 9 deletions

diff --git a/activity/activity.info b/activity/activity.info
index b7f4f8d..ad38490 100755
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,9 +1,8 @@
 [Activity]
-name=StarChart
-service_name = org.laptop.StarChart
-class = StarChart.StarChart
-icon = StarChart
+name = StarChart
 activity_version = 13
-host_version = 1
+icon = StarChart
 show_launcher = yes
-license=GPLv2+
+license = GPLv2+
+bundle_id = org.laptop.StarChart
+exec = sugar-activity PathsActivity.PathsActivity
diff --git a/setup.py b/setup.py
index b20a550..e5026ee 100755
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,32 @@
 #!/usr/bin/env python
-from sugar.activity import bundlebuilder
-if __name__ == "__main__":
-  bundlebuilder.start("StarChart")
+import os
+import sys
 
+if len(sys.argv) > 1 and '--no-sugar' == sys.argv[1]:
+    # Remove the argument from the stack so we don't cause problems
+    # for distutils
+    sys.argv.pop(1)
+    
+    import glob, os.path, string
+    from distutils.core import setup
+    
+    DATA_FILES = [
+        ('icons', glob.glob('icons/*')),
+        ('images', glob.glob('images/*')),
+        ('/usr/share/applications', ['turtleart.desktop'])
+        ]
+
+    setup (name = 'Turtle Art',
+           description = "A LOGO-like tool for teaching programming",
+           author = "Walter Bender",
+           author_email = "walter.bender@gmail.com",
+           version = '0.9.4',
+           packages = ['TurtleArt'],
+           scripts = ['turtleart'],
+           data_files = DATA_FILES,
+           )
+else: 
+    from sugar.activity import bundlebuilder
+
+    if __name__ == "__main__":
+        bundlebuilder.start()