SRADA-930: Fixed DIBS build on sdk branch

Now common-eplugin-rcp is downloaded manually by script from advux_main repo.

Change-Id: Idfdede890834d68c234954a25f32508e16c05905

diff --git a/package/build.linux b/package/build.linux
index 7c00a2e..0c6c08a 100644 (file)
--- a/package/build.linux
+++ b/package/build.linux
@@ -2,6 +2,7 @@
 
 build_path=${SRCDIR}/org.tizen.dynamicanalyzer.workbench.product/target/products/org.tizen.dynamicanalyzer.workbench.product
 build_time=`date +%Y%m%d-%H%M`
+
 repo_url="http://10.113.138.168/packages/advux_main/binary/"
 
 __set_parameter()
@@ -112,47 +113,73 @@ __restore_product_info() {
 }
 
 __prepare_eclipse() {
+
        case ${platform} in
                ubuntu-32)
-                       package_name="eclipse-pde_3.0.8_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)
-                       package_name="eclipse-pde_3.0.8_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)
-                       package_name="eclipse-pde_3.0.2_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)
-                       package_name="eclipse-pde_3.0.8_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)
-                       package_name="eclipse-pde_3.0.8_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."
                        ;;
        esac
 
-       if [ ! -d ${ROOTDIR}/${package_name} ]; then
-               echo "Downloading Eclipse Mars..."
 
-               cd /tmp
-               wget -nc -q "${repo_url}/${package_name}.zip"
-               unzip "${package_name}.zip" -d "${ROOTDIR}/${package_name}"
-               cd ${SRCDIR}
+       # Change directory to temp.
+       cd /tmp
+
+       if [ ! -d ${ROOTDIR} ]; then
+               mkdir -p ${ROOTDIR}
+       fi
+
+       # Download and Unzip IDE package
+       if [ ! -d ${ROOTDIR}/${ide_package_name} ]; then
+               echo "Downloading Eclipse Mars"
+
+               wget -nc -q "${repo_url}/${ide_package_name}.zip"
+               unzip -o "${ide_package_name}.zip" -d "${ROOTDIR}/${ide_package_name}" > /dev/null
        fi
 
-       reference_ide_path=${ROOTDIR}/${package_name}/data/eclipse-pde/eclipse
+       # 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 [ "${package_name}" = "eclipse-pde_3.0.8_macos-64" ]; then
-               reference_ide_path=${ROOTDIR}/${package_name}/data/eclipse-pde/Eclipse.app/Contents/Eclipse
+       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}" "${ROOTDIR}/ide"
+       /bin/bash -x "${SRCDIR}/prepare_dependencies.sh" "${reference_ide_path}" "${reference_ce_path}"
 }
 
 __execute_pde_build()

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 6e48263..a3c72a2 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -6,7 +6,6 @@ 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
 
@@ -14,14 +13,12 @@ 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
 
@@ -29,12 +26,10 @@ 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