From eb0fabe0c4cb111d9c02dfb92490a65c55c3ec29 Mon Sep 17 00:00:00 2001 From: "munkyu.im" Date: Fri, 12 Aug 2011 16:58:40 +0900 Subject: [PATCH] fix build script --- build.sh | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/build.sh b/build.sh index 5305366..7c256c2 100755 --- a/build.sh +++ b/build.sh @@ -16,12 +16,10 @@ build_path="`pwd`/../build_result" ## ############################################################### build_result_directory=${build_type}.${build_id} -build_result_path="$build_path/$build_result_directory" builder_path="$start_path/builder" equinox_launcher=`echo org.eclipse.equinox.launcher_*.jar` pde_build=`echo org.eclipse.pde.build_*` metadata_path=$start_path/builder -fresh_ide_path=/var/lib/hudson/jobs/slp_sdk_fresh_ide/workspace if [ "x$1" = "x" ] then @@ -45,13 +43,10 @@ Usage : build_ide.sh $1 TARGET_ECLIPSE_PATH exit 1 fi -if [ "x$3" != "x" ] -then - build_path=$3 -fi - +build_result_path="$build_path/$build_result_directory" platform=$1 based_eclipse_path=$2 +fresh_ide_path=$3 parent_path_of_based_eclipse=${based_eclipse_path}/.. architecture=x86 @@ -119,7 +114,7 @@ rm -rf $build_path/plugins/*.feature echo "Copy fresh ide plugins..." if [ -d ${fresh_ide_path} ] then - cp -rf ${fresh_ide_path}/build_result/N.fresh_ide_build/${archive_platform_name}.${windowing}.${architecture}/IDE/plugins/* ${build_path}/plugins + cp -rf ${fresh_ide_path}/${archive_platform_name}.${windowing}.${architecture}/IDE/plugins/* ${build_path}/plugins else echo "ERROR : Fresh IDE does not exist..." exit 1 -- 2.7.4