Attachment #144478 for bug #182085

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 4-16 Link Here

(-)slave/windows-em64t/configure-environment.probekit.sf (-6 / +13 lines)
4	fi	4	fi
5		5
6	#	6	#
7	#Compiler	7	#Dependencies
8	#	8	#
9	PATH="/cygdrive/c/Progra~1/MI9547~1/Bin/Win64/x86/AMD64:/cygdrive/c/Progra~1/MI9547~1/Bin:/cygdrive/c/Progra~1/MI9547~1/Bin/WinNT:/cygdrive/c/WINDOWS/system32:/cygdrive/c/WINDOWS:/cygdrive/c/WINDOWS/System32/Wbem:/usr/local/bin:/usr/bin:/bin"	9	export JAVA_HOME="C:\Util\jdk1.5.0_16"
10	INCLUDE="C:\Progra~1\MI9547~1\Include;C:\Progra~1\MI9547~1\Include\crt;C:\Progra~1\MI9547~1\Include\crt\sys;C:\Progra~1\MI9547~1\Include\mfc;C:\Progra~1\MI9547~1\Include\atl"	10	export JDK_HOME=$JAVA_HOME
11	JAVA_HOME="C:\j2sdk1.4.2_09"	11	export RAC_SDK_HOME="C:\RAC_SDK_HOME"
12	LIB="C:\Progra~1\MI9547~1\Lib\AMD64;C:\Progra~1\MI9547~1\Lib\AMD64\atlmfc"
13		12
14	export PATH INCLUDE JAVA_HOME LIB	13	#
		14	#Compiler
		15	#
		16	export PATH="/cygdrive/d/Microsoft_Platform_SDK_64/Bin:/cygdrive/d/Microsoft_Platform_SDK_64/Bin/Win64/x86/AMD64:/cygdrive/d/Microsoft_Platform_SDK_64/Bin/WinNT:/usr/local/bin:/usr/bin:/bin:/cygdrive/c/WINDOWS/system32"
		17	export INCLUDE="D:\Microsoft_Platform_SDK_64\Include;D:\Microsoft_Platform_SDK_64\Include\crt;D:\Microsoft_Platform_SDK_64\Include\crt\sys;D:\Microsoft_Platform_SDK_64\Include\mfc;D:\Microsoft_Platform_SDK_64\Include\atl"
		18	export LIB="D:\Microsoft_Platform_SDK_64\Lib\AMD64;D:\Microsoft_Platform_SDK_64\Lib\AMD64\atlmfc"
15		19
		20	#
		21	#GNU make
		22	#
16	export NATIVE_MAKE='nmake -f org.eclipse.hyades.probekit\src-native\BCI\makefile.win_em64t.build'	23	export NATIVE_MAKE='nmake -f org.eclipse.hyades.probekit\src-native\BCI\makefile.win_em64t.build'

Lines 4-23 Link Here

