Add zip compression level option. Fix exit_module function

This commit is contained in:
Antonin Décimo
2014-08-20 10:15:40 +02:00
parent cfa93f61d1
commit a3ac751f9e
6 changed files with 17 additions and 12 deletions

View File

@@ -140,6 +140,7 @@ unset OPTOFS
# Modules functions # Modules functions
## $1: Module name
init_module () init_module ()
{ {
unset OPTIND unset OPTIND
@@ -152,14 +153,15 @@ init_module ()
echo "Generating $PROJECT_NAME with Love $LOVE_VERSION for $1..." echo "Generating $PROJECT_NAME with Love $LOVE_VERSION for $1..."
} }
## $1: Compression level 0-9
create_love_file () create_love_file ()
{ {
cd "$PROJECT_DIR" cd "$PROJECT_DIR"
rm -rf "$RELEASE_DIR"/"$PROJECT_NAME".love 2> /dev/null rm -rf "$RELEASE_DIR"/"$PROJECT_NAME".love 2> /dev/null
if [ -z "$PROJECT_FILES" ]; then if [ -z "$PROJECT_FILES" ]; then
zip -9 -r "$RELEASE_DIR"/"$PROJECT_NAME".love -x "$0" "$MAIN_RELEASE_DIR"/\* $EXCLUDE_FILES @ * zip -$1 -r "$RELEASE_DIR"/"$PROJECT_NAME".love -x "$0" "$MAIN_RELEASE_DIR"/\* $EXCLUDE_FILES @ *
else else
zip -9 -r "$RELEASE_DIR"/"$PROJECT_NAME".love -x "$0" "$MAIN_RELEASE_DIR"/\* $EXCLUDE_FILES @ $PROJECT_FILES zip -$1 -r "$RELEASE_DIR"/"$PROJECT_NAME".love -x "$0" "$MAIN_RELEASE_DIR"/\* $EXCLUDE_FILES @ $PROJECT_FILES
fi fi
cd "$RELEASE_DIR" cd "$RELEASE_DIR"
LOVE_FILE="$PROJECT_NAME".love LOVE_FILE="$PROJECT_NAME".love
@@ -170,9 +172,11 @@ remove_love_file ()
rm -rf "$LOVE_FILE" rm -rf "$LOVE_FILE"
} }
## $1: exit code. 0 - success, other - failure
## $2: error message
exit_module () exit_module ()
{ {
if [ -z "$2" ]; then if [ -z "$1" ] || [ "$1" = "0" ]; then
echo "Done !" echo "Done !"
else else
echo -e "$2" echo -e "$2"

View File

@@ -29,9 +29,6 @@ if [ "$activity_defined_argument" = false ]; then
fi fi
create_love_file
# Android # Android
MISSING_INFO=0 MISSING_INFO=0
ERROR_MSG="Could not build Android package." ERROR_MSG="Could not build Android package."
@@ -49,6 +46,10 @@ if [ "$MISSING_INFO" -eq 1 ]; then
exit_module "$MISSING_INFO" "$ERROR_MSG" exit_module "$MISSING_INFO" "$ERROR_MSG"
fi fi
create_love_file 0
LOVE_ANDROID_DIR="$CACHE_DIR"/love-android-sdl2 LOVE_ANDROID_DIR="$CACHE_DIR"/love-android-sdl2
if [ -d "$LOVE_ANDROID_DIR" ]; then if [ -d "$LOVE_ANDROID_DIR" ]; then
cd "$LOVE_ANDROID_DIR" cd "$LOVE_ANDROID_DIR"

View File

@@ -26,9 +26,6 @@ if [ "$package_name_defined_argument" = false ]; then
fi fi
create_love_file
# Debian # Debian
MISSING_INFO=0 MISSING_INFO=0
ERROR_MSG="Could not build Debian package." ERROR_MSG="Could not build Debian package."
@@ -57,6 +54,9 @@ if [ "$MISSING_INFO" -eq 1 ]; then
fi fi
create_love_file 9
TEMP=`mktemp -d` TEMP=`mktemp -d`
mkdir -p $TEMP/DEBIAN mkdir -p $TEMP/DEBIAN

View File

@@ -1,7 +1,7 @@
# Love # Love
init_module "Love" init_module "Love"
create_love_file create_love_file 9
exit_module exit_module

View File

@@ -15,7 +15,7 @@ EXCLUDE_FILES="$EXCLUDE_FILES $PROJECT_ICNS"
PACKAGE_NAME=$(echo $PROJECT_NAME | sed -e 's/[^-a-zA-Z0-9_]/-/g') PACKAGE_NAME=$(echo $PROJECT_NAME | sed -e 's/[^-a-zA-Z0-9_]/-/g')
create_love_file create_love_file 9
# Info.plist # Info.plist

View File

@@ -27,7 +27,7 @@ if [ "$FOUND_WINE" = true ] && [ -n "$PROJECT_ICO" ]; then
fi fi
create_love_file create_love_file 9
# Windows 32-bits # Windows 32-bits