Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 144427 Details for
Bug 182085
Remove dependency of AC packaging on tptpdc
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
Releng changes
182085_build_files.txt (text/plain), 52.69 KB, created by
Joshua Bowles
on 2009-08-13 11:59:28 EDT
(
hide
)
Description:
Releng changes
Filename:
MIME Type:
Creator:
Joshua Bowles
Created:
2009-08-13 11:59:28 EDT
Size:
52.69 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.hyades.releng.builder >Index: slave/windows-em64t/configure-environment.probekit.sf >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.releng.builder/slave/windows-em64t/configure-environment.probekit.sf,v >retrieving revision 1.7 >diff -u -r1.7 configure-environment.probekit.sf >--- slave/windows-em64t/configure-environment.probekit.sf 5 Jun 2008 18:09:47 -0000 1.7 >+++ slave/windows-em64t/configure-environment.probekit.sf 13 Aug 2009 16:01:32 -0000 >@@ -6,11 +6,18 @@ > # > #Compiler > # >-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" >-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" >-JAVA_HOME="C:\j2sdk1.4.2_09" >-LIB="C:\Progra~1\MI9547~1\Lib\AMD64;C:\Progra~1\MI9547~1\Lib\AMD64\atlmfc" >+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" >+ >+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" >+ >+LIB="D:\Microsoft_Platform_SDK_64\Lib\AMD64;D:\Microsoft_Platform_SDK_64\Lib\AMD64\atlmfc" >+ >+JAVA_HOME="C:\Util\jdk1.5.0_16" >+export JDK_HOME=$JAVA_HOME > > export PATH INCLUDE JAVA_HOME LIB > > export NATIVE_MAKE='nmake -f org.eclipse.hyades.probekit\src-native\BCI\makefile.win_em64t.build' >+ >+export RAC_SDK_HOME="C:\RAC_SDK_HOME" >+ >Index: slave/windows-em64t/configure-environment.agntctrl.sf >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.releng.builder/slave/windows-em64t/configure-environment.agntctrl.sf,v >retrieving revision 1.5 >diff -u -r1.5 configure-environment.agntctrl.sf >--- slave/windows-em64t/configure-environment.agntctrl.sf 8 Jun 2007 18:29:30 -0000 1.5 >+++ slave/windows-em64t/configure-environment.agntctrl.sf 13 Aug 2009 16:01:32 -0000 >@@ -3,21 +3,31 @@ > exit 2 > fi > >+ >+umask 002 >+ >+export TEMP_LICENSE_HOME="D:\Cygwin\home\build\TEMP_LICENSE_HOME" >+ >+# CBE_SDK_HOME must be set to a folder in the root level of a Windows drive due to cygwin's problems handling \'s. >+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_HOME/* >+cp -r ${CBE_SDK_HOME_TMP}/* /cygdrive/d/CBE_SDK_HOME >+export CBE_SDK_HOME="D:\CBE_SDK_HOME" >+ >+export XERCESCROOT="C:\Util\xerces-c-src_2_6_0\Build\Win64\VC6\Release" >+export XERCESC_HOME="$XERCESCROOT" >+export NATIVE_MAKE='nmake -f makefile.win_em64t' >+ > # > #Compiler > # >-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" >-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" >-JAVA_HOME="C:\j2sdk1.4.2_09" >-LIB="C:\Progra~1\MI9547~1\Lib\AMD64;C:\Progra~1\MI9547~1\Lib\AMD64\atlmfc" >+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" > >-export PATH INCLUDE JAVA_HOME LIB >+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" > >-umask 002 >+LIB="$XERCESCROOT;D:\Microsoft_Platform_SDK_64\Lib\AMD64;D:\Microsoft_Platform_SDK_64\Lib\AMD64\atlmfc" > >-export TEMP_LICENSE_HOME="C:\cygwin\home\build\TEMP_LICENSE_HOME" >-export RAC_SDK_HOME="C:\RAC_SDK_HOME" >-export CBE_SDK_HOME="C:\CBE_SDK_HOME" >-export XERCESCROOT="C:\utils\xerces-c-src_2_6_0.win_em64t" >-export XERCESC_HOME="$XERCESCROOT" >-export NATIVE_MAKE='nmake -f makefile.win_em64t' >+JAVA_HOME="C:\Util\jdk1.5.0_16" >+ >+export PATH INCLUDE JAVA_HOME LIB >Index: slave/windows-em64t/configure-environment.sf >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.releng.builder/slave/windows-em64t/configure-environment.sf,v >retrieving revision 1.5 >diff -u -r1.5 configure-environment.sf >--- slave/windows-em64t/configure-environment.sf 8 Jun 2007 18:29:31 -0000 1.5 >+++ slave/windows-em64t/configure-environment.sf 13 Aug 2009 16:01:32 -0000 >@@ -6,10 +6,13 @@ > # > #Compiler > # >-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" >-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" >-JAVA_HOME="C:\j2sdk1.4.2_09" >-LIB="C:\Progra~1\MI9547~1\Lib\AMD64;C:\Progra~1\MI9547~1\Lib\AMD64\atlmfc" >+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" >+ >+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" >+ >+LIB="D:\Microsoft_Platform_SDK_64\Lib\AMD64;D:\Microsoft_Platform_SDK_64\Lib\AMD64\atlmfc" >+ >+JAVA_HOME="C:\Util\jdk1.5.0_16" > > export PATH INCLUDE JAVA_HOME LIB > >Index: slave/windows-em64t/configure-environment.jvmti.sf >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.releng.builder/slave/windows-em64t/configure-environment.jvmti.sf,v >retrieving revision 1.5 >diff -u -r1.5 configure-environment.jvmti.sf >--- slave/windows-em64t/configure-environment.jvmti.sf 8 Jun 2007 18:29:30 -0000 1.5 >+++ slave/windows-em64t/configure-environment.jvmti.sf 13 Aug 2009 16:01:32 -0000 >@@ -6,11 +6,18 @@ > # > #Compiler > # >-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" >-export JAVA_HOME="C:\\Progra~1\\Java\\jdk1.5.0_06" >-export LIB="C:\Progra~1\MI9547~1\Lib\AMD64;C:\Progra~1\MI9547~1\Lib\AMD64\atlmfc" >-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" >-export TPTP_ACSDK_HOME="C:\\TPTP_ACSDK_HOME" >+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" >+ >+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" >+ >+export LIB="D:\Microsoft_Platform_SDK_64\Lib\AMD64;D:\Microsoft_Platform_SDK_64\Lib\AMD64\atlmfc" >+ >+ >+export JAVA_HOME="C:\\Util\\jdk1.5.0_16" >+ >+export TPTP_ACSDK_HOME=../../../../agntctrl >+export CBE_SDK_HOME=../../../../cbe/sdk >+export PROBEKIT_LIB="..\probekit\org.eclipse.hyades.probekit\src-native" > > umask 002 > >Index: master/bash/universal-make.sh >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.releng.builder/master/bash/universal-make.sh,v >retrieving revision 1.31 >diff -u -r1.31 universal-make.sh >--- master/bash/universal-make.sh 11 Aug 2008 21:29:35 -0000 1.31 >+++ master/bash/universal-make.sh 13 Aug 2009 16:01:32 -0000 >@@ -124,7 +124,7 @@ > execute-remote-command.sh \ > "--dstosarc=$rmtosarc" \ > "--rmthst=$rmtosarc" \ >- "--rmtcmd=. $rmtutldir/$rmtcfgutl $tgtprj $tgtrel && cd $rmtsrcdir && \$NATIVE_MAKE && \$NATIVE_MAKE package" >+ "--rmtcmd=cd $rmtsrcdir && . $rmtutldir/$rmtcfgutl $tgtprj $tgtrel && \$NATIVE_MAKE && \$NATIVE_MAKE package" > > # Retrieve the result of the build. > pull-binary-files.sh \ >Index: master/bash/convert-to-native-encoding.windows-ia32.sf >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.releng.builder/master/bash/convert-to-native-encoding.windows-ia32.sf,v >retrieving revision 1.3 >diff -u -r1.3 convert-to-native-encoding.windows-ia32.sf >--- master/bash/convert-to-native-encoding.windows-ia32.sf 8 Jun 2007 17:27:26 -0000 1.3 >+++ master/bash/convert-to-native-encoding.windows-ia32.sf 13 Aug 2009 16:01:32 -0000 >@@ -20,4 +20,4 @@ > > > # The only transformation required for Windows is the end of line character. >-# find "$stgdir" $txtfileptrn -exec unix2dos -of {} \; >+find "$stgdir" $txtfileptrn ! -name *.sf -exec unix2dos -of {} \; >Index: master/bash/updateNativeRelatedPlugins.sh >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.releng.builder/master/bash/updateNativeRelatedPlugins.sh,v >retrieving revision 1.9 >diff -u -r1.9 updateNativeRelatedPlugins.sh >--- master/bash/updateNativeRelatedPlugins.sh 18 Apr 2008 14:08:32 -0000 1.9 >+++ master/bash/updateNativeRelatedPlugins.sh 13 Aug 2009 16:01:32 -0000 >@@ -18,7 +18,7 @@ > unzip -q $publishdir/$component.$platform.zip -d $wsdir/upd-$component/$updpath > cd $wsdir/upd-$component > chmod +x $updpath/* >- zip -urq $feat * >+ zip -urqy $feat * > rm -rf $wsdir/upd-$component > unset feat updpath > fi >Index: master/bash/upload-driver.sh >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.releng.builder/master/bash/upload-driver.sh,v >retrieving revision 1.109 >diff -u -r1.109 upload-driver.sh >--- master/bash/upload-driver.sh 14 Oct 2008 14:17:54 -0000 1.109 >+++ master/bash/upload-driver.sh 13 Aug 2009 16:01:32 -0000 >@@ -40,12 +40,24 @@ > probekit.all_platforms-$bldid.zip \ > probekit.linux_ia32-$bldid.zip \ > probekit.win_ia32-$bldid.zip \ >- tptpdc.all_platforms.sdk-$bldid.zip \ >- tptpdc.all_platforms-$bldid.zip \ >- tptpdc.linux_ia32.sdk-$bldid.zip \ >- tptpdc.linux_ia32-$bldid.zip \ >- tptpdc.win_ia32.sdk-$bldid.zip \ >- tptpdc.win_ia32-$bldid.zip \ >+ agntctrl.linux_ia32.sdk-$bldid.zip \ >+ agntctrl.linux_ia32-$bldid.zip \ >+ agntctrl.win_ia32.sdk-$bldid.zip \ >+ agntctrl.win_ia32-$bldid.zip \ >+ agntctrl.linux_em64t.sdk-$bldid.zip \ >+ agntctrl.linux_em64t-$bldid.zip \ >+ agntctrl.win_em64t.sdk-$bldid.zip \ >+ agntctrl.win_em64t-$bldid.zip \ >+ agntctrl.all_platforms.sdk-$bldid.zip \ >+ agntctrl.all_platforms-$bldid.zip \ >+ javaprofiler.linux_ia32-$bldid.zip \ >+ javaprofiler.linux_ia32.sdk-$bldid.zip \ >+ javaprofiler.win_ia32-$bldid.zip \ >+ javaprofiler.win_ia32.sdk-$bldid.zip \ >+ javaprofiler.linux_em64t-$bldid.zip \ >+ javaprofiler.linux_em64t.sdk-$bldid.zip \ >+ javaprofiler.win_em64t-$bldid.zip \ >+ javaprofiler.win_em64t.sdk-$bldid.zip \ > tptp.examples-$bldid.zip \ > tptp.gla.runtime-$bldid.zip \ > tptp.lta.runtime-$bldid.zip \ >Index: master/bash/eclipse-build.sh >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.releng.builder/master/bash/eclipse-build.sh,v >retrieving revision 1.54 >diff -u -r1.54 eclipse-build.sh >--- master/bash/eclipse-build.sh 11 Apr 2007 21:17:41 -0000 1.54 >+++ master/bash/eclipse-build.sh 13 Aug 2009 16:01:32 -0000 >@@ -104,8 +104,6 @@ > -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" \ >@@ -113,5 +111,7 @@ > -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) >+ $(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) > >Index: master/bash/make-multiplatforms.sh >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.releng.builder/master/bash/make-multiplatforms.sh,v >retrieving revision 1.14 >diff -u -r1.14 make-multiplatforms.sh >--- master/bash/make-multiplatforms.sh 11 Aug 2008 21:29:35 -0000 1.14 >+++ master/bash/make-multiplatforms.sh 13 Aug 2009 16:01:32 -0000 >@@ -68,6 +68,10 @@ > > if [ $tgtosarc = 'linux-ia32' ]; then > swtzippth=$swtzipdir/$eclipseSwtLinux >+ elif [ $tgtosarc = 'linux-em64t' ]; then >+ swtzippth=$swtzipdir/$eclipseSwtLinux >+ elif [ $tgtosarc = 'linux-ipf' ]; then >+ swtzippth=$swtzipdir/$eclipseSwtLinux > elif [ $tgtosarc = 'linux-ppc64' ]; then > swtzippth=$swtzipdir/$eclipseSwtLinuxPPC > elif [ $tgtosarc = 'hpux-risc' ]; then >@@ -78,6 +82,10 @@ > swtzippth=$swtzipdir/$eclipseSwtAIX > elif [ $tgtosarc = 'windows-ia32' ]; then > swtzippth=$swtzipdir/$eclipseSwtWindows >+ elif [ $tgtosarc = 'windows-em64t' ]; then >+ swtzippth=$swtzipdir/$eclipseSwtWindows >+ elif [ $tgtosarc = 'windows-ipf' ]; then >+ swtzippth=$swtzipdir/$eclipseSwtWindows > else > unset swtzippth > fi >Index: slave/linux-ia32/configure-environment.jvmti.sf >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.releng.builder/slave/linux-ia32/configure-environment.jvmti.sf,v >retrieving revision 1.5 >diff -u -r1.5 configure-environment.jvmti.sf >--- slave/linux-ia32/configure-environment.jvmti.sf 8 Jun 2007 18:29:29 -0000 1.5 >+++ slave/linux-ia32/configure-environment.jvmti.sf 13 Aug 2009 16:01:32 -0000 >@@ -3,11 +3,22 @@ > exit 2 > fi > >-export JAVA_HOME=/home/proj/tptp/builder/ia32/TPTP/4.2.0/depends/jrockit >-export PATH=$JAVA_HOME/bin:/opt/binutils/bin:/usr/bin:/bin:$PATH >-export LD_LIBRARY_PATH=/opt/binutils/lib:$LD_LIBRARY_PATH >-export TPTP_ACSDK_HOME=/home/proj/tptp/tptpbld/depends/IA32/TPTP_ACSDK_HOME >+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 >+ >+# For creating ProbeAgentExtension.so to be packaged in the AC >+export RASERVER_SDK=$TPTP_ACSDK_HOME > > umask 022 > > export NATIVE_MAKE='make -f org.eclipse.tptp.platform.jvmti.runtime/makefile' >+ >+export JAVA_HOME=$HOME/$1/$2/depends/java_sun >+ >+export XERCESCROOT=$HOME/$1/$2/depends/xercesc >+export XERCESC_HOME=$XERCESCROOT >+export LD_LIBRARY_PATH=$XERCESCROOT/lib >+export PATH=$JAVA_HOME/bin:/opt/binutils/bin:/usr/bin:/bin:$PATH >+export LD_LIBRARY_PATH=/opt/binutils/lib:$LD_LIBRARY_PATH >\ No newline at end of file >Index: slave/linux-ia32/configure-environment.agntctrl.sf >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.releng.builder/slave/linux-ia32/configure-environment.agntctrl.sf,v >retrieving revision 1.6 >diff -u -r1.6 configure-environment.agntctrl.sf >--- slave/linux-ia32/configure-environment.agntctrl.sf 8 Jun 2007 18:29:29 -0000 1.6 >+++ slave/linux-ia32/configure-environment.agntctrl.sf 13 Aug 2009 16:01:32 -0000 >@@ -17,11 +17,13 @@ > #GNU make > # > >-export JAVA_HOME=$HOME/../tptpbld/depends/IA32/java >+export JAVA_HOME=$HOME/$1/$2/depends/java_5 > umask 022 > NATIVE_MAKE=make > export NATIVE_MAKE > >-export XERCESCROOT=$HOME/../tptpbld/depends/IA32/xerces-c-src_2_6_0 >+export XERCESCROOT=$HOME/$1/$2/depends/xercesc > export XERCESC_HOME=$XERCESCROOT > export LD_LIBRARY_PATH=$XERCESCROOT/lib >+CBE_SDK_HOME=`pwd` >+export CBE_SDK_HOME=`echo $CBE_SDK_HOME/../cbe/sdk` >Index: master/runtime/customTargets.xml >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.releng.builder/master/runtime/customTargets.xml,v >retrieving revision 1.719 >diff -u -r1.719 customTargets.xml >--- master/runtime/customTargets.xml 16 Apr 2009 00:20:48 -0000 1.719 >+++ master/runtime/customTargets.xml 13 Aug 2009 16:01:32 -0000 >@@ -501,7 +501,7 @@ > <!-- 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> >@@ -529,6 +529,7 @@ > <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" >@@ -548,7 +549,23 @@ > <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}" /> >@@ -562,13 +579,6 @@ > <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" /> >@@ -787,9 +797,9 @@ > <param name="platformId" value="windows-ia32" /> > <param name="plgId" value="eclipse/plugins/org.eclipse.hyades.probekit" /> > <param name="destDir" value="os/win32/x86" /> >- </antcall> >+ </antcall> > >- <!-- tptpdc dependencies --> >+ <!-- 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"/> >@@ -818,7 +828,7 @@ > <arg line="-silent ${buildDirectory}/post-build/eclipse/plugins ${buildDirectory}/all-plugins"/> > </exec> > >- <!-- make sure CBE and probekit native builds have finished before starting tptpdc builds. --> >+ <!-- 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> >@@ -826,11 +836,32 @@ > <arg line="-r 16 ${publishDirectory}/lock.probekit.linux-ia32 ${publishDirectory}/lock.probekit.windows-ia32"/> > </exec> > >- <!-- tptpdc build will continue after removing these lock files --> >+ <!-- agntctrl build will continue after removing these lock files --> > <exec executable="rm"> >- <arg line="-f ${publishDirectory}/lock.tptpdc.linux-ia32 ${publishDirectory}/lock.tptpdc.linux-ppc64 ${publishDirectory}/lock.tptpdc.linux-zseries ${publishDirectory}/lock.tptpdc.hpux-risc ${publishDirectory}/lock.tptpdc.solaris-sparc ${publishDirectory}/lock.tptpdc.aix-ppc ${publishDirectory}/lock.tptpdc.zos-zseries ${publishDirectory}/lock.tptpdc.os400-iseries ${publishDirectory}/lock.tptpdc.windows-ia32"/> >+ <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" /> > >@@ -842,22 +873,6 @@ > <!-- <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 --> > >@@ -1158,7 +1173,111 @@ > <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"/> >@@ -1351,7 +1470,21 @@ > > <!-- 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"> >@@ -1364,36 +1497,108 @@ > <param name="platform" value="win_ia32"/> > <param name="platformId" value="windows-ia32"/> > </antcall> >- > <antcall target="nativeRepackaging"> >- <param name="component" value="tptpdc"/> >+ <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="tptpdc"/> >+ <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="probekit"/> >+ <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> >+ >+ <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|tptpdc|probekit|...) >+ 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) > --> >@@ -1507,7 +1712,7 @@ > <sleep seconds="2"/> > <!-- Add license and notice --> > <exec executable="zip" failonerror="true"> >- <arg value="-9ju" /> >+ <arg value="-9juy" /> > <arg value="${newRTFile}" /> > <arg value="${buildDirectory}/${buildId}/notice.html" /> > <arg value="${buildDirectory}/${buildId}/epl-v10.html" /> >@@ -1538,7 +1743,7 @@ > > <!-- Add license and notice --> > <exec executable="zip" failonerror="true"> >- <arg value="-9juq" /> >+ <arg value="-9juqy" /> > <arg value="${newSDKFile}" /> > <arg value="${buildDirectory}/${buildId}/notice.html" /> > <arg value="${buildDirectory}/${buildId}/epl-v10.html" /> >@@ -1568,7 +1773,7 @@ > > <!-- Add license and notice --> > <exec executable="zip" failonerror="true"> >- <arg value="-9juq" /> >+ <arg value="-9juqy" /> > <arg value="${newUTFile}" /> > <arg value="${buildDirectory}/${buildId}/notice.html" /> > <arg value="${buildDirectory}/${buildId}/epl-v10.html" /> >@@ -1602,33 +1807,6 @@ > <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"/> >@@ -1636,7 +1814,7 @@ > <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? --> >Index: slave/linux-em64t/configure-environment.probekit.sf >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.releng.builder/slave/linux-em64t/configure-environment.probekit.sf,v >retrieving revision 1.4 >diff -u -r1.4 configure-environment.probekit.sf >--- slave/linux-em64t/configure-environment.probekit.sf 8 Jun 2007 18:29:29 -0000 1.4 >+++ slave/linux-em64t/configure-environment.probekit.sf 13 Aug 2009 16:01:32 -0000 >@@ -23,7 +23,9 @@ > # > PATH=$HOME/$1/$2/depends/make:$PATH > >-export PATH >+JDK_HOME=$HOME/$1/$2/depends/java >+ >+export PATH JDK_HOME > umask 022 >-export NATIVE_MAKE='make -f makefile.unix' >-export ZIP_EXT=linux_ia32.zip >+export NATIVE_MAKE='make -f org.eclipse.hyades.probekit/src-native/BCI/makefile.unix.build' >+export ZIP_EXT=linux_em64t.zip >Index: slave/linux-em64t/configure-environment.jvmti.sf >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.releng.builder/slave/linux-em64t/configure-environment.jvmti.sf,v >retrieving revision 1.5 >diff -u -r1.5 configure-environment.jvmti.sf >--- slave/linux-em64t/configure-environment.jvmti.sf 8 Jun 2007 18:29:29 -0000 1.5 >+++ slave/linux-em64t/configure-environment.jvmti.sf 13 Aug 2009 16:01:32 -0000 >@@ -3,10 +3,22 @@ > exit 2 > fi > >-export JAVA_HOME=/home/proj/tptp/builder/em64t/TPTP/4.2.0/depends/jrockit >-export PATH=$JAVA_HOME/bin:/usr/bin:/bin:$PATH >-export TPTP_ACSDK_HOME=/home/proj/tptp/tptpbld/depends/EM64T/TPTP_ACSDK_HOME >+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 >+ >+# For creating ProbeAgentExtension.so to be packaged in the AC >+export RASERVER_SDK=$TPTP_ACSDK_HOME > > umask 022 > > export NATIVE_MAKE='make -f org.eclipse.tptp.platform.jvmti.runtime/makefile' >+ >+export JAVA_HOME=$HOME/$1/$2/depends/java >+ >+export XERCESCROOT=$HOME/$1/$2/depends/xercesc >+export XERCESC_HOME=$XERCESCROOT >+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 >Index: slave/windows-ia32/configure-environment.jvmti.sf >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.releng.builder/slave/windows-ia32/configure-environment.jvmti.sf,v >retrieving revision 1.7 >diff -u -r1.7 configure-environment.jvmti.sf >--- slave/windows-ia32/configure-environment.jvmti.sf 8 Jun 2007 18:29:31 -0000 1.7 >+++ slave/windows-ia32/configure-environment.jvmti.sf 13 Aug 2009 16:01:32 -0000 >@@ -3,11 +3,21 @@ > exit 2 > fi > >-#export JAVA_HOME="D:\\Progra~1\\Java\\jrockit-R26.3.0-jdk1.5.0_06" >-#export INCLUDE=$INCLUDE;"C:\Util\ibm.java.sdk.142\include" >-#export PATH=/cygdrive/d/Progra~1/Java/jrockit-R26.3.0-jdk1.5.0_06/bin:$PATH >-export TPTP_ACSDK_HOME="D:\\TPTP_ACSDK_HOME" >- > umask 002 > > export NATIVE_MAKE='nmake -f org.eclipse.tptp.platform.jvmti.runtime/makefile.win_ia32' >+ >+export TPTP_ACSDK_HOME=../../../../agntctrl >+export CBE_SDK_HOME=../../../../cbe/sdk >+export PROBEKIT_LIB="..\probekit\org.eclipse.hyades.probekit\src-native\BCI\Release" >+ >+export JAVA_HOME="C:\Util\jdk1.5.0_16" >+ >+export XERCESCROOT=$HOME/$1/$2/depends/xerces-c-src_2_6_0 >+export XERCESC_HOME=$XERCESCROOT >+export LD_LIBRARY_PATH=$XERCESCROOT/lib >+export PATH=$JAVA_HOME/bin:/opt/binutils/bin:/usr/bin:/bin:$PATH >+export LD_LIBRARY_PATH=/opt/binutils/lib:$LD_LIBRARY_PATH >+ >+export RASERVER_SDK=../../../../../agntctrl >+export JDK_HOME=$JAVA_HOME >Index: slave/windows-ia32/configure-environment.agntctrl.sf >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.releng.builder/slave/windows-ia32/configure-environment.agntctrl.sf,v >retrieving revision 1.7 >diff -u -r1.7 configure-environment.agntctrl.sf >--- slave/windows-ia32/configure-environment.agntctrl.sf 8 Jun 2007 18:29:31 -0000 1.7 >+++ slave/windows-ia32/configure-environment.agntctrl.sf 13 Aug 2009 16:01:32 -0000 >@@ -3,16 +3,20 @@ > exit 2 > fi > >-# >-#Compiler >-# >-#export INCLUDE=$INCLUDE:C:\Util\ibm.java.sdk.142\include >- > 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 TEMP_LICENSE_HOME="D:\TEMP_LICENSE_HOME" >+ >+# 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" > export NATIVE_MAKE='nmake -f makefile.win_ia32' >+ >+export PATH="C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Bin:$PATH" >Index: master/templateFiles/drop.html.template >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.releng.builder/master/templateFiles/drop.html.template,v >retrieving revision 1.231 >diff -u -r1.231 drop.html.template >--- master/templateFiles/drop.html.template 11 Aug 2009 19:16:31 -0000 1.231 >+++ master/templateFiles/drop.html.template 13 Aug 2009 16:01:32 -0000 >@@ -170,7 +170,7 @@ > <td> > <select name="runtime"> > <option value="" selected>-- Select a platform --</option> >- <option value="http://www.eclipse.org/downloads/download.php?file=/tptp/@releaseVersion@/dev/@buildID@/tptpdc.all_platforms-@buildID@.zip">ALL</option> >+ <option value="http://www.eclipse.org/downloads/download.php?file=/tptp/@releaseVersion@/dev/@buildID@/agntctrl.all_platforms-@buildID@.zip">ALL</option> > <option value="http://www.eclipse.org/downloads/download.php?file=/tptp/@releaseVersion@/dev/@buildID@/agntctrl.linux_ia32-@buildID@.zip">LINUX-IA32</option> > <option value="http://www.eclipse.org/downloads/download.php?file=/tptp/@releaseVersion@/dev/@buildID@/agntctrl.linux_em64t-@buildID@.zip">LINUX-EM64T</opption> > <option value="http://www.eclipse.org/downloads/download.php?file=/tptp/@releaseVersion@/dev/@buildID@/agntctrl.linux_ipf-@buildID@.zip">LINUX-IPF</option> >@@ -190,7 +190,7 @@ > <td> > <select name="sdk"> > <option value="" selected>-- Select a platform --</option> >- <option value="http://www.eclipse.org/downloads/download.php?file=/tptp/@releaseVersion@/dev/@buildID@/tptpdc.all_platforms.sdk-@buildID@.zip">ALL</option> >+ <option value="http://www.eclipse.org/downloads/download.php?file=/tptp/@releaseVersion@/dev/@buildID@/agntctrl.all_platforms.sdk-@buildID@.zip">ALL</option> > <option value="http://www.eclipse.org/downloads/download.php?file=/tptp/@releaseVersion@/dev/@buildID@/agntctrl.linux_ia32.sdk-@buildID@.zip">LINUX-IA32</option> > <option value="http://www.eclipse.org/downloads/download.php?file=/tptp/@releaseVersion@/dev/@buildID@/agntctrl.linux_em64t.sdk-@buildID@.zip">LINUX-EM64T</opption> > <option value="http://www.eclipse.org/downloads/download.php?file=/tptp/@releaseVersion@/dev/@buildID@/agntctrl.linux_ipf.sdk-@buildID@.zip">LINUX-IPF</option> >Index: master/bash/make-iac.sh >=================================================================== >RCS file: master/bash/make-iac.sh >diff -N master/bash/make-iac.sh >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ master/bash/make-iac.sh 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,61 @@ >+#!/bin/bash -x >+ >+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 >Index: slave/linux-em64t/configure-environment.agntctrl.sf >=================================================================== >RCS file: slave/linux-em64t/configure-environment.agntctrl.sf >diff -N slave/linux-em64t/configure-environment.agntctrl.sf >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ slave/linux-em64t/configure-environment.agntctrl.sf 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,34 @@ >+if [ $# -ne 2 ]; then >+ echo "usage: . configure-environment.agntctrl.sf <project> <release>" >+ exit 2 >+fi >+ >+# >+#Compiler >+# >+PATH=/usr/bin:$PATH >+ >+# >+#Zip/Unzip >+# >+PATH=/usr/bin:$PATH >+ >+# >+#GNU make >+# >+ >+export JAVA_HOME=$HOME/$1/$2/depends/java >+umask 022 >+NATIVE_MAKE=make >+export NATIVE_MAKE >+ >+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` >+ >+#export CBE_SDK_HOME=../../../../cbe/sdk >+export LD_LIBRARY_PATH=/lib64:$LD_LIBRARY_PATH:$XERCESCROOT/lib >+export INCLUDE=$INCLUDE:/usr/include/uuid >+export KERNEL_SRC=/usr >Index: master/bash/add-dependencies.agntctrl.sh >=================================================================== >RCS file: master/bash/add-dependencies.agntctrl.sh >diff -N master/bash/add-dependencies.agntctrl.sh >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ master/bash/add-dependencies.agntctrl.sh 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,71 @@ >+#!/bin/bash -x >+ >+# 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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 182085
:
144239
|
144245
|
144303
|
144427
|
144463
|
144478