(-)slave/windows-em64t/configure-environment.agntctrl.sf (-13 / +20 lines)
4	fi	4	fi
5		5
6	#	6	#
7	#Compiler	7	#Dependencies
8	#	8	#
9	PATH="/cygdrive/c/Progra~1/MI9547~1/Bin/Win64/x86/AMD64:/cygdrive/c/Progra~1/MI9547~1/Bin:/cygdrive/c/Progra~1/MI9547~1/Bin/WinNT:/cygdrive/c/WINDOWS/system32:/cygdrive/c/WINDOWS:/cygdrive/c/WINDOWS/System32/Wbem:/usr/local/bin:/usr/bin:/bin"	9	# CBE_SDK_HOME must be set to a folder in the root level of a Windows drive due to cygwin's problems handling \'s.
10	INCLUDE="C:\Progra~1\MI9547~1\Include;C:\Progra~1\MI9547~1\Include\crt;C:\Progra~1\MI9547~1\Include\crt\sys;C:\Progra~1\MI9547~1\Include\mfc;C:\Progra~1\MI9547~1\Include\atl"	10	CBE_SDK_HOME_TMP=`pwd \| cut -d/ -f1-6`
11	JAVA_HOME="C:\j2sdk1.4.2_09"	11	CBE_SDK_HOME_TMP="$CBE_SDK_HOME_TMP/cbe/sdk"
12	LIB="C:\Progra~1\MI9547~1\Lib\AMD64;C:\Progra~1\MI9547~1\Lib\AMD64\atlmfc"	12	rm -rf /cygdrive/d/CBE_SDK_HOME/*
		13	cp -r ${CBE_SDK_HOME_TMP}/* /cygdrive/d/CBE_SDK_HOME
		14	export CBE_SDK_HOME="D:\CBE_SDK_HOME"
		15	export XERCESCROOT="C:\Util\xerces-c-src_2_6_0\Build\Win64\VC6\Release"
		16	export XERCESC_HOME="$XERCESCROOT"
		17	export JAVA_HOME="C:\Util\jdk1.5.0_16"
13		18
14	export PATH INCLUDE JAVA_HOME LIB	19	#
		20	#Compiler
		21	#
		22	export PATH="/cygdrive/d/Microsoft_Platform_SDK_64/Bin:/cygdrive/d/Microsoft_Platform_SDK_64/Bin/Win64/x86/AMD64:/cygdrive/d/Microsoft_Platform_SDK_64/Bin/WinNT:/usr/local/bin:/usr/bin:/bin:/cygdrive/c/WINDOWS/system32"
		23	export INCLUDE="C:\Util\xerces-c-src_2_6_0\src;D:\Microsoft_Platform_SDK_64\Include;D:\Microsoft_Platform_SDK_64\Include\crt;D:\Microsoft_Platform_SDK_64\Include\crt\sys;D:\Microsoft_Platform_SDK_64\Include\mfc;D:\Microsoft_Platform_SDK_64\Include\atl"
		24	export LIB="$XERCESCROOT;D:\Microsoft_Platform_SDK_64\Lib\AMD64;D:\Microsoft_Platform_SDK_64\Lib\AMD64\atlmfc"
15		25
		26	#
		27	#GNU make
		28	#
16	umask 002	29	umask 002
17		30	export NATIVE_MAKE='nmake -f makefile.win_em64t'
18	export TEMP_LICENSE_HOME="C:\cygwin\home\build\TEMP_LICENSE_HOME"
19	export RAC_SDK_HOME="C:\RAC_SDK_HOME"
20	export CBE_SDK_HOME="C:\CBE_SDK_HOME"
21	export XERCESCROOT="C:\utils\xerces-c-src_2_6_0.win_em64t"
22	export XERCESC_HOME="$XERCESCROOT"
23	export NATIVE_MAKE='nmake -f makefile.win_em64t'

Lines 4-16 Link Here

(-)slave/windows-em64t/configure-environment.sf (-6 / +11 lines)
4	fi	4	fi
5		5
6	#	6	#
7	#Compiler	7	#Dependencies
8	#	8	#
9	PATH="/cygdrive/c/Progra~1/MI9547~1/Bin/Win64/x86/AMD64:/cygdrive/c/Progra~1/MI9547~1/Bin:/cygdrive/c/Progra~1/MI9547~1/Bin/WinNT:/cygdrive/c/WINDOWS/system32:/cygdrive/c/WINDOWS:/cygdrive/c/WINDOWS/System32/Wbem:/usr/local/bin:/usr/bin:/bin"	9	export JAVA_HOME="C:\Util\jdk1.5.0_16"
10	INCLUDE="C:\Progra~1\MI9547~1\Include;C:\Progra~1\MI9547~1\Include\crt;C:\Progra~1\MI9547~1\Include\crt\sys;C:\Progra~1\MI9547~1\Include\mfc;C:\Progra~1\MI9547~1\Include\atl"
11	JAVA_HOME="C:\j2sdk1.4.2_09"
12	LIB="C:\Progra~1\MI9547~1\Lib\AMD64;C:\Progra~1\MI9547~1\Lib\AMD64\atlmfc"
13		10
14	export PATH INCLUDE JAVA_HOME LIB	11	#
		12	#Compiler
		13	#
		14	export PATH="/cygdrive/d/Microsoft_Platform_SDK_64/Bin:/cygdrive/d/Microsoft_Platform_SDK_64/Bin/Win64/x86/AMD64:/cygdrive/d/Microsoft_Platform_SDK_64/Bin/WinNT:/usr/local/bin:/usr/bin:/bin:/cygdrive/c/WINDOWS/system32"
		15	export INCLUDE="D:\Microsoft_Platform_SDK_64\Include;D:\Microsoft_Platform_SDK_64\Include\crt;D:\Microsoft_Platform_SDK_64\Include\crt\sys;D:\Microsoft_Platform_SDK_64\Include\mfc;D:\Microsoft_Platform_SDK_64\Include\atl"
		16	export LIB="D:\Microsoft_Platform_SDK_64\Lib\AMD64;D:\Microsoft_Platform_SDK_64\Lib\AMD64\atlmfc"
15		17
		18	#
		19	#GNU make
		20	#
16	export NATIVE_MAKE='nmake -f makefile.win_em64t'	21	export NATIVE_MAKE='nmake -f makefile.win_em64t'

Lines 4-17 Link Here

(-)slave/windows-em64t/configure-environment.jvmti.sf (-6 / +14 lines)
4	fi	4	fi
5		5
6	#	6	#
		7	#Dependencies
		8	#
		9	export JAVA_HOME="C:\\Util\\jdk1.5.0_16"
		10	export TPTP_ACSDK_HOME=../../../../agntctrl
		11	export CBE_SDK_HOME=../../../../cbe/sdk
		12	export PROBEKIT_LIB="..\probekit\org.eclipse.hyades.probekit\src-native"
		13
		14	#
7	#Compiler	15	#Compiler
8	#	16	#
9	export INCLUDE="C:\Progra~1\MI9547~1\Include;C:\Progra~1\MI9547~1\Include\crt;C:\Progra~1\MI9547~1\Include\crt\sys;C:\Progra~1\MI9547~1\Include\mfc;C:\Progra~1\MI9547~1\Include\atl"	17	export PATH="/cygdrive/d/Microsoft_Platform_SDK_64/Bin:/cygdrive/d/Microsoft_Platform_SDK_64/Bin/Win64/x86/AMD64:/cygdrive/d/Microsoft_Platform_SDK_64/Bin/WinNT:/usr/local/bin:/usr/bin:/bin:/cygdrive/c/WINDOWS/system32"
10	export JAVA_HOME="C:\\Progra~1\\Java\\jdk1.5.0_06"	18	export INCLUDE="D:\Microsoft_Platform_SDK_64\Include;D:\Microsoft_Platform_SDK_64\Include\crt;D:\Microsoft_Platform_SDK_64\Include\crt\sys;D:\Microsoft_Platform_SDK_64\Include\mfc;D:\Microsoft_Platform_SDK_64\Include\atl"
11	export LIB="C:\Progra~1\MI9547~1\Lib\AMD64;C:\Progra~1\MI9547~1\Lib\AMD64\atlmfc"	19	export LIB="D:\Microsoft_Platform_SDK_64\Lib\AMD64;D:\Microsoft_Platform_SDK_64\Lib\AMD64\atlmfc"
12	export PATH="/cygdrive/c/Progra~1/Java/jdk1.5.0_06/bin:/cygdrive/c/Progra~1/MI9547~1/Bin/Win64/x86/AMD64:/cygdrive/c/Progra~1/MI9547~1/Bin:/cygdrive/c/Progra~1/MI9547~1/Bin/WinNT:/cygdrive/c/WINDOWS/system32:/cygdrive/c/WINDOWS:/cygdrive/c/WINDOWS/System32/Wbem:/usr/local/bin:/usr/bin:/bin"
13	export TPTP_ACSDK_HOME="C:\\TPTP_ACSDK_HOME"
14		20
		21	#
		22	#GNU make
		23	#
15	umask 002	24	umask 002
16
17	export NATIVE_MAKE='nmake -f org.eclipse.tptp.platform.jvmti.runtime/makefile.win_em64t'	25	export NATIVE_MAKE='nmake -f org.eclipse.tptp.platform.jvmti.runtime/makefile.win_em64t'

Lines 1-6 Link Here

(-)master/bash/universal-make.sh (-2 / +2 lines)
1	#!/bin/bash -ex	1	#!/bin/bash -ex
2	###############################################################################	2	###############################################################################
3	# Copyright (c) 2005, 2008 IBM Corporation and others.	3	# Copyright (c) 2005, 2009 IBM Corporation and others.
4	# All rights reserved. This program and the accompanying materials	4	# All rights reserved. This program and the accompanying materials
5	# are made available under the terms of the Eclipse Public License v1.0	5	# are made available under the terms of the Eclipse Public License v1.0
6	# which accompanies this distribution, and is available at	6	# which accompanies this distribution, and is available at
Lines 124-130 Link Here
124	execute-remote-command.sh \	124	execute-remote-command.sh \
125	"--dstosarc=$rmtosarc" \	125	"--dstosarc=$rmtosarc" \
126	"--rmthst=$rmtosarc" \	126	"--rmthst=$rmtosarc" \
127	"--rmtcmd=. $rmtutldir/$rmtcfgutl $tgtprj $tgtrel && cd $rmtsrcdir && \$NATIVE_MAKE && \$NATIVE_MAKE package"	127	"--rmtcmd=cd $rmtsrcdir && . $rmtutldir/$rmtcfgutl $tgtprj $tgtrel && \$NATIVE_MAKE && \$NATIVE_MAKE package"
128		128
129	# Retrieve the result of the build.	129	# Retrieve the result of the build.
130	pull-binary-files.sh \	130	pull-binary-files.sh \

Lines 1-5 Link Here

(-)master/bash/convert-to-native-encoding.windows-ia32.sf (-2 / +2 lines)
1	###############################################################################	1	###############################################################################
2	# Copyright (c) 2005 IBM Corporation and others.	2	# Copyright (c) 2005, 2009 IBM Corporation and others.
3	# All rights reserved. This program and the accompanying materials	3	# All rights reserved. This program and the accompanying materials
4	# are made available under the terms of the Eclipse Public License v1.0	4	# are made available under the terms of the Eclipse Public License v1.0
5	# which accompanies this distribution, and is available at	5	# which accompanies this distribution, and is available at
Lines 20-23 Link Here
20		20
21		21
22	# The only transformation required for Windows is the end of line character.	22	# The only transformation required for Windows is the end of line character.
23	# find "$stgdir" $txtfileptrn -exec unix2dos -of {} \;	23	find "$stgdir" $txtfileptrn ! -name *.sf -exec unix2dos -of {} \;




#!/bin/bash -x
############################################################################### 
# Copyright (c) 2009 IBM Corporation and others.
# All rights reserved.   This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
# $Id: $
#
# Contributors: 
# IBM - Initial API and implementation
############################################################################### 

wsdir=$1
bldid=$2

		unzip -q $publishdir/$component.$platform.zip -d $wsdir/upd-$component/$updpath
		cd $wsdir/upd-$component
		chmod +x $updpath/*
		zip -urqy $feat *
		rm -rf $wsdir/upd-$component
		unset feat updpath
	fi

Lines 1-4 Link Here

(-)master/bash/upload-driver.sh (-4 / +29 lines)
1	#!/bin/bash -ex	1	#!/bin/bash -ex
		2	###############################################################################
		3	# Copyright (c) 2009 IBM Corporation and others.
		4	# All rights reserved. This program and the accompanying materials
		5	# are made available under the terms of the Eclipse Public License v1.0
		6	# which accompanies this distribution, and is available at
		7	# http://www.eclipse.org/legal/epl-v10.html
		8	# $Id: $
		9	#
		10	# Contributors:
		11	# IBM - Initial API and implementation
		12	###############################################################################
2		13
3	if [ $# -ne 3 ]; then	14	if [ $# -ne 3 ]; then
4	echo "usage: upload-driver.sh <driver-root> <releaseVersion> <build-id>"	15	echo "usage: upload-driver.sh <driver-root> <releaseVersion> <build-id>"
Lines 40-51 Link Here
40	probekit.all_platforms-$bldid.zip \	51	probekit.all_platforms-$bldid.zip \
41	probekit.linux_ia32-$bldid.zip \	52	probekit.linux_ia32-$bldid.zip \
42	probekit.win_ia32-$bldid.zip \	53	probekit.win_ia32-$bldid.zip \
		54	agntctrl.linux_ia32.sdk-$bldid.zip \
		55	agntctrl.linux_ia32-$bldid.zip \
		56	agntctrl.win_ia32.sdk-$bldid.zip \
		57	agntctrl.win_ia32-$bldid.zip \
		58	agntctrl.linux_em64t.sdk-$bldid.zip \
		59	agntctrl.linux_em64t-$bldid.zip \
		60	agntctrl.win_em64t.sdk-$bldid.zip \
		61	agntctrl.win_em64t-$bldid.zip \
		62	agntctrl.all_platforms.sdk-$bldid.zip \
		63	agntctrl.all_platforms-$bldid.zip \
43	tptpdc.all_platforms.sdk-$bldid.zip \	64	tptpdc.all_platforms.sdk-$bldid.zip \
44	tptpdc.all_platforms-$bldid.zip \	65	tptpdc.all_platforms-$bldid.zip \
45	tptpdc.linux_ia32.sdk-$bldid.zip \	66	javaprofiler.linux_ia32-$bldid.zip \
46	tptpdc.linux_ia32-$bldid.zip \	67	javaprofiler.linux_ia32.sdk-$bldid.zip \
47	tptpdc.win_ia32.sdk-$bldid.zip \	68	javaprofiler.win_ia32-$bldid.zip \
48	tptpdc.win_ia32-$bldid.zip \	69	javaprofiler.win_ia32.sdk-$bldid.zip \
		70	javaprofiler.linux_em64t-$bldid.zip \
		71	javaprofiler.linux_em64t.sdk-$bldid.zip \
		72	javaprofiler.win_em64t-$bldid.zip \
		73	javaprofiler.win_em64t.sdk-$bldid.zip \
49	tptp.examples-$bldid.zip \	74	tptp.examples-$bldid.zip \
50	tptp.gla.runtime-$bldid.zip \	75	tptp.gla.runtime-$bldid.zip \
51	tptp.lta.runtime-$bldid.zip \	76	tptp.lta.runtime-$bldid.zip \




#!/bin/bash -ex
############################################################################### 
# Copyright (c) 2005, 2009 IBM Corporation and others.
# All rights reserved.   This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at

    -DtemplateFilesDirectory="$bldloc/master/templateFiles" \
    -DcbePlatforms="$CBE_PLATFORMS" \
    $(for plat in $CBE_PLATFORMS; do echo "-Dcbe_$plat=true" | tr '\n' ' '; done) \
    -DtptpdcPlatforms="$TPTPDC_PLATFORMS" \
    $(for plat in $TPTPDC_PLATFORMS; do echo "-Dtptpdc_$plat=true" | tr '\n' ' '; done) \
    -DglaPlatforms="$GLA_PLATFORMS" \
    $(for plat in $GLA_PLATFORMS; do echo "-Dgla_$plat=true" | tr '\n' ' '; done) \
    -DprobekitPlatforms="$PROBEKIT_PLATFORMS" \

    -DiacPlatforms="$IAC_PLATFORMS" \
    $(for plat in $IAC_PLATFORMS; do echo "-Diac_$plat=true" | tr '\n' ' '; done) \
    -DagntctrlPlatforms="$AGNTCTRL_PLATFORMS" \
    $(for plat in $AGNTCTRL_PLATFORMS; do echo "-Dagntctrl_$plat=true" | tr '\n' ' '; done) \
    -DjvmtiPlatforms="$JVMTI_PLATFORMS" \
    $(for plat in $JVMTI_PLATFORMS; do echo "-Djavaprofiler_$plat=true" | tr '\n' ' '; done)


Lines 1-6 Link Here

(-)master/bash/make-multiplatforms.sh (-1 / +9 lines)
1	#!/bin/bash -ex	1	#!/bin/bash -ex
2	###############################################################################	2	###############################################################################
3	# Copyright (c) 2005, 2008 IBM Corporation and others.	3	# Copyright (c) 2005, 2009 IBM Corporation and others.
4	# All rights reserved. This program and the accompanying materials	4	# All rights reserved. This program and the accompanying materials
5	# are made available under the terms of the Eclipse Public License v1.0	5	# are made available under the terms of the Eclipse Public License v1.0
6	# which accompanies this distribution, and is available at	6	# which accompanies this distribution, and is available at
Lines 68-73 Link Here
68		68
69	if [ $tgtosarc = 'linux-ia32' ]; then	69	if [ $tgtosarc = 'linux-ia32' ]; then
70	swtzippth=$swtzipdir/$eclipseSwtLinux	70	swtzippth=$swtzipdir/$eclipseSwtLinux
		71	elif [ $tgtosarc = 'linux-em64t' ]; then
		72	swtzippth=$swtzipdir/$eclipseSwtLinux
		73	elif [ $tgtosarc = 'linux-ipf' ]; then
		74	swtzippth=$swtzipdir/$eclipseSwtLinux
71	elif [ $tgtosarc = 'linux-ppc64' ]; then	75	elif [ $tgtosarc = 'linux-ppc64' ]; then
72	swtzippth=$swtzipdir/$eclipseSwtLinuxPPC	76	swtzippth=$swtzipdir/$eclipseSwtLinuxPPC
73	elif [ $tgtosarc = 'hpux-risc' ]; then	77	elif [ $tgtosarc = 'hpux-risc' ]; then
Lines 78-83 Link Here
78	swtzippth=$swtzipdir/$eclipseSwtAIX	82	swtzippth=$swtzipdir/$eclipseSwtAIX
79	elif [ $tgtosarc = 'windows-ia32' ]; then	83	elif [ $tgtosarc = 'windows-ia32' ]; then
80	swtzippth=$swtzipdir/$eclipseSwtWindows	84	swtzippth=$swtzipdir/$eclipseSwtWindows
		85	elif [ $tgtosarc = 'windows-em64t' ]; then
		86	swtzippth=$swtzipdir/$eclipseSwtWindows
		87	elif [ $tgtosarc = 'windows-ipf' ]; then
		88	swtzippth=$swtzipdir/$eclipseSwtWindows
81	else	89	else
82	unset swtzippth	90	unset swtzippth
83	fi	91	fi




    exit 2
fi

#
#Dependencies
#
WORKING_DIR=`pwd`
export TPTP_ACSDK_HOME=$WORKING_DIR/../agntctrl
export CBE_SDK_HOME=$WORKING_DIR/../cbe/sdk
export PROBEKIT_LIB=$WORKING_DIR/../probekit/org.eclipse.hyades.probekit/src-native/BCI/Release
export JAVA_HOME=$HOME/$1/$2/depends/java_sun
export XERCESCROOT=$HOME/$1/$2/depends/xercesc
export XERCESC_HOME=$XERCESCROOT

# For creating ProbeAgentExtension.so to be packaged in the AC
export RASERVER_SDK=$TPTP_ACSDK_HOME

#
#Compiler
#
export PATH=$JAVA_HOME/bin:/opt/binutils/bin:/usr/bin:/bin:$PATH
export LD_LIBRARY_PATH=/opt/binutils/lib:$XERCESCROOT/lib:$LD_LIBRARY_PATH
export TPTP_ACSDK_HOME=/home/proj/tptp/tptpbld/depends/IA32/TPTP_ACSDK_HOME

#
#GNU make
#
umask 022
export NATIVE_MAKE='make -f org.eclipse.tptp.platform.jvmti.runtime/makefile'
export NATIVE_MAKE='make -f org.eclipse.tptp.platform.jvmti.runtime/makefile'




fi

#
#Dependencies
#
export XERCESCROOT=$HOME/$1/$2/depends/xercesc
export XERCESC_HOME=$XERCESCROOT
export LD_LIBRARY_PATH=$XERCESCROOT/lib
export JAVA_HOME=$HOME/$1/$2/depends/java_5
CBE_SDK_HOME=`pwd`
export CBE_SDK_HOME=`echo $CBE_SDK_HOME/../cbe/sdk`

#
#Compiler
#
PATH=/usr/bin:$PATH

#
#GNU make
#

export JAVA_HOME=$HOME/../tptpbld/depends/IA32/java
umask 022
NATIVE_MAKE=make
export NATIVE_MAKE

export XERCESCROOT=$HOME/../tptpbld/depends/IA32/xerces-c-src_2_6_0
export XERCESC_HOME=$XERCESCROOT
export LD_LIBRARY_PATH=$XERCESCROOT/lib




	<!-- Runs copyright report on the build workspace before new files are created -->	
	<antcall target="checkCopyright" />
	<antcall target="runCHKPII" />

	<replace dir="${buildDirectory}/plugins" includes="**/about.mappings">
		<replacefilter token="@PDESetBuildID@" value="${buildId}"/>
	</replace>

    	<param name="depDir" value="." />
    </antcall>

	<!-- Create a probekit scr folder with it's build requirements -->
	<!-- Manual check-out of Harmony code. Copy files to temp location (as workaround) to push onto native build machine-->
	<cvs 
		command="export"

		<arg value="makefile.unix.build"/>
    </exec>	
	<chmod dir="${buildDirectory}/probekit/platform/org.eclipse.hyades.probekit/src-native/BCI" perm="a+x" includes="**/*.build"/>
	
	<!-- Create a JVMTI src folder with it's build requirements -->
	<mkdir dir="${buildDirectory}/jvmti-src"/>
	<exec executable="cp">
	   <arg line="-r ${buildDirectory}/plugins/org.eclipse.tptp.platform.jvmti.runtime ${buildDirectory}/jvmti-src"/>
	</exec>
	<!-- Get the Harmony code that was checked out manually for probekit -->
	<exec executable="cp">
	   <arg line="-r ${buildDirectory}/probekit/platform/org.apache.harmony_vmcore_verifier ${buildDirectory}/jvmti-src"/>
	</exec>
	<exec executable="cp">
		<arg line="-r ${buildDirectory}/plugins/org.eclipse.hyades.probekit ${buildDirectory}/jvmti-src"/>
	</exec>
	<exec executable="cp">
		<arg line="-r ${buildDirectory}/plugins/org.eclipse.tptp.platform.agentcontroller ${buildDirectory}/jvmti-src"/>
	</exec>
	
	<antcall target="nativeBuild">
        <param name="component" value="probekit" />
        <param name="platforms" value="${probekitPlatforms}" />

		<param name="srcDir" value="${buildDirectory}/plugins/org.eclipse.hyades.execution/src-iac-native" />
    	<param name="depDir" value="." />
    </antcall>
		
	<antcall target="nativeBuild">
        <param name="component" value="tptpdc" />
        <param name="platforms" value="${tptpdcPlatforms}" />
		<param name="srcDir" value="${buildDirectory}/plugins/org.eclipse.tptp.platform.agentcontroller/src-native/collection ${buildDirectory}/plugins/org.eclipse.hyades.probekit/src-native/ProbeAgentExtension" />
    	<param name="depDir" value="${buildDirectory}/all-plugins" />
    </antcall>

    <exec dir="${buildDirectory}/plugins" executable="zip">
        <arg value="-9rq" /> 

		<param name="platformId" value="windows-ia32" />
		<param name="plgId" value="eclipse/plugins/org.eclipse.hyades.probekit" />
		<param name="destDir" value="os/win32/x86" />
	</antcall>

	<!-- agntctrl dependencies -->
    <mkdir dir="${buildDirectory}/post-build"/>
    <exec executable="unzip">
        <arg line="-q ${buildDirectory}/${buildId}/org.eclipse.tptp.platform.runtime-${buildId}.zip -d ${buildDirectory}/post-build"/>

        <arg line="-silent ${buildDirectory}/post-build/eclipse/plugins ${buildDirectory}/all-plugins"/>
    </exec>
    
	<!-- make sure CBE and probekit native builds have finished before starting agntctrl builds. -->
	<exec executable="lockfile">
        <arg line="-r 16 ${publishDirectory}/lock.cbe.linux-ia32 ${publishDirectory}/lock.cbe.windows-ia32"/>
    </exec>

        <arg line="-r 16 ${publishDirectory}/lock.probekit.linux-ia32 ${publishDirectory}/lock.probekit.windows-ia32"/>
    </exec>

    <!-- agntctrl build will continue after removing these lock files -->
    <exec executable="rm">
        <arg line="-f ${publishDirectory}/lock.agntctrl.linux-ia32 ${publishDirectory}/lock.agntctrl.windows-ia32 ${publishDirectory}/lock.agntctrl.linux-em64t ${publishDirectory}/lock.agntctrl.windows-em64t"/>
    </exec>

	<!-- Wait for agntctrl to finish building before building JVMTI -->
	<waitfor maxwait="1000" maxwaitunit="second" checkevery="10" checkeveryunit="second">
		<available file="${publishDirectory}/agntctrl.linux_ia32.zip" />
	</waitfor>
	<waitfor maxwait="1000" maxwaitunit="second" checkevery="10" checkeveryunit="second">
		<available file="${publishDirectory}/agntctrl.linux_em64t.zip" />
	</waitfor>
	<waitfor maxwait="1000" maxwaitunit="second" checkevery="10" checkeveryunit="second">
		<available file="${publishDirectory}/agntctrl.win_ia32.zip" />
	</waitfor>
	<waitfor maxwait="1000" maxwaitunit="second" checkevery="10" checkeveryunit="second">
		<available file="${publishDirectory}/agntctrl.win_em64t.zip" />
	</waitfor>

	<antcall target="nativeBuild">
	    <param name="component" value="jvmti" />
	    <param name="platforms" value="${jvmtiPlatforms}" />
		<param name="srcDir" value="${buildDirectory}/jvmti-src" />
	  	<param name="depDir" value="${buildDirectory}/all-plugins" />
	</antcall>

	<antcall target="packageGLARuntime" />
	<antcall target="internalPkgUse" />


