SRADA-990: Partly revert "SRADA-930: Fixed DIBS build on sdk branch"

This partly reverts commit 5e208c0ce2144ebf827303d37bb126fc6bb75889.
The path to commmon-eplugin was hard-coded in this patch so not the most recent
version was used for DA build. Now it is changed back to auto-download by DIBS.

Change-Id: Idd7bfb0f2934002ded4d4d626cad62e98f88dee4
Signed-off-by: Maria Guseva <m.guseva@samsung.com>
(cherry picked from commit 0388270d8616f72b6a8876ce3f0f1c13cf9eee97)

diff --git a/package/build.linux b/package/build.linux
index 0c6c08a..3c98cc1 100644 (file)
--- a/package/build.linux
+++ b/package/build.linux
@@ -117,23 +117,18 @@ __prepare_eclipse() {
        case ${platform} in
                ubuntu-32)
                        ide_package_name="eclipse-pde_3.0.8_ubuntu-32"
-                       ce_package_name="common-eplugin-rcp_2.3.100_ubuntu-32"
                        ;;
                windows-32)
                        ide_package_name="eclipse-pde_3.0.8_windows-32"
-                       ce_package_name="common-eplugin-rcp_2.3.100_windows-32"
                        ;;
                ubuntu-64)
                        ide_package_name="eclipse-pde_3.0.2_ubuntu-64"
-                       ce_package_name="common-eplugin-rcp_2.3.100_ubuntu-64"
                        ;;
                        windows-64)
                        ide_package_name="eclipse-pde_3.0.8_windows-64"
-                       ce_package_name="common-eplugin-rcp_2.3.100_windows-64"
                        ;;
                macos-64)
                        ide_package_name="eclipse-pde_3.0.8_macos-64"
-                       ce_package_name="common-eplugin-rcp_2.3.100_macos-64"
                        ;;
                *)
                        echo "${platform} is not support yet."
@@ -156,30 +151,20 @@ __prepare_eclipse() {
                unzip -o "${ide_package_name}.zip" -d "${ROOTDIR}/${ide_package_name}" > /dev/null
        fi
 
-       # Download and Unzip common-eplugin-rcp package
-       if [ ! -d ${ROOTDIR}/${ce_package_name} ]; then
-               echo "Download common-eplugin-rcp"
-
-               wget -nc -q "$repo_url/${ce_package_name}.zip"
-               unzip -o "${ce_package_name}.zip" -d "${ROOTDIR}/${ce_package_name}" > /dev/null
-       fi
-
        # Change direcotry to source
        cd ${SRCDIR}
 
        reference_ide_path=${ROOTDIR}/${ide_package_name}/data/eclipse-pde/eclipse
-       reference_ce_path=${ROOTDIR}/${ce_package_name}/data/ide
 
        if [ "${platform}" = "macos-64" ]; then
                reference_ide_path=${ROOTDIR}/${ide_package_name}/data/eclipse-pde/Eclipse.app/Contents/Eclipse
-               reference_ce_path=${ROOTDIR}/${ce_package_name}/data/IDE.app/Contents/Eclipse
        fi
 }
 
 __compose_da_dependencies() {
        echo "Compose dependencies repository..."
 
-       /bin/bash -x "${SRCDIR}/prepare_dependencies.sh" "${reference_ide_path}" "${reference_ce_path}"
+       /bin/bash -x "${SRCDIR}/prepare_dependencies.sh" "${reference_ide_path}" "${ROOTDIR}/ide"
 }
 
 __execute_pde_build()

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 082a02b..294f22b 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -6,6 +6,7 @@ Package:dynamic-analyzer-product
 Label:Dynamic Analyzer
 OS:ubuntu-32
 Build-host-os:ubuntu-32
+Build-dependency: common-eplugin-rcp [ubuntu-32]
 Description:The host of the Dynamic Analyzer
 C-Prerequisites:rpm2cpio,cpio
 
@@ -13,12 +14,14 @@ Package:dynamic-analyzer-product
 Label:Dynamic Analyzer
 OS:windows-32
 Build-host-os:ubuntu-32
+Build-dependency: common-eplugin-rcp [windows-32]
 Description:The host of the Dynamic Analyzer
 
 Package:dynamic-analyzer-product
 Label:Dynamic Analyzer
 OS:ubuntu-64
 Build-host-os:ubuntu-64
+Build-dependency: common-eplugin-rcp [ubuntu-64]
 Description:The host of the Dynamic Analyzer
 C-Prerequisites:rpm2cpio,cpio
 
@@ -26,10 +29,12 @@ Package:dynamic-analyzer-product
 Label:Dynamic Analyzer
 OS:windows-64
 Build-host-os:ubuntu-64
+Build-dependency: common-eplugin-rcp [windows-64]
 Description:The host of the Dynamic Analyzer
 
 Package:dynamic-analyzer-product
 Label:Dynamic Analyzer
 OS:macos-64
 Build-host-os:ubuntu-64
+Build-dependency: common-eplugin-rcp [macos-64]
 Description:The host of the Dynamic Analyzer