diff --git a/.github/workflows/of.yml b/.github/workflows/of.yml index cb47d2bd405..adc7f02ca65 100644 --- a/.github/workflows/of.yml +++ b/.github/workflows/of.yml @@ -184,7 +184,7 @@ jobs: key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }} - name: Download libs - run: ./scripts/${{matrix.cfg.libs}}/download_latest_libs.sh + run: ./scripts/${{matrix.cfg.libs}}/download_libs.sh - name: install run: ./scripts/ci/$TARGET/install.sh - name: Build @@ -291,7 +291,7 @@ jobs: - name: Download libs - run: ./scripts/${{ matrix.cfg.target }}/download_latest_libs.sh + run: ./scripts/${{ matrix.cfg.target }}/download_libs.sh - name: Build run: diff --git a/libs/openFrameworksCompiled/project/ios/iOS+OFLib.xcodeproj/project.pbxproj b/libs/openFrameworksCompiled/project/ios/iOS+OFLib.xcodeproj/project.pbxproj index 8651e690534..6e7b882dd27 100644 --- a/libs/openFrameworksCompiled/project/ios/iOS+OFLib.xcodeproj/project.pbxproj +++ b/libs/openFrameworksCompiled/project/ios/iOS+OFLib.xcodeproj/project.pbxproj @@ -1195,7 +1195,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = "/usr/bin/env bash"; - shellScript = "#!/usr/bin/env bash\nif [ ! -d \"${SRCROOT}/../../../freetype/lib/macos/freetype.xcframework\" ]; then\n\techo \"openFrameworks has missing xcFrameworks for iOS / macOS. Downloading libaries now via scripts/macos/download_latest_libs.sh\"\n ${SRCROOT}/../../../../scripts/macos/download_latest_libs.sh\nelse\n\techo \"xcFrameworks found\"\nfi\n"; + shellScript = "#!/usr/bin/env bash\nif [ ! -d \"${SRCROOT}/../../../freetype/lib/macos/freetype.xcframework\" ]; then\n\techo \"openFrameworks has missing xcFrameworks for iOS / macOS. Downloading libaries now via scripts/macos/download_libs.sh\"\n ${SRCROOT}/../../../../scripts/macos/download_libs.sh\nelse\n\techo \"xcFrameworks found\"\nfi\n"; }; BFF80A5C2C50B25B00784E74 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; diff --git a/libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj/project.pbxproj b/libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj/project.pbxproj index fcec43cadf3..f4105425043 100644 --- a/libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj/project.pbxproj +++ b/libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj/project.pbxproj @@ -871,7 +871,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = "/usr/bin/env bash"; - shellScript = "#!/usr/bin/env bash\nif [ ! -d \"${SRCROOT}/../../../freetype/lib/macos/freetype.xcframework\" ]; then\n\techo \"openFrameworks has missing xcFrameworks for osx. Downloading libaries now via scripts/osx/download_latest_libs.sh\"\n ${SRCROOT}/../../../../scripts/osx/download_latest_libs.sh\nelse\n\techo \"xcFrameworks found\"\nfi\n"; + shellScript = "#!/usr/bin/env bash\nif [ ! -d \"${SRCROOT}/../../../freetype/lib/macos/freetype.xcframework\" ]; then\n\techo \"openFrameworks has missing xcFrameworks for osx. Downloading libaries now via scripts/osx/download_libs.sh\"\n ${SRCROOT}/../../../../scripts/osx/download_libs.sh\nelse\n\techo \"xcFrameworks found\"\nfi\n"; }; BFF80A5D2C50B2C300784E74 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; diff --git a/libs/openFrameworksCompiled/project/tvOS/tvOS+OFLib.xcodeproj/project.pbxproj b/libs/openFrameworksCompiled/project/tvOS/tvOS+OFLib.xcodeproj/project.pbxproj index 398c6315306..295b001fe88 100644 --- a/libs/openFrameworksCompiled/project/tvOS/tvOS+OFLib.xcodeproj/project.pbxproj +++ b/libs/openFrameworksCompiled/project/tvOS/tvOS+OFLib.xcodeproj/project.pbxproj @@ -997,7 +997,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = "/usr/bin/env bash"; - shellScript = "#!/usr/bin/env bash\nif [ ! -d \"${SRCROOT}/../../../freetype/lib/macos/freetype.xcframework\" ]; then\n\techo \"openFrameworks has missing xcFrameworks for tvOS / macOS. Downloading libaries now via scripts/macos/download_latest_libs.sh\"\n ${SRCROOT}/../../../../scripts/macos/download_latest_libs.sh\nelse\n\techo \"xcFrameworks found\"\nfi\n"; + shellScript = "#!/usr/bin/env bash\nif [ ! -d \"${SRCROOT}/../../../freetype/lib/macos/freetype.xcframework\" ]; then\n\techo \"openFrameworks has missing xcFrameworks for tvOS / macOS. Downloading libaries now via scripts/macos/download_libs.sh\"\n ${SRCROOT}/../../../../scripts/macos/download_libs.sh\nelse\n\techo \"xcFrameworks found\"\nfi\n"; }; BFF80A5B2C50B01B00784E74 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; diff --git a/scripts/ci/vs/install_bleeding.sh b/scripts/ci/vs/install_bleeding.sh index ace137a095f..ed5adc56bfc 100644 --- a/scripts/ci/vs/install_bleeding.sh +++ b/scripts/ci/vs/install_bleeding.sh @@ -6,7 +6,7 @@ if [[ ! -d "$SCRIPT_DIR" ]]; then SCRIPT_DIR="$PWD"; fi unset BITS cd "${OF_ROOT}" -./scripts/vs/download_latest_libs.sh -p vs --silent +./scripts/vs/download_libs.sh -p vs --silent rm -rf projectGenerator mkdir -p projectGenerator diff --git a/scripts/dev/download_libs.sh b/scripts/dev/download_libs.sh index 324ef36d4a0..f30b7acc393 100755 --- a/scripts/dev/download_libs.sh +++ b/scripts/dev/download_libs.sh @@ -143,7 +143,12 @@ if [ "$ARCH" == "" ]; then if [ "$PLATFORM" == "linux" ]; then ARCH=$(uname -m) if [ "$ARCH" == "x86_64" ]; then - GCC_VERSION=$(gcc -dumpversion | cut -f1 -d.) + if command -v gcc &> /dev/null + then + GCC_VERSION=$(gcc -dumpversion | cut -f1 -d.) + else + GCC_VERSION=6 + fi if [ $GCC_VERSION -eq 4 ]; then ARCH=64gcc6 elif [ $GCC_VERSION -eq 5 ]; then diff --git a/scripts/emscripten/download_latest_libs.sh b/scripts/emscripten/download_legacy_libs.sh old mode 100755 new mode 100644 similarity index 68% rename from scripts/emscripten/download_latest_libs.sh rename to scripts/emscripten/download_legacy_libs.sh index 6b3a8698e3e..674c0e01f77 --- a/scripts/emscripten/download_latest_libs.sh +++ b/scripts/emscripten/download_legacy_libs.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $SCRIPT_DIR -../dev/download_libs.sh -p emscripten -b $@ +../dev/download_libs.sh -p emscripten $@ diff --git a/scripts/emscripten/download_libs.sh b/scripts/emscripten/download_libs.sh index 674c0e01f77..6b3a8698e3e 100755 --- a/scripts/emscripten/download_libs.sh +++ b/scripts/emscripten/download_libs.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $SCRIPT_DIR -../dev/download_libs.sh -p emscripten $@ +../dev/download_libs.sh -p emscripten -b $@ diff --git a/scripts/ios/download_latest_libs.sh b/scripts/ios/download_latest_libs.sh deleted file mode 100755 index d2d9a8c9297..00000000000 --- a/scripts/ios/download_latest_libs.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -cd $SCRIPT_DIR -cd $SCRIPT_DIR -if [ ! -z ${BITS+x} ]; then - ../dev/download_libs.sh -p macos -b -a $BITS -n $@ -else - ../dev/download_libs.sh -p macos -b -n $@ -fi diff --git a/scripts/ios/download_libs.sh b/scripts/ios/download_libs.sh index 75c50b48216..d2d9a8c9297 100755 --- a/scripts/ios/download_libs.sh +++ b/scripts/ios/download_libs.sh @@ -1,4 +1,9 @@ #!/usr/bin/env bash SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $SCRIPT_DIR -../dev/download_libs.sh -p ios -n $@ +cd $SCRIPT_DIR +if [ ! -z ${BITS+x} ]; then + ../dev/download_libs.sh -p macos -b -a $BITS -n $@ +else + ../dev/download_libs.sh -p macos -b -n $@ +fi diff --git a/scripts/linux/download_libs.sh b/scripts/linux/download_libs.sh index 47964fe8601..6aff8f87641 100755 --- a/scripts/linux/download_libs.sh +++ b/scripts/linux/download_libs.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $SCRIPT_DIR -../dev/download_libs.sh -p linux $@ +../dev/download_libs.sh -p linux -b $@ diff --git a/scripts/linux/ubuntu/install_dependencies.sh b/scripts/linux/ubuntu/install_dependencies.sh index 63c8dde80d6..4ec460f9d55 100755 --- a/scripts/linux/ubuntu/install_dependencies.sh +++ b/scripts/linux/ubuntu/install_dependencies.sh @@ -36,7 +36,7 @@ function installPackages { exit_code=$? if [ $exit_code != 0 ]; then echo "error installing ${pkg}, there could be an error with your internet connection" - echo "if the error persists, please report an issue in github: http://github.com/openframeworks/openFrameworks/issues" + echo "if the error persists, please report an issue in github: https://github.com/openframeworks/openFrameworks/issues" exit $exit_code fi elif [ $exit_code -eq 0 ]; then @@ -44,14 +44,14 @@ function installPackages { exit_code=$? if [ $exit_code != 0 ]; then echo "error installing ${pkg}, there could be an error with your internet connection" - echo "if the error persists, please report an issue in github: http://github.com/openframeworks/openFrameworks/issues" + echo "if the error persists, please report an issue in github: https://github.com/openframeworks/openFrameworks/issues" exit $exit_code fi else echo "error installing ${pkg}" echo $error echo "this seems an error with your distribution repositories but you can also" - echo "report an issue in the openFrameworks github: http://github.com/openframeworks/openFrameworks/issues" + echo "report an issue in the openFrameworks github: https://github.com/openframeworks/openFrameworks/issues" exit $exit_code fi fi diff --git a/scripts/macos/download_latest_libs.sh b/scripts/macos/download_latest_libs.sh deleted file mode 100755 index 7496511357b..00000000000 --- a/scripts/macos/download_latest_libs.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -cd $SCRIPT_DIR -cd $SCRIPT_DIR -if [ ! -z ${BITS+x} ]; then - ../dev/download_libs.sh -p macos -b -a $BITS $@ -else - ../dev/download_libs.sh -p macos -b -n $@ -fi diff --git a/scripts/macos/download_libs.sh b/scripts/macos/download_libs.sh index 2f314c6ca7b..7496511357b 100755 --- a/scripts/macos/download_libs.sh +++ b/scripts/macos/download_libs.sh @@ -3,7 +3,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $SCRIPT_DIR cd $SCRIPT_DIR if [ ! -z ${BITS+x} ]; then - ../dev/download_libs.sh -p macos -a $BITS $@ + ../dev/download_libs.sh -p macos -b -a $BITS $@ else - ../dev/download_libs.sh -p macos $@ + ../dev/download_libs.sh -p macos -b -n $@ fi diff --git a/scripts/osx/download_latest_libs.sh b/scripts/osx/download_latest_libs.sh deleted file mode 100755 index 8a693de45d4..00000000000 --- a/scripts/osx/download_latest_libs.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -cd $SCRIPT_DIR -cd $SCRIPT_DIR -if [ ! -z ${BITS+x} ]; then - ../dev/download_libs.sh -p osx -b -a $BITS $@ -else - ../dev/download_libs.sh -p osx -b $@ -fi diff --git a/scripts/osx/download_libs.sh b/scripts/osx/download_libs.sh index c170bcdbda5..8a693de45d4 100755 --- a/scripts/osx/download_libs.sh +++ b/scripts/osx/download_libs.sh @@ -3,7 +3,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $SCRIPT_DIR cd $SCRIPT_DIR if [ ! -z ${BITS+x} ]; then - ../dev/download_libs.sh -p osx -a $BITS $@ + ../dev/download_libs.sh -p osx -b -a $BITS $@ else - ../dev/download_libs.sh -p osx $@ + ../dev/download_libs.sh -p osx -b $@ fi diff --git a/scripts/templates/osx/emptyExample.xcodeproj/project.pbxproj b/scripts/templates/osx/emptyExample.xcodeproj/project.pbxproj index 9c0351c8c03..74d0151bd5f 100644 --- a/scripts/templates/osx/emptyExample.xcodeproj/project.pbxproj +++ b/scripts/templates/osx/emptyExample.xcodeproj/project.pbxproj @@ -31,7 +31,7 @@ "outputPaths": [], "runOnlyForDeploymentPostprocessing": "0", "shellPath": "/usr/bin/env bash", - "shellScript": "#!/usr/bin/env bash\nif [ ! -d \"${OF_PATH}/libs/freetype/lib/macos/freetype.xcframework\" ]; then\n\techo \"openFrameworks has missing xcFrameworks for osx. Downloading libaries now via scripts/osx/download_latest_libs.sh\"\n ${OF_PATH}/scripts/osx/download_latest_libs.sh\nelse\n\techo \"xcFrameworks found\"\nfi\n" + "shellScript": "#!/usr/bin/env bash\nif [ ! -d \"${OF_PATH}/libs/freetype/lib/macos/freetype.xcframework\" ]; then\n\techo \"openFrameworks has missing xcFrameworks for osx. Downloading libaries now via scripts/osx/download_libs.sh\"\n ${OF_PATH}/scripts/osx/download_libs.sh\nelse\n\techo \"xcFrameworks found\"\nfi\n" }, "E42962A92163ECCD00A6A9E2": { "alwaysOutOfDate": "1", diff --git a/scripts/vs/download_latest_libs.sh b/scripts/vs/download_latest_libs.sh deleted file mode 100755 index e842fae9755..00000000000 --- a/scripts/vs/download_latest_libs.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -cd $SCRIPT_DIR -if [ ! -z ${BITS+x} ]; then - ../dev/download_libs.sh -p vs -b -a $BITS -n $@ -else - ../dev/download_libs.sh -p vs -b -n $@ -fi diff --git a/scripts/vs/download_libs.ps1 b/scripts/vs/download_libs.ps1 deleted file mode 100755 index 28d55c4816c..00000000000 --- a/scripts/vs/download_libs.ps1 +++ /dev/null @@ -1,145 +0,0 @@ -# You may override default parameters for this script by specifying -# -paramName paramValue -# When calling this script. For example: -# download_libs.ps1 -platform vs2015 -# Which will load the visual studio 2015 libraries -param( - [String]$ver="master", - [String]$platform="vs" - ) -$currentPath = $pwd -$scriptPath = split-path -parent $MyInvocation.MyCommand.Definition -$libsDir = $scriptPath + "\..\..\libs" - -function DownloadPackage{ - $pkg = $args[0] - $url = " https://github.com/openframeworks/apothecary/releases/download/nightly/$pkg" - If(Test-Path "$pkg") { - echo "Deleting old package" - Remove-Item $pkg - } - - echo "Downloading $url to $scriptPath\$pkg" - $client.DownloadFile($url, "$scriptPath\$pkg") - - If(-Not (Test-Path "$libsDir\$arch")){ - new-item "$libsDir\$arch" -itemtype directory - } - - echo "Uncompressing downloaded libs to $libsDir\$arch" - Add-Type -A System.IO.Compression.FileSystem - [IO.Compression.ZipFile]::ExtractToDirectory("$scriptPath\$pkg", "$libsDir\$arch") - - Remove-Item $pkg -} - -function DownloadLibs{ - cd $scriptPath - $client = new-object System.Net.WebClient - $arch = $args[0] - $pkg1 = "openFrameworksLibs_"+$ver+"_"+$platform+"_"+$arch+"_1.zip" - $pkg2 = "openFrameworksLibs_"+$ver+"_"+$platform+"_"+$arch+"_2.zip" - $pkg3 = "openFrameworksLibs_"+$ver+"_"+$platform+"_"+$arch+"_3.zip" - $pkg4 = "openFrameworksLibs_"+$ver+"_"+$platform+"_"+$arch+"_4.zip" - DownloadPackage $pkg1 - DownloadPackage $pkg2 - DownloadPackage $pkg3 - DownloadPackage $pkg4 -} - -echo "Installing libs for platform $platform." - -if (-Not ($platform -eq "vs2015")){ - echo "You may want to call this script with parameters: 'download_libs.ps1 -platform vs2015' to install libs for Visual Studio 2015." -} - -$libsExists = Test-Path $libsDir -If(-Not $libsExists) { - echo "Creating libs directory" - new-item $libsDir -itemtype directory -} - -$libs = @( - "64", - "boost", - "cairo", - "curl", - "FreeImage", - "freetype", - "glew", - "glfw", - "json", - "libpng", - "openssl", - "pixman", - "poco", - "rtAudio", - "tess2", - "uriparser", - "utf8", - "videoInput", - "zlib", - "opencv", - "ippicv", - "assimp", - "README.md", - ".appveyor.yml", - ".travis.yml" - ) - -$addon_libs = @( - "ofxOpenCv\libs\opencv", - "ofxOpenCv\libs\ippicv", - "ofxAssimpModelLoader\libs\assimp", - "ofxSvg\libs\libxml2", - "ofxSvg\libs\svgtiny", - "ofxPoco\libs\poco" - ) - - - -echo "Deleting existing libs" -ForEach ($lib in $libs){ - if(Test-Path "..\..\libs\$lib"){ - Remove-Item "..\..\libs\$lib" -Force -Recurse - } -} - -echo "Deleting existing addons libs" -ForEach ($lib in $addon_libs){ - if(Test-Path "..\..\addons\$lib"){ - Remove-Item "..\..\addons\$lib" -Force -Recurse - } -} - -DownloadLibs 64 - -function moveAddonLib { - $addonLib = $args[0] - - $addon_path = split-path -parent "$addonLib" - $lib_name = split-path -leaf "$addonLib" - - echo "Moving addon lib: $lib_name" - - robocopy.exe "..\..\libs\64\$lib_name" "..\..\addons\$addon_path\$lib_name" /MOVE /NFL /R:5 /S -} - -echo "Moving addons libs" -ForEach ($lib in $addon_libs){ - moveAddonLib $lib -} - -robocopy.exe ..\..\libs\64\ ..\..\libs\ /MOVE /NFL /R:5 /S - -if(Test-Path "..\..\libs\64"){ - Remove-Item "..\..\libs\64" -Force -Recurse -} - -if(Test-Path "..\..\libs\README.md"){ - Remove-Item "..\..\libs\README.md" -Force -Recurse -} - -cd $currentPath - -echo "Success." \ No newline at end of file diff --git a/scripts/vs/download_libs.sh b/scripts/vs/download_libs.sh index 4f1c0d46d1b..e842fae9755 100755 --- a/scripts/vs/download_libs.sh +++ b/scripts/vs/download_libs.sh @@ -2,7 +2,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $SCRIPT_DIR if [ ! -z ${BITS+x} ]; then - ../dev/download_libs.sh -p vs -n $@ -a $BITS + ../dev/download_libs.sh -p vs -b -a $BITS -n $@ else - ../dev/download_libs.sh -p vs -n $@ -fi + ../dev/download_libs.sh -p vs -b -n $@ +fi diff --git a/scripts/vs/download_latest_libs_x64.sh b/scripts/vs/download_libs_x64.sh old mode 100755 new mode 100644 similarity index 100% rename from scripts/vs/download_latest_libs_x64.sh rename to scripts/vs/download_libs_x64.sh