Refactor directory structure a bit, preliminary to the

library split-out.
16 years ago · ae5ce06ccb
parent 652df4bf51
commit ae5ce06ccb
105 changed files with 15 additions and 17 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4

-SUBDIRS = bin data lib po shell services
+SUBDIRS = bin data lib po src service

 bin_SCRIPTS = 			\
 	sugar-emulator
--- a/configure.ac
+++ b/configure.ac
@ -43,7 +43,7 @@ AC_CONFIG_FILES([
 bin/sugar
 bin/sugar-control-panel
 bin/sugar-shell
-shell/config.py
+src/config.py
 ])

 AC_OUTPUT([
@ -58,19 +58,18 @@ lib/sugar/clipboard/Makefile
 lib/sugar/graphics/Makefile
 lib/sugar/presence/Makefile
 lib/sugar/datastore/Makefile
-services/Makefile
-services/shell/Makefile
-shell/Makefile
-shell/controlpanel/Makefile
-shell/intro/Makefile
-shell/hardware/Makefile
-shell/view/Makefile
-shell/view/devices/Makefile
-shell/view/devices/network/Makefile
-shell/view/frame/Makefile
-shell/view/home/Makefile
-shell/model/Makefile
-shell/model/devices/Makefile
-shell/model/devices/network/Makefile
+service/Makefile
+src/Makefile
+src/controlpanel/Makefile
+src/intro/Makefile
+src/hardware/Makefile
+src/view/Makefile
+src/view/devices/Makefile
+src/view/devices/network/Makefile
+src/view/frame/Makefile
+src/view/home/Makefile
+src/model/Makefile
+src/model/devices/Makefile
+src/model/devices/network/Makefile
 po/Makefile.in
 ])
