[Kimchi-devel] [PATCH 11/38] Add/update kimchi plugin makefiles
Lucio Correia
luciojhc at linux.vnet.ibm.com
Thu May 21 21:33:24 UTC 2015
---
plugins/kimchi/.gitignore | 9 +-
plugins/kimchi/Makefile.am | 158 ++++++++++++++++++++
plugins/kimchi/configure.ac | 70 +++------
plugins/kimchi/contrib/Makefile.am | 4 -
plugins/kimchi/control/Makefile.am | 2 +-
plugins/kimchi/control/vm/Makefile.am | 2 +-
plugins/kimchi/docs/Makefile.am | 28 ++++
plugins/kimchi/model/Makefile.am | 2 +-
plugins/kimchi/po/Makefile.in.in | 2 +-
plugins/kimchi/po/POTFILES.in | 3 +-
plugins/kimchi/tests/Makefile.am | 2 +-
plugins/kimchi/ui/Makefile.am | 4 +-
plugins/kimchi/ui/config/Makefile.am | 4 +-
plugins/kimchi/ui/css/Makefile.am | 26 ++++
plugins/kimchi/ui/images/Makefile.am | 22 +++
plugins/kimchi/ui/images/theme-default/Makefile.am | 20 +++
plugins/kimchi/ui/js/Makefile.am | 27 ++++
plugins/kimchi/ui/libs/Makefile.am | 2 +-
plugins/kimchi/ui/libs/themes/base/Makefile.am | 2 +-
.../kimchi/ui/libs/themes/base/images/Makefile.am | 2 +-
plugins/kimchi/ui/pages/Makefile.am | 22 +++
plugins/kimchi/ui/pages/help/Makefile.am | 2 +-
plugins/kimchi/ui/pages/help/de_DE/Makefile.am | 2 +-
plugins/kimchi/ui/pages/help/en_US/Makefile.am | 2 +-
plugins/kimchi/ui/pages/help/es_ES/Makefile.am | 2 +-
plugins/kimchi/ui/pages/help/fr_FR/Makefile.am | 2 +-
plugins/kimchi/ui/pages/help/it_IT/Makefile.am | 2 +-
plugins/kimchi/ui/pages/help/ja_JP/Makefile.am | 2 +-
plugins/kimchi/ui/pages/help/ko_KR/Makefile.am | 2 +-
plugins/kimchi/ui/pages/help/pt_BR/Makefile.am | 2 +-
plugins/kimchi/ui/pages/help/ru_RU/Makefile.am | 2 +-
plugins/kimchi/ui/pages/help/zh_CN/Makefile.am | 2 +-
plugins/kimchi/ui/pages/help/zh_TW/Makefile.am | 2 +-
plugins/kimchi/ui/pages/tabs/Makefile.am | 2 +-
plugins/kimchi/ui/spice-html5/Makefile.am | 2 +-
plugins/kimchi/ui/spice-html5/css/Makefile.am | 2 +-
plugins/kimchi/ui/spice-html5/pages/Makefile.am | 2 +-
.../kimchi/ui/spice-html5/thirdparty/Makefile.am | 2 +-
plugins/kimchi/xmlutils/Makefile.am | 2 +-
39 files changed, 360 insertions(+), 89 deletions(-)
create mode 100644 plugins/kimchi/Makefile.am
create mode 100644 plugins/kimchi/docs/Makefile.am
create mode 100644 plugins/kimchi/ui/css/Makefile.am
create mode 100644 plugins/kimchi/ui/images/Makefile.am
create mode 100644 plugins/kimchi/ui/images/theme-default/Makefile.am
create mode 100644 plugins/kimchi/ui/js/Makefile.am
create mode 100644 plugins/kimchi/ui/pages/Makefile.am
diff --git a/plugins/kimchi/.gitignore b/plugins/kimchi/.gitignore
index 4ced984..1dae610 100644
--- a/plugins/kimchi/.gitignore
+++ b/plugins/kimchi/.gitignore
@@ -16,6 +16,7 @@ build-aux/missing
build-aux/py-compile
configure
config.log
+config.py
config.status
contrib/DEBIAN/control
contrib/kimchi.spec.fedora
@@ -26,17 +27,11 @@ contrib/make-deb.sh
*.gmo
stamp-po
kimchi-*.tar.gz
-src/kimchid
-src/kimchi.conf
-src/nginx_kimchi.conf
-src/backend/config.py
tests/run_tests.sh
tests/test_config.py
-plugins/sample/po/POTFILES
-plugins/sample/sample.conf
po/POTFILES
po/gen-pot
*.orig
*.rej
*.pem
-plugins/kimchi/ui/pages/help/*/*.html
+ui/pages/help/*/*.html
diff --git a/plugins/kimchi/Makefile.am b/plugins/kimchi/Makefile.am
new file mode 100644
index 0000000..32d80ff
--- /dev/null
+++ b/plugins/kimchi/Makefile.am
@@ -0,0 +1,158 @@
+#
+# 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
+
+SUBDIRS = contrib control distros.d docs model po tests ui xmlutils
+
+kimchi_PYTHON = $(filter-out config.py, $(wildcard *.py))
+
+nodist_kimchi_PYTHON = config.py
+
+if WITH_SPICE
+WITH_SPICE=yes
+else
+WITH_SPICE=no
+endif
+
+wokdir = $(pythondir)/wok
+kimchidir = $(pythondir)/wok/plugins/kimchi
+
+confdir = $(sysconfdir)/wok/plugins.d
+dist_conf_DATA = kimchi.conf template.conf
+
+AUTOMAKE_OPTIONS = foreign
+
+ACLOCAL_AMFLAGS = --install -I m4
+
+EXTRA_DIST = \
+ API.json \
+ config.rpath \
+ autogen.sh \
+ COPYING.ASL2 \
+ COPYING.LGPL \
+ CONTRIBUTE.md \
+ VERSION \
+ build-aux/pkg-version \
+ config.py.in
+
+PEP8_BLACKLIST = *config.py,*i18n.py,*tests/test_config.py
+
+I18N_FILES = i18n.py
+
+check-local:
+ contrib/check_i18n.py $(I18N_FILES)
+ find . -path './.git' -prune -type f -o \
+ -name '*.py' -o -name '*.py.in' | xargs $(PYFLAKES) | \
+ while read LINE; do echo "$$LINE"; false; done
+
+ $(PEP8) --version
+ $(PEP8) --filename '*.py,*.py.in' --exclude="$(PEP8_BLACKLIST)" .
+
+# Link built mo files in the source tree to enable use of translations from
+# within the source tree
+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 ; \
+ done < po/LINGUAS
+
+
+install-data-local:
+ $(MKDIR_P) $(DESTDIR)$(kimchidir)
+ $(INSTALL_DATA) API.json $(DESTDIR)$(kimchidir)/API.json
+
+uninstall-local:
+ $(RM) $(DESTDIR)$(kimchidir)/API.json
+
+do_substitution = \
+ sed -e 's,[@]prefix[@],$(prefix),g' \
+ -e 's,[@]datadir[@],$(datadir),g' \
+ -e 's,[@]sysconfdir[@],$(sysconfdir),g' \
+ -e 's,[@]localstatedir[@],$(localstatedir),g' \
+ -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \
+ -e 's,[@]wokdir[@],$(wokdir),g' \
+ -e 's,[@]kimchidir[@],$(kimchidir),g' \
+ -e 's,[@]kimchiversion[@],$(PACKAGE_VERSION),g' \
+ -e 's,[@]kimchirelease[@],$(PACKAGE_RELEASE),g' \
+ -e 's,[@]withspice[@],$(WITH_SPICE),g'
+
+config.py: config.py.in Makefile
+ $(do_substitution) < $(srcdir)/config.py.in > config.py
+
+
+#
+# Packaging helpers
+#
+
+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/isos
+ touch $(DESTDIR)/var/lib/kimchi/objectstore
+ $(MKDIR_P) $(DESTDIR)/etc/init
+ cp -R $(top_srcdir)/contrib/kimchid-upstart.conf.debian \
+ $(DESTDIR)/etc/init/kimchid.conf
+
+
+deb: contrib/make-deb.sh
+ $(top_srcdir)/contrib/make-deb.sh
+
+kimchi.spec: contrib/kimchi.spec.fedora contrib/kimchi.spec.suse
+ @if test -e /etc/redhat-release; then \
+ ln -sf contrib/kimchi.spec.fedora $@ ; \
+ elif test -e /etc/SuSE-release; then \
+ ln -sf contrib/kimchi.spec.suse $@ ; \
+ else \
+ echo "Unable to select a spec file for RPM build" ; \
+ /bin/false ; \
+ fi
+
+rpm: dist kimchi.spec
+ $(MKDIR_P) rpm/BUILD rpm/RPMS rpm/SOURCES rpm/SPECS rpm/SRPMS
+ cp $(top_srcdir)/kimchi.spec rpm/SPECS/kimchi.spec
+ cp $(DIST_ARCHIVES) rpm/SOURCES
+ rpmbuild -ba --define "_topdir `pwd`/rpm" rpm/SPECS/kimchi.spec
+
+fedora-rpm: contrib/kimchi.spec.fedora
+ ln -sf contrib/kimchi.spec.fedora kimchi.spec
+ $(MAKE) rpm
+
+suse-rpm: contrib/kimchi.spec.suse
+ ln -sf contrib/kimchi.spec.suse kimchi.spec
+ $(MAKE) rpm
+
+ChangeLog:
+ @if test -d .git; then \
+ $(top_srcdir)/build-aux/genChangelog --release > $@; \
+ fi
+
+VERSION:
+ @if test -d .git; then \
+ git describe --abbrev=0 > $@; \
+ fi
+
+.PHONY: deb install-deb rpm fedora-rpm suse-rpm ChangeLog VERSION
+
+clean-local:
+ rm -rf mo rpm
+
+BUILT_SOURCES = config.py
+CLEANFILES = config.py kimchi.spec `find "$(top_srcdir)" -type f -name "*.pyc" -print`
+
diff --git a/plugins/kimchi/configure.ac b/plugins/kimchi/configure.ac
index a1504d3..9a50d49 100644
--- a/plugins/kimchi/configure.ac
+++ b/plugins/kimchi/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([backend], [m4_esyscmd([./build-aux/pkg-version --version])])
+AC_INIT([kimchi], [m4_esyscmd([./build-aux/pkg-version --version])])
AC_SUBST([PACKAGE_VERSION],
[m4_esyscmd([./build-aux/pkg-version --version])])
@@ -78,52 +78,12 @@ AC_CONFIG_FILES([
po/gen-pot
Makefile
docs/Makefile
- src/Makefile
- src/distros.d/Makefile
- src/backend/Makefile
- src/backend/control/Makefile
- src/backend/model/Makefile
- src/backend/xmlutils/Makefile
- plugins/Makefile
- plugins/kimchi/Makefile
- plugins/kimchi/control/Makefile
- plugins/kimchi/control/vm/Makefile
- plugins/kimchi/model/Makefile
- plugins/kimchi/ui/Makefile
- plugins/kimchi/ui/config/Makefile
- plugins/kimchi/ui/css/Makefile
- plugins/kimchi/ui/images/Makefile
- plugins/kimchi/ui/images/theme-default/Makefile
- plugins/kimchi/ui/js/Makefile
- plugins/kimchi/ui/libs/Makefile
- plugins/kimchi/ui/libs/themes/Makefile
- plugins/kimchi/ui/libs/themes/base/Makefile
- plugins/kimchi/ui/libs/themes/base/images/Makefile
- plugins/kimchi/ui/spice-html5/Makefile
- plugins/kimchi/ui/spice-html5/css/Makefile
- plugins/kimchi/ui/spice-html5/pages/Makefile
- plugins/kimchi/ui/spice-html5/thirdparty/Makefile
- plugins/kimchi/ui/pages/Makefile
- plugins/kimchi/ui/pages/help/Makefile
- plugins/kimchi/ui/pages/help/en_US/Makefile
- plugins/kimchi/ui/pages/help/de_DE/Makefile
- plugins/kimchi/ui/pages/help/es_ES/Makefile
- plugins/kimchi/ui/pages/help/fr_FR/Makefile
- plugins/kimchi/ui/pages/help/it_IT/Makefile
- plugins/kimchi/ui/pages/help/ja_JP/Makefile
- plugins/kimchi/ui/pages/help/ko_KR/Makefile
- plugins/kimchi/ui/pages/help/pt_BR/Makefile
- plugins/kimchi/ui/pages/help/ru_RU/Makefile
- plugins/kimchi/ui/pages/help/zh_CN/Makefile
- plugins/kimchi/ui/pages/help/zh_TW/Makefile
- plugins/sample/Makefile
- plugins/sample/po/Makefile.in
- plugins/sample/sample.conf
- plugins/sample/ui/Makefile
- plugins/sample/ui/config/Makefile
- plugins/sample/ui/js/Makefile
- plugins/sample/ui/pages/Makefile
+ distros.d/Makefile
+ control/Makefile
+ control/vm/Makefile
+ model/Makefile
ui/Makefile
+ ui/config/Makefile
ui/css/Makefile
ui/images/Makefile
ui/images/theme-default/Makefile
@@ -132,14 +92,30 @@ AC_CONFIG_FILES([
ui/libs/themes/Makefile
ui/libs/themes/base/Makefile
ui/libs/themes/base/images/Makefile
+ ui/spice-html5/Makefile
+ ui/spice-html5/css/Makefile
+ ui/spice-html5/pages/Makefile
+ ui/spice-html5/thirdparty/Makefile
ui/pages/Makefile
- ui/pages/websockify/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
contrib/Makefile
contrib/DEBIAN/Makefile
contrib/DEBIAN/control
contrib/kimchi.spec.fedora
contrib/kimchi.spec.suse
tests/Makefile
+ xmlutils/Makefile
],[
chmod +x po/gen-pot
])
diff --git a/plugins/kimchi/contrib/Makefile.am b/plugins/kimchi/contrib/Makefile.am
index 393306f..5001191 100644
--- a/plugins/kimchi/contrib/Makefile.am
+++ b/plugins/kimchi/contrib/Makefile.am
@@ -18,11 +18,7 @@ SUBDIRS = DEBIAN
EXTRA_DIST = \
check_i18n.py \
- kimchid.sysvinit \
- kimchid.service.fedora \
kimchi.spec.fedora.in \
- kimchid-upstart.conf.debian \
- kimchid-upstart.conf.fedora \
make-deb.sh.in \
$(NULL)
diff --git a/plugins/kimchi/control/Makefile.am b/plugins/kimchi/control/Makefile.am
index fee98dc..33118ca 100644
--- a/plugins/kimchi/control/Makefile.am
+++ b/plugins/kimchi/control/Makefile.am
@@ -21,7 +21,7 @@ SUBDIRS = vm
control_PYTHON = *.py
-controldir = $(pythondir)/kimchi/control
+controldir = $(pythondir)/wok/plugins/kimchi/control
install-data-local:
$(MKDIR_P) $(DESTDIR)$(controldir)
diff --git a/plugins/kimchi/control/vm/Makefile.am b/plugins/kimchi/control/vm/Makefile.am
index e57b907..b17c68a 100644
--- a/plugins/kimchi/control/vm/Makefile.am
+++ b/plugins/kimchi/control/vm/Makefile.am
@@ -20,7 +20,7 @@
vm_PYTHON = *.py
-vmdir = $(pythondir)/kimchi/control/vm
+vmdir = $(pythondir)/wok/plugins/kimchi/control/vm
install-data-local:
$(MKDIR_P) $(DESTDIR)$(vmdir)
diff --git a/plugins/kimchi/docs/Makefile.am b/plugins/kimchi/docs/Makefile.am
new file mode 100644
index 0000000..679aa18
--- /dev/null
+++ b/plugins/kimchi/docs/Makefile.am
@@ -0,0 +1,28 @@
+#
+# 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
+
+docdir = $(datadir)/kimchi/doc
+
+dist_doc_DATA = \
+ API.md \
+ README.md \
+ README-federation.md \
+ kimchi-guest.png \
+ kimchi-templates.png \
+ $(NULL)
diff --git a/plugins/kimchi/model/Makefile.am b/plugins/kimchi/model/Makefile.am
index a6ccbf0..f4f4750 100644
--- a/plugins/kimchi/model/Makefile.am
+++ b/plugins/kimchi/model/Makefile.am
@@ -19,7 +19,7 @@
model_PYTHON = *.py
-modeldir = $(pythondir)/kimchi/model
+modeldir = $(pythondir)/wok/plugins/kimchi/model
install-data-local:
$(MKDIR_P) $(DESTDIR)$(modeldir)
diff --git a/plugins/kimchi/po/Makefile.in.in b/plugins/kimchi/po/Makefile.in.in
index d01fb31..ae58e85 100644
--- a/plugins/kimchi/po/Makefile.in.in
+++ b/plugins/kimchi/po/Makefile.in.in
@@ -26,7 +26,7 @@ prefix = @prefix@
exec_prefix = @exec_prefix@
datarootdir = @datarootdir@
datadir = @datadir@
-localedir = @prefix@/share/locale
+localedir = @datadir@/wok/plugins/kimchi/mo
gettextsrcdir = $(datadir)/gettext/po
INSTALL = @INSTALL@
diff --git a/plugins/kimchi/po/POTFILES.in b/plugins/kimchi/po/POTFILES.in
index 57bc711..92eef1e 100644
--- a/plugins/kimchi/po/POTFILES.in
+++ b/plugins/kimchi/po/POTFILES.in
@@ -1,4 +1,3 @@
# List of source files which contain translatable strings.
-src/kimchi/i18n.py
+i18n.py
ui/pages/*.tmpl
-ui/pages/tabs/*.tmpl
diff --git a/plugins/kimchi/tests/Makefile.am b/plugins/kimchi/tests/Makefile.am
index 09dce6c..c1f6784 100644
--- a/plugins/kimchi/tests/Makefile.am
+++ b/plugins/kimchi/tests/Makefile.am
@@ -31,7 +31,7 @@ do_substitution = \
-e 's,[@]prefix[@],$(prefix),g' \
-e 's,[@]datadir[@],$(datadir),g' \
-e 's,[@]PYTHON_VERSION[@],$(PYTHON_VERSION),g' \
- -e 's,[@]kimchidir[@],$(pythondir)/kimchi,g' \
+ -e 's,[@]wokdir[@],$(pythondir)/wok,g' \
-e 's,[@]pkgdatadir[@],$(pkgdatadir),g'
diff --git a/plugins/kimchi/ui/Makefile.am b/plugins/kimchi/ui/Makefile.am
index 208d3e3..386aa78 100644
--- a/plugins/kimchi/ui/Makefile.am
+++ b/plugins/kimchi/ui/Makefile.am
@@ -15,4 +15,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-SUBDIRS = ui
+SUBDIRS = config css images js libs pages spice-html5
+
+uidir = $(datadir)/wok/plugins/kimchi/ui
diff --git a/plugins/kimchi/ui/config/Makefile.am b/plugins/kimchi/ui/config/Makefile.am
index 32b74e3..e3b3d19 100644
--- a/plugins/kimchi/ui/config/Makefile.am
+++ b/plugins/kimchi/ui/config/Makefile.am
@@ -15,8 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-xmldir = $(datadir)/kimchi/config/ui
+xmldir = $(datadir)/wok/plugins/kimchi/ui/config
dist_xml_DATA = \
- tabs.xml \
+ tab-ext.xml \
$(NULL)
diff --git a/plugins/kimchi/ui/css/Makefile.am b/plugins/kimchi/ui/css/Makefile.am
new file mode 100644
index 0000000..5071d29
--- /dev/null
+++ b/plugins/kimchi/ui/css/Makefile.am
@@ -0,0 +1,26 @@
+#
+# 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.
+
+EXTRA_DIST = theme-default
+
+cssdir = $(datadir)/wok/plugins/kimchi/ui/css
+dist_css_DATA = theme-default.min.css
+
+theme-default.min.css: theme-default/*.css
+ cat $^ > $@
+
+CLEANFILES = theme-default.min.css
diff --git a/plugins/kimchi/ui/images/Makefile.am b/plugins/kimchi/ui/images/Makefile.am
new file mode 100644
index 0000000..0562e6a
--- /dev/null
+++ b/plugins/kimchi/ui/images/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 = theme-default
+
+imagedir = $(datadir)/wok/plugins/kimchi/ui/images
+
+dist_image_DATA = *.png *.ico
diff --git a/plugins/kimchi/ui/images/theme-default/Makefile.am b/plugins/kimchi/ui/images/theme-default/Makefile.am
new file mode 100644
index 0000000..7e11d75
--- /dev/null
+++ b/plugins/kimchi/ui/images/theme-default/Makefile.am
@@ -0,0 +1,20 @@
+#
+# 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.
+
+imagedir = $(datadir)/wok/plugins/kimchi/ui/images/theme-default
+
+dist_image_DATA = *.png *.gif
diff --git a/plugins/kimchi/ui/js/Makefile.am b/plugins/kimchi/ui/js/Makefile.am
new file mode 100644
index 0000000..50f5f77
--- /dev/null
+++ b/plugins/kimchi/ui/js/Makefile.am
@@ -0,0 +1,27 @@
+#
+# 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.
+
+EXTRA_DIST = src widgets
+
+jsdir = $(datadir)/wok/plugins/kimchi/ui/js
+
+dist_js_DATA = kimchi.min.js $(filter-out kimchi.min.js, $(wildcard *.js))
+
+kimchi.min.js: widgets/*.js src/*.js
+ cat $(sort $^) > $@
+
+CLEANFILES = kimchi.min.js
diff --git a/plugins/kimchi/ui/libs/Makefile.am b/plugins/kimchi/ui/libs/Makefile.am
index a2acce2..818c4ec 100644
--- a/plugins/kimchi/ui/libs/Makefile.am
+++ b/plugins/kimchi/ui/libs/Makefile.am
@@ -17,6 +17,6 @@
SUBDIRS = themes
-jsdir = $(datadir)/kimchi/ui/libs
+jsdir = $(datadir)/wok/plugins/kimchi/ui/libs
dist_js_DATA = $(wildcard *.js) $(NULL)
diff --git a/plugins/kimchi/ui/libs/themes/base/Makefile.am b/plugins/kimchi/ui/libs/themes/base/Makefile.am
index d7454f0..70326ba 100644
--- a/plugins/kimchi/ui/libs/themes/base/Makefile.am
+++ b/plugins/kimchi/ui/libs/themes/base/Makefile.am
@@ -17,6 +17,6 @@
SUBDIRS = images
-basedir = $(datadir)/kimchi/ui/libs/themes/base
+basedir = $(datadir)/wok/plugins/kimchi/ui/libs/themes/base
dist_base_DATA = $(wildcard *.css) $(NULL)
diff --git a/plugins/kimchi/ui/libs/themes/base/images/Makefile.am b/plugins/kimchi/ui/libs/themes/base/images/Makefile.am
index 312cbeb..e20b434 100644
--- a/plugins/kimchi/ui/libs/themes/base/images/Makefile.am
+++ b/plugins/kimchi/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/plugins/kimchi/ui/libs/themes/base/images
dist_images_DATA = *.png *.gif
diff --git a/plugins/kimchi/ui/pages/Makefile.am b/plugins/kimchi/ui/pages/Makefile.am
new file mode 100644
index 0000000..076b814
--- /dev/null
+++ b/plugins/kimchi/ui/pages/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 = help tabs
+
+htmldir = $(datadir)/wok/plugins/kimchi/ui/pages
+
+dist_html_DATA = $(wildcard *.tmpl) $(NULL)
diff --git a/plugins/kimchi/ui/pages/help/Makefile.am b/plugins/kimchi/ui/pages/help/Makefile.am
index 5c04319..0fbe47b 100644
--- a/plugins/kimchi/ui/pages/help/Makefile.am
+++ b/plugins/kimchi/ui/pages/help/Makefile.am
@@ -22,7 +22,7 @@ DITA_XSL_FILE = dita-help.xsl
EXTRA_DIST = gen-index.py\
$(DITA_XSL_FILE)
-helpdir = $(datadir)/kimchi/ui/pages/help
+helpdir = $(datadir)/wok/plugins/kimchi/ui/pages/help
dist_help_DATA = kimchi.css
diff --git a/plugins/kimchi/ui/pages/help/de_DE/Makefile.am b/plugins/kimchi/ui/pages/help/de_DE/Makefile.am
index ab1c769..3d99aae 100644
--- a/plugins/kimchi/ui/pages/help/de_DE/Makefile.am
+++ b/plugins/kimchi/ui/pages/help/de_DE/Makefile.am
@@ -14,7 +14,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
-de_DE_helpdir = $(datadir)/kimchi/ui/pages/help/de_DE
+de_DE_helpdir = $(datadir)/wok/plugins/kimchi/ui/pages/help/de_DE
dist_de_DE_help_DATA = $(wildcard *.html) $(NULL)
diff --git a/plugins/kimchi/ui/pages/help/en_US/Makefile.am b/plugins/kimchi/ui/pages/help/en_US/Makefile.am
index d5ab24f..d37f03a 100644
--- a/plugins/kimchi/ui/pages/help/en_US/Makefile.am
+++ b/plugins/kimchi/ui/pages/help/en_US/Makefile.am
@@ -14,7 +14,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
-en_US_helpdir = $(datadir)/kimchi/ui/pages/help/en_US
+en_US_helpdir = $(datadir)/wok/plugins/kimchi/ui/pages/help/en_US
dist_en_US_help_DATA = $(wildcard *.html) $(NULL)
diff --git a/plugins/kimchi/ui/pages/help/es_ES/Makefile.am b/plugins/kimchi/ui/pages/help/es_ES/Makefile.am
index a3317a6..29c596f 100644
--- a/plugins/kimchi/ui/pages/help/es_ES/Makefile.am
+++ b/plugins/kimchi/ui/pages/help/es_ES/Makefile.am
@@ -14,7 +14,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
-es_ES_helpdir = $(datadir)/kimchi/ui/pages/help/es_ES
+es_ES_helpdir = $(datadir)/wok/plugins/kimchi/ui/pages/help/es_ES
dist_es_ES_help_DATA = $(wildcard *.html) $(NULL)
diff --git a/plugins/kimchi/ui/pages/help/fr_FR/Makefile.am b/plugins/kimchi/ui/pages/help/fr_FR/Makefile.am
index a5eba5a..11ce394 100644
--- a/plugins/kimchi/ui/pages/help/fr_FR/Makefile.am
+++ b/plugins/kimchi/ui/pages/help/fr_FR/Makefile.am
@@ -14,7 +14,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
-fr_FR_helpdir = $(datadir)/kimchi/ui/pages/help/fr_FR
+fr_FR_helpdir = $(datadir)/wok/plugins/kimchi/ui/pages/help/fr_FR
dist_fr_FR_help_DATA = $(wildcard *.html) $(NULL)
diff --git a/plugins/kimchi/ui/pages/help/it_IT/Makefile.am b/plugins/kimchi/ui/pages/help/it_IT/Makefile.am
index c828f26..62e2f29 100644
--- a/plugins/kimchi/ui/pages/help/it_IT/Makefile.am
+++ b/plugins/kimchi/ui/pages/help/it_IT/Makefile.am
@@ -14,7 +14,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
-it_IT_helpdir = $(datadir)/kimchi/ui/pages/help/it_IT
+it_IT_helpdir = $(datadir)/wok/plugins/kimchi/ui/pages/help/it_IT
dist_it_IT_help_DATA = $(wildcard *.html) $(NULL)
diff --git a/plugins/kimchi/ui/pages/help/ja_JP/Makefile.am b/plugins/kimchi/ui/pages/help/ja_JP/Makefile.am
index a7d6464..f9c2f33 100644
--- a/plugins/kimchi/ui/pages/help/ja_JP/Makefile.am
+++ b/plugins/kimchi/ui/pages/help/ja_JP/Makefile.am
@@ -14,7 +14,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
-ja_JP_helpdir = $(datadir)/kimchi/ui/pages/help/ja_JP
+ja_JP_helpdir = $(datadir)/wok/plugins/kimchi/ui/pages/help/ja_JP
dist_ja_JP_help_DATA = $(wildcard *.html) $(NULL)
diff --git a/plugins/kimchi/ui/pages/help/ko_KR/Makefile.am b/plugins/kimchi/ui/pages/help/ko_KR/Makefile.am
index 3242ad7..e441955 100644
--- a/plugins/kimchi/ui/pages/help/ko_KR/Makefile.am
+++ b/plugins/kimchi/ui/pages/help/ko_KR/Makefile.am
@@ -14,7 +14,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
-ko_KR_helpdir = $(datadir)/kimchi/ui/pages/help/ko_KR
+ko_KR_helpdir = $(datadir)/wok/plugins/kimchi/ui/pages/help/ko_KR
dist_ko_KR_help_DATA = $(wildcard *.html) $(NULL)
diff --git a/plugins/kimchi/ui/pages/help/pt_BR/Makefile.am b/plugins/kimchi/ui/pages/help/pt_BR/Makefile.am
index 0f1df92..7fc2cb0 100644
--- a/plugins/kimchi/ui/pages/help/pt_BR/Makefile.am
+++ b/plugins/kimchi/ui/pages/help/pt_BR/Makefile.am
@@ -14,7 +14,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
-pt_BR_helpdir = $(datadir)/kimchi/ui/pages/help/pt_BR
+pt_BR_helpdir = $(datadir)/wok/plugins/kimchi/ui/pages/help/pt_BR
dist_pt_BR_help_DATA = $(wildcard *.html) $(NULL)
diff --git a/plugins/kimchi/ui/pages/help/ru_RU/Makefile.am b/plugins/kimchi/ui/pages/help/ru_RU/Makefile.am
index b128c6d..85ca27a 100644
--- a/plugins/kimchi/ui/pages/help/ru_RU/Makefile.am
+++ b/plugins/kimchi/ui/pages/help/ru_RU/Makefile.am
@@ -14,7 +14,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
-ru_RU_helpdir = $(datadir)/kimchi/ui/pages/help/ru_RU
+ru_RU_helpdir = $(datadir)/wok/plugins/kimchi/ui/pages/help/ru_RU
dist_ru_RU_help_DATA = $(wildcard *.html) $(NULL)
diff --git a/plugins/kimchi/ui/pages/help/zh_CN/Makefile.am b/plugins/kimchi/ui/pages/help/zh_CN/Makefile.am
index 8b812ff..e785048 100644
--- a/plugins/kimchi/ui/pages/help/zh_CN/Makefile.am
+++ b/plugins/kimchi/ui/pages/help/zh_CN/Makefile.am
@@ -14,7 +14,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
-zh_CN_helpdir = $(datadir)/kimchi/ui/pages/help/zh_CN
+zh_CN_helpdir = $(datadir)/wok/plugins/kimchi/ui/pages/help/zh_CN
dist_zh_CN_help_DATA = $(wildcard *.html) $(NULL)
diff --git a/plugins/kimchi/ui/pages/help/zh_TW/Makefile.am b/plugins/kimchi/ui/pages/help/zh_TW/Makefile.am
index 911d737..9c8ac26 100644
--- a/plugins/kimchi/ui/pages/help/zh_TW/Makefile.am
+++ b/plugins/kimchi/ui/pages/help/zh_TW/Makefile.am
@@ -14,7 +14,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
-zh_TW_helpdir = $(datadir)/kimchi/ui/pages/help/zh_TW
+zh_TW_helpdir = $(datadir)/wok/plugins/kimchi/ui/pages/help/zh_TW
dist_zh_TW_help_DATA = $(wildcard *.html) $(NULL)
diff --git a/plugins/kimchi/ui/pages/tabs/Makefile.am b/plugins/kimchi/ui/pages/tabs/Makefile.am
index a29df7e..4d5d33e 100644
--- a/plugins/kimchi/ui/pages/tabs/Makefile.am
+++ b/plugins/kimchi/ui/pages/tabs/Makefile.am
@@ -15,6 +15,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-tabshtmldir = $(datadir)/kimchi/ui/pages/tabs
+tabshtmldir = $(datadir)/wok/plugins/kimchi/ui/pages/tabs
dist_tabshtml_DATA = $(wildcard *.html.tmpl) $(NULL)
diff --git a/plugins/kimchi/ui/spice-html5/Makefile.am b/plugins/kimchi/ui/spice-html5/Makefile.am
index 3a6558a..c43f1ef 100644
--- a/plugins/kimchi/ui/spice-html5/Makefile.am
+++ b/plugins/kimchi/ui/spice-html5/Makefile.am
@@ -20,6 +20,6 @@ SUBDIRS = pages
if WITH_SPICE
SUBDIRS += css thirdparty
-spicehtml5dir = $(datadir)/kimchi/ui/spice-html5
+spicehtml5dir = $(datadir)/wok/plugins/kimchi/ui/spice-html5
dist_spicehtml5_DATA = $(wildcard *.js) $(NULL)
endif
diff --git a/plugins/kimchi/ui/spice-html5/css/Makefile.am b/plugins/kimchi/ui/spice-html5/css/Makefile.am
index 6106e0d..ed51972 100644
--- a/plugins/kimchi/ui/spice-html5/css/Makefile.am
+++ b/plugins/kimchi/ui/spice-html5/css/Makefile.am
@@ -15,6 +15,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-spicecssdir = $(datadir)/kimchi/ui/spice-html5
+spicecssdir = $(datadir)/wok/plugins/kimchi/ui/spice-html5
dist_spicecss_DATA = $(wildcard *.css) $(NULL)
diff --git a/plugins/kimchi/ui/spice-html5/pages/Makefile.am b/plugins/kimchi/ui/spice-html5/pages/Makefile.am
index 45e67a5..431ec6c 100644
--- a/plugins/kimchi/ui/spice-html5/pages/Makefile.am
+++ b/plugins/kimchi/ui/spice-html5/pages/Makefile.am
@@ -15,6 +15,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-spicepagesdir = $(datadir)/kimchi/ui/spice-html5/pages
+spicepagesdir = $(datadir)/wok/plugins/kimchi/ui/spice-html5/pages
dist_spicepages_DATA = $(wildcard *.html) $(NULL)
diff --git a/plugins/kimchi/ui/spice-html5/thirdparty/Makefile.am b/plugins/kimchi/ui/spice-html5/thirdparty/Makefile.am
index b83a585..474478d 100644
--- a/plugins/kimchi/ui/spice-html5/thirdparty/Makefile.am
+++ b/plugins/kimchi/ui/spice-html5/thirdparty/Makefile.am
@@ -15,6 +15,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-thirdpartydir = $(datadir)/kimchi/ui/spice-html5/thirdparty
+thirdpartydir = $(datadir)/wok/plugins/kimchi/ui/spice-html5/thirdparty
dist_thirdparty_DATA = $(wildcard *.js) $(NULL)
diff --git a/plugins/kimchi/xmlutils/Makefile.am b/plugins/kimchi/xmlutils/Makefile.am
index 73f86f4..207ad7f 100644
--- a/plugins/kimchi/xmlutils/Makefile.am
+++ b/plugins/kimchi/xmlutils/Makefile.am
@@ -19,7 +19,7 @@
xmlutils_PYTHON = *.py
-xmlutilsdir = $(pythondir)/kimchi/xmlutils
+xmlutilsdir = $(pythondir)/wok/plugins/kimchi/xmlutils
install-data-local:
$(MKDIR_P) $(DESTDIR)$(xmlutilsdir)
--
1.7.1
More information about the Kimchi-devel
mailing list