Remove Wok code from Kimchi repository

Signed-off-by: Aline Manera <[email protected]>

.gitignore

@@ -17,32 +17,22 @@ build-aux/missing
 build-aux/py-compile
 configure
 config.log
+config.py
 config.status
 contrib/DEBIAN/control
-contrib/wok.spec.fedora
-contrib/wok.spec.suse
+contrib/kimchi.spec.fedora
+contrib/kimchi.spec.suse
 contrib/make-deb.sh
-docs/wokd.8
 *.min.css
 *.min.js
 *.gmo
 stamp-po
-wok-*.tar.gz
-wok.spec
-src/wokd
-src/wok.conf
-src/nginx/wok.conf
-src/wok/config.py
+kimchi-*.tar.gz
 tests/run_tests.sh
 tests/test_config.py
-src/wok/plugins/sample/po/POTFILES
-src/wok/plugins/sample/sample.conf
 po/POTFILES
 po/gen-pot
-ui/css/wok.css
-ui/css/bootstrap.custom.css
-ui/css/bootstrap-select.custom.css
-!ui/css/src/modules
 *.orig
 *.rej
 *.pem
+ui/pages/help/*/*.html

COPYING

@@ -1,13 +1,11 @@
-Wok/Kimchi are distributed pursuant to the terms of two different licenses.
-The user interface (located in ui/ and plugins/kimchi/ui in this distribution)
-is governed by the Apache License version 2.0.
+Kimchi is distributed pursuant to the terms of two different licenses.
+
+The user interface (located in ui/ in this distribution) is governed by the
+Apache License version 2.0.
 
 Kimchi makes use of different projects and they are placed as below:
 - the code under ui/spice-html5 is imported from spice-html5 project
 (http://cgit.freedesktop.org/spice/spice-html5);
-- the code under ui/libs which is imported from JQuery UI (http://jqueryui.com);
-- the code under ui/base64 is imported from Jquery Base64 (https://plugins.jquery.com/base64/).
-- the code under ui/fontello is imported from Fontello (http://fontello.com).
 
 The rest of this distribution is governed by the GNU Lesser General Public
 License version 2.1.

Makefile.am

@@ -1,10 +1,8 @@
 #
-# Project Wok
+# Kimchi
 #
 # Copyright IBM Corp, 2013-2015
 #
-# Code derived from Project Kimchi
-#
 # 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
@@ -19,100 +17,118 @@
 # 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 po tests
+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
 
-man_MANS = docs/wokd.8
+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 = \
 	config.rpath \
+	API.json \
 	autogen.sh \
 	COPYING.ASL2 \
 	COPYING.LGPL \
 	CONTRIBUTE.md \
 	VERSION \
 	build-aux/pkg-version \
+	config.py.in \
 	$(NULL)
 
 
-PEP8_BLACKLIST = *src/wok/plugins,*src/wok/config.py,*src/wok/i18n.py,*tests/test_config.py
-
-SKIP_PYFLAKES_ERR = "\./src/wok/websocket\.py"
+PEP8_BLACKLIST = *config.py,*i18n.py,*tests/test_config.py
 
-I18N_FILES = src/wok/plugins/*/i18n.py \
-	src/wok/i18n.py \
+I18N_FILES = ./i18n.py \
 	$(NULL)
 
 check-local:
-	PYTHONPATH=src contrib/check_i18n.py $(I18N_FILES)
+	contrib/check_i18n.py $(I18N_FILES)
 	find . -path './.git' -prune -type f -o \
 		-name '*.py' -o -name '*.py.in'  | xargs $(PYFLAKES) | \
-		grep -w -v $(SKIP_PYFLAKES_ERR) | \
 		while read LINE; do echo "$$LINE"; false; done
 
 	$(PEP8) --version
 	$(PEP8) --filename '*.py,*.py.in' --exclude="$(PEP8_BLACKLIST)" .
-
-	/bin/bash check_ui_code_errors.sh
+	./check_ui_code_errors.sh
 
 # 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/wok.mo ;   \
+		ln -sf ../../../po/$$L.gmo $$dir/kimchi.mo ;   \
 	done < po/LINGUAS
 