<!--	<mkdir dir="${buildDirectory}/tmp.iac"/>  -->

<!--	<antcall target="addDll2IAC" />   --> 

	<!-- add probe agent extension to probekit plugin -->
	<antcall target="updateNativeRelatedPlugins">
		<param name="component" value="pae" />
		<param name="platform" value="linux_ia32" />
		<param name="platformId" value="linux-ia32" />
		<param name="plgId" value="eclipse/plugins/org.eclipse.hyades.probekit" />
		<param name="destDir" value="os/linux/x86" />
	</antcall>
	<antcall target="updateNativeRelatedPlugins">
		<param name="component" value="pae" />
		<param name="platform" value="win_ia32" />
		<param name="platformId" value="windows-ia32" />
		<param name="plgId" value="eclipse/plugins/org.eclipse.hyades.probekit" />
		<param name="destDir" value="os/win32/x86" />
	</antcall>	
	
<!-- Repackage all the features -->
	

	<move file="${buildDirectory}/AsIsCleanUp/org.eclipse.tptp.platform.sdk-${buildId}.zip" todir="${buildDirectory}/${buildId}"/>	
	<delete dir="${buildDirectory}/AsIsCleanUp"/>
	<!-- END STATIC ANALYSIS -->

	<!-- Wait for the JVMTI native build to finish before adding it to the agntctrl native files -->
	<waitfor maxwait="1000" maxwaitunit="second" checkevery="10" checkeveryunit="second">
		<available file="${publishDirectory}/javaprofiler.linux_ia32.zip" />
	</waitfor>
	<waitfor maxwait="1000" maxwaitunit="second" checkevery="10" checkeveryunit="second">
		<available file="${publishDirectory}/javaprofiler.linux_em64t.zip" />
	</waitfor>
	<waitfor maxwait="1000" maxwaitunit="second" checkevery="10" checkeveryunit="second">
		<available file="${publishDirectory}/javaprofiler.win_ia32.zip" />
	</waitfor>
	<waitfor maxwait="1000" maxwaitunit="second" checkevery="10" checkeveryunit="second">
		<available file="${publishDirectory}/javaprofiler.win_em64t.zip" />
	</waitfor>
	
	<!-- Add ProbeKit and JVMTI plugins to the AC -->
	<antcall target="nativeACpackaging">
		<param name="platform" value="linux_ia32" />
	</antcall>
	<antcall target="nativeACpackaging">
		<param name="platform" value="win_ia32" />
	</antcall>
	<antcall target="nativeACpackaging">
		<param name="platform" value="linux_em64t" />
	</antcall>
	<antcall target="nativeACpackaging">
		<param name="platform" value="win_em64t" />
	</antcall>
	
	<!-- add probe agent extension to probekit plugin -->
	<antcall target="updateNativeRelatedPlugins">
		<param name="component" value="pae-only" />
		<param name="platform" value="linux_ia32" />
		<param name="platformId" value="linux-ia32" />
		<param name="plgId" value="eclipse/plugins/org.eclipse.hyades.probekit" />
		<param name="destDir" value="os/linux/x86" />
	</antcall>
	<antcall target="updateNativeRelatedPlugins">
		<param name="component" value="pae-only" />
		<param name="platform" value="win_ia32" />
		<param name="platformId" value="windows-ia32" />
		<param name="plgId" value="eclipse/plugins/org.eclipse.hyades.probekit" />
		<param name="destDir" value="os/win32/x86" />
	</antcall>

	<!-- add java profiler extension to javaprofiler plugin -->
	<antcall target="updateNativeRelatedPlugins">
		<param name="component" value="jvmti-only" />
		<param name="platform" value="linux_ia32" />
		<param name="platformId" value="linux-ia32" />
		<param name="plgId" value="eclipse/plugins/org.eclipse.tptp.platform.jvmti.runtime" />
		<param name="destDir" value="agent_files/linux_ia32" />
	</antcall>
	<antcall target="updateNativeRelatedPlugins">
		<param name="component" value="jvmti-only" />
		<param name="platform" value="win_ia32" />
		<param name="platformId" value="windows-ia32" />
		<param name="plgId" value="eclipse/plugins/org.eclipse.tptp.platform.jvmti.runtime" />
		<param name="destDir" value="agent_files/win_ia32" />
	</antcall>
	<antcall target="updateNativeRelatedPlugins">
		<param name="component" value="jvmti-only" />
		<param name="platform" value="linux_em64t" />
		<param name="platformId" value="linux-em64t" />
		<param name="plgId" value="eclipse/plugins/org.eclipse.tptp.platform.jvmti.runtime" />
		<param name="destDir" value="agent_files/linux_em64t" />
	</antcall>
	<antcall target="updateNativeRelatedPlugins">
		<param name="component" value="jvmti-only" />
		<param name="platform" value="win_em64t" />
		<param name="platformId" value="windows-em64t" />
		<param name="plgId" value="eclipse/plugins/org.eclipse.tptp.platform.jvmti.runtime" />
		<param name="destDir" value="agent_files/win_em64t" />
	</antcall>
	
	<!-- add agent controler files to iac plugin -->
	<antcall target="updateNativeRelatedPlugins">
		<param name="component" value="agntctrl" />
		<param name="platform" value="linux_ia32" />
		<param name="platformId" value="linux-ia32" />
		<param name="plgId" value="eclipse/plugins/org.eclipse.tptp.platform.ac.linux_ia32" />
		<param name="destDir" value="agent_controller" />
	</antcall>
	<antcall target="updateNativeRelatedPlugins">
		<param name="component" value="agntctrl" />
		<param name="platform" value="win_ia32" />
		<param name="platformId" value="windows-ia32" />
		<param name="plgId" value="eclipse/plugins/org.eclipse.tptp.platform.ac.win_ia32" />
		<param name="destDir" value="agent_controller" />
	</antcall>
	<antcall target="updateNativeRelatedPlugins">
		<param name="component" value="agntctrl" />
		<param name="platform" value="linux_em64t" />
		<param name="platformId" value="linux-em64t" />
		<param name="plgId" value="eclipse/plugins/org.eclipse.tptp.platform.ac.linux_em64t" />
		<param name="destDir" value="agent_controller" />
	</antcall>
	<antcall target="updateNativeRelatedPlugins">
		<param name="component" value="agntctrl" />
		<param name="platform" value="win_em64t" />
		<param name="platformId" value="windows-em64t" />
		<param name="plgId" value="eclipse/plugins/org.eclipse.tptp.platform.ac.win_em64t" />
		<param name="destDir" value="agent_controller" />
	</antcall>

	<!-- pack the driver -->
	<property name="pack200wrapper" 
		value="${buildDirectory}/platform/org.eclipse.hyades.releng.builder/master/bash/pack200"/>

	
	<!-- Check feature and plugin version numbers -->
	<antcall target="checkVersion" />

	<!-- Create the IAC's by altering the Standalone AC's -->
	<exec executable="make-iac.sh">
		<arg line="${buildDirectory} linux_ia32 ${publishDirectory} ${buildId}"/>
	</exec>
	<exec executable="make-iac.sh">
		<arg line="${buildDirectory} win_ia32 ${publishDirectory} ${buildId}"/>
	</exec>
	<exec executable="make-iac.sh">
		<arg line="${buildDirectory} linux_em64t ${publishDirectory} ${buildId}"/>
	</exec>
	<exec executable="make-iac.sh">
		<arg line="${buildDirectory} win_em64t ${publishDirectory} ${buildId}"/>
	</exec>

	<!-- Repackage native components -->
	<mkdir dir="${buildDirectory}/tmp.packaging" />
    <antcall target="nativeRepackaging">

    	<param name="platform" value="win_ia32"/>
    	<param name="platformId" value="windows-ia32"/>
    </antcall>

	<antcall target="nativeRepackaging">
	    <param name="component" value="cbe"/>
	    <param name="platform" value="linux_em64t"/>
	    <param name="platformId" value="linux-em64t"/>
	</antcall>
	<antcall target="nativeRepackaging">
	   	<param name="component" value="cbe"/>
	   	<param name="platform" value="win_em64t"/>
	   	<param name="platformId" value="windows-em64t"/>
	</antcall>
	
    <antcall target="nativeRepackaging">
    	<param name="component" value="probekit"/>
    	<param name="platform" value="linux_ia32"/>
    	<param name="platformId" value="linux-ia32"/>
    </antcall>
    <antcall target="nativeRepackaging">
    	<param name="component" value="probekit"/>
    	<param name="platform" value="win_ia32"/>
    	<param name="platformId" value="windows-ia32"/>
    </antcall>
	
    <antcall target="nativeRepackaging">
    	<param name="component" value="probekit"/>
    	<param name="platform" value="linux_em64t"/>
    	<param name="platformId" value="linux-em64t"/>
    </antcall>
	<antcall target="nativeRepackaging">
		<param name="component" value="probekit"/>
		<param name="platform" value="win_em64t"/>
		<param name="platformId" value="windows-em64t"/>
	</antcall>
	
    <antcall target="nativeRepackaging">
    	<param name="component" value="agntctrl"/>
    	<param name="platform" value="linux_ia32"/>
    	<param name="platformId" value="linux-ia32"/>
    </antcall>
    <antcall target="nativeRepackaging">
    	<param name="component" value="agntctrl"/>
    	<param name="platform" value="win_ia32"/>
    	<param name="platformId" value="windows-ia32"/>
    </antcall>
	<antcall target="nativeRepackaging">
	    <param name="component" value="agntctrl"/>
	    <param name="platform" value="linux_em64t"/>
	    <param name="platformId" value="linux-em64t"/>
	</antcall>
	<antcall target="nativeRepackaging">
	   	<param name="component" value="agntctrl"/>
	   	<param name="platform" value="win_em64t"/>
	   	<param name="platformId" value="windows-em64t"/>
	</antcall>
	
	<!-- TEMP - make a  copy of the agntctrl all_platform.zip named tptpdc.all_platform for consumtion by IES until they are ready for new zip name -->
	<exec executable="unzip">
		<arg line="-q ${publishDirectory}/agntctrl.all_platforms-${buildId} -d ${buildDirectory}/tptpdc-package"/>
	</exec>
	<exec executable="mv">
		<arg line="${buildDirectory}/tptpdc-package/tptp/agntctrl ${buildDirectory}/tptpdc-package/tptp/tptpdc"/>
	</exec>
	<exec executable="zip" dir="${buildDirectory}/tptpdc-package" failonerror="true">
		<arg line="-9rquy ${publishDirectory}/tptpdc.all_platforms-${buildId}.zip tptp" />
	</exec>
	<delete dir="${buildDirectory}/tptpdc-package"/>

	<antcall target="nativeRepackaging">
    	<param name="component" value="javaprofiler"/>
    	<param name="platform" value="linux_ia32"/>
    	<param name="platformId" value="linux-ia32"/>
    </antcall>
    <antcall target="nativeRepackaging">
    	<param name="component" value="javaprofiler"/>
    	<param name="platform" value="win_ia32"/>
    	<param name="platformId" value="windows-ia32"/>
    </antcall>
	<antcall target="nativeRepackaging">
	    <param name="component" value="javaprofiler"/>
	    <param name="platform" value="linux_em64t"/>
	    <param name="platformId" value="linux-em64t"/>
	</antcall>
	<antcall target="nativeRepackaging">
	   	<param name="component" value="javaprofiler"/>
	   	<param name="platform" value="win_em64t"/>
	   	<param name="platformId" value="windows-em64t"/>
	</antcall>
	
	<antcall target="createDriversList" />
