Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes for #297 #298

Merged
merged 1 commit into from
Nov 12, 2014
Merged

Fixes for #297 #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions distribute.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,6 +552,10 @@ function run_get_packages() {
try mkdir -p $BUILD_PATH/$module
fi

if [ ! -d "$PACKAGES_PATH/$module" ]; then
try mkdir -p "$PACKAGES_PATH/$module"
fi

if [ "X$url" == "X" ]; then
debug "No package for $module"
continue
Expand All @@ -561,7 +565,7 @@ function run_get_packages() {
marker_filename=".mark-$filename"
do_download=1

cd $PACKAGES_PATH
cd "$PACKAGES_PATH/$module"

# check if the file is already present
if [ -f $filename ]; then
Expand Down Expand Up @@ -631,7 +635,7 @@ function run_get_packages() {
fi

# decompress
pfilename=$PACKAGES_PATH/$filename
pfilename=$PACKAGES_PATH/$module/$filename
info "Extract $pfilename"
case $pfilename in
*.tar.gz|*.tgz )
Expand Down
4 changes: 2 additions & 2 deletions recipes/audiostream/recipe.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#!/bin/bash

VERSION_audiostream=${VERSION_audiostream:-master}
URL_audiostream=https://github.com/kivy/audiostream/zipball/$VERSION_audiostream/audiostream.zip
URL_audiostream=https://github.com/kivy/audiostream/archive/$VERSION_audiostream.zip
DEPS_audiostream=(python sdl pyjnius)
MD5_audiostream=
BUILD_audiostream=$BUILD_PATH/audiostream/audiostream
BUILD_audiostream=$BUILD_PATH/audiostream/$(get_directory $URL_audiostream)
RECIPE_audiostream=$RECIPES_PATH/audiostream

function prebuild_audiostream() {
Expand Down
2 changes: 1 addition & 1 deletion recipes/cymunk/recipe.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

VERSION_cymunk=${VERSION_cymunk:-master}
URL_cymunk=http://github.com/tito/cymunk/zipball/$VERSION_cymunk/cymunk.zip
URL_cymunk=http://github.com/tito/cymunk/archive/$VERSION_cymunk.zip
DEPS_cymunk=(python)
MD5_cymunk=
BUILD_cymunk=$BUILD_PATH/cymunk/$(get_directory $URL_cymunk)
Expand Down
4 changes: 2 additions & 2 deletions recipes/ffmpeg/recipe.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
# Only h264+aac build are working.

VERSION_ffmpeg=${VERSION_ffmpeg:-master}
URL_ffmpeg=https://github.com/tito/ffmpeg-android/zipball/$VERSION_ffmpeg/ffmpeg-android.zip
URL_ffmpeg=https://github.com/tito/ffmpeg-android/archive/$VERSION_ffmpeg.zip
DEPS_ffmpeg=(python sdl)
MD5_ffmpeg=
BUILD_ffmpeg=$BUILD_PATH/ffmpeg/ffmpeg-android
BUILD_ffmpeg=$BUILD_PATH/ffmpeg/$(get_directory $URL_ffmpeg)
RECIPE_ffmpeg=$RECIPES_PATH/ffmpeg

function prebuild_ffmpeg() {
Expand Down
2 changes: 1 addition & 1 deletion recipes/kivy/recipe.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

VERSION_kivy=${VERSION_kivy:-stable}
URL_kivy=https://github.com/kivy/kivy/zipball/$VERSION_kivy/kivy-$VERSION_kivy.zip
URL_kivy=https://github.com/kivy/kivy/archive/$VERSION_kivy.zip
DEPS_kivy=(pygame pyjnius android)
MD5_kivy=
BUILD_kivy=$BUILD_PATH/kivy/$(get_directory $URL_kivy)
Expand Down
2 changes: 1 addition & 1 deletion recipes/plyer/recipe.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

VERSION_plyer=${VERSION_plyer:-master}
URL_plyer=https://github.com/kivy/plyer/zipball/$VERSION_plyer/plyer-$VERSION_plyer.zip
URL_plyer=https://github.com/kivy/plyer/archive/$VERSION_plyer.zip
DEPS_plyer=(pyjnius android)
MD5_plyer=
BUILD_plyer=$BUILD_PATH/plyer/$(get_directory $URL_plyer)
Expand Down
2 changes: 1 addition & 1 deletion recipes/pyjnius/recipe.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

VERSION_pyjnius=${VERSION_pyjnius:-master}
URL_pyjnius=https://github.com/kivy/pyjnius/zipball/$VERSION_pyjnius/pyjnius-$VERSION_pyjnius.zip
URL_pyjnius=https://github.com/kivy/pyjnius/archive/$VERSION_pyjnius.zip
DEPS_pyjnius=(python sdl)
MD5_pyjnius=
BUILD_pyjnius=$BUILD_PATH/pyjnius/$(get_directory $URL_pyjnius)
Expand Down