+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)/
-	@if test -d "$(systemdsystemunitdir)" ; then \
-		$(MKDIR_P) $(DESTDIR)/$(systemdsystemunitdir); \
-		cp -R contrib/wokd.service.fedora \
-			$(DESTDIR)/$(systemdsystemunitdir)/wokd.service; \
-	else \
-		$(MKDIR_P) $(DESTDIR)/etc/init; \
-		cp -R $(top_srcdir)/contrib/wokd-upstart.conf.debian \
-			$(DESTDIR)/etc/init/wokd.conf; \
-	fi
-	$(MKDIR_P) $(DESTDIR)/$(localstatedir)/lib/wok/
-	$(MKDIR_P) $(DESTDIR)/usr/lib/firewalld/services
-	cp -R $(top_srcdir)/src/firewalld.xml \
-		$(DESTDIR)/usr/lib/firewalld/services/wokd.xml
+	mkdir -p $(DESTDIR)/$(localstatedir)/lib/kimchi
+	mkdir -p $(DESTDIR)/$(localstatedir)/lib/kimchi/vnc-tokens
+	mkdir -p $(DESTDIR)/$(localstatedir)/lib/kimchi/screenshots
+	mkdir -p $(DESTDIR)/$(localstatedir)/lib/kimchi/isos
 
 
 deb: contrib/make-deb.sh
 	$(top_srcdir)/contrib/make-deb.sh
 
-wok.spec: contrib/wok.spec.fedora contrib/wok.spec.suse
+kimchi.spec: contrib/kimchi.spec.fedora contrib/kimchi.spec.suse
 	@if test -e /etc/redhat-release; then                   \
-		ln -sf contrib/wok.spec.fedora $@ ;              \
+		ln -sf contrib/kimchi.spec.fedora $@ ;              \
 	elif test -e /etc/SuSE-release; then                    \
-		ln -sf contrib/wok.spec.suse $@ ;                \
+		ln -sf contrib/kimchi.spec.suse $@ ;                \
 	else                                                    \
 		echo "Unable to select a spec file for RPM build" ; \
 		/bin/false ;                                        \
 	fi
 
-rpm: dist wok.spec
+rpm: dist kimchi.spec
 	$(MKDIR_P) rpm/BUILD rpm/RPMS rpm/SOURCES rpm/SPECS rpm/SRPMS
-	cp $(top_srcdir)/wok.spec rpm/SPECS/wok.spec
+	cp $(top_srcdir)/kimchi.spec rpm/SPECS/kimchi.spec
 	cp $(DIST_ARCHIVES) rpm/SOURCES
-	rpmbuild -ba --define "_topdir `pwd`/rpm" rpm/SPECS/wok.spec
+	rpmbuild -ba --define "_topdir `pwd`/rpm" rpm/SPECS/kimchi.spec
 
-fedora-rpm: contrib/wok.spec.fedora
-	ln -sf contrib/wok.spec.fedora wok.spec
+fedora-rpm: contrib/kimchi.spec.fedora
+	ln -sf contrib/kimchi.spec.fedora kimchi.spec
 	$(MAKE) rpm
 
-suse-rpm: contrib/wok.spec.suse
-	ln -sf contrib/wok.spec.suse wok.spec
+suse-rpm: contrib/kimchi.spec.suse
+	ln -sf contrib/kimchi.spec.suse kimchi.spec
 	$(MAKE) rpm
 
 ChangeLog:
@@ -122,39 +138,22 @@ ChangeLog:
 
 install-data-local:
 	@if test -d "$(systemdsystemunitdir)" ; then \
-		mkdir -p $(DESTDIR)/$(systemdsystemunitdir); \
-		$(INSTALL_DATA) contrib/wokd.service.fedora $(DESTDIR)/$(systemdsystemunitdir)/wokd.service; \
-	else \
-		mkdir -p $(DESTDIR)/etc/init.d/; \
-		$(INSTALL_DATA) contrib/wokd.sysvinit $(DESTDIR)/etc/init.d/wokd; \
-		chmod +x $(DESTDIR)/etc/init.d/wokd; \
-	fi; \
-	if test -d /usr/lib/firewalld/services/; then \
-		mkdir -p $(DESTDIR)/usr/lib/firewalld/services/; \
-		$(INSTALL_DATA) src/firewalld.xml $(DESTDIR)/usr/lib/firewalld/services/wokd.xml; \
+		mkdir -p $(DESTDIR)/etc/systemd/system/wokd.service.d; \
+		$(INSTALL_DATA) contrib/kimchid.service.fedora $(DESTDIR)/etc/systemd/system/wokd.service.d/kimchi.conf; \
 	fi; \
