MISC: Merged Kepler based pde build scripts

Squashed commit of the following:

commit f9af85604d52c097c6096da54ae404fd081c1f23
Author: Jihoon Song <jihoon80.song@samsung.com>
Date:   Fri Aug 8 21:31:08 2014 +0900

    MISC: Fixed cross platform executable problem

    Change-Id: I686574a412a2872690a78de12f7ae7e5a399f35c
    Signed-off-by: Jihoon Song <jihoon80.song@samsung.com>
commit 27ad6fed989b8c4f258c0505f15a61622d2cc2d5
Author: Jihoon Song <jihoon80.song@samsung.com>
Date:   Fri Aug 8 20:27:30 2014 +0900

    Fixed macos problem

    Change-Id: Idc9dcd8c258c3411b03716cc2f1ca7c48120333a
    Signed-off-by: Jihoon Song <jihoon80.song@samsung.com>
commit 784822b79b652ff93d08a7833f798c94bf784b37
Author: Jihoon Song <jihoon80.song@samsung.com>
Date:   Fri Aug 8 19:49:11 2014 +0900

    MISC: Changed a way of dependency feature installation to p2 install

    Change-Id: Icca316c7abf1107ee128a7d6e3fc5229826cdd4b
    Signed-off-by: Jihoon Song <jihoon80.song@samsung.com>
commit 6a000db47e4c663ab178976a39df2472ab9ffb20
Author: Jihoon Song <jihoon80.song@samsung.com>
Date:   Fri Aug 8 18:29:40 2014 +0900

    Fixed: wrong script logic

    Change-Id: I743ba2dadfd7e138c0a5015c63b5af8d7ec2c1f0
    Signed-off-by: Jihoon Song <jihoon80.song@samsung.com>
commit 1dcf88a4482c7eb167040aa7b533d8ee989f6cc8
Author: Taeyoung Son <taeyoung2.son@samsung.com>
Date:   Fri Aug 8 16:42:20 2014 +0900

    MISC: package version up (2.1.4)

    package version up

    Change-Id: I421bd16bcac12743ab14408cf390a853f6553064
    Signed-off-by: Taeyoung Son <taeyoung2.son@samsung.com>
commit 99b5c65504da4dcb83a77af91511408cc24dce81
Author: Taeyoung Son <taeyoung2.son@samsung.com>
Date:   Fri Aug 8 16:40:24 2014 +0900

    BUILD: Modified build script

    base ide package is saparated. so the build script should be modified.

    Change-Id: I7ae9abbde01fb566ac9731017a149890db3739f7
    Signed-off-by: Taeyoung Son <taeyoung2.son@samsung.com>
Change-Id: I20885ddfa967d454b128a1a1e85b3c1998de1594
Signed-off-by: Jihoon Song <jihoon80.song@samsung.com>

diff --git a/package/changelog b/package/changelog
index 0d5c474..0c9b1b1 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,6 @@
+* 2.1.4
+- Supported building new base ide package
+== taeyoung2.son <taeyoung2.son@samsung.com> 2014-08-08
 * 2.1.3
 - Removed __copy_dependency_plugins in build.sh
 == kh5325.kim <kh5325.kim@samsung.com> 2013-12-30

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 0c1bc0d..22006f2 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version:2.1.3
+Version:2.1.4
 Source:pde-build
 Maintainer:kangho kim <kh5325.kim@samsung.com>, yoonki park <yoonki.park@samsung.com>, hyunsik non <hyunsik.noh@samsung.com>, taeyoung son <taeyoung2.son@samsung.com>, gune Kim <gune.kim@samsung.com>, ho namkoong <ho.namkoong@samsung.com>, hyeongseok heo <hyeong-seok.heo@samsung.com>, gyeongseok seo <gyeongseok.seo@samsung.com>, jihoon song <jihoon80.song@samsung.com>, changhyun lee <changhyun1.lee@samsung.com>, bonyong lee <bonyong.lee@samsung.com>
 

