Skip to content

Commit 4ad1990

Browse files
authored
Merge pull request #63 from AlwinEsch/Matrix-change
[Matrix] final Matrix change to correct test builds and take as Version 19.0.0
2 parents 15e9c7e + 9d47fd0 commit 4ad1990

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ matrix:
3737
before_install:
3838
- if [[ $DEBIAN_BUILD != true ]] && [[ $TRAVIS_OS_NAME == linux ]]; then sudo apt-get update -qq; fi
3939
- if [[ $DEBIAN_BUILD != true ]] && [[ $TRAVIS_OS_NAME == linux ]]; then sudo apt-get install -y libgl1-mesa-dev freeglut3-dev; fi
40-
- if [[ $DEBIAN_BUILD == true ]]; then sudo add-apt-repository -y ppa:team-xbmc/xbmc-nightly; fi
40+
- if [[ $DEBIAN_BUILD == true ]]; then sudo add-apt-repository -y ppa:team-xbmc/ppa; fi
4141
- if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get install fakeroot; fi
4242

4343
#
@@ -46,12 +46,12 @@ before_install:
4646
#
4747
before_script:
4848
- if [[ $DEBIAN_BUILD != true ]]; then cd $TRAVIS_BUILD_DIR/..; fi
49-
- if [[ $DEBIAN_BUILD != true ]]; then git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git; fi
49+
- if [[ $DEBIAN_BUILD != true ]]; then git clone --branch Matrix --depth=1 https://github.com/xbmc/xbmc.git; fi
5050
- if [[ $DEBIAN_BUILD != true ]]; then cd ${app_id} && mkdir build && cd build; fi
5151
- if [[ $DEBIAN_BUILD != true ]]; then mkdir -p definition/${app_id}; fi
5252
- if [[ $DEBIAN_BUILD != true ]]; then echo ${app_id} $TRAVIS_BUILD_DIR $TRAVIS_COMMIT > definition/${app_id}/${app_id}.txt; fi
5353
- 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
54-
- 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
54+
- 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
5555
- if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get build-dep $TRAVIS_BUILD_DIR; fi
5656

5757
script:

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ This is a [Kodi](https://kodi.tv) visualization addon.
1010
## Build instructions
1111

1212
When building the addon you have to use the correct branch depending on which version of Kodi you're building against.
13-
For example, if you're building the `master` branch of Kodi you should checkout the `master` branch of this repository.
13+
For example, if you're building the `Matrix` branch of Kodi you should checkout the `Matrix` branch of this repository.
1414
Also make sure you follow this README from the branch in question.
1515

1616
### Linux
1717

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

21-
1. `git clone --branch master https://github.com/xbmc/xbmc.git`
21+
1. `git clone --branch Matrix https://github.com/xbmc/xbmc.git`
2222
2. `git clone --branch Matrix https://github.com/xbmc/visualization.projectm.git`
2323
3. `cd visualization.projectm && mkdir build && cd build`
2424
4. `cmake -DADDONS_TO_BUILD=visualization.projectm -DADDON_SRC_PREFIX=../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../../xbmc/kodi-build/addons -DPACKAGE_ZIP=1 ../../xbmc/cmake/addons`

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ environment:
2525

2626
build_script:
2727
- cd ..
28-
- git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git
28+
- git clone --branch Matrix --depth=1 https://github.com/xbmc/xbmc.git
2929
- cd %app_id%
3030
- mkdir build
3131
- cd build

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848

4949
- script: |
5050
cd ..
51-
git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git kodi
51+
git clone --branch Matrix --depth=1 https://github.com/xbmc/xbmc.git kodi
5252
cd $(Build.SourcesDirectory)
5353
mkdir build
5454
cd build

visualization.projectm/addon.xml.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<addon
33
id="visualization.projectm"
4-
version="3.3.0"
4+
version="19.0.0"
55
name="projectM"
66
provider-name="Team Kodi">
77
<requires>@ADDON_DEPENDS@</requires>

0 commit comments

Comments
 (0)