From 65b26600a12fa5a6860c657470e94ddf504a9420 Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Fri, 2 Dec 2016 12:52:29 +0100 Subject: [PATCH] doc: Fix API generation script (javadoc) Change-Id: I99b0925f91658372cd4d736ad1d79e0e92d76392 Signed-off-by: Philippe Coval Reviewed-on: https://gerrit.iotivity.org/gerrit/15065 Tested-by: jenkins-iotivity Reviewed-by: Uze Choi (cherry picked from commit f989db039c8d0b21286f8c6c46f51eb72ef1a9f2) Reviewed-on: https://gerrit.iotivity.org/gerrit/15223 Reviewed-by: Habib Virji --- resource/docs/javadocGen.sh | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/resource/docs/javadocGen.sh b/resource/docs/javadocGen.sh index 667b7a0..28bcafc 100755 --- a/resource/docs/javadocGen.sh +++ b/resource/docs/javadocGen.sh @@ -16,40 +16,34 @@ #!/bin/bash -BASE_PATH="../../android/android_api/base/src/main/java/" +TOPDIR="../.." +BASE_PATH="${TOPDIR}/android/android_api/base/src/main/java/" BASE_PKG="org.iotivity.base" +CA_SRCS="$(find ${TOPDIR}/android/android_api/base/src/ -name 'Ca*Interface.java')" -CA_SRCS="../../android/android_api/base/src/main/java/org/iotivity/ca/CaBtPairingInterface.java \ - ../../android/android_api/base/src/main/java/org/iotivity/ca/CaInterface.java" - -RE_PATH="../../service/resource-encapsulation/android/service/src/main/java/" +RE_PATH="${TOPDIR}/service/resource-encapsulation/android/service/src/main/java/" RE_COMMON_PKG=org.iotivity.service RE_CLINET_PKG=org.iotivity.service.client RE_SERVER_PKG=org.iotivity.service.server -TM_SRCS="../../service/things-manager/sdk/java/src/org/iotivity/service/tm/ThingsConfiguration.java \ - ../../service/things-manager/sdk/java/src/org/iotivity/service/tm/ThingsMaintenance.java" -TM_PKG=org.iotivity.service.tm - -RH_PATH="../../service/resource-hosting/android/resource_hosting/src/" -RH_PKG=org.iotivity.ResourceHosting - - -EASYSETUP_PATH="../../service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/java/" +EASYSETUP_PATH="${TOPDIR}/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/java/" EASYSETUP_PKG=org.iotivity.service.easysetup.mediator -RESOURCECONTAINER_PATH="../../service/resource-container/android/resource-container/src/main/java/" +RESOURCECONTAINER_PATH="${TOPDIR}/service/resource-container/android/resource-container/src/main/java/" RESOURCECONTAINER_PKG=org.iotivity.service.resourcecontainer -NS_PATH="../../service/notification/android/notification-service/src/main/java/" +NS_PATH="${TOPDIR}/service/notification/android/notification-service/src/main/java/" NS_PKG_1=org.iotivity.service.ns.common NS_PKG_2=org.iotivity.service.ns.provider NS_PKG_3=org.iotivity.service.ns.consumer +CLASSPATH=$(find ${TOPDIR}/extlibs/android/sdk/android-sdk-linux/platforms/ \ + -iname "android.jar" | sort | head -n 1) +export CLASSPATH javadoc -public -splitindex -d ./Java_API -sourcepath \ - $BASE_PATH:$RE_PATH:$RH_PATH:$EASYSETUP_PATH:$RESOURCECONTAINER_PATH:$NS_PATH \ + $BASE_PATH:$RE_PATH:$EASYSETUP_PATH:$RESOURCECONTAINER_PATH:$NS_PATH \ $BASE_PKG $CA_SRCS $RE_COMMON_PKG $RE_CLINET_PKG $RE_SERVER_PKG $EASYSETUP_PKG \ $RESOURCECONTAINER_PKG $NS_PKG_1 $NS_PKG_2 $NS_PKG_3 -- 2.7.4