</target>

<!-- Adds javaprofiler probekit and profiler.jar plugins to the ${platform} native AC plugin -->
<target name="nativeACpackaging">
	<mkdir dir="${buildDirectory}/ac-package" />

	<exec executable="unzip">
		<arg line="-q ${publishDirectory}/javaprofiler.${platform}.zip -d ${buildDirectory}/ac-package"/>
	</exec>
	<exec executable="unzip">
		<arg line="-q ${publishDirectory}/pae.${platform}.zip -d ${buildDirectory}/ac-package/plugins/org.eclipse.hyades.probekit"/>
	</exec>
	<copy file="${buildDirectory}/plugins/org.eclipse.tptp.platform.jvmti.runtime/profiler.jar" todir="${buildDirectory}/ac-package/plugins/org.eclipse.tptp.javaprofiler" />
	<copy file="${buildDirectory}/plugins/org.eclipse.tptp.platform.jvmti.runtime/about.html" todir="${buildDirectory}/ac-package/plugins/org.eclipse.tptp.javaprofiler" />

	<exec executable="zip" dir="${buildDirectory}/ac-package">
		<arg line="-r9uy ${publishDirectory}/agntctrl.${platform}.zip plugins/org.eclipse.hyades.probekit plugins/org.eclipse.tptp.javaprofiler"/>
	</exec>
	
	<delete dir="${buildDirectory}/ac-package"/>
	
