From 2fd4af6e53bd674d088e23c5452d5db2f505d150 Mon Sep 17 00:00:00 2001 From: LeoColomb Date: Tue, 26 Mar 2013 21:32:39 +0100 Subject: [PATCH 01/10] Remove unusefull file --- apps/_Examples_Moved.txt | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 apps/_Examples_Moved.txt diff --git a/apps/_Examples_Moved.txt b/apps/_Examples_Moved.txt deleted file mode 100644 index cba21efbd43..00000000000 --- a/apps/_Examples_Moved.txt +++ /dev/null @@ -1,20 +0,0 @@ -From 0071 onwards examples are now located in the root of OF at examples/ -This folder will remain as a place to work on your own apps. -Just remember projects in apps/ still need to be two levels deep. - -So: - -apps/ - mySoundApp/ - -will not work - - -apps/ - soundApps/ - mySoundApp/ - miscApps/ - experiments/ - -will work - From 30e89b3b617dfce10e385fd0ef1ddffc90970cf2 Mon Sep 17 00:00:00 2001 From: LeoColomb Date: Tue, 26 Mar 2013 21:32:56 +0100 Subject: [PATCH 02/10] Missing serial link --- docs/table_of_contents.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/table_of_contents.md b/docs/table_of_contents.md index 08a8103f412..1b9974a1e9f 100644 --- a/docs/table_of_contents.md +++ b/docs/table_of_contents.md @@ -20,6 +20,7 @@ Usage About ----- * [Libraries](libraries.md) — Details about libraries. +* [Serial](serial.md) — Details about serial communication. More ---- From 018e4cd6b602527048a61df319b3375ecf9543db Mon Sep 17 00:00:00 2001 From: LeoColomb Date: Tue, 26 Mar 2013 21:33:24 +0100 Subject: [PATCH 03/10] Move export explanations in docs --- docs/linux.md | 7 +++++++ export/linux/readMe.txt | 17 ----------------- export/linux64/readMe.txt | 17 ----------------- 3 files changed, 7 insertions(+), 34 deletions(-) delete mode 100644 export/linux/readMe.txt delete mode 100644 export/linux64/readMe.txt diff --git a/docs/linux.md b/docs/linux.md index 77b92e824c5..a95cb53cec9 100644 --- a/docs/linux.md +++ b/docs/linux.md @@ -151,5 +151,12 @@ issues, if you have some problem please post in the forum as much info as possible. +Libs +---- +The `export/` folder contains necessary components that need to be exported with the application: +contains .so (shared objects) that the app needs to run against this allows OF linux apps to be released in a very portable way +users of the apps shouldn't need to install anything besides glut (which should be installed in most cases). + + many thanks!! OFteam diff --git a/export/linux/readMe.txt b/export/linux/readMe.txt deleted file mode 100644 index 0131b586420..00000000000 --- a/export/linux/readMe.txt +++ /dev/null @@ -1,17 +0,0 @@ - -OF linux: - -this folder contains necessary components that need to be exported with the application: - -libs ------- contains .so (shared objects) that the app needs to run against ------- this allows OF linux apps to be released in a very portable way ------- users of the apps shouldn't need to install anything besides glut ------- (which should be installed in most cases) - -clickToLaunchApp.sh ------- a shell script which runs the exe and set this variable: ------- LD_LIBRARY_PATH, so that the app looks locally for the .so ------- (shared objects) to run - - diff --git a/export/linux64/readMe.txt b/export/linux64/readMe.txt deleted file mode 100644 index 0131b586420..00000000000 --- a/export/linux64/readMe.txt +++ /dev/null @@ -1,17 +0,0 @@ - -OF linux: - -this folder contains necessary components that need to be exported with the application: - -libs ------- contains .so (shared objects) that the app needs to run against ------- this allows OF linux apps to be released in a very portable way ------- users of the apps shouldn't need to install anything besides glut ------- (which should be installed in most cases) - -clickToLaunchApp.sh ------- a shell script which runs the exe and set this variable: ------- LD_LIBRARY_PATH, so that the app looks locally for the .so ------- (shared objects) to run - - From 890e6c62d7ac330cd48b6d2d62c3a938b4e390e6 Mon Sep 17 00:00:00 2001 From: LeoColomb Date: Thu, 28 Mar 2013 19:05:36 +0100 Subject: [PATCH 04/10] Unify uncapitalized titles --- scripts/dev/ci.template | 2 +- scripts/dev/nightlybuilds.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/dev/ci.template b/scripts/dev/ci.template index b51e764e15a..acaeba7c7f5 100644 --- a/scripts/dev/ci.template +++ b/scripts/dev/ci.template @@ -1,3 +1,3 @@ -

