diff options
21 files changed, 83 insertions, 108 deletions
diff --git a/configure.in b/configure.in index a3a2c6ae4c..d4d2fa6d11 100644 --- a/configure.in +++ b/configure.in @@ -2480,6 +2480,7 @@ OUTPUT_FILES="Makefile \ tools/Linux/FEH.py \ tools/Linux/FEH-ARM.py \ tools/TexturePacker/Makefile \ + tools/EventClients/Makefile \ tools/EventClients/Clients/OSXRemote/Makefile \ xbmc/peripherals/bus/Makefile \ xbmc/peripherals/devices/Makefile \ diff --git a/docs/manpages/diskmounter.1 b/docs/manpages/diskmounter.1 deleted file mode 100644 index 772ccddae9..0000000000 --- a/docs/manpages/diskmounter.1 +++ /dev/null @@ -1,7 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. -.TH DISKMOUNTER "1" "July 2009" "diskmounter " "User Commands" -.SH NAME -diskmounter \- mount various partitions -.SH DESCRIPTION -This utility searches for available HFS+, NTFS and FAT32 partitions, creates -mount points for them and mounts the partitions. diff --git a/docs/manpages/installXBMC.1 b/docs/manpages/installXBMC.1 deleted file mode 100644 index 424e4fbfc4..0000000000 --- a/docs/manpages/installXBMC.1 +++ /dev/null @@ -1,6 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. -.TH INSTALLXBMC "1" "July 2009" "installXBMC " "User Commands" -.SH NAME -installXBMC \- XBMC Live installer -.SH DESCRIPTION -This script installs XBMC Live. diff --git a/docs/manpages/xbmc-j2meremote.1 b/docs/manpages/kodi-j2meremote.1 index 5ce2a99884..2e11d1499a 100644 --- a/docs/manpages/xbmc-j2meremote.1 +++ b/docs/manpages/kodi-j2meremote.1 @@ -1,12 +1,12 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. -.TH XBMC-J2MEREMOTE "1" "July 2009" "xbmc-j2meremote " "User Commands" +.TH KODI-J2MEREMOTE "1" "October 2014" "kodi-j2meremote " "User Commands" .SH NAME -xbmc-j2meremote \- Java Bluetooth Phone Remote Control Client for XBMC +kodi-j2meremote \- Java Bluetooth Phone Remote Control Client for Kodi .SH DESCRIPTION -This script is the XBMC remote control client that will allow XBMC to be +This script is the Kodi remote control client that will allow Kodi to be controlled by a Java Bluetooth Phone. .SH USAGE -Usage for xbmc-j2meremote +Usage for kodi-j2meremote .SS "Arguments:" .TP \fB\-\-address\fR ADDRESS diff --git a/docs/manpages/xbmc-ps3remote.1 b/docs/manpages/kodi-ps3remote.1 index 08e45b9dcd..3b6e6fccde 100644 --- a/docs/manpages/xbmc-ps3remote.1 +++ b/docs/manpages/kodi-ps3remote.1 @@ -1,12 +1,12 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. -.TH XBMC-PS3REMOTE "1" "July 2009" "xbmc-ps3remote " "User Commands" +.TH KODI-PS3REMOTE "1" "October 2014" "kodi-ps3remote " "User Commands" .SH NAME -xbmc-ps3remote \- PS3 Blu\-Ray Remote Control Client for XBMC +kodi-ps3remote \- PS3 Blu\-Ray Remote Control Client for Kodi .SH DESCRIPTION -This script is the XBMC remote control client that will allow XBMC to be +This script is the Kodi remote control client that will allow Kodi to be controlled by a PS3 Blu-Ray Remote. .SH USAGE -Usage for xbmc-ps3remote +Usage for kodi-ps3remote .SS "Arguments:" .TP \fB\-\-address\fR ADDRESS diff --git a/docs/manpages/xbmc-send.1 b/docs/manpages/kodi-send.1 index 562c807f2c..7e1921235f 100644 --- a/docs/manpages/xbmc-send.1 +++ b/docs/manpages/kodi-send.1 @@ -1,14 +1,14 @@ -.TH XBMC-SEND "1" "December 2009" "xbmc-send" +.TH KODI-SEND "1" "October 2014" "kodi-send" .SH NAME -xbmc\-send \- program to send some action to XBMC +xbmc\-send \- program to send some action to Kodi .SH SYNOPSIS xbmc\-send [OPTION] \fB\-\-action\fR=\fIACTION\fR .SH DESCRIPTION -This program is used for sending actions for XBMC. +This program is used for sending actions for Kodi. .PP Example .IP -xbmc\-send \fB\-\-host\fR=\fI192\fR.168.0.1 \fB\-\-port\fR=\fI9777\fR \fB\-\-action=\fR"XBMC.Quit" +kodi\-send \fB\-\-host\fR=\fI192\fR.168.0.1 \fB\-\-port\fR=\fI9777\fR \fB\-\-action=\fR"XBMC.Quit" .PP Options .TP @@ -22,5 +22,5 @@ Choose what HOST to connect to (default=localhost) Choose what PORT to connect to (default=9777) .TP \fB\-\-action\fR=\fIACTION\fR -Sends an action to XBMC, this option can be added multiple times to create a macro. +Sends an action to Kodi, this option can be added multiple times to create a macro. diff --git a/docs/manpages/kodi-standalone.1 b/docs/manpages/kodi-standalone.1 new file mode 100644 index 0000000000..54e2fc0f30 --- /dev/null +++ b/docs/manpages/kodi-standalone.1 @@ -0,0 +1,6 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. +.TH KODI-STANDALONE "1" "October 2014" "kodi-standalone " "User Commands" +.SH NAME +kodi-standalone \- Kodi standalone mode +.SH DESCRIPTION +This script runs Kodi in standalone mode. diff --git a/docs/manpages/xbmc-wiiremote.1 b/docs/manpages/kodi-wiiremote.1 index 909a5803dd..7b0ced839a 100644 --- a/docs/manpages/xbmc-wiiremote.1 +++ b/docs/manpages/kodi-wiiremote.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. -.TH XBMC-WIIREMOTE "1" "July 2009" "xbmc-wiiremote " "User Commands" +.TH KODI-WIIREMOTE "1" "October 20014" "kodi-wiiremote " "User Commands" .SH NAME -xbmc-wiiremote \- Wiimote Remote Control Client for XBMC +kodi-wiiremote \- Wiimote Remote Control Client for Kodi .SH DESCRIPTION -This script is the XBMC remote control client that will allow XBMC to be +This script is the Kodi remote control client that will allow Kodi to be controlled by a Wiimote. .SS "Arguments:" .HP diff --git a/docs/manpages/kodi.1 b/docs/manpages/kodi.1 new file mode 100644 index 0000000000..5f55c7af5a --- /dev/null +++ b/docs/manpages/kodi.1 @@ -0,0 +1 @@ +.so man1/kodi.bin.1 diff --git a/docs/manpages/xbmc.bin.1 b/docs/manpages/kodi.bin.1 index 5113f15b72..80ef889212 100644 --- a/docs/manpages/xbmc.bin.1 +++ b/docs/manpages/kodi.bin.1 @@ -1,24 +1,24 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. -.TH XBMC.BIN "1" "July 2009" "xbmc.bin " "User Commands" +.TH KODI.BIN "1" "October 2014" "kodi.bin " "User Commands" .SH NAME -xbmc.bin \- XBMC main executable +kodi.bin \- Kodi main executable .SH SYNOPSIS -.B xbmc.bin +.B kodi.bin [\fIOPTION\fR]... [\fIFILE\fR]... .SH DESCRIPTION -This is the main executable that will run XBMC. +This is the main executable that will run Kodi. .SS "Arguments:" .TP \fB\-fs\fR -Runs XBMC in full screen +Runs Kodi in full screen .TP \fB\-\-standalone\fR -XBMC runs in a stand alone environment without a window +Kodi runs in a stand alone environment without a window manager and supporting applications. For example, that enables network settings. .TP \fB\-p\fR or \fB\-\-portable\fR -XBMC will look for configurations in install folder instead of ~/.xbmc +Kodi will look for configurations in install folder instead of ~/.kodi .TP \fB\-\-legacy\-res\fR Enables screen resolutions such as PAL, NTSC, etc. diff --git a/docs/manpages/runXBMC.1 b/docs/manpages/runXBMC.1 deleted file mode 100644 index 7c08b2fb2f..0000000000 --- a/docs/manpages/runXBMC.1 +++ /dev/null @@ -1,7 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. -.TH RUNXBMC "1" "July 2009" "runXBMC " "User Commands" -.SH NAME -runXBMC \- XBMC Live launcher -.SH DESCRIPTION -runXBMC is a script that runs XBMC in standalone mode, meant to be run for -XBMC Live. diff --git a/docs/manpages/setAlsaVolumes.1 b/docs/manpages/setAlsaVolumes.1 deleted file mode 100644 index daa79dc2fc..0000000000 --- a/docs/manpages/setAlsaVolumes.1 +++ /dev/null @@ -1,6 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. -.TH SETALSAVOLUMES "1" "July 2009" "setAlsaVolumes " "User Commands" -.SH NAME -setAlsaVolumes \- XBMC Live volume control script -.SH DESCRIPTION -Script that sets output volume for all amixer controls. diff --git a/docs/manpages/xbmc-standalone.1 b/docs/manpages/xbmc-standalone.1 deleted file mode 100644 index 84f34286ad..0000000000 --- a/docs/manpages/xbmc-standalone.1 +++ /dev/null @@ -1,6 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. -.TH XBMC-STANDALONE "1" "July 2009" "xbmc-standalone " "User Commands" -.SH NAME -xbmc-standalone \- XBMC standalone mode -.SH DESCRIPTION -This script runs XBMC in standalone mode. diff --git a/docs/manpages/xbmc.1 b/docs/manpages/xbmc.1 deleted file mode 100644 index 9bc7511fd1..0000000000 --- a/docs/manpages/xbmc.1 +++ /dev/null @@ -1 +0,0 @@ -.so man1/xbmc.bin.1 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 |