11:33 p.m.
---
.gitignore | 16 +++++-----
Makefile.am | 47 +++++++++++++++-----------------
configure.ac | 36 +++++-------------------
contrib/Makefile.am | 39 ++++++++++++++++++++++++++
docs/Makefile.am | 9 +-----
plugins/Makefile.am | 2 +-
po/Makevars | 2 +-
po/POTFILES.in | 3 +-
po/gen-pot.in | 2 +-
src/Makefile.am | 24 ++++++++--------
src/wok/Makefile.am | 18 ++++++------
src/wok/config.py.in | 2 +-
src/wok/control/Makefile.am | 25 +++++++++++++++++
src/wok/control/__init__.py | 26 +++++++++++++++++
src/wok/model/Makefile.am | 25 +++++++++++++++++
src/wok/model/__init__.py | 18 ++++++++++++
src/wok/xmlutils/Makefile.am | 25 +++++++++++++++++
src/wok/xmlutils/__init__.py | 18 ++++++++++++
ui/Makefile.am | 4 +-
ui/css/Makefile.am | 2 +-
ui/images/Makefile.am | 4 +-
ui/images/theme-default/Makefile.am | 4 +-
ui/js/Makefile.am | 2 +-
ui/libs/Makefile.am | 22 +++++++++++++++
ui/libs/themes/Makefile.am | 18 ++++++++++++
ui/libs/themes/base/Makefile.am | 22 +++++++++++++++
ui/libs/themes/base/images/Makefile.am | 2 +-
ui/pages/Makefile.am | 4 +-
ui/pages/websockify/Makefile.am | 2 +-
29 files changed, 315 insertions(+), 108 deletions(-)
create mode 100644 contrib/Makefile.am
create mode 100644 src/wok/control/Makefile.am
create mode 100644 src/wok/control/__init__.py
create mode 100644 src/wok/model/Makefile.am
create mode 100644 src/wok/model/__init__.py
create mode 100644 src/wok/xmlutils/Makefile.am
create mode 100644 src/wok/xmlutils/__init__.py
create mode 100644 ui/libs/Makefile.am
create mode 100644 ui/libs/themes/Makefile.am
create mode 100644 ui/libs/themes/base/Makefile.am
diff --git a/.gitignore b/.gitignore
index a318bd9..9cbdba2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,18 +18,19 @@ configure
config.log
config.status
contrib/DEBIAN/control
-contrib/kimchi.spec.fedora
-contrib/kimchi.spec.suse
+contrib/wok.spec.fedora
+contrib/wok.spec.suse
contrib/make-deb.sh
*.min.css
*.min.js
*.gmo
stamp-po
-kimchi-*.tar.gz
-src/kimchid
-src/kimchi.conf
-src/nginx/kimchi.conf
-src/kimchi/config.py
+wok-*.tar.gz
+wok.spec
+src/wokd
+src/wok.conf
+src/nginx/wok.conf
+src/wok/config.py
tests/run_tests.sh
tests/test_config.py
plugins/sample/po/POTFILES
@@ -39,4 +40,3 @@ po/gen-pot
*.orig
*.rej
*.pem
-ui/pages/help/*/*.html
diff --git a/Makefile.am b/Makefile.am
index 0720277..98b7dc1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,9 +17,9 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-SUBDIRS = src ui docs contrib tests po config plugins
+SUBDIRS = src ui docs contrib po plugins
-man_MANS = docs/kimchid.8
+man_MANS = docs/wokd.8
AUTOMAKE_OPTIONS = foreign
@@ -36,12 +36,12 @@ EXTRA_DIST = \
$(NULL)
-PEP8_BLACKLIST = *src/kimchi/config.py,*src/kimchi/i18n.py,*tests/test_config.py
+PEP8_BLACKLIST = *src/wok/config.py,*src/wok/i18n.py
-SKIP_PYFLAKES_ERR = "\./src/kimchi/websocket\.py"
+SKIP_PYFLAKES_ERR = "\./src/wok/websocket\.py"
I18N_FILES = plugins/*/i18n.py \
- src/kimchi/i18n.py \
+ src/wok/i18n.py \
$(NULL)
check-local:
@@ -61,7 +61,7 @@ all-local:
while read L && test -n "$$L"; do \
dir=mo/$$L/LC_MESSAGES ; \
$(MKDIR_P) $$dir ; \
- ln -sf ../../../po/$$L.gmo $$dir/kimchi.mo ; \
+ ln -sf ../../../po/$$L.gmo $$dir/wok.mo ; \
done < po/LINGUAS
#
@@ -70,44 +70,41 @@ all-local:
install-deb: install
cp -R $(top_srcdir)/contrib/DEBIAN $(DESTDIR)/
- mkdir -p $(DESTDIR)/var/lib/kimchi/debugreports
- mkdir -p $(DESTDIR)/var/lib/kimchi/screenshots
- mkdir -p $(DESTDIR)/var/lib/kimchi/vnc-tokens
- mkdir -p $(DESTDIR)/var/lib/kimchi/isos
- touch $(DESTDIR)/var/lib/kimchi/objectstore
+ mkdir -p $(DESTDIR)/var/lib/wok/vnc-tokens
+ touch $(DESTDIR)/var/lib/wok/objectstore
$(MKDIR_P) $(DESTDIR)/etc/init
$(MKDIR_P) $(DESTDIR)/usr/lib/firewalld/services
- cp -R $(top_srcdir)/contrib/kimchid-upstart.conf.debian \
- $(DESTDIR)/etc/init/kimchid.conf
+ cp -R $(top_srcdir)/contrib/wokd-upstart.conf.debian \
+ $(DESTDIR)/etc/init/wokd.conf
cp -R $(top_srcdir)/src/firewalld.xml \
- $(DESTDIR)/usr/lib/firewalld/services/kimchid.xml
+ $(DESTDIR)/usr/lib/firewalld/services/wokd.xml
deb: contrib/make-deb.sh
$(top_srcdir)/contrib/make-deb.sh
-kimchi.spec: contrib/kimchi.spec.fedora contrib/kimchi.spec.suse
+wok.spec: contrib/wok.spec.fedora contrib/wok.spec.suse
@if test -e /etc/redhat-release; then \
- ln -sf contrib/kimchi.spec.fedora $@ ; \
+ ln -sf contrib/wok.spec.fedora $@ ; \
elif test -e /etc/SuSE-release; then \
- ln -sf contrib/kimchi.spec.suse $@ ; \
+ ln -sf contrib/wok.spec.suse $@ ; \
else \
echo "Unable to select a spec file for RPM build" ; \
/bin/false ; \
fi
-rpm: dist kimchi.spec
+rpm: dist wok.spec
$(MKDIR_P) rpm/BUILD rpm/RPMS rpm/SOURCES rpm/SPECS rpm/SRPMS
- cp $(top_srcdir)/kimchi.spec rpm/SPECS/kimchi.spec
+ cp $(top_srcdir)/wok.spec rpm/SPECS/wok.spec
cp $(DIST_ARCHIVES) rpm/SOURCES
- rpmbuild -ba --define "_topdir `pwd`/rpm" rpm/SPECS/kimchi.spec
+ rpmbuild -ba --define "_topdir `pwd`/rpm" rpm/SPECS/wok.spec
-fedora-rpm: contrib/kimchi.spec.fedora
- ln -sf contrib/kimchi.spec.fedora kimchi.spec
+fedora-rpm: contrib/wok.spec.fedora
+ ln -sf contrib/wok.spec.fedora wok.spec
$(MAKE) rpm
-suse-rpm: contrib/kimchi.spec.suse
- ln -sf contrib/kimchi.spec.suse kimchi.spec
+suse-rpm: contrib/wok.spec.suse
+ ln -sf contrib/wok.spec.suse wok.spec
$(MAKE) rpm
ChangeLog:
@@ -125,4 +122,4 @@ VERSION:
clean-local:
rm -rf mo rpm
-CLEANFILES = kimchi.spec `find "$(top_srcdir)" -type f -name "*.pyc"
-print`
+CLEANFILES = wok.spec `find "$(top_srcdir)" -type f -name "*.pyc"
-print`
diff --git a/configure.ac b/configure.ac
index 48873b2..6c1c534 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-AC_INIT([kimchi], [m4_esyscmd([./build-aux/pkg-version --version])])
+AC_INIT([wok], [m4_esyscmd([./build-aux/pkg-version --version])])
AC_SUBST([PACKAGE_VERSION],
[m4_esyscmd([./build-aux/pkg-version --version])])
@@ -79,13 +79,11 @@ AC_CONFIG_FILES([
Makefile
docs/Makefile
src/Makefile
- src/distros.d/Makefile
src/nginx/Makefile
- src/kimchi/Makefile
- src/kimchi/control/Makefile
- src/kimchi/control/vm/Makefile
- src/kimchi/model/Makefile
- src/kimchi/xmlutils/Makefile
+ src/wok/Makefile
+ src/wok/control/Makefile
+ src/wok/model/Makefile
+ src/wok/xmlutils/Makefile
plugins/Makefile
plugins/sample/Makefile
plugins/sample/po/Makefile.in
@@ -99,37 +97,17 @@ AC_CONFIG_FILES([
ui/images/Makefile
ui/images/theme-default/Makefile
ui/js/Makefile
- ui/spice-html5/Makefile
- ui/spice-html5/css/Makefile
- ui/spice-html5/pages/Makefile
- ui/spice-html5/thirdparty/Makefile
ui/libs/Makefile
ui/libs/themes/Makefile
ui/libs/themes/base/Makefile
ui/libs/themes/base/images/Makefile
ui/pages/Makefile
- ui/pages/help/Makefile
- ui/pages/help/en_US/Makefile
- ui/pages/help/de_DE/Makefile
- ui/pages/help/es_ES/Makefile
- ui/pages/help/fr_FR/Makefile
- ui/pages/help/it_IT/Makefile
- ui/pages/help/ja_JP/Makefile
- ui/pages/help/ko_KR/Makefile
- ui/pages/help/pt_BR/Makefile
- ui/pages/help/ru_RU/Makefile
- ui/pages/help/zh_CN/Makefile
- ui/pages/help/zh_TW/Makefile
- ui/pages/tabs/Makefile
ui/pages/websockify/Makefile
contrib/Makefile
contrib/DEBIAN/Makefile
contrib/DEBIAN/control
- contrib/kimchi.spec.fedora
- contrib/kimchi.spec.suse
- tests/Makefile
- config/Makefile
- config/ui/Makefile
+ contrib/wok.spec.fedora
+ contrib/wok.spec.suse
],[
chmod +x po/gen-pot
])
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
new file mode 100644
index 0000000..79c4186
--- /dev/null
+++ b/contrib/Makefile.am
@@ -0,0 +1,39 @@
+# Copyright IBM Corp, 2013
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+SUBDIRS = DEBIAN
+
+EXTRA_DIST = \
+ check_i18n.py \
+ wokd.sysvinit \
+ wokd.service.fedora \
+ wok.spec.fedora.in \
+ wokd-upstart.conf.debian \
+ wokd-upstart.conf.fedora \
+ wok.spec.fedora.in \
+ make-deb.sh.in \
+ $(NULL)
+
+make-deb.sh: make-deb.sh.in $(top_builddir)/config.status
+ $(AM_V_GEN)sed \
+ -e 's|[@]PACKAGE_VERSION[@]|$(PACKAGE_VERSION)|g' \
+ -e 's|[@]PACKAGE_RELEASE[@]|$(PACKAGE_RELEASE)|g' \
+ < $< > $@-t && \
+ chmod a+x $@-t && \
+ mv $@-t $@
+BUILT_SOURCES = make-deb.sh
+
+CLEANFILES = wok.spec.fedora wok.spec.suse wok.spec make-deb.sh
diff --git a/docs/Makefile.am b/docs/Makefile.am
index a22fe1a..e1d36cc 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -17,13 +17,8 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-docdir = $(datadir)/kimchi/doc
+docdir = $(datadir)/wok/doc
dist_doc_DATA = \
- API.md \
- README.md \
- README-federation.md \
- kimchi-guest.png \
- kimchi-templates.png \
- kimchid.8 \
+ wokd.8 \
$(NULL)
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 894d28e..21a6ece 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -22,4 +22,4 @@ SUBDIRS = sample
plugins_PYTHON = \
__init__.py
-pluginsdir = $(pythondir)/kimchi/plugins
+pluginsdir = $(pythondir)/wok/plugins
diff --git a/po/Makevars b/po/Makevars
index c29a807..e135764 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -1,7 +1,7 @@
# Makefile variables for PO directory in any package using GNU gettext.
# Usually the message domain is the same as the package name.
-DOMAIN = kimchi
+DOMAIN = wok
# These two variables depend on the location of this directory.
subdir = po
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 57bc711..aae0ca9 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,4 +1,3 @@
# List of source files which contain translatable strings.
-src/kimchi/i18n.py
+src/wok/i18n.py
ui/pages/*.tmpl
-ui/pages/tabs/*.tmpl
diff --git a/po/gen-pot.in b/po/gen-pot.in
index 0e3cd10..7ccf28b 100644
--- a/po/gen-pot.in
+++ b/po/gen-pot.in
@@ -6,4 +6,4 @@ for src in $@; do
else
cat $src | @CHEETAH@ compile -
fi
-done | xgettext --no-location -o kimchi.pot -L Python -
+done | xgettext --no-location -o wok.pot -L Python -
diff --git a/src/Makefile.am b/src/Makefile.am
index 38d231c..a60acf7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,19 +17,19 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-SUBDIRS = kimchi distros.d nginx
+SUBDIRS = wok nginx
-EXTRA_DIST = kimchid.in \
- kimchi.conf.in \
+EXTRA_DIST = wokd.in \
+ wok.conf.in \
firewalld.xml \
$(NULL)
-bin_SCRIPTS = kimchid
+bin_SCRIPTS = wokd
-confdir = $(sysconfdir)/kimchi
-dist_conf_DATA = kimchi.conf template.conf
+confdir = $(sysconfdir)/wok
+dist_conf_DATA = wok.conf
-BUILT_SOURCES = kimchi.conf
+BUILT_SOURCES = wok.conf
do_substitution = \
sed -e 's,[@]pythondir[@],$(pythondir),g' \
@@ -38,11 +38,11 @@ do_substitution = \
-e 's,[@]VERSION[@],$(VERSION),g'
-kimchid: kimchid.in Makefile
- $(do_substitution) < $(srcdir)/kimchid.in > kimchid
- chmod +x kimchid
+wokd: wokd.in Makefile
+ $(do_substitution) < $(srcdir)/wokd.in > wokd
+ chmod +x wokd
-kimchi.conf: kimchi.conf.in Makefile
- $(do_substitution) < kimchi.conf.in > kimchi.conf
+wok.conf: wok.conf.in Makefile
+ $(do_substitution) < wok.conf.in > wok.conf
CLEANFILES = $(bin_SCRIPTS) $(BUILT_SOURCES)
diff --git a/src/wok/Makefile.am b/src/wok/Makefile.am
index 5c204e0..6e00907 100644
--- a/src/wok/Makefile.am
+++ b/src/wok/Makefile.am
@@ -19,9 +19,9 @@
SUBDIRS = control model xmlutils
-kimchi_PYTHON = $(filter-out config.py, $(wildcard *.py))
+wok_PYTHON = $(filter-out config.py, $(wildcard *.py))
-nodist_kimchi_PYTHON = config.py
+nodist_wok_PYTHON = config.py
EXTRA_DIST = \
API.json \
@@ -33,14 +33,14 @@ else
WITH_SPICE=no
endif
-kimchidir = $(pythondir)/kimchi
+wokdir = $(pythondir)/wok
install-data-local:
- $(MKDIR_P) $(DESTDIR)$(kimchidir)
- $(INSTALL_DATA) API.json $(DESTDIR)$(kimchidir)/API.json
+ $(MKDIR_P) $(DESTDIR)$(wokdir)
+ $(INSTALL_DATA) API.json $(DESTDIR)$(wokdir)/API.json
uninstall-local:
- $(RM) $(DESTDIR)$(kimchidir)/API.json
+ $(RM) $(DESTDIR)$(wokdir)/API.json
do_substitution = \
sed -e 's,[@]prefix[@],$(prefix),g' \
@@ -48,9 +48,9 @@ do_substitution = \
-e 's,[@]sysconfdir[@],$(sysconfdir),g' \
-e 's,[@]localstatedir[@],$(localstatedir),g' \
-e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \
- -e 's,[@]kimchidir[@],$(kimchidir),g' \
- -e 's,[@]kimchiversion[@],$(PACKAGE_VERSION),g' \
- -e 's,[@]kimchirelease[@],$(PACKAGE_RELEASE),g' \
+ -e 's,[@]wokdir[@],$(wokdir),g' \
+ -e 's,[@]wokversion[@],$(PACKAGE_VERSION),g' \
+ -e 's,[@]wokrelease[@],$(PACKAGE_RELEASE),g' \
-e 's,[@]withspice[@],$(WITH_SPICE),g'
diff --git a/src/wok/config.py.in b/src/wok/config.py.in
index 8cc63e7..019f42f 100644
--- a/src/wok/config.py.in
+++ b/src/wok/config.py.in
@@ -136,7 +136,7 @@ class Paths(object):
else:
base = os.path.dirname('./%s' % __file__)
- if os.access('%s/../../src/kimchi/config.py' % base, os.F_OK):
+ if os.access('%s/../../src/wok/config.py' % base, os.F_OK):
return os.path.abspath('%s/../..' % base)
else:
return '@pkgdatadir@'
diff --git a/src/wok/control/Makefile.am b/src/wok/control/Makefile.am
new file mode 100644
index 0000000..d6cb3f0
--- /dev/null
+++ b/src/wok/control/Makefile.am
@@ -0,0 +1,25 @@
+#
+# Kimchi
+#
+# Copyright IBM Corp, 2013
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+control_PYTHON = *.py
+
+controldir = $(pythondir)/wok/control
+
+install-data-local:
+ $(MKDIR_P) $(DESTDIR)$(controldir)
diff --git a/src/wok/control/__init__.py b/src/wok/control/__init__.py
new file mode 100644
index 0000000..4ad9459
--- /dev/null
+++ b/src/wok/control/__init__.py
@@ -0,0 +1,26 @@
+#
+# Project Kimchi
+#
+# Copyright IBM, Corp. 2013-2014
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+import os
+
+
+from wok.control.utils import load_url_sub_node
+
+
+sub_nodes = load_url_sub_node(os.path.dirname(__file__), __name__)
diff --git a/src/wok/model/Makefile.am b/src/wok/model/Makefile.am
new file mode 100644
index 0000000..8f0f102
--- /dev/null
+++ b/src/wok/model/Makefile.am
@@ -0,0 +1,25 @@
+#
+# Kimchi
+#
+# Copyright IBM Corp, 2013
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+model_PYTHON = *.py
+
+modeldir = $(pythondir)/wok/model
+
+install-data-local:
+ $(MKDIR_P) $(DESTDIR)$(modeldir)
diff --git a/src/wok/model/__init__.py b/src/wok/model/__init__.py
new file mode 100644
index 0000000..ca7ede4
--- /dev/null
+++ b/src/wok/model/__init__.py
@@ -0,0 +1,18 @@
+#
+# Project Kimchi
+#
+# Copyright IBM, Corp. 2014
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
diff --git a/src/wok/xmlutils/Makefile.am b/src/wok/xmlutils/Makefile.am
new file mode 100644
index 0000000..69aa524
--- /dev/null
+++ b/src/wok/xmlutils/Makefile.am
@@ -0,0 +1,25 @@
+#
+# Kimchi
+#
+# Copyright IBM Corp, 2014
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+xmlutils_PYTHON = *.py
+
+xmlutilsdir = $(pythondir)/wok/xmlutils
+
+install-data-local:
+ $(MKDIR_P) $(DESTDIR)$(xmlutilsdir)
diff --git a/src/wok/xmlutils/__init__.py b/src/wok/xmlutils/__init__.py
new file mode 100644
index 0000000..ca7ede4
--- /dev/null
+++ b/src/wok/xmlutils/__init__.py
@@ -0,0 +1,18 @@
+#
+# Project Kimchi
+#
+# Copyright IBM, Corp. 2014
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
diff --git a/ui/Makefile.am b/ui/Makefile.am
index d541355..e534d62 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -15,8 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-SUBDIRS = css images js libs pages spice-html5
+SUBDIRS = css images js libs pages
-uidir = $(datadir)/kimchi/ui
+uidir = $(datadir)/wok/ui
dist_ui_DATA = robots.txt
diff --git a/ui/css/Makefile.am b/ui/css/Makefile.am
index f4f3dac..29ddb26 100644
--- a/ui/css/Makefile.am
+++ b/ui/css/Makefile.am
@@ -17,7 +17,7 @@
EXTRA_DIST = theme-default
-cssdir = $(datadir)/kimchi/ui/css
+cssdir = $(datadir)/wok/ui/css
dist_css_DATA = theme-default.min.css
theme-default.min.css: theme-default/*.css
diff --git a/ui/images/Makefile.am b/ui/images/Makefile.am
index 7b63d23..297c0bd 100644
--- a/ui/images/Makefile.am
+++ b/ui/images/Makefile.am
@@ -17,6 +17,6 @@
SUBDIRS = theme-default
-imagedir = $(datadir)/kimchi/ui/images
+imagedir = $(datadir)/wok/ui/images
-dist_image_DATA = *.png *.ico
+dist_image_DATA = *.ico
diff --git a/ui/images/theme-default/Makefile.am b/ui/images/theme-default/Makefile.am
index 7c69b2a..b1b6308 100644
--- a/ui/images/theme-default/Makefile.am
+++ b/ui/images/theme-default/Makefile.am
@@ -15,6 +15,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-imagedir = $(datadir)/kimchi/ui/images/theme-default
+imagedir = $(datadir)/wok/ui/images/theme-default
-dist_image_DATA = *.png *.gif
+dist_image_DATA = *.png
diff --git a/ui/js/Makefile.am b/ui/js/Makefile.am
index 683715a..2549846 100644
--- a/ui/js/Makefile.am
+++ b/ui/js/Makefile.am
@@ -17,7 +17,7 @@
EXTRA_DIST = src widgets
-jsdir = $(datadir)/kimchi/ui/js
+jsdir = $(datadir)/wok/ui/js
dist_js_DATA = wok.min.js $(filter-out wok.min.js, $(wildcard *.js))
diff --git a/ui/libs/Makefile.am b/ui/libs/Makefile.am
new file mode 100644
index 0000000..49ad3bb
--- /dev/null
+++ b/ui/libs/Makefile.am
@@ -0,0 +1,22 @@
+#
+# Kimchi
+#
+# Copyright IBM, Corp. 2013
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+SUBDIRS = themes
+
+jsdir = $(datadir)/wok/ui/libs
+
+dist_js_DATA = $(wildcard *.js) $(NULL)
diff --git a/ui/libs/themes/Makefile.am b/ui/libs/themes/Makefile.am
new file mode 100644
index 0000000..1ce56d9
--- /dev/null
+++ b/ui/libs/themes/Makefile.am
@@ -0,0 +1,18 @@
+#
+# Kimchi
+#
+# Copyright IBM, Corp. 2013
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+SUBDIRS = base
diff --git a/ui/libs/themes/base/Makefile.am b/ui/libs/themes/base/Makefile.am
new file mode 100644
index 0000000..1bbaa50
--- /dev/null
+++ b/ui/libs/themes/base/Makefile.am
@@ -0,0 +1,22 @@
+#
+# Kimchi
+#
+# Copyright IBM, Corp. 2013
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+SUBDIRS = images
+
+basedir = $(datadir)/wok/ui/libs/themes/base
+
+dist_base_DATA = $(wildcard *.css) $(NULL)
diff --git a/ui/libs/themes/base/images/Makefile.am
b/ui/libs/themes/base/images/Makefile.am
index 312cbeb..5388542 100644
--- a/ui/libs/themes/base/images/Makefile.am
+++ b/ui/libs/themes/base/images/Makefile.am
@@ -15,6 +15,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-imagesdir = $(datadir)/kimchi/ui/libs/themes/base/images
+imagesdir = $(datadir)/wok/ui/libs/themes/base/images
dist_images_DATA = *.png *.gif
diff --git a/ui/pages/Makefile.am b/ui/pages/Makefile.am
index a22afc1..68f4c92 100644
--- a/ui/pages/Makefile.am
+++ b/ui/pages/Makefile.am
@@ -15,8 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-SUBDIRS = help tabs websockify
+SUBDIRS = websockify
-htmldir = $(datadir)/kimchi/ui/pages
+htmldir = $(datadir)/wok/ui/pages
dist_html_DATA = $(wildcard *.tmpl) $(NULL)
diff --git a/ui/pages/websockify/Makefile.am b/ui/pages/websockify/Makefile.am
index d498242..5321562 100644
--- a/ui/pages/websockify/Makefile.am
+++ b/ui/pages/websockify/Makefile.am
@@ -15,6 +15,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-websockifyhtmldir = $(datadir)/kimchi/ui/pages/websockify
+websockifyhtmldir = $(datadir)/wok/ui/pages/websockify
dist_websockifyhtml_DATA = $(wildcard *.html) $(NULL)
--
1.7.1