Continuous Integration

+

continuous integration

This page shows the results of a daily compile of openFrameworks and all the examples. If you see any error or warning and want to fix it, use github to send us a pull request with your changes

This tests are being run on linux 64bit so other platforms could have different errors/warnings even if they don't appear here

diff --git a/scripts/dev/nightlybuilds.template b/scripts/dev/nightlybuilds.template index 6e86307d117..e7d8597473e 100644 --- a/scripts/dev/nightlybuilds.template +++ b/scripts/dev/nightlybuilds.template @@ -1,4 +1,4 @@ -

Nightly builds

+

nightly builds

Here you can find a daily build of the develop branch of openFrameworks. This downloads can be unstable, if you want the latest stable release look in the downloads page

Latest Nightly

From 73275a193efe39b382ca03956e4cf2e670ac1881 Mon Sep 17 00:00:00 2001 From: LeoColomb Date: Thu, 28 Mar 2013 19:06:25 +0100 Subject: [PATCH 05/10] Bad source for javascript on head template --- scripts/dev/head.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/dev/head.template b/scripts/dev/head.template index 873690273c1..80b156b1408 100644 --- a/scripts/dev/head.template +++ b/scripts/dev/head.template @@ -2,7 +2,7 @@ - + From 04b92ba1a897af572334549d3795260c16d1fed7 Mon Sep 17 00:00:00 2001 From: LeoColomb Date: Thu, 28 Mar 2013 19:07:44 +0100 Subject: [PATCH 06/10] Improve create_package docs ref CodeBlocks link didn't get anything --- scripts/dev/create_package.sh | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/scripts/dev/create_package.sh b/scripts/dev/create_package.sh index 7f8922b114f..35f252495c8 100755 --- a/scripts/dev/create_package.sh +++ b/scripts/dev/create_package.sh @@ -378,11 +378,11 @@ function createPackage { #download and copy OF compiled - cd $pkg_ofroot/libs/openFrameworksCompiled/lib/${pkg_platform} - if [ "$pkg_platform" = "win_cb" ]; then - wget http://openframeworks.cc/git_pkgs/OF_compiled/${pkg_platform}/openFrameworks.lib - wget http://openframeworks.cc/git_pkgs/OF_compiled/${pkg_platform}/openFrameworksDebug.lib - fi + #cd $pkg_ofroot/libs/openFrameworksCompiled/lib/${pkg_platform} + #if [ "$pkg_platform" = "win_cb" ]; then + # wget http://openframeworks.cc/git_pkgs/OF_compiled/${pkg_platform}/openFrameworks.lib + # wget http://openframeworks.cc/git_pkgs/OF_compiled/${pkg_platform}/openFrameworksDebug.lib + #fi #if snow leopard change 10.4u to 10.5 @@ -396,28 +396,25 @@ function createPackage { #choose readme cd $pkg_ofroot if [ "$platform" = "linux" ] || [ "$platform" = "linux64" ]; then - mv docs/linux.md readme + cp docs/linux.md INSTALL.md fi if [ "$platform" = "vs" ]; then - mv docs/visualstudio.md readme + cp docs/visualstudio.md INSTALL.md fi if [ "$platform" = "win_cb" ]; then - mv docs/codeblocks.md readme + cp docs/codeblocks.md INSTALL.md fi if [ "$platform" = "osx" ] || [ "$platform" = "ios" ]; then - mv docs/osx.md readme + cp docs/osx.md INSTALL.md fi if [ "$platform" = "android" ]; then - mv docs/android.md readme + cp docs/android.md INSTALL.md fi - rm readme.* - mv readme readme.txt - rm CONTRIBUTING.md #copy empty example From 0f030c24503a78e831f6c270471985fecd6eaa5a Mon Sep 17 00:00:00 2001 From: LeoColomb Date: Thu, 28 Mar 2013 19:24:54 +0100 Subject: [PATCH 07/10] create_package clean up osxSL is not anymore a platform for building --- scripts/dev/create_package.sh | 34 ++++------------------------------ 1 file changed, 4 insertions(+), 30 deletions(-) diff --git a/scripts/dev/create_package.sh b/scripts/dev/create_package.sh index 35f252495c8..90afccd543a 100755 --- a/scripts/dev/create_package.sh +++ b/scripts/dev/create_package.sh @@ -1,5 +1,5 @@ #!/bin/bash -# $1 -> platform: win_cb, linux, linux64, vs, osx, osxSL, ios, all +# $1 -> platform: win_cb, linux, linux64, vs, osx, ios, all # $2 -> version number: 006 platform=$1 @@ -15,12 +15,6 @@ PG_BRANCH=master hostArch=`uname` -#if [ "$platform" = "osxSL" ]; then -# platform="osx" -# runOSXSLScript=1 -# echo "will make changes for snow leopard" -#fi - if [ "$platform" != "win_cb" ] && [ "$platform" != "linux" ] && [ "$platform" != "linux64" ] && [ "$platform" != "vs" ] && [ "$platform" != "osx" ] && [ "$platform" != "android" ] && [ "$platform" != "ios" ] && [ "$platform" != "all" ]; then echo usage: echo ./create_package.sh platform version @@ -33,7 +27,7 @@ if [ "$version" == "" ]; then echo usage: echo ./create_package.sh platform version echo platform: - echo win_cb, linux, linux64, vs, osx, android, all + echo win_cb, linux, linux64, vs, osx, android, ios, all exit 1 fi @@ -123,12 +117,8 @@ function createPackage { #remove previously created package cd $pkg_ofroot/.. - #if [ $runOSXSLScript = 1 ]; then - # rm -Rf of_v${pkg_version}_osxSL* - #else - rm -Rf of_v${pkg_version}_${pkg_platform}.* - rm -Rf of_v${pkg_version}_${pkg_platform}_* - #fi + rm -Rf of_v${pkg_version}_${pkg_platform}.* + rm -Rf of_v${pkg_version}_${pkg_platform}_* echo "creating package $pkg_platform $version in $pkg_ofroot" #remove devApps folder @@ -377,22 +367,6 @@ function createPackage { fi - #download and copy OF compiled - #cd $pkg_ofroot/libs/openFrameworksCompiled/lib/${pkg_platform} - #if [ "$pkg_platform" = "win_cb" ]; then - # wget http://openframeworks.cc/git_pkgs/OF_compiled/${pkg_platform}/openFrameworks.lib - # wget http://openframeworks.cc/git_pkgs/OF_compiled/${pkg_platform}/openFrameworksDebug.lib - #fi - - - #if snow leopard change 10.4u to 10.5 - #if [ $runOSXSLScript = 1 ]; then - # cd $pkg_ofroot - # echo "replacing 10.4u with 10.5 for snow leopard" - # find . -name '*.pbxproj' | xargs perl -pi -e 's/10\.4u/10\.5/g' - # pkg_platform="osxSL" - #fi - #choose readme cd $pkg_ofroot if [ "$platform" = "linux" ] || [ "$platform" = "linux64" ]; then From 6d538e129194a81c03be10e152e1195fb0fb3020 Mon Sep 17 00:00:00 2001 From: LeoColomb Date: Sat, 30 Mar 2013 17:55:53 +0100 Subject: [PATCH 08/10] .o files already ignored --- other/serialTest/.gitignore | 4 ---- 1 file changed, 4 deletions(-) diff --git a/other/serialTest/.gitignore b/other/serialTest/.gitignore index 2e65cd92572..49374e291f2 100644 --- a/other/serialTest/.gitignore +++ b/other/serialTest/.gitignore @@ -1,7 +1,3 @@ -# applet/serialTest.cpp.eep applet/serialTest.cpp.elf applet/serialTest.cpp.hex - -# Building files -*.o \ No newline at end of file From 8141c59be07650381a1cb00645969fbd339ebb37 Mon Sep 17 00:00:00 2001 From: LeoColomb Date: Sat, 30 Mar 2013 17:56:34 +0100 Subject: [PATCH 09/10] _Examples_Moved.txt moved in docomentation --- apps/.gitignore | 2 -- 1 file changed, 2 deletions(-) diff --git a/apps/.gitignore b/apps/.gitignore index 0c0ebb42258..c7e18914dd9 100644 --- a/apps/.gitignore +++ b/apps/.gitignore @@ -9,8 +9,6 @@ /devApps/*/.project /devApps/*/.settings/ -!_Examples_Moved.txt - # don't ignore the .gitignore file !.gitignore From 601cb04fdd693f3cb6b721e7a6c8be029b8e7e9a Mon Sep 17 00:00:00 2001 From: LeoColomb Date: Sat, 30 Mar 2013 17:57:40 +0100 Subject: [PATCH 10/10] Be sure all build's files are ignored --- .gitignore | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f7995cde870..4ce79987e7b 100644 --- a/.gitignore +++ b/.gitignore @@ -17,11 +17,11 @@ apps/* # Some general ignore patterns -build/ -obj/ +[Bb]uild/ +[Oo]bj/ *.o -Debug*/ -Release*/ +[Dd]ebug*/ +[Rr]elease*/ *.mode* *.app/ *.pyc @@ -48,6 +48,8 @@ xcuserdata *.opensdf *.suo *.pdb +*.ilk +*.aps ipch/ #Eclipse