Merge branch 'feature-realsense'

.gitignore

@@ -11,3 +11,6 @@ build
 /papart-complete.tgz
 /PapARt.tgz
 /big-files/
+/Papart-examples-master/
+/Papart-examples/
+*.tgz

build.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+cd papart
+mvn install
+mvn javadoc:javadoc

createAll.rb

@@ -0,0 +1,23 @@
+#!/bin/ruby
+# coding: utf-8
+
+
+# %x(sh downloadExamples.sh)
+
+current_branch = %x(git rev-parse --abbrev-ref HEAD).chomp
+
+output_names=["realsense",
+              "kinect",
+              "hardware2",
+              "hardware3"]
+
+output_names.each do |release_name|
+  puts "Get the version: " + release_name
+  %x(git checkout release-#{release_name})
+  puts "Build it."
+  %x(sh build.sh)  
+  puts "Create redistribuable."
+  %x(sh createRedist.sh #{release_name}) 
+end
+
+%x(git checkout #{current_branch})

createRedist.sh

@@ -1,34 +1,21 @@
 #!/bin/bash
 
-SKETCHBOOK=sketches
 TMP=tmp
 NAME=PapARt
+VERSION=$1
 
 ## NAME must match
-## fr.inria.papart.procam.Utils.LibraryName = "ProCam";
-
+## fr.inria.papart.procam.Utils.LibraryName = "PapARt"
 
 mkdir $TMP
 mkdir $TMP/$NAME
 mkdir $TMP/$NAME/library
 mkdir $TMP/$NAME/examples
 
-
-echo "Cleaning previous versions"
-rm -rf libraries/$NAME
-echo "Create archive of depedencies"
-tar -zcf libs.tgz libraries
-
 echo "Copy Library"
 # Library
 cp papart/target/$NAME.jar $TMP/$NAME/library/$NAME.jar
 
-
-# echo "Copy JavaCV, OpenCV and friends"
-# libs are  javaCV and javaCV cppjars
-# cp libs/* $NAME/library/
-
-
 echo "Copy the sources"
 # copy the source also
 cp -R papart/src $TMP/$NAME/
@@ -41,43 +28,18 @@ cp -R papart/target/site/apidocs $TMP/$NAME/
 echo "Copy the Data"
 cp -R papart/data $TMP/$NAME/
 
-
-echo "Download the examples"
-wget https://github.com/potioc/Papart-examples/archive/master.zip
-unzip master.zip
-
-mv Papart-examples-master/apps $TMP/$NAME/examples/
-mv Papart-examples-master/papart-examples $TMP/$NAME/examples/
-
-echo "cleaning the examples"
-rm master.zip
-rm -rf Papart-examples-master
-
-
-# Calibration stuff
-# cp -R sketches/calibration $TMP/$NAME/examples/calib
-
-# Now working with github examples and apps.
-
-# echo "Copy Examples, Calibration & Apps"
-# Examples
-# cp -R sketches/examples $TMP/$NAME/examples/examples
-# Apps
-# cp -R sketches/apps $TMP/$NAME/examples/apps
+echo "Copy the examples"
+cp -R Papart-examples/apps $TMP/$NAME/examples/
+cp -R Papart-examples/papart-examples $TMP/$NAME/examples/
 
 echo "Create the archive..."
 cd $TMP
 
-tar -zcf $NAME.tgz $NAME
+tar -zcf $NAME-$VERSION.tgz $NAME
 
-mv $NAME.tgz  ..
+mv $NAME-$VERSION.tgz  ..
 cd ..
 
-cp -r $TMP/$NAME libraries/
-
-echo "Create full archive : Papart & Deps"
-tar -zcf papart-complete.tgz libraries
-
 echo "Clean "
 rm -rf $TMP
 

deps/.gitignore

@@ -0,0 +1,2 @@
+/libraries/
+*.tgz

deps/getLibs.sh

@@ -0,0 +1,78 @@
+#!/bin/bash
+
+
+mkdir libraries
+
+echo "Get Toxiclibs"
+
+wget https://bitbucket.org/postspectacular/toxiclibs/downloads/toxiclibs-complete-0020.zip
+
+unzip toxiclibs-complete-0020.zip
+mv audioutils libraries/
+mv colorutils libraries/
+mv datautils libraries/
+mv simutils libraries/
+mv toxiclibscore libraries/
+mv toxiclibs_p5 libraries/
+mv verletphysics libraries/
+mv volumeutils libraries/
+
+echo "Get SVGExtended"
+wget https://github.com/Rea-lity-Tech/SVGExtended/releases/download/2.3.1/SVGExtended.tgz 
+
+tar xvzf SVGExtended.tgz 
+mv SVGExtended libraries/
+
+echo "Get Processing Video"
+#wget https://github.com/processing/processing-video/releases/download/latest/video.zip
+
+unzip video.zip
+unzip video
+mv video libraries/
+
+
+echo "Get Processing TUIO" 
+wget https://github.com/poqudrof/ProcessingTUIO/releases/download/0.5/processingTUIO.tgz
+
+tar xvzf processingTUIO.tgz 
+mv processingTUIO libraries/
+
+
+echo "Get OSCP5"
+wget http://www.sojamo.de/libraries/oscP5/download/oscP5-0.9.8.zip
+
+unzip oscP5-0.9.8.zip
+mv oscP5 libraries/
+
+echo "Get Skatolo"
+wget https://github.com/poqudrof/Skatolo/releases/download/1.0.1/skatolo.tgz
+
+tar xvzf skatolo.tgz
+mv skatolo libraries/
+
+echo "Get Gui Modes"
+wget https://github.com/poqudrof/guiModes/releases/download/0.5/guiModes.tgz
+
+tar xvzf guiModes.tgz
+mv guiModes libraries/
+
+echo "get Peasycam"
+wget http://mrfeinberg.com/peasycam/peasycam_202.zip
+unzip peasycam_202.zip
+mv peasycam libraries/
+
+echo "Compile reflections"
+cd reflections-build
+ruby createLibs.rb
+cp reflections.tgz ..
+cd ..
+tar xvzf reflections.tgz
+mv reflections libraries/
+
+echo "Compile JavaCV"
+cd javacv-build
+ruby createLibs.rb
+mv javacv-*.tgz ..
+
+echo "compile all"
+zip -r libraries.zip libraries

deps/javacv-build/.gitignore

@@ -0,0 +1 @@
+*.tgz

deps/javacv-build/createLibs.rb

@@ -0,0 +1,36 @@
+#!/bin/ruby
+
+
+platforms = ["linux", "windows"]
+archs = ["x86_64", "x86"]
+
+
+def build(platform, arch)
+
+  puts "Build " + platform
+  %x(cp pom-#{platform}.xml pom.xml)
+
+  puts "Get the library"
+
+  %x(mvn -Dplatform=#{platform}-#{arch} dependency:copy-dependencies)
+
+  %x(rm target/dependency/*linux*)   if platform.eql? "windows"
+
+  `mv target/dependency target/library`
+  `mv target javacv`
+  `mv javacv/library/javacv-1.3.jar javacv/library/javacv.jar`
+
+  puts "compress library"
+  `tar -zcf javacv-#{platform}-#{arch}.tgz javacv`
+  `rm -rf javacv`
+
+  puts "done javacv-" + platform + "-" + arch
+
+  %x(rm pom.xml)
+end
+
+build("linux", "x86_64")
+build("windows", "x86_64")
+build("windows", "x86")
+
+# mvn -Dplatform=windows-x86_64 dependency:copy-dependencies