</target>
	
<target name="nativeRepackaging" if="${component}_${platformId}">
	<!--
		Required Params:
			component  (ie: cbe|probekit|...)
			platform  ( part of native zip file name ie: os390|linux_ia32|...)
			platformId (as in the call to make-multiple-platforms.sh)
	-->

	<sleep seconds="2"/>
	<!-- Add license and notice -->
    <exec executable="zip" failonerror="true">
        <arg value="-9juy" /> 
        <arg value="${newRTFile}" />
        <arg value="${buildDirectory}/${buildId}/notice.html" />
        <arg value="${buildDirectory}/${buildId}/epl-v10.html" />


	<!-- Add license and notice -->
    <exec executable="zip" failonerror="true">
        <arg value="-9juqy" /> 
        <arg value="${newSDKFile}" />
        <arg value="${buildDirectory}/${buildId}/notice.html" />
        <arg value="${buildDirectory}/${buildId}/epl-v10.html" />


	<!-- Add license and notice -->
    <exec executable="zip" failonerror="true">
        <arg value="-9juqy" /> 
        <arg value="${newUTFile}" />
        <arg value="${buildDirectory}/${buildId}/notice.html" />
        <arg value="${buildDirectory}/${buildId}/epl-v10.html" />

	<antcall target="allinone.assemble">
		<param name="eviroment.modifier" value="win"/>
	</antcall>

	
	<!-- Temp. Work around for certain native components being installed in the p2 all-in-ones -->
	
	<exec executable="ls" outputproperty="plugin.dirs">
		<arg value="${buildDirectory}/win_allinone/eclipse/plugins" />
	</exec>
	<exec executable="grep" outputproperty="probe.dir" inputstring="${plugin.dirs}">
		<arg value="org.eclipse.hyades.probekit_" />
	</exec>
	
	<copy todir="${buildDirectory}/linux_allinone/eclipse/plugins" includeEmptyDirs="true" preservelastmodified="true">
		<fileset dir="${buildDirectory}/post-build/eclipse/plugins" includes="**/org.eclipse.hyades.probekit_*/os/**"/>
	</copy>
	<copy todir="${buildDirectory}/win_allinone/eclipse/plugins" includeEmptyDirs="true" preservelastmodified="true">
		<fileset dir="${buildDirectory}/post-build/eclipse/plugins" includes="**/org.eclipse.hyades.probekit_*/os/**"/>
	</copy>

	<unzip src="${publishDirectory}/pae.linux_ia32.zip" dest="${buildDirectory}/win_allinone/eclipse/plugins/${probe.dir}/os/linux/x86"/>
	<unzip src="${publishDirectory}/pae.linux_ia32.zip" dest="${buildDirectory}/linux_allinone/eclipse/plugins/${probe.dir}/os/linux/x86"/>
	<unzip src="${publishDirectory}/pae.win_ia32.zip" dest="${buildDirectory}/win_allinone/eclipse/plugins/${probe.dir}/os/win32/x86"/>
	<unzip src="${publishDirectory}/pae.win_ia32.zip" dest="${buildDirectory}/linux_allinone/eclipse/plugins/${probe.dir}/os/win32/x86"/>

	<!-- Restore file permissions for linux -->
	<chmod dir="${buildDirectory}/linux_allinone/eclipse/plugins" perm="755" includes="**/org.eclipse.hyades.probekit_*/os/linux/x86/*"/>
	<chmod dir="${buildDirectory}/win_allinone/eclipse/plugins" perm="755" includes="**/org.eclipse.hyades.probekit_*/os/linux/x86/*"/>

	
	<exec executable="zip" dir="${buildDirectory}/win_allinone">
		<arg line="-qry ${publishDirectory}/tptp.runtime.allInOne.win32.win32.x86-${buildId}.zip eclipse"/>

	<exec executable="zip" dir="${buildDirectory}/linux_allinone">
		<arg line="-qry ${publishDirectory}/tptp.runtime.allInOne.linux.gtk.x86-${buildId}.zip eclipse"/>
	</exec>

	<antcall target="publish" />

	<!-- Did any plugins fail? -->




fi

#
#Dependencies
#
PATH=/usr/bin:$PATH

#
export JDK_HOME=$HOME/$1/$2/depends/java
#
PATH=$HOME/$1/$2/depends/java/jre/bin:$HOME/$1/$2/depends/java/bin:$PATH

#
#Compiler
#
export PATH=$HOME/$1/$2/depends/make:$HOME/$1/$2/depends/java/jre/bin:$HOME/$1/$2/depends/java/bin:/usr/bin:$PATH

#
#GNU make
#
PATH=$HOME/$1/$2/depends/make:$PATH

export PATH
umask 022
export NATIVE_MAKE='make -f org.eclipse.hyades.probekit/src-native/BCI/makefile.unix.build'
export ZIP_EXT=linux_ia32.zip




    exit 2
fi

#
#Dependencies
#
WORKING_DIR=`pwd`
export TPTP_ACSDK_HOME=$WORKING_DIR/../agntctrl
export CBE_SDK_HOME=$WORKING_DIR/../cbe/sdk
export PROBEKIT_LIB=$WORKING_DIR/../probekit/org.eclipse.hyades.probekit/src-native/BCI/Release
export XERCESCROOT=$HOME/$1/$2/depends/xercesc
export XERCESC_HOME=$XERCESCROOT
export JAVA_HOME=$HOME/$1/$2/depends/java

# For creating ProbeAgentExtension.so to be packaged in the AC
export RASERVER_SDK=$TPTP_ACSDK_HOME

#
#Compiler
#
export LD_LIBRARY_PATH=$XERCESCROOT/lib:$JAVA_HOME/lib:$LD_LIBRARY_PATH
export PATH=$JAVA_HOME/bin:/usr/bin:/bin:$PATH
export INCLUDE=$INCLUDE:$JAVA_HOME/include

#
#GNU make
#
umask 022

export NATIVE_MAKE='make -f org.eclipse.tptp.platform.jvmti.runtime/makefile'

Lines 3-13 Link Here

(-)slave/windows-ia32/configure-environment.jvmti.sf (-5 / +20 lines)
3	exit 2	3	exit 2
4	fi	4	fi
5		5
6	#export JAVA_HOME="D:\\Progra~1\\Java\\jrockit-R26.3.0-jdk1.5.0_06"	6	#
7	#export INCLUDE=$INCLUDE;"C:\Util\ibm.java.sdk.142\include"	7	#Dependencies
8	#export PATH=/cygdrive/d/Progra~1/Java/jrockit-R26.3.0-jdk1.5.0_06/bin:$PATH	8	#
9	export TPTP_ACSDK_HOME="D:\\TPTP_ACSDK_HOME"	9	export TPTP_ACSDK_HOME=../../../../agntctrl
		10	export CBE_SDK_HOME=../../../../cbe/sdk
		11	export PROBEKIT_LIB="..\probekit\org.eclipse.hyades.probekit\src-native\BCI\Release"
		12	export JAVA_HOME="C:\Util\jdk1.5.0_16"
		13	export XERCESCROOT=$HOME/$1/$2/depends/xerces-c-src_2_6_0
		14	export XERCESC_HOME=$XERCESCROOT
		15	export RASERVER_SDK=../../../../../agntctrl
		16	export JDK_HOME=$JAVA_HOME
10		17
11	umask 002	18	#
		19	#Compiler
		20	#
		21	export PATH=$JAVA_HOME/bin:/opt/binutils/bin:/usr/bin:/bin:$PATH
		22	export LD_LIBRARY_PATH=/opt/binutils/lib:$XERCESCROOT/lib:$LD_LIBRARY_PATH
12		23
		24	#
		25	#GNU make
		26	#
		27	umask 002
13	export NATIVE_MAKE='nmake -f org.eclipse.tptp.platform.jvmti.runtime/makefile.win_ia32'	28	export NATIVE_MAKE='nmake -f org.eclipse.tptp.platform.jvmti.runtime/makefile.win_ia32'




fi

