[rebrand/linux] rename event clients and manpages

7 files changed, 52 insertions, 52 deletions

diff --git a/tools/EventClients/Clients/J2ME Client/j2me_remote.py b/tools/EventClients/Clients/J2ME Client/j2me_remote.py
index 5f78f83ffd..b963a87a79 100755
--- a/tools/EventClients/Clients/J2ME Client/j2me_remote.py
+++ b/tools/EventClients/Clients/J2ME Client/j2me_remote.py
@@ -21,9 +21,9 @@
 
 import sys
 try:
-    from xbmc.xbmcclient import *
-    from xbmc.bt.bt import *
-    from xbmc.defs import *
+    from kodi.xbmcclient import *
+    from kodi.bt.bt import *
+    from kodi.defs import *
 except:
     sys.path.append('../../lib/python')
     from xbmcclient import *
diff --git a/tools/EventClients/Clients/XBMC Send/xbmc-send.py b/tools/EventClients/Clients/Kodi Send/kodi-send.py
index 4dfbc5734d..a49a4db0c1 100755
--- a/tools/EventClients/Clients/XBMC Send/xbmc-send.py
+++ b/tools/EventClients/Clients/Kodi Send/kodi-send.py
@@ -23,15 +23,15 @@ import sys
 import getopt
 from socket import *
 try:
-    from xbmc.xbmcclient import *
+    from kodi.xbmcclient import *
 except:
     sys.path.append('../../lib/python')
     from xbmcclient import *
 
 def usage():
-    print "xbmc-send [OPTION] --action=ACTION"
+    print "kodi-send [OPTION] --action=ACTION"
     print 'Example'
-    print '\txbmc-send --host=192.168.0.1 --port=9777 --action="XBMC.Quit"'
+    print '\tkodi-send --host=192.168.0.1 --port=9777 --action="XBMC.Quit"'
     print "Options"
     print "\t-?, --help\t\t\tWill bring up this message"
     print "\t--host=HOST\t\t\tChoose what HOST to connect to (default=localhost)"
diff --git a/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py b/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py
index 6a83406d8a..c5bb6ca9cc 100755
--- a/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py
+++ b/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py
@@ -43,10 +43,10 @@ try:
     ICON_PATH = "../../icons/"
 except:
     # fallback to system wide modules
-    from xbmc.xbmcclient import *
-    from xbmc.ps3.keymaps import keymap_remote as g_keymap # look here to change the keymapping
-    from xbmc.bt.bt import *
-    from xbmc.defs import *
+    from kodi.xbmcclient import *
+    from kodi.ps3.keymaps import keymap_remote as g_keymap # look here to change the keymapping
+    from kodi.bt.bt import *
+    from kodi.defs import *
 
 import os
 import time
diff --git a/tools/EventClients/Clients/PS3 Sixaxis Controller/ps3d.py b/tools/EventClients/Clients/PS3 Sixaxis Controller/ps3d.py
index a88c550f0a..1b54700edd 100755
--- a/tools/EventClients/Clients/PS3 Sixaxis Controller/ps3d.py
+++ b/tools/EventClients/Clients/PS3 Sixaxis Controller/ps3d.py
@@ -45,19 +45,19 @@ if os.path.exists("../../lib/python"):
     ICON_PATH = "../../icons/"
 else:
     # fallback to system wide modules
-    from xbmc.bt.hid import HID
-    from xbmc.bt.bt import bt_lookup_name
-    from xbmc.xbmcclient import XBMCClient
-    from xbmc.ps3 import sixaxis
-    from xbmc.ps3_remote import process_keys as process_remote
-    from xbmc.defs import *
+    from kodi.bt.hid import HID
+    from kodi.bt.bt import bt_lookup_name
+    from kodi.xbmcclient import XBMCClient
+    from kodi.ps3 import sixaxis
+    from kodi.ps3_remote import process_keys as process_remote
+    from kodi.defs import *
     try:
-        from xbmc.ps3 import sixwatch
+        from kodi.ps3 import sixwatch
     except Exception, e:
         print "Failed to import sixwatch now disabled: " + str(e)
         sixwatch = None
     try:
-        import xbmc.zeroconf as zeroconf
+        import kodi.zeroconf as zeroconf
     except:
         zeroconf = None
 
