Skip to content

remove external dependencies from main repo #5299

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.

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 73 commits into from
Oct 9, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
8d85ccc
remove external dependencies from main repository
arturoc Oct 5, 2016
385c419
scripts to download external dependencies from ci server
arturoc Oct 5, 2016
700cba4
travis: download libraries before compiling
arturoc Oct 5, 2016
e248948
rename arm download libraries scripts
arturoc Oct 5, 2016
37a6896
appveyor: download libraries
arturoc Oct 5, 2016
7f65ff0
appveyor: fix windows build
arturoc Oct 5, 2016
482c47c
fix travis config
arturoc Oct 5, 2016
5df5065
appveyor: fix download libs
arturoc Oct 5, 2016
a190911
fix download scripts
arturoc Oct 5, 2016
a91f750
appveyor: install unzip
arturoc Oct 5, 2016
76e0b40
ps download libs: go back to current dir
arturoc Oct 5, 2016
e2fe786
fixng ps download_libs
arturoc Oct 5, 2016
f31b525
fixing appveyor download libs
arturoc Oct 5, 2016
9c5400e
fix download_libs scripts
arturoc Oct 5, 2016
1a1d5f3
fix appveyor
arturoc Oct 5, 2016
572f743
fix appveyor dowload
arturoc Oct 5, 2016
bb929a4
fix appveyor download
arturoc Oct 5, 2016
06a9574
fixing appveyor
arturoc Oct 5, 2016
a0fb92e
exec permissions for download libs
arturoc Oct 5, 2016
5750656
fixing appveyor builds
arturoc Oct 6, 2016
3e0fab2
Merge branch 'refactor-remove_libs' of github.com:arturoc/openFramewo…
arturoc Oct 6, 2016
3d9915a
disabling travis by now
arturoc Oct 6, 2016
995ddf6
fixing appveyor builds
arturoc Oct 6, 2016
6504b96
fix appveyor byuilds
arturoc Oct 6, 2016
3a58541
fixing appveyor builds
arturoc Oct 6, 2016
fc10044
gitignore compiled libraries
arturoc Oct 6, 2016
988e4f1
ios project files: utf8cpp -> utf8
arturoc Oct 6, 2016
bb5f56e
osx projects: utf8cpp -> utf8
arturoc Oct 6, 2016
0d4d05a
nux arm makefiles: ignore fmod sound player
arturoc Oct 6, 2016
6619f5a
download_libs: allow to not overwrite for multi downloads
arturoc Oct 6, 2016
1755747
re-enable travis builds
arturoc Oct 6, 2016
024c04a
emscripten download_libs
arturoc Oct 6, 2016
1cdccdd
android makefiles: remove unexisting poco libs
arturoc Oct 6, 2016
76da197
emscripten download_libs exec permissions
arturoc Oct 6, 2016
2fe61d0
appveyor: don't cache msys
arturoc Oct 6, 2016
9431e9b
osx: download libs in 2 parts
arturoc Oct 6, 2016
f339961
vs: remove references to glut
arturoc Oct 6, 2016
8f6eb85
remove remaining references to qt and glut in vs
arturoc Oct 6, 2016
c2ef82b
android ci: use ndk r12b
arturoc Oct 6, 2016
83f63a6
osx: exclude glut
arturoc Oct 6, 2016
e6fa13f
xcode: ignore glut
arturoc Oct 6, 2016
de86cf7
Merge branch 'refactor-remove_libs' of github.com:arturoc/openFramewo…
arturoc Oct 6, 2016
2313483
android ci: use ndk r12b
arturoc Oct 6, 2016
9fa30ef
download_libs: fix non overwrite
arturoc Oct 6, 2016
a9fa077
Merge branch 'refactor-remove_libs' of github.com:arturoc/openFramewo…
arturoc Oct 6, 2016
37a6262
android: fixes for ndk > 10
arturoc Oct 6, 2016
caf3fc3
Merge branch 'refactor-remove_libs' of github.com:arturoc/openFramewo…
arturoc Oct 6, 2016
346f7aa
osx makefile: correctly exclude glut
arturoc Oct 6, 2016
9015940
android: fixes makefile flags
arturoc Oct 6, 2016
847a771
ios: remove poco data
arturoc Oct 6, 2016
6ec8d5d
osx: set min sdk version to 10.9
arturoc Oct 6, 2016
8d6ad13
tvos: remove poco data
arturoc Oct 6, 2016
176b953
tvos: remove poco data
arturoc Oct 7, 2016
a037205
android: fix x86
arturoc Oct 7, 2016
8c546b8
osx: remove poco data and glut
arturoc Oct 7, 2016
e215ca0
merge linux download libs in one script that detects platform
arturoc Oct 7, 2016
afc3d34
Merge branch 'refactor-remove_libs' of github.com:arturoc/openFramewo…
arturoc Oct 7, 2016
49d119e
fix download_libs call from travis
arturoc Oct 7, 2016
88039b9
travis: trying to use xcode 8 to fix tests crashing in osx
arturoc Oct 7, 2016
d760097
osx: raise min sdk version to 10.9
arturoc Oct 7, 2016
152e7b4
qtcreator: osx, raise min version to 10.9
arturoc Oct 7, 2016
536c7c7
osx don't run tests under gdb, seems to be failing after libs from tr…
arturoc Oct 7, 2016
317138a
download libs: fix parameters
arturoc Oct 7, 2016
05d2723
ofxGui test: removed since it was allocating textures without GL context
arturoc Oct 7, 2016
1efbb3c
better arguments parsing for download_libs
arturoc Oct 8, 2016
0eda9ff
ci: build ios and tvos for device target
arturoc Oct 8, 2016
07d276d
ios & tvos back to simulator, device requires signing
arturoc Oct 8, 2016
e048d03
tvOS: fix utf8 search path
arturoc Oct 8, 2016
13ca32a
README: explanation about external dependencies downloading
arturoc Oct 8, 2016
acbd8cf
download libs: smarter common script
arturoc Oct 9, 2016
ee1603f
fix travis for new download_libs syntax
arturoc Oct 9, 2016
0ea3735
fix download_libs scripts
arturoc Oct 9, 2016
b53f9a2
fix appveyor for new download_libs syntax
arturoc Oct 9, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
29 changes: 17 additions & 12 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,32 +11,40 @@ environment:

#VisualStudio Building
- platform: x86
BUILDER : VS
BUILDER : VS
BITS: 32
- platform: x64
BUILDER : VS

BUILDER : VS
BITS: 64

configuration: Debug
shallow_clone: true
clone_depth: 10
clone_depth: 10

init:
- set MSYS2_PATH=c:\msys64
- set CHERE_INVOKING=1
- '%MSYS2_PATH%\usr\bin\bash -lc "pacman --noconfirm -Sy pacman"'
- '%MSYS2_PATH%\usr\bin\bash -lc "pacman --noconfirm -Syuu"'
#- '%MSYS2_PATH%\usr\bin\bash -lc "pacman --noconfirm -Sy pacman"'
#- '%MSYS2_PATH%\usr\bin\bash -lc "pacman --noconfirm -Syuu"'
- if "%BUILDER%_%PLATFORM%"=="MSYS2_x86" set MSYSTEM=MINGW32
- if "%BUILDER%_%PLATFORM%"=="MSYS2_x64" set MSYSTEM=MINGW64
- '%MSYS2_PATH%\usr\bin\bash -lc "pacman --noconfirm -S --needed tar"'
- '%MSYS2_PATH%\usr\bin\bash -lc "pacman --noconfirm -S --needed unzip"'


- IF "%BUILDER%"=="VS" set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%

install:
#- ps: |
# if ($env:BUILDER -eq "VS") {
# .\scripts\vs\download_libs.ps1
# }
- if "%BUILDER%"=="VS" (%MSYS2_PATH%\usr\bin\bash -lc "scripts/vs/download_libs.sh")
- if "%BUILDER%"=="MSYS2" (%MSYS2_PATH%\usr\bin\bash -lc "scripts/msys2/install_dependencies.sh --noconfirm")
- if "%BUILDER%"=="MSYS2" (%MSYS2_PATH%\usr\bin\bash -lc "scripts/msys2/download_libs.sh")

build_script:
- if "%BUILDER%"=="MSYS2" (%MSYS2_PATH%\usr\bin\bash -lc "scripts/ci/msys2/build.sh")

- ps: |
if ($env:BUILDER -eq "VS") {
msbuild libs/openFrameworksCompiled/project/vs/openframeworksLib.vcxproj /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
Expand All @@ -49,6 +57,3 @@ test_script:
cd scripts/ci/vs
.\run_tests.bat
}

cache:
- C:\msys64
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ addons/*
# see apps/.gitignore
apps/*

# rule to ignore compiled / downloaded libs
/libs/*
!/libs/openFrameworks
!/libs/openFrameworksCompiled

# also, see examples/.gitignore

#########################
Expand Down Expand Up @@ -128,4 +133,3 @@ Desktop.ini

.mailmap
/apps*/

25 changes: 22 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,30 +45,37 @@ matrix:
- libstdc++6

- os: osx
osx_image: xcode8
compiler: clang
env: TARGET="osx"


- os: osx
osx_image: xcode7.1
osx_image: xcode8
compiler: clang
env: TARGET="ios"


