4 added + 7 removed + 14 modified, total 25 files
lcio
diff -u -r1.11 -r1.12
--- BuildSetup.cmake 13 Nov 2007 11:34:59 -0000 1.11
+++ BuildSetup.cmake 29 Jun 2010 00:32:30 -0000 1.12
@@ -27,7 +27,7 @@
# ---- SL4
# Path to Java
-SET( JAVA_HOME "${ILC_HOME}/java/1.6.0"
+SET( JAVA_HOME "/usr/lib/jvm/java-6-sun"
CACHE PATH "Path to Java" FORCE )
# ---- SL3
@@ -59,6 +59,7 @@
# set cmake build type, default value is: RelWithDebInfo
# possible options are: None Debug Release RelWithDebInfo MinSizeRel
#SET( CMAKE_BUILD_TYPE "Debug" CACHE STRING "Choose the type of build" FORCE )
+SET( BUILD_32BIT_COMPATIBLE OFF CACHE BOOL "Set to OFF to build 64 bit libraries" FORCE)
#############################################################################
# Advanced options
lcio/bin
diff -u -r1.8 -r1.9
--- lcio 4 May 2010 23:22:57 -0000 1.8
+++ lcio 29 Jun 2010 00:32:30 -0000 1.9
@@ -31,11 +31,10 @@
#echo "LCIO=$LCIO"
-LOCALCLASSPATH=$LCIO/lib/lcio.jar:$LCIO/tools/sio.jar:$LCIO/tools/jdom.jar:$LCIO/tools/saxpath.jar
+LOCALCLASSPATH=$LCIO/lib/lcio.jar:$LCIO/tools/jdom.jar:$LCIO/tools/saxpath.jar
LOCALCLASSPATH=$LOCALCLASSPATH:$LCIO/tools/jaxen-jdom.jar:$LCIO/tools/jaxen-core.jar:$LCIO/tools/jel.jar
LOCALCLASSPATH=$LOCALCLASSPATH:$LCIO/tools/commons-cli-1.0.jar:$LCIO/tools/commons-lang-2.1.jar:$LCIO/tools/commons-math-1.2.jar
-#LOCALCLASSPATH=$LOCALCLASSPATH:$LCIO/tools/freehep-hep.jar:$LCIO/tools/freehep-physics.jar:$LCIO/tools/freehep-base.jar
-LOCALCLASSPATH=$LOCALCLASSPATH:$LCIO/tools/freehep-mcfio-2.0.1.jar:$LCIO/tools/freehep-stdhep-2.0.2.jar:$LCIO/tools/freehep-sio-2.0.jar:$LCIO/tools/freehep-xdr-2.0.3.jar:$LCIO/tools/freehep-physics-2.1.jar
+LOCALCLASSPATH=$LOCALCLASSPATH:$LCIO/tools/freehep-mcfio-2.0.2.jar:$LCIO/tools/freehep-stdhep-2.0.3.jar:$LCIO/tools/freehep-sio-2.1.jar:$LCIO/tools/freehep-xdr-2.0.4.jar:$LCIO/tools/freehep-physics-2.1.jar
# OS specific support for Cygwin
cygwin=false;
lcio/bin
diff -u -r1.3 -r1.4
--- runAnalysisJob.bat 22 Jun 2010 13:49:54 -0000 1.3
+++ runAnalysisJob.bat 29 Jun 2010 00:32:30 -0000 1.4
@@ -1 +1 @@
-java %JAVA_OPTS% -cp "%LCIO%/lib/lcio.jar;%LCIO%/tools/freehep-sio-2.1-SNAPSHOT.jar;%LCIO%/tools/freehep-xdr-2.0.4-SNAPSHOT.jar" hep.lcio.example.AnalysisJob %*
\ No newline at end of file
+java %JAVA_OPTS% -cp "%LCIO%/lib/lcio.jar;%LCIO%/tools/freehep-sio-2.1.jar;%LCIO%/tools/freehep-xdr-2.0.4.jar" hep.lcio.example.AnalysisJob %*
lcio/bin
diff -u -r1.1 -r1.2
--- runAnalysisJob.cyg 15 Sep 2003 21:49:52 -0000 1.1
+++ runAnalysisJob.cyg 29 Jun 2010 00:32:30 -0000 1.2
@@ -1,2 +1,2 @@
-java -cp "$LCIO/lib/lcio.jar;$LCIO/tools/sio.jar" hep.lcio.example.AnalysisJob $1
+java -cp "$LCIO/lib/lcio.jar:$LCIO/tools/freehep-sio-2.1.jar:$LCIO/tools/freehep-xdr-2.0.4.jar" hep.lcio.example.AnalysisJob $1
lcio/bin
diff -u -r1.5 -r1.6
--- runAnalysisJob.sh 22 Jun 2010 13:49:54 -0000 1.5
+++ runAnalysisJob.sh 29 Jun 2010 00:32:30 -0000 1.6
@@ -1,7 +1,6 @@
#!/bin/sh
-LOCALCLASSPATH=$LCIO/lib/lcio.jar:$LCIO/tools/sio.jar
-LOCALCLASSPATH=$LOCALCLASSPATH:$LCIO/tools/freehep-sio-2.1-SNAPSHOT.jar:$LCIO/tools/freehep-xdr-2.0.4-SNAPSHOT.jar
+LOCALCLASSPATH=$LCIO/lib/lcio.jar:$LCIO/tools/freehep-sio-2.1.jar:$LCIO/tools/freehep-xdr-2.0.4.jar
# OS specific support for Cygwin
cygwin=false;
lcio/bin
diff -u -r1.2 -r1.3
--- runRecJob.bat 6 Sep 2003 01:04:44 -0000 1.2
+++ runRecJob.bat 29 Jun 2010 00:32:30 -0000 1.3
@@ -1 +1 @@
-java -cp %LCIO%/lib/lcio.jar;%LCIO%/tools/sio.jar hep.lcio.example.RecJob %*
\ No newline at end of file
+java -cp "%LCIO%/lib/lcio.jar;%LCIO%/tools/freehep-sio-2.1.jar;%LCIO%/tools/freehep-xdr-2.0.4.jar" hep.lcio.example.RecJob %*
lcio/bin
diff -u -r1.4 -r1.5
--- runRecJob.sh 22 Jun 2010 13:49:54 -0000 1.4
+++ runRecJob.sh 29 Jun 2010 00:32:30 -0000 1.5
@@ -1,8 +1,7 @@
#!/bin/sh
-LOCALCLASSPATH=$LCIO/lib/lcio.jar:$LCIO/tools/sio.jar
-#LOCALCLASSPATH=$LOCALCLASSPATH:$LCIO/tools/freehep-sio-2.0.jar:$LCIO/tools/freehep-xdr-2.0.3.jar
-LOCALCLASSPATH=$LOCALCLASSPATH:$LCIO/tools/freehep-sio-2.1-SNAPSHOT.jar:$LCIO/tools/freehep-xdr-2.0.4-SNAPSHOT.jar
+LOCALCLASSPATH=$LCIO/lib/lcio.jar
+LOCALCLASSPATH=$LOCALCLASSPATH:$LCIO/tools/freehep-sio-2.1.jar:$LCIO/tools/freehep-xdr-2.0.4.jar
# OS specific support for Cygwin
cygwin=false;
lcio/bin
diff -u -r1.2 -r1.3
--- runSIODump.bat 22 Jun 2010 13:49:54 -0000 1.2
+++ runSIODump.bat 29 Jun 2010 00:32:30 -0000 1.3
@@ -1,2 +1,2 @@
@echo off
-java -cp "%LCIO%/lib/lcio.jar;%LCIO%/tools/freehep-sio-2.1-SNAPSHOT.jar;%LCIO%/tools/freehep-xdr-2.0.4-SNAPSHOT.jar;%LCIO%/tools/jdom.jar;%LCIO%/tools/saxpath.jar;%LCIO%/tools/jaxen-jdom.jar;%LCIO%/tools/jaxen-core.jar;%LCIO%/tools/jel.jar" hep.lcio.util.SIODump %*
\ No newline at end of file
+java -cp "%LCIO%/lib/lcio.jar;%LCIO%/tools/freehep-sio-2.1.jar;%LCIO%/tools/freehep-xdr-2.0.4.jar;%LCIO%/tools/jdom.jar;%LCIO%/tools/saxpath.jar;%LCIO%/tools/jaxen-jdom.jar;%LCIO%/tools/jaxen-core.jar;%LCIO%/tools/jel.jar" hep.lcio.util.SIODump %*
lcio/bin
diff -u -r1.4 -r1.5
--- runSIODump.sh 22 Jun 2010 13:49:54 -0000 1.4
+++ runSIODump.sh 29 Jun 2010 00:32:30 -0000 1.5
@@ -1,7 +1,7 @@
#!/bin/sh
-LOCALCLASSPATH=$LCIO/lib/lcio.jar:$LCIO/tools/sio.jar:$LCIO/tools/jdom.jar:$LCIO/tools/saxpath.jar
-LOCALCLASSPATH=$LOCALCLASSPATH:$LCIO/tools/freehep-sio-2.1-SNAPSHOT.jar:$LCIO/tools/freehep-xdr-2.0.4-SNAPSHOT.jar
+LOCALCLASSPATH=$LCIO/lib/lcio.jar:$LCIO/tools/freehep-sio-2.1.jar:$LCIO/tools/freehep-xdr-2.0.4.jar
+LOCALCLASSPATH=$LOCALCLASSPATH:$LCIO/tools/jdom.jar:$LCIO/tools/saxpath.jar
LOCALCLASSPATH=$LOCALCLASSPATH:$LCIO/tools/jaxen-jdom.jar:$LCIO/tools/jaxen-core.jar:$LCIO/tools/jel.jar
# OS specific support for Cygwin
lcio/bin
diff -u -r1.3 -r1.4
--- runSimJob.bat 22 Jun 2010 13:49:54 -0000 1.3
+++ runSimJob.bat 29 Jun 2010 00:32:30 -0000 1.4
@@ -1 +1 @@
-java -cp "%LCIO%/lib/lcio.jar;%LCIO%/tools/freehep-sio-2.1-SNAPSHOT.jar;%LCIO%/tools/freehep-xdr-2.0.4-SNAPSHOT.jar" hep.lcio.example.SimJob %*
\ No newline at end of file
+java -cp "%LCIO%/lib/lcio.jar;%LCIO%/tools/freehep-sio-2.1.jar;%LCIO%/tools/freehep-xdr-2.0.4.jar" hep.lcio.example.SimJob %*
lcio/bin
diff -u -r1.1 -r1.2
--- runSimJob.cyg 15 Sep 2003 21:49:52 -0000 1.1
+++ runSimJob.cyg 29 Jun 2010 00:32:30 -0000 1.2
@@ -1,2 +1,2 @@
-java -cp "$LCIO/lib/lcio.jar;$LCIO/tools/sio.jar" hep.lcio.example.SimJob $1
+java -cp "$LCIO/lib/lcio.jar:$LCIO/tools/freehep-sio-2.1.jar:$LCIO/tools/freehep-xdr-2.0.4.jar" hep.lcio.example.SimJob $1
lcio/bin
diff -u -r1.4 -r1.5
--- runSimJob.sh 22 Jun 2010 13:49:54 -0000 1.4
+++ runSimJob.sh 29 Jun 2010 00:32:30 -0000 1.5
@@ -1,7 +1,6 @@
#!/bin/sh
-LOCALCLASSPATH=$LCIO/lib/lcio.jar:$LCIO/tools/sio.jar
-LOCALCLASSPATH=$LOCALCLASSPATH:$LCIO/tools/freehep-sio-2.1-SNAPSHOT.jar:$LCIO/tools/freehep-xdr-2.0.4-SNAPSHOT.jar
+LOCALCLASSPATH=$LCIO/lib/lcio.jar:$LCIO/tools/freehep-sio-2.1.jar:$LCIO/tools/freehep-xdr-2.0.4.jar
# OS specific support for Cygwin
cygwin=false;
lcio/bin
diff -u -r1.3 -r1.4
--- runrandomtests.sh 3 Jun 2008 10:13:48 -0000 1.3
+++ runrandomtests.sh 29 Jun 2010 00:32:30 -0000 1.4
@@ -1,7 +1,6 @@
#!/bin/sh
-LOCALCLASSPATH=$LCIO/lib/lcio.jar:$LCIO/tools/sio.jar
-LOCALCLASSPATH=$LOCALCLASSPATH:$LCIO/tools/freehep-sio-2.0.jar:$LCIO/tools/freehep-xdr-2.0.3.jar
+LOCALCLASSPATH=$LCIO/lib/lcio.jar:$LCIO/tools/freehep-sio-2.1.jar:$LCIO/tools/freehep-xdr-2.0.4.jar
case "`uname`" in
CYGWIN*)
lcio/config
diff -u -r1.72 -r1.73
--- lcio.properties 22 Jun 2010 13:49:54 -0000 1.72
+++ lcio.properties 29 Jun 2010 00:32:30 -0000 1.73
@@ -1,7 +1,7 @@
# ANT property file for LCIO
#
# Author: Mark Donszelmann
-# Version: $Id: lcio.properties,v 1.72 2010/06/22 13:49:54 gaede Exp $
+# Version: $Id: lcio.properties,v 1.73 2010/06/29 00:32:30 tonyj Exp $
#
debug=true
@@ -25,7 +25,7 @@
test.classpath=lib/lcio.jar;tools/sio.jar;tools/commons-cli-1.0.jar;tools/commons-lang-2.1.jar
test.format=frames
-classpath=src/java;tools/saxpath.jar;tools/jel.jar;tools/jdom.jar;tools/jaxen-core.jar;tools/jaxen-jdom.jar;tools/commons-cli-1.0.jar;tools/commons-lang-2.1.jar;tools/freehep-physics-2.1.jar;tools/freehep-mcfio-2.0.2-SNAPSHOT.jar;tools/freehep-sio-2.1-SNAPSHOT.jar;tools/freehep-stdhep-2.0.3-SNAPSHOT.jar;tools/freehep-xdr-2.0.4-SNAPSHOT.jar;tools/commons-math-1.2.jar
+classpath=src/java;tools/saxpath.jar;tools/jel.jar;tools/jdom.jar;tools/jaxen-core.jar;tools/jaxen-jdom.jar;tools/commons-cli-1.0.jar;tools/commons-lang-2.1.jar;tools/freehep-physics-2.1.jar;tools/freehep-mcfio-2.0.2.jar;tools/freehep-sio-2.1.jar;tools/freehep-stdhep-2.0.3.jar;tools/freehep-xdr-2.0.4.jar;tools/commons-math-1.2.jar
srcpath=src/java
exp.srcpath=
CVSspam 0.2.8