diff --git a/tools/EventClients/Makefile b/tools/EventClients/Makefile
deleted file mode 100644
index 7460851e67..0000000000
--- a/tools/EventClients/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-WII_EXTRA_OPTS=
-CLEAN_FILES=Clients/WiiRemote/WiiRemote
-PYTHON_SITEDIR := $(shell python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-
-all: install
-
-wiimote: Clients/WiiRemote/WiiRemote
-
-Clients/WiiRemote/WiiRemote:
-	cd Clients/WiiRemote && \
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) CWIID_WiiRemote.cpp -lcwiid -lbluetooth -DICON_PATH="\"$(datarootdir)/pixmaps/xbmc/\"" $(WII_EXTRA_OPTS) -o WiiRemote
-
-j2me-remote:
-	cd Clients/J2ME\ Client
-	ant -f build.xml
-
-install: Clients/WiiRemote/WiiRemote
-	mkdir -p $(DESTDIR)$(bindir)
-	cp -a Clients/WiiRemote/WiiRemote $(DESTDIR)$(bindir)/xbmc-wiiremote
-	cp -a Clients/J2ME\ Client/j2me_remote.py $(DESTDIR)$(bindir)/xbmc-j2meremote
-	cp -a Clients/PS3\ BD\ Remote/ps3_remote.py $(DESTDIR)$(bindir)/xbmc-ps3remote
-	cp -a Clients/PS3\ Sixaxis\ Controller/ps3d.py $(DESTDIR)$(bindir)/xbmc-ps3d
-	cp -a Clients/XBMC\ Send/xbmc-send.py $(DESTDIR)$(bindir)/xbmc-send
-	mkdir -p $(DESTDIR)$(PYTHON_SITEDIR)/xbmc
-	echo 'ICON_PATH="$(datarootdir)/pixmaps/xbmc/"' > $(DESTDIR)$(PYTHON_SITEDIR)/xbmc/defs.py
-	cp -a lib/python/* $(DESTDIR)$(PYTHON_SITEDIR)/xbmc/
-	cp -a Clients/PS3\ BD\ Remote/ps3_remote.py $(DESTDIR)$(PYTHON_SITEDIR)/xbmc/
-	mkdir -p $(DESTDIR)$(includedir)/xbmc
-	cp -a lib/c++/* $(DESTDIR)$(includedir)/xbmc/
-	mkdir -p $(DESTDIR)$(datarootdir)/pixmaps/xbmc
-	cp -a icons/* $(DESTDIR)$(datarootdir)/pixmaps/xbmc/
-
-include ../../Makefile.include
diff --git a/tools/EventClients/Makefile.in b/tools/EventClients/Makefile.in
new file mode 100644
index 0000000000..757ee0b141
--- /dev/null
+++ b/tools/EventClients/Makefile.in
@@ -0,0 +1,33 @@
+WII_EXTRA_OPTS=
+CLEAN_FILES=Clients/WiiRemote/WiiRemote
+PYTHON_SITEDIR := $(shell python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
+
+all: install
+
+wiimote: Clients/WiiRemote/WiiRemote
+
+Clients/WiiRemote/WiiRemote:
+	cd Clients/WiiRemote && \
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) CWIID_WiiRemote.cpp -lcwiid -lbluetooth -DICON_PATH="\"$(datarootdir)/pixmaps/@APP_NAME_LC@/\"" $(WII_EXTRA_OPTS) -o WiiRemote
+
+j2me-remote:
+	cd Clients/J2ME\ Client
+	ant -f build.xml
+
+install: Clients/WiiRemote/WiiRemote
+	mkdir -p $(DESTDIR)$(bindir)
+	cp -a Clients/WiiRemote/WiiRemote $(DESTDIR)$(bindir)/@APP_NAME_LC@-wiiremote
+	cp -a Clients/J2ME\ Client/j2me_remote.py $(DESTDIR)$(bindir)/@APP_NAME_LC@-j2meremote
+	cp -a Clients/PS3\ BD\ Remote/ps3_remote.py $(DESTDIR)$(bindir)/@APP_NAME_LC@-ps3remote
+	cp -a Clients/PS3\ Sixaxis\ Controller/ps3d.py $(DESTDIR)$(bindir)/@APP_NAME_LC@-ps3d
+	cp -a Clients/Kodi\ Send/kodi-send.py $(DESTDIR)$(bindir)/@APP_NAME_LC@-send
+	mkdir -p $(DESTDIR)$(PYTHON_SITEDIR)/@APP_NAME_LC@
+	echo 'ICON_PATH="$(datarootdir)/pixmaps/@APP_NAME_LC@/"' > $(DESTDIR)$(PYTHON_SITEDIR)/@APP_NAME_LC@/defs.py
+	cp -a lib/python/* $(DESTDIR)$(PYTHON_SITEDIR)/@APP_NAME_LC@/
+	cp -a Clients/PS3\ BD\ Remote/ps3_remote.py $(DESTDIR)$(PYTHON_SITEDIR)/@APP_NAME_LC@/
+	mkdir -p $(DESTDIR)$(includedir)/@APP_NAME_LC@
+	cp -a lib/c++/* $(DESTDIR)$(includedir)/@APP_NAME_LC@/
+	mkdir -p $(DESTDIR)$(datarootdir)/pixmaps/@APP_NAME_LC@
+	cp -a icons/* $(DESTDIR)$(datarootdir)/pixmaps/@APP_NAME_LC@/
+
+include ../../Makefile.include
diff --git a/tools/mk-release-source b/tools/mk-release-source
index 68bdfa13c5..68b3854d14 100755
--- a/tools/mk-release-source
+++ b/tools/mk-release-source
@@ -1,7 +1,7 @@
 #!/bin/bash
 REVISION="${1}"
 COMPRESS="gzip"
-WORKDIR="xbmc-${REVISION}"
+WORKDIR="kodi-${REVISION}"
 
 if [[ -z "${REVISION}" ]]; then echo "Usage: ${0} tag|branch|commit [gzip|xz|...]" && exit 1; fi
 if [[ -d "${WORKDIR}" ]]; then echo "${WORKDIR} dir exists, refusing to overwrite" && exit 1; fi