Skip to content

Commit

Permalink
build: use shell scripts instead of git-submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
bbcallen committed Aug 12, 2013
1 parent 4681897 commit ccd8f13
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 6 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# -----
build/
ffmpeg-temp/
android/ffmpeg-armv7a
.DS_Store

# built application files
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ Android MediaPlayer-like video player based on [ffplay](http://ffmpeg.org)
git clone https://github.com/bbcallen/ijkplayer.git ijkplayer
cd ijkplayer
git checkout -B stable n0.0.4
git submodule init
git submodule update
sh init-submodules.sh
sh compile-ffmpeg.sh
sh compile-ijk.sh

Expand Down
1 change: 1 addition & 0 deletions extra/ffmpeg
Submodule ffmpeg added at c103d5
1 change: 0 additions & 1 deletion ffmpeg-armv7a
Submodule ffmpeg-armv7a deleted from e6021a
33 changes: 33 additions & 0 deletions init-submodules.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#! /bin/sh

IJK_FFMPEG_COMMIT=ijk-r0.0.5-dev
IJK_FFMPEG_LOCAL_REPO=extra/ffmpeg

set -e


echo "== pull ffmpeg base =="
if [ ! -d ${IJK_FFMPEG_LOCAL_REPO} ]; then
git clone git://git.videolan.org/ffmpeg.git ${IJK_FFMPEG_LOCAL_REPO}
else
cd ${IJK_FFMPEG_LOCAL_REPO}
git pull
cd -
fi


echo "== pull ffmpeg fork =="
if [ ! -d "android/ffmpeg-armv7a" ]; then
git clone --reference "${IJK_FFMPEG_LOCAL_REPO}" https://github.com/bbcallen/FFmpeg.git android/ffmpeg-armv7a
cd android/ffmpeg-armv7a

# do not depend on the reference repo
git repack -a
else
echo "== pull ffmpeg base =="
cd android/ffmpeg-armv7a
git fetch --all
fi

git checkout ${IJK_FFMPEG_COMMIT}
cd -

0 comments on commit ccd8f13

Please sign in to comment.