Pull activities from activities.sugarlabs.org

8 files changed, 42 insertions, 21 deletions

diff --git a/.gitmodules b/.gitmodules
index 2c80d0a..7c15f1c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,3 @@
 [submodule "scripts/jhbuild"]
 	path = scripts/jhbuild
 	url = git://git.gnome.org/jhbuild
-[submodule "activities/terminal"]
-	path = activities/terminal
-	url = git://git.sugarlabs.org/terminal/mainline.git
-[submodule "activities/browse"]
-	path = activities/browse
-	url = git://git.sugarlabs.org/browse/mainline.git
diff --git a/Makefile b/Makefile
index 7ceebd3..dee3b9f 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ else
 TYPESCRIPT = script -ae -c
 endif
 
-all: build
+all: build install-activities
 
 submodules:
 	git submodule init
@@ -31,14 +31,13 @@ install-jhbuild: submodules check-system
 	./autogen.sh --prefix=$(CURDIR)/install ; \
 	make ; make install
 
-build-activities: submodules
-	$(LOG) "$(JHBUILD) run $(SCRIPTS)/build-activity terminal" $(LOGFILE)
-	$(LOG) "$(JHBUILD) run $(SCRIPTS)/build-activity browse" $(LOGFILE)
-
 build-glucose: install-jhbuild check-system
 	$(TYPESCRIPT) "$(JHBUILD) build" $(LOGFILE)
 
-build: build-glucose build-activities scripts/list-outputs
+build: build-glucose scripts/list-outputs
+
+install-activities:
+	$(SCRIPTS)/install-activities
 
 build-%:
 	$(TYPESCRIPT) "$(JHBUILD) buildone $*" $(LOGFILE)
diff --git a/README b/README
index c6ab6d1..f90ea1f 100644
--- a/README
+++ b/README
@@ -18,7 +18,7 @@ I'm hoping we can get rid of this step in the next Ubuntu version when a working
 
 Run the commands
 
-    make build
+    make
     make run
 
 That should be all you need to have sugar running!
diff --git a/activities/browse b/activities/browse
deleted file mode 160000
-Subproject ba233cf653a7b6b801bfdfb42aebe3723c1e567
diff --git a/activities/terminal b/activities/terminal
deleted file mode 160000
-Subproject 164c37db3d9a997d77bfb89b66fcb62721f46de
diff --git a/scripts/build-activity b/scripts/build-activity
deleted file mode 100755
index c1aaaf7..0000000
--- a/scripts/build-activity
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-scriptsdir=`dirname "$0"`
-rootdir=`dirname "$scriptsdir"`
-
-cd $rootdir/activities/$1
-./setup.py install --prefix=$rootdir/install
-
diff --git a/scripts/check-system b/scripts/check-system
index ea47e59..cf2615c 100755
--- a/scripts/check-system
+++ b/scripts/check-system
@@ -200,6 +200,10 @@ checks = \
 
  # sugar-build buildtime
 
+ { "check": "curl",
+   "checker": "binary",
+   "packages": { "fedora": "curl",
+                 "ubuntu": "curl" } },
  { "check": "xrandr",
    "checker": "pkgconfig",
    "packages": { "fedora": "libXrandr-devel",
diff --git a/scripts/install-activities b/scripts/install-activities
new file mode 100755
index 0000000..3560202
--- /dev/null
+++ b/scripts/install-activities
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+scriptsdir=`dirname "$0"`
+rootdir=`dirname "$scriptsdir"`
+activitiesdir=$rootdir/install/share/sugar/activities
+
+activities=$(cat <<EOF
+http://activities.sugarlabs.org/downloads/file/28118/browse-140.xo
+http://activities.sugarlabs.org/downloads/file/28135/terminal-40.xo
+EOF
+)
+
+cd $activitiesdir
+
+for activity in $activities
+do
+    curl -L -o temp.xo $activity
+
+    activityinfopath=`zipinfo -1 temp.xo | grep activity.info`
+    activitydir=`dirname $activityinfopath`
+    rootactivitydir=`dirname $activitydir`
+
+    if [ -d "$rootactivitydir" ]; then
+        rm -rf $rootactivitydir
+    fi
+    
+    unzip temp.xo
+    
+    rm temp.xo
+done
+
+