Attachment 162828 Details for Bug 300811 – Patch - configuration changes

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

[patch] Patch - configuration changes

patch_bug300811_20100323.txt (text/plain), 9.68 KB, created by Sean Lamers

on 2010-03-23 17:34:39 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Sean Lamers

Created: 2010-03-23 17:34:39 EDT

Size: 9.68 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.hyades.releng.builder
>Index: slave/linux-em64t/configure-environment.agntctrl.sf
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.releng.builder/slave/linux-em64t/configure-environment.agntctrl.sf,v
>retrieving revision 1.1
>diff -u -r1.1 configure-environment.agntctrl.sf
>--- slave/linux-em64t/configure-environment.agntctrl.sf	13 Aug 2009 21:37:29 -0000	1.1
>+++ slave/linux-em64t/configure-environment.agntctrl.sf	23 Mar 2010 21:26:23 -0000
>@@ -6,8 +6,8 @@
> #
> #Dependencies
> #
>-export JAVA_HOME=$HOME/$1/$2/depends/java
>-export XERCESCROOT=$HOME/$1/$2/depends/xercesc
>+export JAVA_HOME=$HOME/$1/$2/depends/java_64
>+export XERCESCROOT=$HOME/$1/$2/depends/xerces-c_64
> export XERCESC_HOME=$XERCESCROOT
> CBE_SDK_HOME=`pwd`
> export CBE_SDK_HOME=`echo $CBE_SDK_HOME/../cbe/sdk`
>@@ -15,9 +15,9 @@
> #
> #Compiler
> #
>-PATH=/usr/bin:$PATH
>-export LD_LIBRARY_PATH=/lib64:$LD_LIBRARY_PATH:$XERCESCROOT/lib
>-export INCLUDE=$INCLUDE:/usr/include/uuid
>+export PATH=$JAVA_HOME/bin:/usr/bin:/bin:$PATH
>+export LD_LIBRARY_PATH=$XERCESCROOT/lib:/lib64:/usr/lib64:$LD_LIBRARY_PATH
>+export INCLUDE=$INCLUDE:$JAVA_HOME/include
> export KERNEL_SRC=/usr
> 
> #
>@@ -26,3 +26,4 @@
> umask 022
> NATIVE_MAKE=make
> export NATIVE_MAKE
>+
>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.6
>diff -u -r1.6 configure-environment.jvmti.sf
>--- slave/linux-em64t/configure-environment.jvmti.sf	13 Aug 2009 21:37:29 -0000	1.6
>+++ slave/linux-em64t/configure-environment.jvmti.sf	23 Mar 2010 21:26:23 -0000
>@@ -8,11 +8,8 @@
> #
> 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
>+export JAVA_HOME=$HOME/$1/$2/depends/java_64
> 
> # For creating ProbeAgentExtension.so to be packaged in the AC
> export RASERVER_SDK=$TPTP_ACSDK_HOME
>@@ -20,8 +17,8 @@
> #
> #Compiler
> #
>-export LD_LIBRARY_PATH=$XERCESCROOT/lib:$JAVA_HOME/lib:$LD_LIBRARY_PATH
> export PATH=$JAVA_HOME/bin:/usr/bin:/bin:$PATH
>+export LD_LIBRARY_PATH=/lib64:/usr/lib64:$LD_LIBRARY_PATH
> export INCLUDE=$INCLUDE:$JAVA_HOME/include
> 
> #
>@@ -29,3 +26,5 @@
> #
> umask 022
> export NATIVE_MAKE='make -f org.eclipse.tptp.platform.jvmti.runtime/makefile'
>+
>+export RELEASE=1
>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.6
>diff -u -r1.6 configure-environment.probekit.sf
>--- slave/linux-em64t/configure-environment.probekit.sf	14 Aug 2009 20:22:37 -0000	1.6
>+++ slave/linux-em64t/configure-environment.probekit.sf	23 Mar 2010 21:26:23 -0000
>@@ -6,13 +6,13 @@
> #
> #Dependencies
> #
>-export JDK_HOME=$HOME/$1/$2/depends/java
>-export export ZIP_EXT=linux_em64t.zip
>+export JDK_HOME=$HOME/$1/$2/depends/java_64
>+export ZIP_EXT=linux_em64t.zip
> 
> #
> #Compiler
> #
>-export PATH=$HOME/$1/$2/depends/make:$HOME/$1/$2/depends/java/jre/bin:$HOME/$1/$2/depends/java/bin:/usr/bin:$PATH
>+export PATH=$JDK_HOME/jre/bin:$JDK_HOME/bin:/usr/bin:/bin:$PATH
> 
> #
> #GNU make
>Index: slave/linux-em64t/configure-environment.sf
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.releng.builder/slave/linux-em64t/configure-environment.sf,v
>retrieving revision 1.5
>diff -u -r1.5 configure-environment.sf
>--- slave/linux-em64t/configure-environment.sf	8 Jun 2007 18:29:29 -0000	1.5
>+++ slave/linux-em64t/configure-environment.sf	23 Mar 2010 21:26:23 -0000
>@@ -4,26 +4,21 @@
> fi
> 
> #
>-#Compiler
>+#Dependencies
> #
>-PATH=/usr/bin:$PATH
>+export JAVA_HOME=$HOME/$1/$2/depends/java_64
>+export XERCESCROOT=$HOME/$1/$2/depends/xerces-c_64
>+export XERCESC_HOME=$XERCESCROOT
> 
> #
>-#Zip/Unzip
>+#Compiler
> #
>-PATH=/usr/bin:$PATH
>+export PATH=$JAVA_HOME/bin:/usr/bin:/bin:$PATH
>+export LD_LIBRARY_PATH=$XERCESCROOT/lib:/lib64:/usr/lib64:$LD_LIBRARY_PATH
> 
> #
> #GNU make
> #
>-
>-export JAVA_HOME=$HOME/../tptpbld/depends/EM64T/java
>-
>-export XERCESCROOT=$HOME/../tptpbld/depends/EM64T/xerces-c-src_2_6_0
>-export XERCESC_HOME=$XERCESCROOT
>-export LD_LIBRARY_PATH=$XERCESCROOT/lib
>-
>-export PATH
> umask 022
>-NATIVE_MAKE=make
>-export NATIVE_MAKE
>+export NATIVE_MAKE=make
>+
>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.6
>diff -u -r1.6 configure-environment.jvmti.sf
>--- slave/linux-ia32/configure-environment.jvmti.sf	13 Aug 2009 21:37:29 -0000	1.6
>+++ slave/linux-ia32/configure-environment.jvmti.sf	23 Mar 2010 21:26:23 -0000
>@@ -8,11 +8,8 @@
> #
> 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
>+export JAVA_HOME=$HOME/$1/$2/depends/java
> 
> # For creating ProbeAgentExtension.so to be packaged in the AC
> export RASERVER_SDK=$TPTP_ACSDK_HOME
>@@ -20,11 +17,13 @@
> #
> #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 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'
>\ No newline at end of file
>+export NATIVE_MAKE='make -f org.eclipse.tptp.platform.jvmti.runtime/makefile'
>+
>+export RELEASE=1
>Index: slave/linux-ia32/configure-environment.probekit.sf
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.releng.builder/slave/linux-ia32/configure-environment.probekit.sf,v
>retrieving revision 1.13
>diff -u -r1.13 configure-environment.probekit.sf
>--- slave/linux-ia32/configure-environment.probekit.sf	5 Jun 2008 20:48:15 -0000	1.13
>+++ slave/linux-ia32/configure-environment.probekit.sf	23 Mar 2010 21:26:23 -0000
>@@ -4,28 +4,19 @@
> fi
> 
> #
>-#Compiler
>-#
>-PATH=/usr/bin:$PATH
>-
>+#Dependencies
> #
>-#Java
>-#
>-PATH=$HOME/$1/$2/depends/java/jre/bin:$HOME/$1/$2/depends/java/bin:$PATH
>+export JDK_HOME=$HOME/$1/$2/depends/java
>+export ZIP_EXT=linux_ia32.zip
> 
> #
>-#Zip/Unzip
>+#Compiler
> #
>-PATH=/usr/bin:$PATH
>+export PATH=$JDK_HOME/jre/bin:$JDK_HOME/bin:/usr/bin:/bin:$PATH
> 
> #
> #GNU make
> #
>-PATH=$HOME/$1/$2/depends/make:$PATH
>-
>-JDK_HOME=$HOME/$1/$2/depends/java
>-
>-export PATH JDK_HOME
> umask 022
> export NATIVE_MAKE='make -f org.eclipse.hyades.probekit/src-native/BCI/makefile.unix.build'
>-export ZIP_EXT=linux_ia32.zip
>+
>Index: slave/linux-ia32/configure-environment.sf
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.releng.builder/slave/linux-ia32/configure-environment.sf,v
>retrieving revision 1.14
>diff -u -r1.14 configure-environment.sf
>--- slave/linux-ia32/configure-environment.sf	6 Jun 2008 11:27:55 -0000	1.14
>+++ slave/linux-ia32/configure-environment.sf	23 Mar 2010 21:26:23 -0000
>@@ -4,27 +4,27 @@
> fi
> 
> #
>-#Compiler
>+#Dependencies
> #
>-PATH=/usr/bin:$PATH
>+export XERCESCROOT=$HOME/$1/$2/depends/xercesc
>+export XERCESC_HOME=$XERCESCROOT
>+export JAVA_HOME=$HOME/$1/$2/depends/java
>+export BCIDIR=../../probekit/org.eclipse.hyades.probekit/src-native/BCI
> 
> #
>-#Zip/Unzip
>+#Compiler
> #
>-PATH=/usr/bin:$PATH
>+PATH=/usr/bin:/bin:$PATH
>+export LD_LIBRARY_PATH=$XERCESCROOT/lib
> 
> #
> #GNU make
> #
>-PATH=$HOME/$1/$2/depends/make:$PATH
>-JAVA_HOME=$HOME/$1/$2/depends/java
>-BCIDIR=../../probekit/org.eclipse.hyades.probekit/src-native/BCI
>+export PATH=$JAVA_HOME/bin:/usr/bin:/bin:$PATH
>+export LD_LIBRARY_PATH=$XERCESCROOT/lib:$LD_LIBRARY_PATH
> 
>-export PATH JAVA_HOME BCIDIR
>+#
>+#GNU make
>+#
> umask 022
>-NATIVE_MAKE=make
>-export NATIVE_MAKE
>-
>-export XERCESCROOT=$HOME/$1/$2/depends/xercesc
>-export XERCESC_HOME=$XERCESCROOT
>-export LD_LIBRARY_PATH=$XERCESCROOT/lib
>+export NATIVE_MAKE=make
>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.7
>diff -u -r1.7 configure-environment.agntctrl.sf
>--- slave/linux-ia32/configure-environment.agntctrl.sf	13 Aug 2009 21:37:29 -0000	1.7
>+++ slave/linux-ia32/configure-environment.agntctrl.sf	23 Mar 2010 21:26:23 -0000
>@@ -8,15 +8,15 @@
> #
> 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
>+export JAVA_HOME=$HOME/$1/$2/depends/java
> CBE_SDK_HOME=`pwd`
> export CBE_SDK_HOME=`echo $CBE_SDK_HOME/../cbe/sdk`
> 
> #
> #Compiler
> #
>-PATH=/usr/bin:$PATH
>+PATH=$JAVA_HOME/bin:/usr/bin:/bin:$PATH
>+export LD_LIBRARY_PATH=$XERCESCROOT/lib:$LD_LIBRARY_PATH
> 
> #
> #GNU make

Actions: View | Diff

Attachments on bug 300811: 162828 | 162829 | 162830