diff --git a/README.md b/README.md index e774eea0b..1737ab613 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,30 @@ Note that the steps in the following section need to be performed before the add 1. `cd $HOME/pvr.iptvsimple` 2. `./build-install-mac.sh ../xbmc-addon` +If you would prefer to run the rebuild steps manually instead of using the above helper script check the appendix [here](#manual-steps-to-rebuild-the-addon-on-macosx) + ##### Useful links * [Kodi's PVR user support](http://forum.kodi.tv/forumdisplay.php?fid=167) * [Kodi's PVR development support](http://forum.kodi.tv/forumdisplay.php?fid=136) + +## Appendix + +### Manual Steps to rebuild the addon on MacOSX + +The following steps can be followed manually instead of using the `build-install-mac.sh` in the root of the addon repo after the [initial addon build](#build-tools-and-initial-addon-build) has been completed. + +**To rebuild the addon after changes** + +1. `rm tools/depends/target/binary-addons/.installed-macosx*` +2. `make -j$(getconf _NPROCESSORS_ONLN) -C tools/depends/target/binary-addons ADDONS="pvr.vuplus" ADDON_SRC_PREFIX=$HOME` + +or + +1. `cd tools/depends/target/binary-addons/macosx*` +2. `make` + +**Copy the addon to the Kodi addon directory on Mac** + +1. `rm -rf "$HOME/Library/Application Support/Kodi/addons/pvr.vuplus"` +2. `cp -rf $HOME/xbmc-addon/addons/pvr.vuplus "$HOME/Library/Application Support/Kodi/addons"` \ No newline at end of file diff --git a/build-install-mac.sh b/build-install-mac.sh index 6056af682..079aa89bd 100755 --- a/build-install-mac.sh +++ b/build-install-mac.sh @@ -12,6 +12,16 @@ if [[ "$OSTYPE" != "darwin"* ]]; then exit 1 fi +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +if [[ "$1" = /* ]] +then + #absolute path + SCRIPT_DIR="" +else + #relative + SCRIPT_DIR="$SCRIPT_DIR/" +fi + BINARY_ADDONS_TARGET_DIR="$1/tools/depends/target/binary-addons" MACOSX_BINARY_ADDONS_TARGET_DIR="" KODI_ADDONS_DIR="$HOME/Library/Application Support/Kodi/addons" @@ -42,6 +52,6 @@ fi cd "$MACOSX_BINARY_ADDONS_TARGET_DIR" make -XBMC_BUILD_ADDON_INSTALL_DIR=$(cd $1/addons/$ADDON_NAME 2> /dev/null && pwd -P) +XBMC_BUILD_ADDON_INSTALL_DIR=$(cd "$SCRIPT_DIR$1/addons/$ADDON_NAME" 2> /dev/null && pwd -P) rm -rf "$KODI_ADDONS_DIR/$ADDON_NAME" cp -rf "$XBMC_BUILD_ADDON_INSTALL_DIR" "$KODI_ADDONS_DIR" diff --git a/pvr.iptvsimple/addon.xml.in b/pvr.iptvsimple/addon.xml.in index bef6e519c..e4004d12b 100644 --- a/pvr.iptvsimple/addon.xml.in +++ b/pvr.iptvsimple/addon.xml.in @@ -1,7 +1,7 @@ @ADDON_DEPENDS@ diff --git a/pvr.iptvsimple/changelog.txt b/pvr.iptvsimple/changelog.txt index 2df5e0997..41861098b 100644 --- a/pvr.iptvsimple/changelog.txt +++ b/pvr.iptvsimple/changelog.txt @@ -1,3 +1,6 @@ +v3.7.1 +- Fix OSX build script + v3.7.0 - Support EXTVCOPT in m3u - Build helper script for OSX