--- a/services/shell/Makefile.am
+++ b/services/shell/Makefile.am
--- a/services/shell/init.py
+++ b/services/shell/init.py
--- a/services/shell/activityregistryservice.py
+++ b/services/shell/activityregistryservice.py
--- a/services/shell/bundleregistry.py
+++ b/services/shell/bundleregistry.py
--- a/services/shell/clipboardobject.py
+++ b/services/shell/clipboardobject.py
--- a/services/shell/clipboardservice.py
+++ b/services/shell/clipboardservice.py
--- a/services/shell/org.laptop.ActivityRegistry.service.in
+++ b/services/shell/org.laptop.ActivityRegistry.service.in
--- a/services/shell/org.laptop.Clipboard.service.in
+++ b/services/shell/org.laptop.Clipboard.service.in
--- a/services/shell/org.laptop.ObjectTypeRegistry.service.in
+++ b/services/shell/org.laptop.ObjectTypeRegistry.service.in
--- a/services/shell/sugar-shell-service
+++ b/services/shell/sugar-shell-service
--- a/services/Makefile.am
+++ b/services/Makefile.am
@ -1 +0,0 @@
-SUBDIRS = shell
--- a/shell/.gitignore
+++ b/shell/.gitignore
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
--- a/shell/init.py
+++ b/shell/init.py
--- a/shell/config.py.in
+++ b/shell/config.py.in
--- a/shell/controlpanel/Makefile.am
+++ b/shell/controlpanel/Makefile.am
--- a/shell/controlpanel/init.py
+++ b/shell/controlpanel/init.py
--- a/shell/controlpanel/cmd.py
+++ b/shell/controlpanel/cmd.py
--- a/shell/controlpanel/control.py
+++ b/shell/controlpanel/control.py
--- a/shell/hardware/Makefile.am
+++ b/shell/hardware/Makefile.am
--- a/shell/hardware/NetworkManagerInfo.conf
+++ b/shell/hardware/NetworkManagerInfo.conf
--- a/shell/hardware/init.py
+++ b/shell/hardware/init.py
--- a/shell/hardware/hardwaremanager.py
+++ b/shell/hardware/hardwaremanager.py
--- a/shell/hardware/keydialog.py
+++ b/shell/hardware/keydialog.py
--- a/shell/hardware/nmclient.py
+++ b/shell/hardware/nmclient.py
--- a/shell/hardware/nminfo.py
+++ b/shell/hardware/nminfo.py
--- a/shell/hardware/schoolserver.py
+++ b/shell/hardware/schoolserver.py
--- a/shell/intro/Makefile.am
+++ b/shell/intro/Makefile.am
--- a/shell/intro/init.py
+++ b/shell/intro/init.py
--- a/shell/intro/colorpicker.py
+++ b/shell/intro/colorpicker.py
--- a/shell/intro/default-picture.png
+++ b/shell/intro/default-picture.png
--- a/shell/intro/glive.py
+++ b/shell/intro/glive.py
--- a/shell/intro/intro.py
+++ b/shell/intro/intro.py
--- a/shell/logsmanager.py
+++ b/shell/logsmanager.py
--- a/shell/main.py
+++ b/shell/main.py
--- a/shell/model/BuddyModel.py
+++ b/shell/model/BuddyModel.py
--- a/shell/model/Friends.py
+++ b/shell/model/Friends.py
--- a/shell/model/Invites.py
+++ b/shell/model/Invites.py
--- a/shell/model/Makefile.am
+++ b/shell/model/Makefile.am
--- a/shell/model/MeshModel.py
+++ b/shell/model/MeshModel.py
--- a/shell/model/Owner.py
+++ b/shell/model/Owner.py
--- a/shell/model/init.py
+++ b/shell/model/init.py
--- a/shell/model/accesspointmodel.py
+++ b/shell/model/accesspointmodel.py
--- a/shell/model/devices/Makefile.am
+++ b/shell/model/devices/Makefile.am
--- a/shell/model/devices/init.py
+++ b/shell/model/devices/init.py
--- a/shell/model/devices/battery.py
+++ b/shell/model/devices/battery.py
--- a/shell/model/devices/device.py
+++ b/shell/model/devices/device.py
--- a/shell/model/devices/devicesmodel.py
+++ b/shell/model/devices/devicesmodel.py
--- a/shell/model/devices/network/Makefile.am
+++ b/shell/model/devices/network/Makefile.am
--- a/shell/model/devices/network/init.py
+++ b/shell/model/devices/network/init.py
--- a/shell/model/devices/network/mesh.py
+++ b/shell/model/devices/network/mesh.py
--- a/shell/model/devices/network/wired.py
+++ b/shell/model/devices/network/wired.py
--- a/shell/model/devices/network/wireless.py
+++ b/shell/model/devices/network/wireless.py
--- a/shell/model/homeactivity.py
+++ b/shell/model/homeactivity.py
--- a/shell/model/homemodel.py
+++ b/shell/model/homemodel.py
--- a/shell/model/shellmodel.py
+++ b/shell/model/shellmodel.py
--- a/shell/shellservice.py
+++ b/shell/shellservice.py
--- a/shell/view/ActivityHost.py
+++ b/shell/view/ActivityHost.py
--- a/shell/view/BuddyIcon.py
+++ b/shell/view/BuddyIcon.py
--- a/shell/view/BuddyMenu.py
+++ b/shell/view/BuddyMenu.py
--- a/shell/view/Makefile.am
+++ b/shell/view/Makefile.am
--- a/shell/view/OverlayWindow.py
+++ b/shell/view/OverlayWindow.py
--- a/shell/view/Shell.py
+++ b/shell/view/Shell.py
--- a/shell/view/init.py
+++ b/shell/view/init.py
--- a/shell/view/clipboardicon.py
+++ b/shell/view/clipboardicon.py
--- a/shell/view/clipboardmenu.py
+++ b/shell/view/clipboardmenu.py
--- a/shell/view/devices/Makefile.am
+++ b/shell/view/devices/Makefile.am
--- a/shell/view/devices/init.py
+++ b/shell/view/devices/init.py
--- a/shell/view/devices/battery.py
+++ b/shell/view/devices/battery.py
--- a/shell/view/devices/deviceview.py
+++ b/shell/view/devices/deviceview.py
--- a/shell/view/devices/network/Makefile.am
+++ b/shell/view/devices/network/Makefile.am
--- a/shell/view/devices/network/init.py
+++ b/shell/view/devices/network/init.py
--- a/shell/view/devices/network/mesh.py
+++ b/shell/view/devices/network/mesh.py
--- a/shell/view/devices/network/wired.py
+++ b/shell/view/devices/network/wired.py
--- a/shell/view/devices/network/wireless.py
+++ b/shell/view/devices/network/wireless.py
--- a/shell/view/frame/Makefile.am
+++ b/shell/view/frame/Makefile.am
--- a/shell/view/frame/init.py
+++ b/shell/view/frame/init.py
--- a/shell/view/frame/activitiestray.py
+++ b/shell/view/frame/activitiestray.py
--- a/shell/view/frame/activitybutton.py
+++ b/shell/view/frame/activitybutton.py
--- a/shell/view/frame/clipboardbox.py
+++ b/shell/view/frame/clipboardbox.py
--- a/shell/view/frame/clipboardpanelwindow.py
+++ b/shell/view/frame/clipboardpanelwindow.py
--- a/shell/view/frame/eventarea.py
+++ b/shell/view/frame/eventarea.py
--- a/shell/view/frame/frame.py
+++ b/shell/view/frame/frame.py
--- a/shell/view/frame/frameinvoker.py
+++ b/shell/view/frame/frameinvoker.py
--- a/shell/view/frame/framewindow.py
+++ b/shell/view/frame/framewindow.py
--- a/shell/view/frame/friendstray.py
+++ b/shell/view/frame/friendstray.py
--- a/shell/view/frame/overlaybox.py
+++ b/shell/view/frame/overlaybox.py
--- a/shell/view/frame/zoomtoolbar.py
+++ b/shell/view/frame/zoomtoolbar.py
--- a/shell/view/home/FriendView.py
+++ b/shell/view/home/FriendView.py
--- a/shell/view/home/FriendsBox.py
+++ b/shell/view/home/FriendsBox.py
--- a/shell/view/home/HomeBox.py
+++ b/shell/view/home/HomeBox.py
--- a/shell/view/home/HomeWindow.py
+++ b/shell/view/home/HomeWindow.py
--- a/shell/view/home/Makefile.am
+++ b/shell/view/home/Makefile.am
--- a/shell/view/home/MeshBox.py
+++ b/shell/view/home/MeshBox.py
--- a/shell/view/home/MyIcon.py
+++ b/shell/view/home/MyIcon.py
--- a/shell/view/home/init.py
+++ b/shell/view/home/init.py
--- a/shell/view/home/activitiesdonut.py
+++ b/shell/view/home/activitiesdonut.py
--- a/shell/view/home/proc_smaps.py
+++ b/shell/view/home/proc_smaps.py
--- a/Show More
+++ b/Show More