diff --git a/script/build.sh b/script/build.sh
index 624a8fa..afe3c9e 100755 (executable)
--- a/script/build.sh
+++ b/script/build.sh
@@ -19,7 +19,7 @@ __set_parameter()
             architecture=x86
             if [ ! "x${pde_name}" = "x" ]
             then
-                ide_root_path_name=indigo-pde/eclipse
+                ide_root_path_name=eclipse-pde/eclipse
             fi
             ;;
         windows-32)
@@ -28,7 +28,7 @@ __set_parameter()
             architecture=x86
             if [ ! "x${pde_name}" = "x" ]
             then
-                ide_root_path_name=indigo-winpde/eclipse
+                ide_root_path_name=eclipse-pde/eclipse
             fi
             ;;
         ubuntu-64)
@@ -37,7 +37,7 @@ __set_parameter()
             architecture=x86_64
             if [ ! "x${pde_name}" = "x" ]
             then
-                ide_root_path_name=indigo-pde/eclipse
+                ide_root_path_name=eclipse-pde/eclipse
             fi
             ;;
         windows-64)
@@ -46,7 +46,7 @@ __set_parameter()
             architecture=x86_64
             if [ ! "x${pde_name}" = "x" ]
             then
-                ide_root_path_name=indigo-winpde/eclipse
+                ide_root_path_name=eclipse-pde/eclipse
             fi
             ;;
        macos-64)
@@ -55,7 +55,7 @@ __set_parameter()
             architecture=x86_64
             if [ ! "x${pde_name}" = "x" ]
             then
-                ide_root_path_name=indigo-macpde/eclipse
+                ide_root_path_name=eclipse-pde/eclipse
             fi
             ;;
         *)
@@ -145,11 +145,41 @@ __copy_build_sources()
 __copy_dependency_plugins()
 {
     dependency_plugin_path=${ROOTDIR}/${ide_root_path_name}
-    if [ -d ${dependency_plugin_path} ]
+    
+    equinox_launcher=`echo org.eclipse.equinox.launcher_*.jar`
+    
+    ## check base-native-ide-product p2 install
+    update_plugin_path=${ROOTDIR}/ide/updatablenative
+    if [ -d ${update_plugin_path} ]
     then
-        cp -rf ${dependency_plugin_path}/features/* ${build_path}/features/
-        cp -rf ${dependency_plugin_path}/plugins/* ${build_path}/plugins/
+        ## install native feature by p2 for install script failure on the cross build
+        java -jar ${reference_ide_path}/plugins/$equinox_launcher \
+            -application org.eclipse.equinox.p2.director \
+            -repository "file:/${update_plugin_path}" \
+            -installIU org.tizen.base.native.feature.feature.group \
+            -noSplash \
+            -p2.os ${archive_platform_name} \
+            -p2.ws ${windowing} \
+            -p2.arch ${architecture}
+        rm -rf ${update_plugin_path}
     fi
+    
+    ## check base-web-ide-product p2 install
+    update_plugin_path=${ROOTDIR}/ide/updatableweb
+    if [ -d ${update_plugin_path} ]
+    then
+        ## install web feature by p2 for install script failure on the cross build
+        java -jar ${reference_ide_path}/plugins/$equinox_launcher \
+            -application org.eclipse.equinox.p2.director \
+            -repository "file:/${update_plugin_path}" \
+            -installIU org.tizen.base.web.feature.feature.group \
+            -noSplash \
+            -p2.os ${archive_platform_name} \
+            -p2.ws ${windowing} \
+            -p2.arch ${architecture}
+        rm -rf ${update_plugin_path}
+    fi
+    
 }
 
 __make_ant_build_properties_file()
@@ -235,7 +265,7 @@ build_plugins()
     __set_build_parameter
     __clean_build_environment
     __copy_build_sources
-    #__copy_dependency_plugins
+    __copy_dependency_plugins
     __make_ant_build_properties_file
     __modify_about_mappings_file
     __execute_pde_build