#
#Dependencies
#
# CBE_SDK_HOME must be set to a folder in the root level of a Windows drive.
CBE_SDK_HOME_TMP=`pwd | cut -d/ -f1-6`
CBE_SDK_HOME_TMP="$CBE_SDK_HOME_TMP/cbe/sdk"
rm -rf /cygdrive/d/CBE_SDK_HOME2/*
cp -r ${CBE_SDK_HOME_TMP}/* /cygdrive/d/CBE_SDK_HOME2
export CBE_SDK_HOME="D:\CBE_SDK_HOME2"
export XERCESCROOT="C:\Util\xerces-c_2_6_0"
export XERCESC_HOME="$XERCESCROOT"

#
#Compiler
#
export PATH="C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Bin:$PATH"

#
#GNU make
#
umask 002

export TEMP_LICENSE_HOME="D:\cygwin\home\build\TEMP_LICENSE_HOME"
export RAC_SDK_HOME="D:\RAC_SDK_HOME"
export CBE_SDK_HOME="D:\CBE_SDK_HOME"
export XERCESCROOT="C:\Util\xerces-c_2_6_0"
export XERCESC_HOME="$XERCESCROOT"
export NATIVE_MAKE='nmake -f makefile.win_ia32'

Lines 170-176 Link Here

(-)master/templateFiles/drop.html.template (-2 / +2 lines)
170	<td>	170	<td>
171	<select name="runtime">	171	<select name="runtime">
172	<option value="" selected>-- Select a platform --</option>	172	<option value="" selected>-- Select a platform --</option>
173	<option value="http://www.eclipse.org/downloads/download.php?file=/tptp/@releaseVersion@/dev/@buildID@/tptpdc.all_platforms-@buildID@.zip">ALL</option>	173	<option value="http://www.eclipse.org/downloads/download.php?file=/tptp/@releaseVersion@/dev/@buildID@/agntctrl.all_platforms-@buildID@.zip">ALL</option>
174	<option value="http://www.eclipse.org/downloads/download.php?file=/tptp/@releaseVersion@/dev/@buildID@/agntctrl.linux_ia32-@buildID@.zip">LINUX-IA32</option>	174	<option value="http://www.eclipse.org/downloads/download.php?file=/tptp/@releaseVersion@/dev/@buildID@/agntctrl.linux_ia32-@buildID@.zip">LINUX-IA32</option>
175	<option value="http://www.eclipse.org/downloads/download.php?file=/tptp/@releaseVersion@/dev/@buildID@/agntctrl.linux_em64t-@buildID@.zip">LINUX-EM64T</opption>	175	<option value="http://www.eclipse.org/downloads/download.php?file=/tptp/@releaseVersion@/dev/@buildID@/agntctrl.linux_em64t-@buildID@.zip">LINUX-EM64T</opption>
176	<option value="http://www.eclipse.org/downloads/download.php?file=/tptp/@releaseVersion@/dev/@buildID@/agntctrl.linux_ipf-@buildID@.zip">LINUX-IPF</option>	176	<option value="http://www.eclipse.org/downloads/download.php?file=/tptp/@releaseVersion@/dev/@buildID@/agntctrl.linux_ipf-@buildID@.zip">LINUX-IPF</option>
Lines 190-196 Link Here
190	<td>	190	<td>
191	<select name="sdk">	191	<select name="sdk">
192	<option value="" selected>-- Select a platform --</option>	192	<option value="" selected>-- Select a platform --</option>
193	<option value="http://www.eclipse.org/downloads/download.php?file=/tptp/@releaseVersion@/dev/@buildID@/tptpdc.all_platforms.sdk-@buildID@.zip">ALL</option>	193	<option value="http://www.eclipse.org/downloads/download.php?file=/tptp/@releaseVersion@/dev/@buildID@/agntctrl.all_platforms.sdk-@buildID@.zip">ALL</option>
194	<option value="http://www.eclipse.org/downloads/download.php?file=/tptp/@releaseVersion@/dev/@buildID@/agntctrl.linux_ia32.sdk-@buildID@.zip">LINUX-IA32</option>	194	<option value="http://www.eclipse.org/downloads/download.php?file=/tptp/@releaseVersion@/dev/@buildID@/agntctrl.linux_ia32.sdk-@buildID@.zip">LINUX-IA32</option>
195	<option value="http://www.eclipse.org/downloads/download.php?file=/tptp/@releaseVersion@/dev/@buildID@/agntctrl.linux_em64t.sdk-@buildID@.zip">LINUX-EM64T</opption>	195	<option value="http://www.eclipse.org/downloads/download.php?file=/tptp/@releaseVersion@/dev/@buildID@/agntctrl.linux_em64t.sdk-@buildID@.zip">LINUX-EM64T</opption>
196	<option value="http://www.eclipse.org/downloads/download.php?file=/tptp/@releaseVersion@/dev/@buildID@/agntctrl.linux_ipf.sdk-@buildID@.zip">LINUX-IPF</option>	196	<option value="http://www.eclipse.org/downloads/download.php?file=/tptp/@releaseVersion@/dev/@buildID@/agntctrl.linux_ipf.sdk-@buildID@.zip">LINUX-IPF</option>




#!/bin/bash -x
############################################################################### 
# Copyright (c) 2009 IBM Corporation and others.
# All rights reserved.   This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
# $Id: $
#
# Contributors: 
# IBM - Initial API and implementation
############################################################################### 

buildDirectory=$1
platform=$2
publishDirectory=$3
buildId=$4

pushd ${buildDirectory}/post-build/eclipse/plugins
acplugin=$(eval echo org.eclipse.tptp.platform.agentcontroller_*)
acNative=$(eval echo org.eclipse.tptp.platform.ac.${platform}_*)
popd

iac_packages="tptp.runtime-${buildId} \
	tptp.sdk-${buildId} \
	tptp.platform.runtime-${buildId} \
	tptp.platform.sdk-${buildId}"

for package in $iac_packages; do
	unzip -q ${publishDirectory}/${package}.zip -d ${buildDirectory}/iac-repack
	
	# exclude content not necessary for IAC
	rm -rf ${buildDirectory}/iac-repack/eclipse/plugins/${acNative}/agent_controller/getting_started.html ${buildDirectory}/iac-repack/eclipse/plugins/${acNative}/agent_controller/plugins ${buildDirectory}/iac-repack/eclipse/plugins/${acNative}/agent_controller/bin/tptpcore.jar
	case ${platform} in
	    win*) rm -rf ${buildDirectory}/iac-repack/eclipse/plugins/${acNative}/agent_controller/lib ;;
	    linux*) rm -f ${buildDirectory}/iac-repack/eclipse/plugins/${acNative}/agent_controller/lib/config.jar ;;
	esac
	
	# update SetConfig script for IAC
	# to look for config.jar in org.eclipse.tptp.platform.agentcontroller plugin
	# (bug #215023)
	case ${platform} in
		win*) sed -i "s%..\\\\lib\\\\%..\\\\..\\\\..\\\\$acplugin\\\\%g" ${buildDirectory}/iac-repack/eclipse/plugins/${acNative}/agent_controller/bin/SetConfig.bat ;;
		linux*) sed -i "s%../lib/%../../../$acplugin/%g" ${buildDirectory}/iac-repack/eclipse/plugins/${acNative}/agent_controller/bin/SetConfig.sh ;;
	esac
	# Notes:
	#  we quote sed commands into " (not in ') because of we need shell to expand $rmt_acplugin variable 
	#  we use \\\\ for \ because of shell converts \\ to \ and then sed converts \\ to \
	#  we use % as separator for sed s command because the usual / conflicts with / in path
	
	# update META-INF/p2.inf for Linux platforms (bug #230922)
	if [ `echo ${platform} | grep linux` ]
	then
	    # update version part of swt libraries file names
		if [ -f ${buildDirectory}/iac-repack/eclipse/plugins/${acNative}/agent_controller/META-INF/p2.inf -a -d ${buildDirectory}/iac-repack/eclipse/plugins/${acNative}/lib ]
		then
	    	pushd ${buildDirectory}/iac-repack/eclipse/plugins/${acNative}/lib
	        libswt_ver=$(echo libswt-gtk-*.so | sed "s/libswt-gtk-//" | sed "s/.so//")
	        popd
	        if [ "$libswt_ver" ]; then
	        	sed -i "s/#SWTLIBVER#/$libswt_ver/" ${buildDirectory}/iac-repack/eclipse/plugins/${acNative}/META-INF/p2.inf
	        fi
	    fi
	fi
	
	pushd ${buildDirectory}/iac-repack
	rm -f ${publishDirectory}/${package}.zip
	zip -rqy9 ${publishDirectory}/${package}.zip *
	popd
	
	rm -rf ${buildDirectory}/iac-repack
done




if [ $# -ne 2 ]; then
    echo "usage: . configure-environment.agntctrl.sf <project> <release>"
    exit 2
fi

#
#Dependencies
#
export JAVA_HOME=$HOME/$1/$2/depends/java
export XERCESCROOT=$HOME/$1/$2/depends/xercesc
export XERCESC_HOME=$XERCESCROOT
CBE_SDK_HOME=`pwd`
export CBE_SDK_HOME=`echo $CBE_SDK_HOME/../cbe/sdk`

#
#Compiler
#
PATH=/usr/bin:$PATH
export LD_LIBRARY_PATH=/lib64:$LD_LIBRARY_PATH:$XERCESCROOT/lib
export INCLUDE=$INCLUDE:/usr/include/uuid
export KERNEL_SRC=/usr

#
#GNU make
#
umask 022
NATIVE_MAKE=make
export NATIVE_MAKE




#!/bin/bash -x
############################################################################### 
# Copyright (c) 2009 IBM Corporation and others.
# All rights reserved.   This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
# $Id: $
#
# Contributors: 
# IBM - Initial API and implementation
############################################################################### 

# Perform Sanity checking and set up environment.
source convert-parameters-into-variables.sf
source verify-environment-variables.sf \
    '--depdir=Directory where all dependencies to the build are stored' \
    '--srcdir=Directory where the source code is stored and to which dependencies will be added' \
    '--rmtosarc=Operating system and architecture of the remote host'

# Set up the internal directory structure.
pkgdir="$srcdir/packaging"

# Create hyades data collection engine dependency zip file
depplg="$pkgdir/plugins"
mkdir -p "$depplg"
ln -s `ls -1d $depdir/org.apache.commons.logging_*|head -1` \
	  "$depdir"/org.eclipse.emf.common_* \
      "$depdir"/org.eclipse.emf.ecore_* \
      "$depdir"/org.eclipse.equinox.common_* \
      "$depdir"/org.eclipse.emf.ecore.xmi_* \
      "$depdir"/org.junit_* \
      "$depdir"/org.eclipse.tptp.platform.models_* \
      "$depdir"/org.eclipse.hyades.execution_* \
      "$depdir"/org.eclipse.tptp.platform.logging.events_* \
      "$depdir"/org.eclipse.hyades.logging.core_* \
      "$depdir"/org.eclipse.tptp.platform.collection.framework_* \
      "$depdir"/org.eclipse.jface_* \
      "$depdir"/org.eclipse.osgi_* \
      "$depdir"/com.ibm.icu_* \
      "$depdir"/org.eclipse.core.runtime_* \
      "$depdir"/org.eclipse.core.commands_* \
      "$depdir"/org.eclipse.tptp.platform.models.hierarchy_* \
      "$depdir"/org.eclipse.tptp.monitoring.instrumentation_* \
      "$depdir"/org.eclipse.tptp.test.tools.junit.plugin_* \
      "$depdir"/org.eclipse.tptp.trace.arm_* \
      "$depdir"/org.mx4j.jmx_* \
      "$depdir"/org.opengroup.arm_* \
      "$depplg"

cp -r "$depdir"/org.eclipse.hyades.test.core_* \
      "$depdir"/org.eclipse.hyades.test.tools.core_* \
      "$depplg"

rm -f $depplg/org.eclipse.hyades.test.core_*/hexrecr.jar \
	  $depplg/org.eclipse.hyades.test.tools.core_*/http.hexrecr.jar

