[libreoffice] 04/12: fix (set -e) and improve sdk-examples test (build everything)

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice.

commit f3e49fdd1bfbbbf643706e423a40c19b202dd146
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Jun 26 18:58:07 2017 +0000

    fix (set -e) and improve sdk-examples test (build everything)
---
 changelog          |  6 ++--
 tests/control      |  2 +-
 tests/sdk-examples | 90 ++++++++++++++++++++++++++++++++++++++++++------------
 3 files changed, 75 insertions(+), 23 deletions(-)

diff --git a/changelog b/changelog
index 1a30421..84c4bbd 100644
--- a/changelog
+++ b/changelog
@@ -8,8 +8,10 @@ libreoffice (1:5.3.4-2) UNRELEASED; urgency=medium
   * debian/rules:
     - clean up JRE Depends; we consider java6_architectures as Java arch, so
       let's remove the Java5 alternatives
-  * debian/tests/sdk-examples: DevelopersGuide/OfficeDev/DesktopEnvironment
-    needs -ljawt. Build this to check this and the JAVA_PROC_TYPE setting also.
+  * debian/tests/control, debian/tests/sdk-examples: resemble upstream
+    build-esamples check. Build all examples mentioned there.
+    (Needs python3-uno and libreoffice-officbean as new test Depends:)
+  * debian/tests/sdk-examples: actually set -e...
   * debian/rules, debian/tests/control: remove extra hackery to add our
     Build-Depends-(Indep): to debian/tests/control.in; misses some packages
     (e.g. ant) and it should work at least since autopktest 3.16 from Jul 2015;
diff --git a/tests/control b/tests/control
index 099f8b7..f1aa13a 100644
--- a/tests/control
+++ b/tests/control
@@ -8,4 +8,4 @@ Tests: pyuno-import
 Depends: python3, python3-uno
 
 Tests: sdk-examples
-Depends: libreoffice-dev, libreoffice-dev-doc, libreoffice-dev-common, libreoffice-java-common, build-essential, default-jdk
+Depends: libreoffice-dev, libreoffice-dev-doc, libreoffice-dev-common, libreoffice-java-common, build-essential, default-jdk, python3-uno, libreoffice-officebean
diff --git a/tests/sdk-examples b/tests/sdk-examples
index 4585284..26af824 100755
--- a/tests/sdk-examples
+++ b/tests/sdk-examples
@@ -1,32 +1,82 @@
 #!/bin/sh
 
+set -e
+
+SRCDIR=`pwd`
+
+# sync with odk/CustomTarget_build-examples
+my_example_dirs=" \
+    CLI/CSharp/Spreadsheet \
+    CLI/VB.NET/WriterDemo \
+    DevelopersGuide/BasicAndDialogs/ToolkitControls \
+    DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp \
+    DevelopersGuide/Components/CppComponent \
+    DevelopersGuide/Database/DriverSkeleton \
+    DevelopersGuide/Extensions/DialogWithHelp \
+    DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp \
+    DevelopersGuide/ProfUNO/CppBinding \
+    DevelopersGuide/ProfUNO/SimpleBootstrap_cpp \
+    OLE/activex \
+    cpp/DocumentLoader \
+    cpp/complextoolbarcontrols \
+    cpp/counter \
+    cpp/remoteclient \
+    python/toolpanel \
+    DevelopersGuide/BasicAndDialogs/CreatingDialogs \
+    DevelopersGuide/Charts \
+    DevelopersGuide/Components/Addons/JobsAddon \
+    DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java \
+    DevelopersGuide/Components/JavaComponent \
+    DevelopersGuide/Components/SimpleLicense \
+    DevelopersGuide/Components/Thumbs \
+    DevelopersGuide/Components/dialogcomponent \
+    DevelopersGuide/Config \
+    DevelopersGuide/Database \
+    DevelopersGuide/Drawing \
+    DevelopersGuide/FirstSteps \
+    DevelopersGuide/Forms \
+    DevelopersGuide/GUI \
+    DevelopersGuide/OfficeBean \
+    DevelopersGuide/OfficeDev \
+    DevelopersGuide/OfficeDev/Clipboard \
+    DevelopersGuide/OfficeDev/DesktopEnvironment \
+    DevelopersGuide/OfficeDev/DisableCommands \
+    DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter \
+    DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection \
+    DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java \
+    DevelopersGuide/OfficeDev/Linguistic \
+    DevelopersGuide/OfficeDev/PathSettings \
+    DevelopersGuide/OfficeDev/PathSubstitution \
+    DevelopersGuide/OfficeDev/TerminationTest \
+    DevelopersGuide/ProfUNO/InterprocessConn \
+    DevelopersGuide/ProfUNO/Lifetime \
+    DevelopersGuide/ProfUNO/SimpleBootstrap_java \
+    DevelopersGuide/ScriptingFramework/SayHello \
+    DevelopersGuide/ScriptingFramework/ScriptSelector \
+    DevelopersGuide/Spreadsheet \
+    DevelopersGuide/Text \
+    DevelopersGuide/UCB \
+    java/DocumentHandling \
+    java/Drawing \
+    java/Inspector \
+    java/MinimalComponent \
+    java/PropertySet \
+    java/Spreadsheet \
+    java/Text \
+    java/ToDo"
+
 echo "====== Preparing the SDK environment ======"
 cd /usr/lib/libreoffice/sdk
 . ./setsdkenv_unix.sh
 
-SRCDIR=`pwd`
-
 # don't clobber $HOME but do it in /tmp
 _old_sdk_out=$OO_SDK_OUT
 WORKDIR=`mktemp -d`
 export OO_SDK_OUT=$WORKDIR
 export PATH=`echo $PATH | sed -e "s,$_old_sdk_out,$OO_SDK_OUT,g"`
 
-echo "====== Building C++ example DocumentLoader ====== "
-cd $SRCDIR/examples/cpp/DocumentLoader
-make
-
-echo "====== Building C++ example counter ====== "
-cd $SRCDIR/examples/cpp/counter
-make
-echo "====== Running countermain.run ======"
-make countermain.run
-
-echo "====== Building Java DocumentHandling example ======"
-cd $SRCDIR/examples/java/DocumentHandling
-make
-
-echo "====== Building Developers Guide DesktopEnvironment example ======"
-cd $SRCDIR/examples/DevelopersGuide/OfficeDev/DesktopEnvironment
-make
-
+for i in $my_example_dirs; do 
+	echo "====== Building $i example ======"
+	cd /usr/lib/libreoffice/sdk/examples/$i
+	make
+done

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git