Skip to content

Commit

Permalink
Merge pull request #33 from AlwinEsch/Matrix-change
Browse files Browse the repository at this point in the history
[Matrix] final Matrix change to correct test builds and take as Version 19.0.0
  • Loading branch information
AlwinEsch authored Sep 13, 2021
2 parents 82170b5 + a92627e commit 9358947
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 15 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ matrix:
before_install:
- if [[ $DEBIAN_BUILD != true ]] && [[ $TRAVIS_OS_NAME == linux ]]; then sudo apt-get update -qq; fi
- if [[ $DEBIAN_BUILD != true ]] && [[ $TRAVIS_OS_NAME == linux ]]; then sudo apt-get install -y libgl1-mesa-dev; fi
- if [[ $DEBIAN_BUILD == true ]]; then sudo add-apt-repository -y ppa:team-xbmc/xbmc-nightly; fi
- if [[ $DEBIAN_BUILD == true ]]; then sudo add-apt-repository -y ppa:team-xbmc/ppa; fi
- if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get install fakeroot; fi

#
Expand All @@ -42,12 +42,12 @@ before_install:
#
before_script:
- if [[ $DEBIAN_BUILD != true ]]; then cd $TRAVIS_BUILD_DIR/..; fi
- if [[ $DEBIAN_BUILD != true ]]; then git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git; fi
- if [[ $DEBIAN_BUILD != true ]]; then git clone --branch Matrix --depth=1 https://github.com/xbmc/xbmc.git; fi
- if [[ $DEBIAN_BUILD != true ]]; then cd ${app_id} && mkdir build && cd build; fi
- if [[ $DEBIAN_BUILD != true ]]; then mkdir -p definition/${app_id}; fi
- if [[ $DEBIAN_BUILD != true ]]; then echo ${app_id} $TRAVIS_BUILD_DIR $TRAVIS_COMMIT > definition/${app_id}/${app_id}.txt; fi
- if [[ $DEBIAN_BUILD != true ]]; then cmake -DADDONS_TO_BUILD=${app_id} -DADDON_SRC_PREFIX=$TRAVIS_BUILD_DIR/.. -DADDONS_DEFINITION_DIR=$TRAVIS_BUILD_DIR/build/definition -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/../xbmc/addons -DPACKAGE_ZIP=1 $TRAVIS_BUILD_DIR/../xbmc/cmake/addons; fi
- if [[ $DEBIAN_BUILD == true ]]; then wget https://raw.githubusercontent.com/xbmc/xbmc/master/xbmc/addons/kodi-dev-kit/tools/debian-addon-package-test.sh && chmod +x ./debian-addon-package-test.sh; fi
- if [[ $DEBIAN_BUILD == true ]]; then wget https://raw.githubusercontent.com/xbmc/xbmc/Matrix/xbmc/addons/kodi-dev-kit/tools/debian-addon-package-test.sh && chmod +x ./debian-addon-package-test.sh; fi
- if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get build-dep $TRAVIS_BUILD_DIR; fi

script:
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@ This is a [Kodi](http://kodi.tv) visualization addon.
[![Build Status](https://jenkins.kodi.tv/view/Addons/job/xbmc/job/visualization.fishbmc/job/Matrix/badge/icon)](https://jenkins.kodi.tv/blue/organizations/jenkins/xbmc%2Fvisualization.fishbmc/branches/)
<!--- [![Build Status](https://ci.appveyor.com/api/projects/status/github/xbmc/visualization.fishbmc?branch=Matrix&svg=true)](https://ci.appveyor.com/project/xbmc/visualization-fishbmc?branch=Matrix) -->

![screenshot](https://raw.githubusercontent.com/xbmc/visualization.fishbmc/master/visualization.fishbmc/resources/screenshot-01.jpg)
![screenshot](https://raw.githubusercontent.com/xbmc/visualization.fishbmc/Matrix/visualization.fishbmc/resources/screenshot-01.jpg)

## Build instructions

When building the addon you have to use the correct branch depending on which version of Kodi you're building against.
If you want to build the addon to be compatible with the latest kodi `master` commit, you need to checkout the branch with the current kodi codename.
If you want to build the addon to be compatible with the latest kodi `Matrix` commit, you need to checkout the branch with the current kodi codename.
Also make sure you follow this README from the branch in question.

### Linux

The following instructions assume you will have built Kodi already in the `kodi-build` directory
suggested by the README.

1. `git clone--branch master https://github.com/xbmc/xbmc.git`
1. `git clone --branch Matrix https://github.com/xbmc/xbmc.git`
2. `git clone --branch Matrix https://github.com/xbmc/visualization.fishbmc.git`
3. `cd visualization.fishbmc && mkdir build && cd build`
4. `cmake -DADDONS_TO_BUILD=visualization.fishbmc -DADDON_SRC_PREFIX=../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../../xbmc/kodi-build/addons -DPACKAGE_ZIP=1 ../../xbmc/cmake/addons`
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ environment:

build_script:
- cd ..
- git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git
- git clone --branch Matrix --depth=1 https://github.com/xbmc/xbmc.git
- cd %app_id%
- mkdir build
- cd build
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:

- script: |
cd ..
git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git kodi
git clone --branch Matrix --depth=1 https://github.com/xbmc/xbmc.git kodi
cd $(Build.SourcesDirectory)
mkdir build
cd build
Expand Down
2 changes: 1 addition & 1 deletion visualization.fishbmc/addon.xml.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="visualization.fishbmc"
version="6.3.0"
version="19.0.0"
name="FishBMC"
provider-name="26elf">
<requires>@ADDON_DEPENDS@</requires>
Expand Down
19 changes: 13 additions & 6 deletions visualization.fishbmc/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
19.0.0 (2021-09-13)
- Updated language files from Weblate
- Update description text on strings.po (en_GB)
- Change test builds to 'Kodi 20 Nexus'
- Increase version to 20.0.0
- With start of Kodi 20 Nexus, takes addon as major the same version number as Kodi.
This done to know easier to which Kodi the addon works.

6.3.0 (2020-09-13)
- Kodi API change update

Expand Down Expand Up @@ -47,17 +55,16 @@
- kodi to addon interface changes

2014-03-01:
Updated language files from Transifex
- Updated language files from Transifex

2014-02-17:
Updated language files from Transifex
- Updated language files from Transifex

2014-02-02:
Updated language files from Transifex
- Updated language files from Transifex

2014-01-11:
Updated language files from Transifex
- Updated language files from Transifex

2011-02-26:
Initial release for XBMC 11, based on fische 4

- Initial release for XBMC 11, based on fische 4

0 comments on commit 9358947

Please sign in to comment.