Browse Source

Move build scripts in a dedicated folder

merge-requests/382/head
Geoffrey Métais 7 years ago
parent
commit
717b611c12
  1. 2
      api/build.gradle
  2. 0
      buildsystem/compile-libvlc.sh
  3. 2
      buildsystem/compile-medialibrary.sh
  4. 5
      buildsystem/compile.sh
  5. 0
      buildsystem/gitlab/.gitlab-ci.yml
  6. 0
      buildsystem/publish.gradle
  7. 2
      libvlc/build.gradle
  8. 2
      medialibrary/build.gradle

2
api/build.gradle

@ -56,4 +56,4 @@ dependencies {
testImplementation "junit:junit:$rootProject.ext.junitVersion"
}
apply from: '../publish.gradle'
apply from: '../buildsystem/publish.gradle'

0
compile-libvlc.sh → buildsystem/compile-libvlc.sh

2
compile-medialibrary.sh → buildsystem/compile-medialibrary.sh

@ -24,7 +24,7 @@ while [ $# -gt 0 ]; do
shift
done
AVLC_SOURCED=1 . ./compile-libvlc.sh
AVLC_SOURCED=1 . buildsystem/compile-libvlc.sh
avlc_make_toolchain
################

5
compile.sh → buildsystem/compile.sh

@ -1,6 +1,7 @@
#! /bin/sh
set -e
#############
# FUNCTIONS #
#############
@ -309,7 +310,7 @@ compile() {
mkdir -p $OUT_DBG_DIR
if [ "$BUILD_MEDIALIB" != 1 -o ! -d "libvlc/jni/libs/$1" ]; then
AVLC_SOURCED=1 . ./compile-libvlc.sh
AVLC_SOURCED=1 . buildsystem/compile-libvlc.sh
avlc_build
$NDK_BUILD -C libvlc \
@ -332,7 +333,7 @@ compile() {
fi
if [ "$NO_ML" != 1 ]; then
ANDROID_ABI=$ANDROID_ABI RELEASE=$RELEASE ./compile-medialibrary.sh
ANDROID_ABI=$ANDROID_ABI RELEASE=$RELEASE buildsystem/compile-medialibrary.sh
if [ "$copy_tmp" = "--copy-tmp=medialibrary" ];then
cp -r medialibrary/jni/libs/${ANDROID_ABI} build/tmp
fi

0
.gitlab-ci.yml → buildsystem/gitlab/.gitlab-ci.yml

0
publish.gradle → buildsystem/publish.gradle

2
libvlc/build.gradle

@ -75,4 +75,4 @@ def vlcRevision() {
return vlc.toString()
}
apply from: '../publish.gradle'
apply from: '../buildsystem/publish.gradle'

2
medialibrary/build.gradle

@ -103,4 +103,4 @@ dependencies {
}
apply from: '../publish.gradle'
apply from: '../buildsystem/publish.gradle'

Loading…
Cancel
Save