- os: osx
osx_image: xcode8
compiler: clang
env: TARGET="tvos"


- os: linux
sudo: false
env: TARGET="android" OPT="armv7"
cache:
directories:
- ~/android-ndk-r10e
- ~/android-ndk-r12b


- os: linux
sudo: false
env: TARGET="android" OPT="x86"
cache:
directories:
- ~/android-ndk-r10e
- ~/android-ndk-r12b


# Exclude the default build that would otherwise be generated
Expand All @@ -80,6 +87,18 @@ install:
- if [ "$TARGET" == "android" ] || [ "$TARGET" == "linux" ] || [ "$TARGET" == "linuxarmv6" ] || [ "$TARGET" == "linuxarmv7" ] || [ "$TARGET" == "docs" ] || [ "$TARGET" == "osx" ] || [ "$TARGET" == "emscripten" ]; then
scripts/ci/$TARGET/install.sh;
fi
- if [ "$TARGET" == "linux" ]; then
scripts/linux/download_libs.sh -a 64;
elif [ "$TARGET" == "linuxarmv6" ]; then
scripts/linux/download_libs.sh -a armv6l;
elif [ "$TARGET" == "linuxarmv7" ]; then
scripts/linux/download_libs.sh -a armv7l;
elif [ "$TARGET" == "tvos" ]; then
scripts/ios/download_libs.sh;
else
scripts/$TARGET/download_libs.sh;
fi


script:
- scripts/ci/$TARGET/build.sh $OPT
Expand Down
13 changes: 7 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Visual studio [![Build status](https://ci.appveyor.com/api/projects/status/sm9jx
folder structure
--------

This release of OF comes with several folders:
This release of OF comes with several folders:

* addons
* apps
Expand All @@ -41,30 +41,31 @@ The openframeworks forum:

is a warm and friendly place. Please ask or answer a question. The most important part of this project is that it's a community, more than just a tool, so please join us! Also, this is free software, and we learn so much about what is hard, what doesn't make sense, what is useful, etc. The most basic questions are acceptable here! Don't worry, just join the conversation. Learning in OF is social, it's hard to do it alone, but together we can get far!

Our github site is active:
Our github site is active:

[https://github.com/openframeworks/openFrameworks](https://github.com/openframeworks/openFrameworks)

if you have bugs or feature requests, consider opening an issue. If you are a developer and want to help, pull requests are warmly welcome. Please read the contributing guide for guidelines:
if you have bugs or feature requests, consider opening an issue. If you are a developer and want to help, pull requests are warmly welcome. Please read the contributing guide for guidelines:

[https://github.com/openframeworks/openFrameworks/blob/master/CONTRIBUTING.md](https://github.com/openframeworks/openFrameworks/blob/master/CONTRIBUTING.md
)

We also have a developer's mailing list, which is useful for discussing issues around the development and future of OF.
We also have a developer's mailing list, which is useful for discussing issues around the development and future of OF.


Developers
------

To grab a copy of openFrameworks for your platform, check the [download page](http://openframeworks.cc/download) on the main site.

If you are working with the Git repository, the `stable` branch of the OF repository corresponds to the most recent release, with a few important differences:

1. The release includes a simple openFrameworks project generator.
2. This GitHub repository contains code and libs for all the platforms, but the releases are done on a per-platform basis.
3. This GitHub repository has no project files for the different examples. They are generated automatically for each release using a tool in `apps/devApps/projectGenerator/`.
4. There's no external dependencies in this repository, you can download them using the download_libs.sh script for each platform in the particular platform folder inside scripts.

If you want to work with the openFrameworks GitHub repository, you should use the project generator to create project files for all the code in `examples/`. To generate the project files with the project generator enable the 'Advanced Options' in the settings tab, then use 'Update Multiple' to update the projects for the `examples/` folder path in the repo.
If you want to work with the openFrameworks GitHub repository, you need to download the external dependencies and you should use the project generator to create project files for all the code in `examples/`. To generate the project files with the project generator enable the 'Advanced Options' in the settings tab, then use 'Update Multiple' to update the projects for the `examples/` folder path in the repo.

To set up the project generator submodule within the OF repo, use the command `git submodule init` then `git submodule update` whilst inside the openFrameworks repo.

Expand Down
5 changes: 1 addition & 4 deletions examples/graphics/polygonExample/src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,9 @@

//========================================================================
int main( ){

ofSetupOpenGL(1024,768, OF_WINDOW); // <-------- setup the GL context

ofSetupOpenGL(1024,768, OF_WINDOW); // <-------- setup the GL context
// this kicks off the running of my app
// can be OF_WINDOW or OF_FULLSCREEN
// pass in width and height too:
ofRunApp( new ofApp());

}
Loading