mkdir -p "$pkgdir/lib"
mkdir -p "$pkgdir/bin"

if [ $swtzippth ]; then
        mkdir -p "$pkgdir"/swt_licenses "$pkgdir"/temporarydir
        unzip $swtzippth -d "$pkgdir"/temporarydir
        unzip "$pkgdir"/temporarydir/swt.jar *.dll -d "$pkgdir"/bin
        unzip "$pkgdir"/temporarydir/swt.jar lib* -d "$pkgdir"/lib
        
        mv $pkgdir/temporarydir/swt.jar "$depplg"
        mv $pkgdir/temporarydir/about.html $pkgdir/temporarydir/about_files $pkgdir/swt_licenses
        rm -r "$pkgdir/temporarydir"
fi

ln -s "$depdir"/org.eclipse.tptp.platform.agentcontroller_*/config.jar "$pkgdir"/lib

cp -r "$depdir"/org.eclipse.tptp.platform.execution/tptpcore.jar \
      "$pkgdir/bin"
      
mkdir -p "$depplg"/org.eclipse.tptp.jsse
mkdir -p "$depplg"/org.eclipse.tptp.jsse/config
cp -r "$depdir"/org.eclipse.tptp.platform.agentcontroller/jsse.jar \
      "$depdir"/org.eclipse.tptp.platform.agentcontroller/about.html \
      "$depplg"/org.eclipse.tptp.jsse
cp -r "$depdir"/org.eclipse.tptp.platform.agentcontroller/jsse-config/pluginconfig.xml "$depplg"/org.eclipse.tptp.jsse/config

Return to bug 182085

Lines 1-4 Link Here

(-)master/bash/updateNativeRelatedPlugins.sh (-1 / +12 lines)
1	#!/bin/bash -x	1	#!/bin/bash -x
		2	###############################################################################
		3	# Copyright (c) 2009 IBM Corporation and others.
		4	# All rights reserved. This program and the accompanying materials
		5	# are made available under the terms of the Eclipse Public License v1.0
		6	# which accompanies this distribution, and is available at
		7	# http://www.eclipse.org/legal/epl-v10.html
		8	# $Id: $
		9	#
		10	# Contributors:
		11	# IBM - Initial API and implementation
		12	###############################################################################