-	mkdir -p $(DESTDIR)/$(localstatedir)/lib/wok/
-	mkdir -p $(DESTDIR)/$(localstatedir)/log/wok/
-	touch $(DESTDIR)/$(localstatedir)/log/wok/wok-access.log
-	touch $(DESTDIR)/$(localstatedir)/log/wok/wok-error.log
-	mkdir -p $(DESTDIR)/etc/wok/
-	$(INSTALL_DATA) src/dhparams.pem $(DESTDIR)/etc/wok/dhparams.pem
-	touch $(DESTDIR)/etc/nginx/conf.d/wok.conf
+	$(MKDIR_P) $(DESTDIR)/$(localstatedir)/lib/kimchi/
+	$(MKDIR_P) $(DESTDIR)$(kimchidir)
+	$(INSTALL_DATA) API.json $(DESTDIR)$(kimchidir)/API.json
+	mkdir -p $(DESTDIR)/$(localstatedir)/lib/kimchi/vnc-tokens
+	mkdir -p $(DESTDIR)/$(localstatedir)/lib/kimchi/screenshots
+	mkdir -p $(DESTDIR)/$(localstatedir)/lib/kimchi/isos
 
 uninstall-local:
-	@if test -f $(systemdsystemunitdir)/wokd.service; then \
-		$(RM) $(DESTDIR)/$(systemdsystemunitdir)/wokd.service; \
-	elif test -f /etc/init.d/wokd; then \
-		$(RM) $(DESTDIR)/etc/init.d/wokd; \
-		$(RM) $(DESTDIR)/etc/init/wok.conf; \
-	fi; \
-	if test -d /usr/lib/firewalld/services/; then \
-		$(RM) $(DESTDIR)/usr/lib/firewalld/services/wokd.xml; \
+	@if test -f $(DESTDIR)/etc/systemd/system/wokd.service.d/kimchi.conf; then \
+		$(RM) $(DESTDIR)/etc/systemd/system/wokd.service.d/kimchi.conf; \
 	fi; \
-	$(RM) -rf $(DESTDIR)/$(localstatedir)/lib/wok
-	$(RM) -rf $(DESTDIR)/$(localstatedir)/log/wok
-	$(RM) -rf $(DESTDIR)/etc/wok
-	$(RM) $(DESTDIR)/etc/nginx/conf.d/wok.conf
+	$(RM) $(DESTDIR)$(kimchidir)/API.json
+	$(RM) -rf $(DESTDIR)/$(localstatedir)/lib/kimchi
 
 VERSION:
 	@if test -d .git; then                                \
@@ -167,4 +166,5 @@ VERSION:
 clean-local:
 	rm -rf mo rpm
 
-CLEANFILES = wok.spec `find "$(top_srcdir)" -type f -name "*.pyc" -print`
+BUILT_SOURCES = config.py
+CLEANFILES = config.py kimchi.spec `find "$(top_srcdir)" -type f -name "*.pyc" -print`

VERSION

@@ -1 +1 @@
-1.5.0
+2.0.0

autogen.sh

@@ -1,24 +1,4 @@
 #!/bin/bash
-#
-# Project Wok
-#
-# Copyright IBM Corp, 2013-2015
-#
-# Code derived from Project Kimchi
-#
-# 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
 
 aclocal
 automake --add-missing

check_ui_code_errors.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# Project Wok
+# Project Kimchi
 #
 # Copyright IBM, Corp. 2015
 #
@@ -19,8 +19,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
 
-errors="$(cat ui/pages/i18n.json.tmpl | grep -o 'WOK[0-9A-Z]*'| sort)"
-uiErrors="$(grep -Ro 'WOK[0-9A-Z]*' ui/js/ | cut -d: -f2 | sort| uniq)"
+errors="$(cat ui/pages/i18n.json.tmpl | grep -o 'KCH[0-9A-Z]*'| sort)"
+uiErrors="$(grep -Ro 'KCH[0-9A-Z]*' ui/js/ | cut -d: -f2 | sort| uniq)"
 
 # all errors on i18n are present in js/html files: success
 if [ "$errors" == "$uiErrors" ]; then