@@ -5,7 +5,9 @@ PLATFORM=""
55ARCH=" "
66OVERWRITE=1
77SILENT_ARGS=" "
8+ NO_SSL=" "
89BLEEDING_EDGE=0
10+ DL_VERSION=2.2
911
1012printHelp (){
1113cat << EOF
@@ -25,6 +27,7 @@ cat << EOF
2527 If not set deletes any existing libraries
2628 -s, --silent Silent download progress
2729 -h, --help Shows this message
30+ -k, --no-ssl Allow no SSL validation
2831EOF
2932}
3033
@@ -33,15 +36,21 @@ if [[ ! -d "$SCRIPT_DIR" ]]; then SCRIPT_DIR="$PWD"; fi
3336. " $SCRIPT_DIR /downloader.sh"
3437
3538download (){
36- echo " Downloading $1 "
39+ echo ' -----'
40+ # echo " Downloading $1"
3741 # downloader ci.openframeworks.cc/libs/$1 $SILENT_ARGS
42+
43+ COMMAND=" "
44+ REPO=" nightly"
3845 if [[ $BLEEDING_EDGE = 1 ]] ; then
39- echo downloader https://github.com/openframeworks/apothecary/releases/download/bleeding/$1 $SILENT_ARGS
40- downloader https://github.com/openframeworks/apothecary/releases/download/bleeding/$1 $SILENT_ARGS
41- else
42- echo downloader https://github.com/openframeworks/apothecary/releases/download/nightly/$1 $SILENT_ARGS
43- downloader https://github.com/openframeworks/apothecary/releases/download/nightly/$1 $SILENT_ARGS
46+ REPO=" bleeding"
4447 fi
48+
49+ for PKG in $1 ; do
50+ COMMAND+=" https://github.com/openframeworks/apothecary/releases/download/$REPO /$PKG "
51+ done
52+ # echo $COMMAND;
53+ downloader $COMMAND $SILENT_ARGS $NO_SSL
4554}
4655
4756# trap any script errors and exit
@@ -89,7 +98,10 @@ while [[ $# -gt 0 ]]; do
8998 BLEEDING_EDGE=1
9099 ;;
91100 -s|--silent)
92- SILENT_ARGS=-nv
101+ SILENT_ARGS=1
102+ ;;
103+ -k|--no-ssl)
104+ NO_SSL=1
93105 ;;
94106 -h|--help)
95107 printHelp
@@ -104,6 +116,10 @@ while [[ $# -gt 0 ]]; do
104116 shift # past argument or value
105117done
106118
119+ if [[ " $TARGET " != " " && [[ " $PLATFORM " == " " ; then
120+ PLATFORM=$TARGET
121+ fi
122+
107123if [ " $PLATFORM " == " " ; then
108124 OS=$( uname)
109125 if [ " $OS " == " Linux" ; then
@@ -176,6 +192,8 @@ if [ "$PLATFORM" == "linux" ] && [ "$ARCH" == "64" ]; then
176192 fi
177193fi
178194
195+ echo " openFrameworks download_libs.sh v$DL_VERSION "
196+
179197if [ " $PLATFORM " == " msys2" ; then
180198 PKGS=" openFrameworksLibs_${VER} _${PLATFORM} _${ARCH} .zip"
181199elif [ " $ARCH " == " " && [ " $PLATFORM " == " vs" ; then
@@ -207,9 +225,9 @@ elif [[ "$PLATFORM" =~ ^(osx|ios|tvos|xros|catos|watchos)$ ]]; then
207225elif [ " $ARCH " == " " && [ " $PLATFORM " == " android" ; then
208226 if [[ $BLEEDING_EDGE = 1 ]] ; then
209227 PKGS=" openFrameworksLibs_${VER} _${PLATFORM} _armv7.tar.bz2 \
210- openFrameworksLibs_${VER} _${PLATFORM} _arm64.tar.bz2 \
211- openFrameworksLibs_${VER} _${PLATFORM} _x86_64.tar.bz2
212- openFrameworksLibs_${VER} _${PLATFORM} _x86.tar.bz2"
228+ openFrameworksLibs_${VER} _${PLATFORM} _arm64.tar.bz2 \
229+ openFrameworksLibs_${VER} _${PLATFORM} _x86_64.tar.bz2
230+ openFrameworksLibs_${VER} _${PLATFORM} _x86.tar.bz2"
213231 else
214232 PKGS=" openFrameworksLibs_${VER} _${PLATFORM} armv7.tar.bz2 \
215233 openFrameworksLibs_${VER} _${PLATFORM} arm64.tar.bz2 \
@@ -223,33 +241,63 @@ else # Linux
223241 fi
224242fi
225243
226- for PKG in $PKGS ; do
227- download $PKG
228- done
229-
230244cd ../../
231245mkdir -p libs
232246cd libs
233247
248+ mkdir -p download
249+ cd download
250+
251+ # IFS=' ' read -r -a PKGS_DATA <<< "$PKGS"
252+ # if [ $OVERWRITE -eq 1 ]; then
253+ # for ((i = 0; i < ${#PKGS_DATA[@]}; i++)); do
254+ # FILE_CHECK="${PKGS_DATA[$i]}"
255+ # # Check if the file exists
256+ # if [ -e "${FILE_CHECK}" ]; then
257+ # echo " Removing Prior Download:[${FILE_CHECK}]"
258+ # # Remove the file or directory
259+ # rm -rf "${FILE_CHECK}"
260+ # fi
261+ # done
262+ # fi
263+
264+ download " ${PKGS[@]} "
265+
266+ cd ../ # back to libs
267+
234268if [ $OVERWRITE -eq 1 ]; then
235- echo " Removing old libraries"
236- libs=(" boost" " cairo" " curl" " FreeImage" " freetype" " glew" " glfw" " json" " libpng" " openssl" " pixman" " poco" " rtAudio" " tess2" " uriparser" " utf8" " videoInput" " zlib" " opencv" " ippicv" " assimp" " libxml2" " svgtiny" " README.md"
237- for lib in $libs ; do
238- if [ -e $lib ]; then
239- rm -rf $lib
269+ echo " "
270+ echo " Overwrite - Removing prior libraries for [$PLATFORM ]"
271+ libs=(" boost" " cairo" " curl" " FreeImage" " brotli" " fmod" " freetype" " glew" " glfw" " json" " libpng" " openssl" " pixman" " poco" " rtAudio" " tess2" " uriparser" " utf8" " videoInput" " zlib" " opencv" " ippicv" " assimp" " libxml2" " svgtiny" " fmt"
272+ for (( i= 0 ;i< ${# libs[@]} ;++ i)) ; do
273+ if [ -e " ${libs[i]} /lib/$PLATFORM " ; then
274+ echo " Removing: [${libs[i]} /lib/$PLATFORM ]"
275+ rm -rf " ${libs[i]} /lib/$PLATFORM "
240276 fi
277+ if [ " $PLATFORM " == " msys2" || [ " $PLATFORM " == " vs" ; then
278+ if [ -e " ${libs[i]} /bin" ; then
279+ echo " Removing: [${libs[i]} /bin]"
280+ rm -rf " ${libs[i]} /bin"
281+ fi
282+ fi
283+ # if [ -e "${libs[i]}/include" ]; then
284+ # echo " Removing: [${libs[i]}/include]"
285+ # rm -rf "${libs[i]}/include"
286+ # fi
241287 done
242288fi
243289
290+ echo " ------ "
244291for PKG in $PKGS ; do
245- echo " Uncompressing libraries ${PLATFORM}${ARCH} from $PKG "
292+ echo " Uncompressing libraries [ ${PLATFORM} ] from [ $PKG ] "
246293 if [ " $PLATFORM " == " msys2" || [ " $PLATFORM " == " vs" ; then
247- unzip -qo ../scripts/dev /$PKG
248- rm ../scripts/dev /$PKG
294+ unzip -qo download /$PKG
295+ # rm -r download /$PKG
249296 else
250- tar xjf ../scripts/dev /$PKG
251- rm ../scripts/dev /$PKG
297+ tar xjf download /$PKG
298+ # rm -r download /$PKG
252299 fi
300+ echo " Deployed libraries from [download/$PKG ]to [/libs]"
253301done
254302
255303if [ " $PLATFORM " == " osx" ; then
@@ -266,13 +314,31 @@ else
266314 addons=(" ofxOpenCv" " ofxOpenCv" " ofxAssimpModelLoader" " ofxSvg" " ofxSvg" " ofxPoco"
267315fi
268316
269- for (( i= 0 ;i< ${# addonslibs[@]} ;++ i)) ; do
270- if [ -e ${addonslibs[i]} ]; then
271- echo " Copying ${addonslibs[i]} to ${addons[i]} "
272- if [ $OVERWRITE -eq 1 ] && [ -e ../addons/${addons[i]} /libs/${addonslibs[i]} ]; then
273- echo " Removing old opencv libraries"
274- rm -rf ../addons/${addons[i]} /libs/${addonslibs[i]}
317+ echo " ------ "
318+ if [ $OVERWRITE -eq 1 ]; then
319+ for (( i= 0 ;i< ${# addonslibs[@]} ;++ i)) ; do
320+ if [ -e ${addonslibs[i]} ] ; then
321+ echo " Overwrite - addon: [${addons[i]} - ${addonslibs[i]} ]"
322+ if [ -e ../addons/${addons[i]} /libs/${addonslibs[i]} /lib/$PLATFORM ]; then
323+ echo " Remove binaries: [${addons[i]} /libs/${addonslibs[i]} /lib/$PLATFORM ]"
324+ rm -rf ../addons/${addons[i]} /libs/${addonslibs[i]} /lib/$PLATFORM
325+ fi
326+ if [ -e ../addons/${addons[i]} /libs/${addonslibs[i]} /bin ]; then
327+ echo " Remove binaries: [${addons[i]} /libs/${addonslibs[i]} /bin]"
328+ rm -rf ../addons/${addons[i]} /libs/${addonslibs[i]} /bin
329+ fi
330+ # if [ -e ../addons/${addons[i]}/libs/${addonslibs[i]}/include ]; then
331+ # echo " Remove include: [${addons[i]}/libs/include]"
332+ # rm -rf ../addons/${addons[i]}/libs/${addonslibs[i]}/include
333+ # fi
275334 fi
335+ done
336+ echo " ------ "
337+ fi
338+
339+ for (( i= 0 ;i< ${# addonslibs[@]} ;++ i)) ; do
340+ if [ -e " ${addonslibs[i]} " ; then
341+ echo " Deploying [${addonslibs[i]} ] to [../addons/${addons[i]} /libs]"
276342 mkdir -p ../addons/${addons[i]} /libs/${addonslibs[i]}
277343 if ! command -v rsync & > /dev/null
278344 then
@@ -284,3 +350,5 @@ for ((i=0;i<${#addonslibs[@]};++i)); do
284350 fi
285351done
286352
353+ echo " ------ "
354+ echo " openFrameworks download_libs and install complete!"
0 commit comments