2		13
3	wsdir=$1	14	wsdir=$1
4	bldid=$2	15	bldid=$2
Lines 18-24 Link Here
18	unzip -q $publishdir/$component.$platform.zip -d $wsdir/upd-$component/$updpath	29	unzip -q $publishdir/$component.$platform.zip -d $wsdir/upd-$component/$updpath
19	cd $wsdir/upd-$component	30	cd $wsdir/upd-$component
20	chmod +x $updpath/*	31	chmod +x $updpath/*
21	zip -urq $feat *	32	zip -urqy $feat *
22	rm -rf $wsdir/upd-$component	33	rm -rf $wsdir/upd-$component
23	unset feat updpath	34	unset feat updpath
24	fi	35	fi

Lines 1-6 Link Here

(-)master/bash/eclipse-build.sh (-4 / +4 lines)
1	#!/bin/bash -ex	1	#!/bin/bash -ex
2	###############################################################################	2	###############################################################################
3	# Copyright (c) 2005 IBM Corporation and others.	3	# Copyright (c) 2005, 2009 IBM Corporation and others.
4	# All rights reserved. This program and the accompanying materials	4	# All rights reserved. This program and the accompanying materials
5	# are made available under the terms of the Eclipse Public License v1.0	5	# are made available under the terms of the Eclipse Public License v1.0
6	# which accompanies this distribution, and is available at	6	# which accompanies this distribution, and is available at
Lines 104-111 Link Here
104	-DtemplateFilesDirectory="$bldloc/master/templateFiles" \	104	-DtemplateFilesDirectory="$bldloc/master/templateFiles" \
105	-DcbePlatforms="$CBE_PLATFORMS" \	105	-DcbePlatforms="$CBE_PLATFORMS" \
106	$(for plat in $CBE_PLATFORMS; do echo "-Dcbe_$plat=true" \| tr '\n' ' '; done) \	106	$(for plat in $CBE_PLATFORMS; do echo "-Dcbe_$plat=true" \| tr '\n' ' '; done) \
107	-DtptpdcPlatforms="$TPTPDC_PLATFORMS" \
108	$(for plat in $TPTPDC_PLATFORMS; do echo "-Dtptpdc_$plat=true" \| tr '\n' ' '; done) \
109	-DglaPlatforms="$GLA_PLATFORMS" \	107	-DglaPlatforms="$GLA_PLATFORMS" \
110	$(for plat in $GLA_PLATFORMS; do echo "-Dgla_$plat=true" \| tr '\n' ' '; done) \	108	$(for plat in $GLA_PLATFORMS; do echo "-Dgla_$plat=true" \| tr '\n' ' '; done) \
111	-DprobekitPlatforms="$PROBEKIT_PLATFORMS" \	109	-DprobekitPlatforms="$PROBEKIT_PLATFORMS" \
Lines 113-117 Link Here
113	-DiacPlatforms="$IAC_PLATFORMS" \	111	-DiacPlatforms="$IAC_PLATFORMS" \
114	$(for plat in $IAC_PLATFORMS; do echo "-Diac_$plat=true" \| tr '\n' ' '; done) \	112	$(for plat in $IAC_PLATFORMS; do echo "-Diac_$plat=true" \| tr '\n' ' '; done) \
115	-DagntctrlPlatforms="$AGNTCTRL_PLATFORMS" \	113	-DagntctrlPlatforms="$AGNTCTRL_PLATFORMS" \
116	$(for plat in $AGNTCTRL_PLATFORMS; do echo "-Dagntctrl_$plat=true" \| tr '\n' ' '; done)	114	$(for plat in $AGNTCTRL_PLATFORMS; do echo "-Dagntctrl_$plat=true" \| tr '\n' ' '; done) \
		115	-DjvmtiPlatforms="$JVMTI_PLATFORMS" \
		116	$(for plat in $JVMTI_PLATFORMS; do echo "-Djavaprofiler_$plat=true" \| tr '\n' ' '; done)
117		117

Lines 3-13 Link Here

(-)slave/linux-ia32/configure-environment.jvmti.sf (-5 / +22 lines)
3	exit 2	3	exit 2
4	fi	4	fi
5		5
6	export JAVA_HOME=/home/proj/tptp/builder/ia32/TPTP/4.2.0/depends/jrockit	6	#
		7	#Dependencies
		8	#
		9	WORKING_DIR=`pwd`
		10	export TPTP_ACSDK_HOME=$WORKING_DIR/../agntctrl
		11	export CBE_SDK_HOME=$WORKING_DIR/../cbe/sdk
		12	export PROBEKIT_LIB=$WORKING_DIR/../probekit/org.eclipse.hyades.probekit/src-native/BCI/Release
		13	export JAVA_HOME=$HOME/$1/$2/depends/java_sun
		14	export XERCESCROOT=$HOME/$1/$2/depends/xercesc
		15	export XERCESC_HOME=$XERCESCROOT
		16
		17	# For creating ProbeAgentExtension.so to be packaged in the AC
		18	export RASERVER_SDK=$TPTP_ACSDK_HOME
		19
		20	#
		21	#Compiler
		22	#
7	export PATH=$JAVA_HOME/bin:/opt/binutils/bin:/usr/bin:/bin:$PATH	23	export PATH=$JAVA_HOME/bin:/opt/binutils/bin:/usr/bin:/bin:$PATH
8	export LD_LIBRARY_PATH=/opt/binutils/lib:$LD_LIBRARY_PATH	24	export LD_LIBRARY_PATH=/opt/binutils/lib:$XERCESCROOT/lib:$LD_LIBRARY_PATH
9	export TPTP_ACSDK_HOME=/home/proj/tptp/tptpbld/depends/IA32/TPTP_ACSDK_HOME
10		25
		26	#
		27	#GNU make
		28	#
11	umask 022	29	umask 022
12		30	export NATIVE_MAKE='make -f org.eclipse.tptp.platform.jvmti.runtime/makefile'
13	export NATIVE_MAKE='make -f org.eclipse.tptp.platform.jvmti.runtime/makefile'

Lines 4-29 Link Here

(-)slave/linux-em64t/configure-environment.probekit.sf (-14 / +5 lines)
4	fi	4	fi
5		5
6	#	6	#
7	#Compiler	7	#Dependencies
8	#
9	PATH=/usr/bin:$PATH
10
11	#	8	#
12	#Java	9	export JDK_HOME=$HOME/$1/$2/depends/java
13	#
14	PATH=$HOME/$1/$2/depends/java/jre/bin:$HOME/$1/$2/depends/java/bin:$PATH
15		10
16	#	11	#
17	#Zip/Unzip	12	#Compiler
18	#	13	#
19	PATH=/usr/bin:$PATH	14	export PATH=$HOME/$1/$2/depends/make:$HOME/$1/$2/depends/java/jre/bin:$HOME/$1/$2/depends/java/bin:/usr/bin:$PATH
20		15
21	#	16	#
22	#GNU make	17	#GNU make
23	#	18	#
24	PATH=$HOME/$1/$2/depends/make:$PATH
25
26	export PATH
27	umask 022	19	umask 022
28	export NATIVE_MAKE='make -f makefile.unix'	20	export NATIVE_MAKE='make -f org.eclipse.hyades.probekit/src-native/BCI/makefile.unix.build'
29	export ZIP_EXT=linux_ia32.zip

Added Link Here

(-)master/bash/make-iac.sh (+72 lines)
1	#!/bin/bash -x
2	###############################################################################
3	# Copyright (c) 2009 IBM Corporation and others.
4	# All rights reserved. This program and the accompanying materials
5	# are made available under the terms of the Eclipse Public License v1.0
6	# which accompanies this distribution, and is available at
7	# http://www.eclipse.org/legal/epl-v10.html
8	# $Id: $
9	#
10	# Contributors:
11	# IBM - Initial API and implementation
12	###############################################################################
13
14	buildDirectory=$1
15	platform=$2
16	publishDirectory=$3
17	buildId=$4
18
19	pushd ${buildDirectory}/post-build/eclipse/plugins
20	acplugin=$(eval echo org.eclipse.tptp.platform.agentcontroller_*)
21	acNative=$(eval echo org.eclipse.tptp.platform.ac.${platform}_*)
22	popd
23
24	iac_packages="tptp.runtime-${buildId} \
25	tptp.sdk-${buildId} \
26	tptp.platform.runtime-${buildId} \
27	tptp.platform.sdk-${buildId}"
28
29	for package in $iac_packages; do
30	unzip -q ${publishDirectory}/${package}.zip -d ${buildDirectory}/iac-repack
31
32	# exclude content not necessary for IAC
33	rm -rf ${buildDirectory}/iac-repack/eclipse/plugins/${acNative}/agent_controller/getting_started.html ${buildDirectory}/iac-repack/eclipse/plugins/${acNative}/agent_controller/plugins ${buildDirectory}/iac-repack/eclipse/plugins/${acNative}/agent_controller/bin/tptpcore.jar
34	case ${platform} in
35	win*) rm -rf ${buildDirectory}/iac-repack/eclipse/plugins/${acNative}/agent_controller/lib ;;
36	linux*) rm -f ${buildDirectory}/iac-repack/eclipse/plugins/${acNative}/agent_controller/lib/config.jar ;;
37	esac
38
39	# update SetConfig script for IAC
40	# to look for config.jar in org.eclipse.tptp.platform.agentcontroller plugin
41	# (bug #215023)
42	case ${platform} in
43	win*) sed -i "s%..\\\\lib\\\\%..\\\\..\\\\..\\\\$acplugin\\\\%g" ${buildDirectory}/iac-repack/eclipse/plugins/${acNative}/agent_controller/bin/SetConfig.bat ;;
44	linux*) sed -i "s%../lib/%../../../$acplugin/%g" ${buildDirectory}/iac-repack/eclipse/plugins/${acNative}/agent_controller/bin/SetConfig.sh ;;
45	esac
46	# Notes:
47	# we quote sed commands into " (not in ') because of we need shell to expand $rmt_acplugin variable
48	# we use \\\\ for \ because of shell converts \\ to \ and then sed converts \\ to \
49	# we use % as separator for sed s command because the usual / conflicts with / in path
50
51	# update META-INF/p2.inf for Linux platforms (bug #230922)
52	if [ `echo ${platform} \| grep linux` ]
53	then
54	# update version part of swt libraries file names
55	if [ -f ${buildDirectory}/iac-repack/eclipse/plugins/${acNative}/agent_controller/META-INF/p2.inf -a -d ${buildDirectory}/iac-repack/eclipse/plugins/${acNative}/lib ]
56	then
57	pushd ${buildDirectory}/iac-repack/eclipse/plugins/${acNative}/lib
58	libswt_ver=$(echo libswt-gtk-*.so \| sed "s/libswt-gtk-//" \| sed "s/.so//")
59	popd
60	if [ "$libswt_ver" ]; then
61	sed -i "s/#SWTLIBVER#/$libswt_ver/" ${buildDirectory}/iac-repack/eclipse/plugins/${acNative}/META-INF/p2.inf
62	fi
63	fi
64	fi
65
66	pushd ${buildDirectory}/iac-repack
67	rm -f ${publishDirectory}/${package}.zip
68	zip -rqy9 ${publishDirectory}/${package}.zip *
69	popd
70
71	rm -rf ${buildDirectory}/iac-repack
72	done

Added Link Here

(-)slave/linux-em64t/configure-environment.agntctrl.sf (+28 lines)
1	if [ $# -ne 2 ]; then
2	echo "usage: . configure-environment.agntctrl.sf <project> <release>"
3	exit 2
4	fi
5
6	#
7	#Dependencies
8	#
9	export JAVA_HOME=$HOME/$1/$2/depends/java
10	export XERCESCROOT=$HOME/$1/$2/depends/xercesc
11	export XERCESC_HOME=$XERCESCROOT
12	CBE_SDK_HOME=`pwd`
13	export CBE_SDK_HOME=`echo $CBE_SDK_HOME/../cbe/sdk`
14
15	#
16	#Compiler
17	#
18	PATH=/usr/bin:$PATH
19	export LD_LIBRARY_PATH=/lib64:$LD_LIBRARY_PATH:$XERCESCROOT/lib
20	export INCLUDE=$INCLUDE:/usr/include/uuid
21	export KERNEL_SRC=/usr
22
23	#
24	#GNU make
25	#
26	umask 022
27	NATIVE_MAKE=make
28	export NATIVE_MAKE

Added Link Here

(-)master/bash/add-dependencies.agntctrl.sh (+82 lines)
1	#!/bin/bash -x
2	###############################################################################
3	# Copyright (c) 2009 IBM Corporation and others.
4	# All rights reserved. This program and the accompanying materials
5	# are made available under the terms of the Eclipse Public License v1.0
6	# which accompanies this distribution, and is available at
7	# http://www.eclipse.org/legal/epl-v10.html
8	# $Id: $
9	#
10	# Contributors:
11	# IBM - Initial API and implementation
12	###############################################################################
13
14	# Perform Sanity checking and set up environment.
15	source convert-parameters-into-variables.sf
16	source verify-environment-variables.sf \
17	'--depdir=Directory where all dependencies to the build are stored' \
18	'--srcdir=Directory where the source code is stored and to which dependencies will be added' \
19	'--rmtosarc=Operating system and architecture of the remote host'
20
21	# Set up the internal directory structure.
22	pkgdir="$srcdir/packaging"
23
24	# Create hyades data collection engine dependency zip file
25	depplg="$pkgdir/plugins"
26	mkdir -p "$depplg"
27	ln -s `ls -1d $depdir/org.apache.commons.logging_*\|head -1` \
28	"$depdir"/org.eclipse.emf.common_* \
29	"$depdir"/org.eclipse.emf.ecore_* \
30	"$depdir"/org.eclipse.equinox.common_* \
31	"$depdir"/org.eclipse.emf.ecore.xmi_* \
32	"$depdir"/org.junit_* \
33	"$depdir"/org.eclipse.tptp.platform.models_* \
34	"$depdir"/org.eclipse.hyades.execution_* \
35	"$depdir"/org.eclipse.tptp.platform.logging.events_* \
36	"$depdir"/org.eclipse.hyades.logging.core_* \
37	"$depdir"/org.eclipse.tptp.platform.collection.framework_* \
38	"$depdir"/org.eclipse.jface_* \
39	"$depdir"/org.eclipse.osgi_* \
40	"$depdir"/com.ibm.icu_* \
41	"$depdir"/org.eclipse.core.runtime_* \
42	"$depdir"/org.eclipse.core.commands_* \
43	"$depdir"/org.eclipse.tptp.platform.models.hierarchy_* \
44	"$depdir"/org.eclipse.tptp.monitoring.instrumentation_* \
45	"$depdir"/org.eclipse.tptp.test.tools.junit.plugin_* \
46	"$depdir"/org.eclipse.tptp.trace.arm_* \
47	"$depdir"/org.mx4j.jmx_* \
48	"$depdir"/org.opengroup.arm_* \
49	"$depplg"
50
51	cp -r "$depdir"/org.eclipse.hyades.test.core_* \
52	"$depdir"/org.eclipse.hyades.test.tools.core_* \
53	"$depplg"
54
55	rm -f $depplg/org.eclipse.hyades.test.core_*/hexrecr.jar \
56	$depplg/org.eclipse.hyades.test.tools.core_*/http.hexrecr.jar
57
58	mkdir -p "$pkgdir/lib"
59	mkdir -p "$pkgdir/bin"
60
61	if [ $swtzippth ]; then
62	mkdir -p "$pkgdir"/swt_licenses "$pkgdir"/temporarydir
63	unzip $swtzippth -d "$pkgdir"/temporarydir
64	unzip "$pkgdir"/temporarydir/swt.jar *.dll -d "$pkgdir"/bin
65	unzip "$pkgdir"/temporarydir/swt.jar lib* -d "$pkgdir"/lib
66
67	mv $pkgdir/temporarydir/swt.jar "$depplg"
68	mv $pkgdir/temporarydir/about.html $pkgdir/temporarydir/about_files $pkgdir/swt_licenses
69	rm -r "$pkgdir/temporarydir"
70	fi
71
72	ln -s "$depdir"/org.eclipse.tptp.platform.agentcontroller_*/config.jar "$pkgdir"/lib
73
74	cp -r "$depdir"/org.eclipse.tptp.platform.execution/tptpcore.jar \
75	"$pkgdir/bin"
76
77	mkdir -p "$depplg"/org.eclipse.tptp.jsse
78	mkdir -p "$depplg"/org.eclipse.tptp.jsse/config
79	cp -r "$depdir"/org.eclipse.tptp.platform.agentcontroller/jsse.jar \
80	"$depdir"/org.eclipse.tptp.platform.agentcontroller/about.html \
81	"$depplg"/org.eclipse.tptp.jsse
82	cp -r "$depdir"/org.eclipse.tptp.platform.agentcontroller/jsse-config/pluginconfig.xml "$depplg"/org.eclipse.tptp.jsse/config