diff --git a/android/scripts/package.sh b/android/scripts/package.sh index 087b4b7fc..c2593936e 100644 --- a/android/scripts/package.sh +++ b/android/scripts/package.sh @@ -79,7 +79,7 @@ do fi done -echo "OPENCV_MK_PATH:=../../opencv$CV_VERSION/share/OpenCV/OpenCV.mk" > includeOpenCV.mk +echo "OPENCV_MK_PATH:=../../$OPENCV_NAME/share/OpenCV/OpenCV.mk" > includeOpenCV.mk #clean samples diff --git a/modules/java/android/.project b/modules/java/android/.project index 61ce0dfa3..97b71b63a 100644 --- a/modules/java/android/.project +++ b/modules/java/android/.project @@ -1,6 +1,6 @@ - opencv2.3.1 + OpenCV-2.3.1 diff --git a/modules/java/android/AndroidManifest.xml b/modules/java/android/AndroidManifest.xml index 8e50bf158..acef991ee 100644 --- a/modules/java/android/AndroidManifest.xml +++ b/modules/java/android/AndroidManifest.xml @@ -3,9 +3,9 @@ package="org.opencv" android:versionCode="1" android:versionName="1.0"> - - + + diff --git a/samples/android/0-base/res/values/strings.xml b/samples/android/0-base/res/values/strings.xml deleted file mode 100644 index 772538e14..000000000 --- a/samples/android/0-base/res/values/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - Sample 0: base - diff --git a/samples/android/1-java/res/values/strings.xml b/samples/android/1-java/res/values/strings.xml deleted file mode 100644 index 32aa7c31c..000000000 --- a/samples/android/1-java/res/values/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - Sample 1: Java API - diff --git a/samples/android/CMakeLists.txt b/samples/android/CMakeLists.txt index 699c5446b..9a389cfb8 100644 --- a/samples/android/CMakeLists.txt +++ b/samples/android/CMakeLists.txt @@ -40,7 +40,7 @@ if (BUILD_ANDROID_EXAMPLES) file(RELATIVE_PATH OPENCV_REFERENCE_PATH "${sample_dir}" "${CMAKE_BINARY_DIR}") - if(NOT ("${sample}" STREQUAL "0-base" OR "${sample}" STREQUAL "2-native")) + if(NOT ("${sample}" MATCHES "tutorial-[03].*")) SET(opencv_reference --library \"${OPENCV_REFERENCE_PATH}\") else() SET(opencv_reference) diff --git a/samples/android/0-base/.classpath b/samples/android/tutorial-0-androidcamera/.classpath similarity index 100% rename from samples/android/0-base/.classpath rename to samples/android/tutorial-0-androidcamera/.classpath diff --git a/samples/android/0-base/.project b/samples/android/tutorial-0-androidcamera/.project similarity index 90% rename from samples/android/0-base/.project rename to samples/android/tutorial-0-androidcamera/.project index d828d75c0..61dd3d526 100644 --- a/samples/android/0-base/.project +++ b/samples/android/tutorial-0-androidcamera/.project @@ -1,6 +1,6 @@ - Sample 0 base + Tutorial 1 Basic - 0. Android Camera diff --git a/samples/android/0-base/.settings/org.eclipse.jdt.core.prefs b/samples/android/tutorial-0-androidcamera/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from samples/android/0-base/.settings/org.eclipse.jdt.core.prefs rename to samples/android/tutorial-0-androidcamera/.settings/org.eclipse.jdt.core.prefs diff --git a/samples/android/0-base/AndroidManifest.xml b/samples/android/tutorial-0-androidcamera/AndroidManifest.xml similarity index 96% rename from samples/android/0-base/AndroidManifest.xml rename to samples/android/tutorial-0-androidcamera/AndroidManifest.xml index 3e07ce585..ddfcd5a61 100644 --- a/samples/android/0-base/AndroidManifest.xml +++ b/samples/android/tutorial-0-androidcamera/AndroidManifest.xml @@ -1,6 +1,6 @@ diff --git a/samples/android/0-base/default.properties b/samples/android/tutorial-0-androidcamera/default.properties similarity index 100% rename from samples/android/0-base/default.properties rename to samples/android/tutorial-0-androidcamera/default.properties diff --git a/samples/android/0-base/res/drawable/icon.png b/samples/android/tutorial-0-androidcamera/res/drawable/icon.png similarity index 100% rename from samples/android/0-base/res/drawable/icon.png rename to samples/android/tutorial-0-androidcamera/res/drawable/icon.png diff --git a/samples/android/tutorial-0-androidcamera/res/values/strings.xml b/samples/android/tutorial-0-androidcamera/res/values/strings.xml new file mode 100644 index 000000000..0423b8c67 --- /dev/null +++ b/samples/android/tutorial-0-androidcamera/res/values/strings.xml @@ -0,0 +1,4 @@ + + + Tutorial 1 Basic - 0. Android Camera + diff --git a/samples/android/0-base/src/org/opencv/samples/s0/Sample0Base.java b/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/s0/Sample0Base.java similarity index 97% rename from samples/android/0-base/src/org/opencv/samples/s0/Sample0Base.java rename to samples/android/tutorial-0-androidcamera/src/org/opencv/samples/s0/Sample0Base.java index 7aebe3e20..f49b3587d 100644 --- a/samples/android/0-base/src/org/opencv/samples/s0/Sample0Base.java +++ b/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/s0/Sample0Base.java @@ -1,4 +1,4 @@ -package org.opencv.samples.s0; +package org.opencv.samples.tutorial0; import android.app.Activity; import android.os.Bundle; diff --git a/samples/android/0-base/src/org/opencv/samples/s0/Sample0View.java b/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/s0/Sample0View.java similarity index 98% rename from samples/android/0-base/src/org/opencv/samples/s0/Sample0View.java rename to samples/android/tutorial-0-androidcamera/src/org/opencv/samples/s0/Sample0View.java index 165a61a80..b16723016 100644 --- a/samples/android/0-base/src/org/opencv/samples/s0/Sample0View.java +++ b/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/s0/Sample0View.java @@ -1,4 +1,4 @@ -package org.opencv.samples.s0; +package org.opencv.samples.tutorial0; import android.content.Context; import android.graphics.Bitmap; diff --git a/samples/android/1-java/src/org/opencv/samples/s1/SampleViewBase.java b/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/s0/SampleViewBase.java similarity index 99% rename from samples/android/1-java/src/org/opencv/samples/s1/SampleViewBase.java rename to samples/android/tutorial-0-androidcamera/src/org/opencv/samples/s0/SampleViewBase.java index 5671f029d..837f9f118 100644 --- a/samples/android/1-java/src/org/opencv/samples/s1/SampleViewBase.java +++ b/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/s0/SampleViewBase.java @@ -1,4 +1,4 @@ -package org.opencv.samples.s1; +package org.opencv.samples.tutorial0; import java.util.List; diff --git a/samples/android/3-nativecamera/.classpath b/samples/android/tutorial-1-addopencv/.classpath similarity index 83% rename from samples/android/3-nativecamera/.classpath rename to samples/android/tutorial-1-addopencv/.classpath index da04f5de0..a0a90f9b1 100644 --- a/samples/android/3-nativecamera/.classpath +++ b/samples/android/tutorial-1-addopencv/.classpath @@ -3,6 +3,6 @@ - + diff --git a/samples/android/1-java/.project b/samples/android/tutorial-1-addopencv/.project similarity index 85% rename from samples/android/1-java/.project rename to samples/android/tutorial-1-addopencv/.project index 45ba1a67c..47f794738 100644 --- a/samples/android/1-java/.project +++ b/samples/android/tutorial-1-addopencv/.project @@ -1,6 +1,6 @@ - Sample 1 Java API + Tutorial 1 Basic - 1. Add OpenCV @@ -32,9 +32,9 @@ - opencv2.3.1_src + OpenCV-2.3.1_src 2 - _android_opencv2_3_1_d2471b5d/src + _android_OpenCV-2_3_1_d2471b5d/src diff --git a/samples/android/1-java/.settings/org.eclipse.jdt.core.prefs b/samples/android/tutorial-1-addopencv/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from samples/android/1-java/.settings/org.eclipse.jdt.core.prefs rename to samples/android/tutorial-1-addopencv/.settings/org.eclipse.jdt.core.prefs diff --git a/samples/android/1-java/AndroidManifest.xml b/samples/android/tutorial-1-addopencv/AndroidManifest.xml similarity index 96% rename from samples/android/1-java/AndroidManifest.xml rename to samples/android/tutorial-1-addopencv/AndroidManifest.xml index b0ccc9990..438f09624 100644 --- a/samples/android/1-java/AndroidManifest.xml +++ b/samples/android/tutorial-1-addopencv/AndroidManifest.xml @@ -1,6 +1,6 @@ diff --git a/samples/android/1-java/default.properties b/samples/android/tutorial-1-addopencv/default.properties similarity index 100% rename from samples/android/1-java/default.properties rename to samples/android/tutorial-1-addopencv/default.properties diff --git a/samples/android/1-java/res/drawable/icon.png b/samples/android/tutorial-1-addopencv/res/drawable/icon.png similarity index 100% rename from samples/android/1-java/res/drawable/icon.png rename to samples/android/tutorial-1-addopencv/res/drawable/icon.png diff --git a/samples/android/tutorial-1-addopencv/res/values/strings.xml b/samples/android/tutorial-1-addopencv/res/values/strings.xml new file mode 100644 index 000000000..04fe435d1 --- /dev/null +++ b/samples/android/tutorial-1-addopencv/res/values/strings.xml @@ -0,0 +1,4 @@ + + + Tutorial 1 Basic - 1. Add OpenCV + diff --git a/samples/android/1-java/src/org/opencv/samples/s1/Sample1Java.java b/samples/android/tutorial-1-addopencv/src/org/opencv/samples/s1/Sample1Java.java similarity index 98% rename from samples/android/1-java/src/org/opencv/samples/s1/Sample1Java.java rename to samples/android/tutorial-1-addopencv/src/org/opencv/samples/s1/Sample1Java.java index 67862b75d..2cf830008 100644 --- a/samples/android/1-java/src/org/opencv/samples/s1/Sample1Java.java +++ b/samples/android/tutorial-1-addopencv/src/org/opencv/samples/s1/Sample1Java.java @@ -1,4 +1,4 @@ -package org.opencv.samples.s1; +package org.opencv.samples.tutorial1; import android.app.Activity; import android.os.Bundle; diff --git a/samples/android/1-java/src/org/opencv/samples/s1/Sample1View.java b/samples/android/tutorial-1-addopencv/src/org/opencv/samples/s1/Sample1View.java similarity index 98% rename from samples/android/1-java/src/org/opencv/samples/s1/Sample1View.java rename to samples/android/tutorial-1-addopencv/src/org/opencv/samples/s1/Sample1View.java index 191aa6a9b..8420e8925 100644 --- a/samples/android/1-java/src/org/opencv/samples/s1/Sample1View.java +++ b/samples/android/tutorial-1-addopencv/src/org/opencv/samples/s1/Sample1View.java @@ -1,4 +1,4 @@ -package org.opencv.samples.s1; +package org.opencv.samples.tutorial1; import org.opencv.*; diff --git a/samples/android/0-base/src/org/opencv/samples/s0/SampleViewBase.java b/samples/android/tutorial-1-addopencv/src/org/opencv/samples/s1/SampleViewBase.java similarity index 99% rename from samples/android/0-base/src/org/opencv/samples/s0/SampleViewBase.java rename to samples/android/tutorial-1-addopencv/src/org/opencv/samples/s1/SampleViewBase.java index 8830e3662..e424859e9 100644 --- a/samples/android/0-base/src/org/opencv/samples/s0/SampleViewBase.java +++ b/samples/android/tutorial-1-addopencv/src/org/opencv/samples/s1/SampleViewBase.java @@ -1,4 +1,4 @@ -package org.opencv.samples.s0; +package org.opencv.samples.tutorial1; import java.util.List; diff --git a/samples/android/4-mixed/.classpath b/samples/android/tutorial-2-opencvcamera/.classpath similarity index 83% rename from samples/android/4-mixed/.classpath rename to samples/android/tutorial-2-opencvcamera/.classpath index da04f5de0..a0a90f9b1 100644 --- a/samples/android/4-mixed/.classpath +++ b/samples/android/tutorial-2-opencvcamera/.classpath @@ -3,6 +3,6 @@ - + diff --git a/samples/android/3-nativecamera/.project b/samples/android/tutorial-2-opencvcamera/.project similarity index 100% rename from samples/android/3-nativecamera/.project rename to samples/android/tutorial-2-opencvcamera/.project diff --git a/samples/android/2-native/.settings/org.eclipse.jdt.core.prefs b/samples/android/tutorial-2-opencvcamera/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from samples/android/2-native/.settings/org.eclipse.jdt.core.prefs rename to samples/android/tutorial-2-opencvcamera/.settings/org.eclipse.jdt.core.prefs diff --git a/samples/android/3-nativecamera/AndroidManifest.xml b/samples/android/tutorial-2-opencvcamera/AndroidManifest.xml similarity index 100% rename from samples/android/3-nativecamera/AndroidManifest.xml rename to samples/android/tutorial-2-opencvcamera/AndroidManifest.xml diff --git a/samples/android/3-nativecamera/default.properties b/samples/android/tutorial-2-opencvcamera/default.properties similarity index 100% rename from samples/android/3-nativecamera/default.properties rename to samples/android/tutorial-2-opencvcamera/default.properties diff --git a/samples/android/2-native/res/drawable/icon.png b/samples/android/tutorial-2-opencvcamera/res/drawable/icon.png similarity index 100% rename from samples/android/2-native/res/drawable/icon.png rename to samples/android/tutorial-2-opencvcamera/res/drawable/icon.png diff --git a/samples/android/3-nativecamera/res/values/strings.xml b/samples/android/tutorial-2-opencvcamera/res/values/strings.xml similarity index 100% rename from samples/android/3-nativecamera/res/values/strings.xml rename to samples/android/tutorial-2-opencvcamera/res/values/strings.xml diff --git a/samples/android/3-nativecamera/src/org/opencv/samples/s3/Sample3NativeCamera.java b/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/s3/Sample3NativeCamera.java similarity index 100% rename from samples/android/3-nativecamera/src/org/opencv/samples/s3/Sample3NativeCamera.java rename to samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/s3/Sample3NativeCamera.java diff --git a/samples/android/3-nativecamera/src/org/opencv/samples/s3/Sample3View.java b/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/s3/Sample3View.java similarity index 100% rename from samples/android/3-nativecamera/src/org/opencv/samples/s3/Sample3View.java rename to samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/s3/Sample3View.java diff --git a/samples/android/3-nativecamera/src/org/opencv/samples/s3/SampleViewBase.java b/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/s3/SampleViewBase.java similarity index 100% rename from samples/android/3-nativecamera/src/org/opencv/samples/s3/SampleViewBase.java rename to samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/s3/SampleViewBase.java diff --git a/samples/android/2-native/.classpath b/samples/android/tutorial-3-native/.classpath similarity index 100% rename from samples/android/2-native/.classpath rename to samples/android/tutorial-3-native/.classpath diff --git a/samples/android/2-native/.project b/samples/android/tutorial-3-native/.project similarity index 100% rename from samples/android/2-native/.project rename to samples/android/tutorial-3-native/.project diff --git a/samples/android/3-nativecamera/.settings/org.eclipse.jdt.core.prefs b/samples/android/tutorial-3-native/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from samples/android/3-nativecamera/.settings/org.eclipse.jdt.core.prefs rename to samples/android/tutorial-3-native/.settings/org.eclipse.jdt.core.prefs diff --git a/samples/android/2-native/AndroidManifest.xml b/samples/android/tutorial-3-native/AndroidManifest.xml similarity index 100% rename from samples/android/2-native/AndroidManifest.xml rename to samples/android/tutorial-3-native/AndroidManifest.xml diff --git a/samples/android/2-native/default.properties b/samples/android/tutorial-3-native/default.properties similarity index 100% rename from samples/android/2-native/default.properties rename to samples/android/tutorial-3-native/default.properties diff --git a/samples/android/2-native/jni/Android.mk b/samples/android/tutorial-3-native/jni/Android.mk similarity index 100% rename from samples/android/2-native/jni/Android.mk rename to samples/android/tutorial-3-native/jni/Android.mk diff --git a/samples/android/2-native/jni/Application.mk b/samples/android/tutorial-3-native/jni/Application.mk similarity index 100% rename from samples/android/2-native/jni/Application.mk rename to samples/android/tutorial-3-native/jni/Application.mk diff --git a/samples/android/2-native/jni/jni_part.cpp b/samples/android/tutorial-3-native/jni/jni_part.cpp similarity index 100% rename from samples/android/2-native/jni/jni_part.cpp rename to samples/android/tutorial-3-native/jni/jni_part.cpp diff --git a/samples/android/3-nativecamera/res/drawable/icon.png b/samples/android/tutorial-3-native/res/drawable/icon.png similarity index 100% rename from samples/android/3-nativecamera/res/drawable/icon.png rename to samples/android/tutorial-3-native/res/drawable/icon.png diff --git a/samples/android/2-native/res/values/strings.xml b/samples/android/tutorial-3-native/res/values/strings.xml similarity index 100% rename from samples/android/2-native/res/values/strings.xml rename to samples/android/tutorial-3-native/res/values/strings.xml diff --git a/samples/android/2-native/src/org/opencv/samples/s2/Sample2Native.java b/samples/android/tutorial-3-native/src/org/opencv/samples/s2/Sample2Native.java similarity index 100% rename from samples/android/2-native/src/org/opencv/samples/s2/Sample2Native.java rename to samples/android/tutorial-3-native/src/org/opencv/samples/s2/Sample2Native.java diff --git a/samples/android/2-native/src/org/opencv/samples/s2/Sample2View.java b/samples/android/tutorial-3-native/src/org/opencv/samples/s2/Sample2View.java similarity index 100% rename from samples/android/2-native/src/org/opencv/samples/s2/Sample2View.java rename to samples/android/tutorial-3-native/src/org/opencv/samples/s2/Sample2View.java diff --git a/samples/android/2-native/src/org/opencv/samples/s2/SampleViewBase.java b/samples/android/tutorial-3-native/src/org/opencv/samples/s2/SampleViewBase.java similarity index 100% rename from samples/android/2-native/src/org/opencv/samples/s2/SampleViewBase.java rename to samples/android/tutorial-3-native/src/org/opencv/samples/s2/SampleViewBase.java diff --git a/samples/android/1-java/.classpath b/samples/android/tutorial-4-mixed/.classpath similarity index 100% rename from samples/android/1-java/.classpath rename to samples/android/tutorial-4-mixed/.classpath diff --git a/samples/android/4-mixed/.project b/samples/android/tutorial-4-mixed/.project similarity index 100% rename from samples/android/4-mixed/.project rename to samples/android/tutorial-4-mixed/.project diff --git a/samples/android/4-mixed/.settings/org.eclipse.jdt.core.prefs b/samples/android/tutorial-4-mixed/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from samples/android/4-mixed/.settings/org.eclipse.jdt.core.prefs rename to samples/android/tutorial-4-mixed/.settings/org.eclipse.jdt.core.prefs diff --git a/samples/android/4-mixed/AndroidManifest.xml b/samples/android/tutorial-4-mixed/AndroidManifest.xml similarity index 100% rename from samples/android/4-mixed/AndroidManifest.xml rename to samples/android/tutorial-4-mixed/AndroidManifest.xml diff --git a/samples/android/4-mixed/default.properties b/samples/android/tutorial-4-mixed/default.properties similarity index 100% rename from samples/android/4-mixed/default.properties rename to samples/android/tutorial-4-mixed/default.properties diff --git a/samples/android/4-mixed/jni/Android.mk b/samples/android/tutorial-4-mixed/jni/Android.mk similarity index 100% rename from samples/android/4-mixed/jni/Android.mk rename to samples/android/tutorial-4-mixed/jni/Android.mk diff --git a/samples/android/4-mixed/jni/Application.mk b/samples/android/tutorial-4-mixed/jni/Application.mk similarity index 100% rename from samples/android/4-mixed/jni/Application.mk rename to samples/android/tutorial-4-mixed/jni/Application.mk diff --git a/samples/android/4-mixed/jni/jni_part.cpp b/samples/android/tutorial-4-mixed/jni/jni_part.cpp similarity index 100% rename from samples/android/4-mixed/jni/jni_part.cpp rename to samples/android/tutorial-4-mixed/jni/jni_part.cpp diff --git a/samples/android/4-mixed/res/drawable/icon.png b/samples/android/tutorial-4-mixed/res/drawable/icon.png similarity index 100% rename from samples/android/4-mixed/res/drawable/icon.png rename to samples/android/tutorial-4-mixed/res/drawable/icon.png diff --git a/samples/android/4-mixed/res/values/strings.xml b/samples/android/tutorial-4-mixed/res/values/strings.xml similarity index 100% rename from samples/android/4-mixed/res/values/strings.xml rename to samples/android/tutorial-4-mixed/res/values/strings.xml diff --git a/samples/android/4-mixed/src/org/opencv/samples/s4/Sample4Mixed.java b/samples/android/tutorial-4-mixed/src/org/opencv/samples/s4/Sample4Mixed.java similarity index 100% rename from samples/android/4-mixed/src/org/opencv/samples/s4/Sample4Mixed.java rename to samples/android/tutorial-4-mixed/src/org/opencv/samples/s4/Sample4Mixed.java diff --git a/samples/android/4-mixed/src/org/opencv/samples/s4/Sample4View.java b/samples/android/tutorial-4-mixed/src/org/opencv/samples/s4/Sample4View.java similarity index 100% rename from samples/android/4-mixed/src/org/opencv/samples/s4/Sample4View.java rename to samples/android/tutorial-4-mixed/src/org/opencv/samples/s4/Sample4View.java diff --git a/samples/android/4-mixed/src/org/opencv/samples/s4/SampleViewBase.java b/samples/android/tutorial-4-mixed/src/org/opencv/samples/s4/SampleViewBase.java similarity index 100% rename from samples/android/4-mixed/src/org/opencv/samples/s4/SampleViewBase.java rename to samples/android/tutorial-4-mixed/src/org/opencv/samples/s4/SampleViewBase.java