Skip to content

Android - script updates for download_libs #8341

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

Merged
merged 3 commits into from
Mar 5, 2025
Merged

Android - script updates for download_libs #8341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d191b76
scripts android download libs
danoli3 Mar 5, 2025
35e4d38
of script help for update platform
danoli3 Mar 5, 2025
8c7afd8
script version++
danoli3 Mar 5, 2025
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
2 changes: 1 addition & 1 deletion scripts/android/download_libs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd $SCRIPT_DIR
../dev/download_libs.sh -p android $@
../dev/download_libs.sh -p android -b $@
5 changes: 2 additions & 3 deletions scripts/dev/download_libs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ LEGACY=0
SILENT_ARGS=""
NO_SSL=""
BLEEDING_EDGE=0
DL_VERSION=2.6.4
DL_VERSION=2.6.5
TAG=""

printHelp(){
Expand Down Expand Up @@ -294,8 +294,7 @@ elif [ "$ARCH" == "" ] && [ "$PLATFORM" == "android" ]; then
if [[ $BLEEDING_EDGE = 1 ]] ; then
PKGS="openFrameworksLibs_${VER}_${PLATFORM}_armv7.tar.bz2 \
openFrameworksLibs_${VER}_${PLATFORM}_arm64.tar.bz2 \
openFrameworksLibs_${VER}_${PLATFORM}_x86_64.tar.bz2
openFrameworksLibs_${VER}_${PLATFORM}_x86.tar.bz2"
openFrameworksLibs_${VER}_${PLATFORM}_x86_64.tar.bz2"
else
PKGS="openFrameworksLibs_${VER}_${PLATFORM}armv7.tar.bz2 \
openFrameworksLibs_${VER}_${PLATFORM}arm64.tar.bz2 \
Expand Down
7 changes: 4 additions & 3 deletions scripts/of.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
# pipe commands to core openFrameworks scripts
OF_SCRIPT_VERSION=0.2.1
OF_SCRIPT_VERSION=0.2.2
# Dan Rosser 2025
OF_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
OF_DIR="$(realpath "$OF_DIR/../")"
Expand All @@ -9,7 +9,7 @@ OF_CORE_CI_SCRIPT_DIR="$(realpath "$OF_DIR/scripts/ci")"
OF_PG_INSTALLED_DIR="$(realpath "$OF_DIR/projectGenerator")"
VERBOSE=${VERBOSE:-0}
echoVerbose() {
if [[ -n "$VERBOSE" ]]; then
if [[ "$VERBOSE" = 1 ]]; then
echo "$@"
fi
}
Expand Down Expand Up @@ -75,6 +75,7 @@ Usage: $0 <command> [subcommand] [options]
Commands:
update [subcommand] Update openFrameworks components
libs Download openFrameworks libraries (default)
libs [platform] i.e update libs ios
pg | projectgenerator Download Project Generator

version [subcommand] Show version information
Expand Down Expand Up @@ -126,7 +127,7 @@ runCommand() {
SCRIPT="${OF_CORE_SCRIPT_DIR}/${PLATFORM_DIR}/download_projectGenerator.sh"
;;
*)
SCRIPT="${OF_CORE_SCRIPT_DIR}/${PLATFORM_DIR}/download_libs.sh" ""
SCRIPT="${OF_CORE_SCRIPT_DIR}/${PLATFORM_DIR}/download_libs.sh"
exit 1
;;
esac
Expand Down