30 modified files
SimDist
diff -u -r1.37 -r1.38
--- configure 22 Jun 2006 23:50:02 -0000 1.37
+++ configure 26 Jun 2006 23:56:37 -0000 1.38
@@ -272,7 +272,7 @@
PACKAGE_STRING='SimDist v1r0p0'
[log in to unmask]
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os OS_SHARED_LIBS_VAR SET_MAKE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT have_cvs CVS have_java JAVA have_wget WGET have_scp SCP sim_dist_dir_basename packages_dep_order packages_reverse_dep_order download_script cvs_script patch_script gen_files sim_dist_dir sim_packages_dir sim_build_dir sim_scripts_dir clhep_version_dot clhep clhep_version clhep_package_dir clhep_base_dir clep_build_dir clhep_tgz_local clhep_dir_orig clhep_download clhep_config_opts gdml gdml_version gdml_package_dir gdml_base_dir gdml_build_dir gdml_!
tgz_local gdml_dir_orig gdml_download gdml_config_opts geant4_version_download geant4 geant4_version geant4_package_dir geant4_base_dir geant4_build_dir geant4_tgz_local geant4_dir_orig geant4_download G4SYSTEM G4INSTALL G4INCLUDE G4LIB G4LEVELGAMMADATA G4RADIOACTIVEDATA G4LEDATA G4ELASTICDATA G4DEBUG G4ANALYSIS_USE G4UI_BUILD_XAW_SESSION G4UI_USE_XAW G4UI_BUILD_XM_SESSION G4UI_USE_XM G4UI_BUILD_WIN32_SESSION G4UI_USE_WIN32 G4VIS_BUILD_DAWN_DRIVER G4VIS_BUILD_OPENGLX_DRIVER G4VIS_BUILD_OPENGLXM_DRIVER G4VIS_BUILD_OPENGLWIN32_DRIVER G4VIS_BUILD_OIX_DRIVER G4VIS_BUILD_RAYTRACERX_DRIVER G4VIS_BUILD_OIWIN32_DRIVER G4VIS_BUILD_VRML_DRIVER G4VIS_USE_DAWN G4VIS_USE_OPENGLX G4VIS_USE_OPENGLXM G4VIS_USE_OPENGLWIN32 G4VIS_USE_OIX G4VIS_USE_RAYTRACERX G4VIS_USE_OIWIN32 G4VIS_USE_VRML G4LIB_BUILD_G3TOG4 G4LIB_USE_G3TOG4 G4LIB_BUILD_ZLIB G4LIB_USE_ZLIB G4LIB_BUILD_SHARED G4LIB_BUILD_STATIC G4LIB_USE_GRANULAR G4UI_USE_TCSH G4WORKDIR G4UI_NONE G4VIS_NONE lcdd lcdd_version lcdd_package_dir!
lcdd_base_dir lcdd_build_dir lcdd_cvsroot lcio lcio_version l!
cio_pack
age_dir lcio_base_dir lcio_build_dir lcio_cvsroot lcphys lcphys_version lcphys_package_dir lcphys_base_dir lcphys_cvsmodule lcphys_cvsroot slic slic_version slic_package_dir slic_base_dir slic_cvsroot slic_binname mokka mokka_version mokka_package_dir mokka_base_dir mokka_build_dir mokka_download mokka_dir_orig mokka_tgz_local XERCES_CONFIGURE_ARGS XERCES_OS XERCES_USE_SHARED_LIB XERCES_USE_STATIC_LIB xerces_version_underscore xerces xerces_version xerces_package_dir xerces_base_dir xerces_build_dir xerces_config xerces_tgz_local xerces_download xerces_dir_orig XERCES_OBJDIR CLHEP_CONFIG CLHEP_BASEDIR CLHEP_INCLUDEDIR CLHEP_LIBDIR CLHEP_LIBNAME CLHEP_VERSION MYSQL_BASEDIR MYSQL_INCLUDEDIR MYSQL_LIBDIR dist_tarball dist_tarball_current dist_version bin_tarball_current bin_tarball dist_dir LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os OS_SHARED_LIBS_VAR SET_MAKE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT have_cvs CVS have_java JAVA have_wget WGET have_scp SCP SLACCVSROOT SLACCVSUSER sim_dist_dir_basename packages_dep_order packages_reverse_dep_order download_script cvs_script patch_script gen_files sim_dist_dir sim_packages_dir sim_build_dir sim_scripts_dir clhep_version_dot CLHEP_BASEDIR CLHEP_BUILDDIR CLHEP_CONFIG_OPTS CLHEP_DIR_ORIG CLHEP_DOWNLOAD GDML_BASEDIR GDML_BUILDDIR GDML_DIR_ORIG GDML_DOWNLOAD GDML_CONFIG_OPTS GEANT4_VERSION_DOWNLOAD GEANT4!
_BUILDDIR GEANT4_DIR_ORIG GEANT4_DOWNLOAD GEANT4_VERSION G4SYSTEM G4INSTALL G4INCLUDE G4LIB G4LEVELGAMMADATA G4RADIOACTIVEDATA G4LEDATA G4ELASTICDATA G4DEBUG G4ANALYSIS_USE G4UI_BUILD_XAW_SESSION G4UI_USE_XAW G4UI_BUILD_XM_SESSION G4UI_USE_XM G4UI_BUILD_WIN32_SESSION G4UI_USE_WIN32 G4VIS_BUILD_DAWN_DRIVER G4VIS_BUILD_OPENGLX_DRIVER G4VIS_BUILD_OPENGLXM_DRIVER G4VIS_BUILD_OPENGLWIN32_DRIVER G4VIS_BUILD_OIX_DRIVER G4VIS_BUILD_RAYTRACERX_DRIVER G4VIS_BUILD_OIWIN32_DRIVER G4VIS_BUILD_VRML_DRIVER G4VIS_USE_DAWN G4VIS_USE_OPENGLX G4VIS_USE_OPENGLXM G4VIS_USE_OPENGLWIN32 G4VIS_USE_OIX G4VIS_USE_RAYTRACERX G4VIS_USE_OIWIN32 G4VIS_USE_VRML G4LIB_BUILD_G3TOG4 G4LIB_USE_G3TOG4 G4LIB_BUILD_ZLIB G4LIB_USE_ZLIB G4LIB_BUILD_SHARED G4LIB_BUILD_STATIC G4LIB_USE_GRANULAR G4UI_USE_TCSH G4WORKDIR G4UI_NONE G4VIS_NONE LCDD_BASEDIR LCIO_BASEDIR LCPHYS_CVSMODULE LCPHYS_BASEDIR slic_binname SLIC_BASEDIR MOKKA_BASEDIR MOKKA_BUILDDIR MOKKA_DOWNLOAD MOKKA_DIR_ORIG XERCES_CONFIGURE_ARGS XERCES_OS XERC!
ES_USE_SHARED_LIB XERCES_USE_STATIC_LIB xerces_version_undersc!
ore XERC
ES_BASEDIR XERCES_BUILDDIR XERCES_CONFIG XERCES_CONFIG_OPTS XERCES_DOWNLOAD XERCES_DIR_ORIG XERCES_OBJDIR MYSQL_BASEDIR MYSQL_INCLUDEDIR MYSQL_LIBDIR dist_tarball dist_tarball_current dist_version bin_tarball_current bin_tarball dist_dir LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -729,26 +729,6 @@
ac_env_CPPFLAGS_value=$CPPFLAGS
ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-ac_env_CLHEP_BASEDIR_set=${CLHEP_BASEDIR+set}
-ac_env_CLHEP_BASEDIR_value=$CLHEP_BASEDIR
-ac_cv_env_CLHEP_BASEDIR_set=${CLHEP_BASEDIR+set}
-ac_cv_env_CLHEP_BASEDIR_value=$CLHEP_BASEDIR
-ac_env_CLHEP_INCLUDEDIR_set=${CLHEP_INCLUDEDIR+set}
-ac_env_CLHEP_INCLUDEDIR_value=$CLHEP_INCLUDEDIR
-ac_cv_env_CLHEP_INCLUDEDIR_set=${CLHEP_INCLUDEDIR+set}
-ac_cv_env_CLHEP_INCLUDEDIR_value=$CLHEP_INCLUDEDIR
-ac_env_CLHEP_LIBDIR_set=${CLHEP_LIBDIR+set}
-ac_env_CLHEP_LIBDIR_value=$CLHEP_LIBDIR
-ac_cv_env_CLHEP_LIBDIR_set=${CLHEP_LIBDIR+set}
-ac_cv_env_CLHEP_LIBDIR_value=$CLHEP_LIBDIR
-ac_env_CLHEP_LIBNAME_set=${CLHEP_LIBNAME+set}
-ac_env_CLHEP_LIBNAME_value=$CLHEP_LIBNAME
-ac_cv_env_CLHEP_LIBNAME_set=${CLHEP_LIBNAME+set}
-ac_cv_env_CLHEP_LIBNAME_value=$CLHEP_LIBNAME
-ac_env_CLHEP_VERSION_set=${CLHEP_VERSION+set}
-ac_env_CLHEP_VERSION_value=$CLHEP_VERSION
-ac_cv_env_CLHEP_VERSION_set=${CLHEP_VERSION+set}
-ac_cv_env_CLHEP_VERSION_value=$CLHEP_VERSION
ac_env_MYSQL_BASEDIR_set=${MYSQL_BASEDIR+set}
ac_env_MYSQL_BASEDIR_value=$MYSQL_BASEDIR
ac_cv_env_MYSQL_BASEDIR_set=${MYSQL_BASEDIR+set}
@@ -839,17 +819,6 @@
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-cvsuser=<path> SLAC CVS user name. (Default is anonymous)
--with-prefix=<path> binary installation base area
- --with-clhep-basedir=<path>
- absolute path to CLHEP base install directory
- --with-clhep-includedir=<path>
- absolute path to CLHEP include directory
- --with-clhep-libdir=<path>
- absolute path to CLHEP lib directory
- --with-clhep-libname=<path>
- name of CLHEP library with (NO prefix or file
- extension)
- --with-clhep-version=<version>
- dot-separated CLHEP version string
--with-mysql-basedir=<path>
absolute path to mysql base directory
--with-mysql-includedir=<path>
@@ -866,19 +835,6 @@
nonstandard directory <lib dir>
CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
headers in a nonstandard directory <include dir>
- CLHEP_BASEDIR
- base installation directory of CLHEP package, containing
- directories bin, lib, include, etc.
- CLHEP_INCLUDEDIR
- directory containing the CLHEP headers, which should itself
- contain a directory called CLHEP
- CLHEP_LIBDIR
- directory containing the CLHEP library
- CLHEP_LIBNAME
- name of the CLHEP library, without library prefix or static,
- shared extension
- CLHEP_VERSION
- dot-separated CLHEP version string
MYSQL_BASEDIR
base mysql directory
MYSQL_INCLUDEDIR
@@ -2179,6 +2135,12 @@
echo "$as_me:$LINENO: result: $cvsroot" >&5
echo "${ECHO_T}$cvsroot" >&6
+SLACCVSROOT=$cvsroot
+
+
+SLACCVSUSER=$cvsuser
+
+
@@ -2464,1758 +2426,357 @@
package_version=$(grep "^${package_name} " ${package_root_dir}/VERSION | awk '{print $2}')
-if test -z $package_version
-then
- { { echo "$as_me:$LINENO: error: $package_name version tag was not found in ${package_root_dir}/VERSION." >&5
-echo "$as_me: error: $package_name version tag was not found in ${package_root_dir}/VERSION." >&2;}
- { (exit 1); exit 1; }; }
-else
- echo "$as_me:$LINENO: result: $package_version" >&5
-echo "${ECHO_T}$package_version" >&6
-fi
-
-package_dir=${sim_packages_dir}/${package_name}
-package_base_dir=${sim_packages_dir}/${package_name}/${package_version}
-
-> ${sim_packages_dir}/${package_name}/package.gmk.in
-
-case "$package_name" in
-
-clhep )
-
- clhep_url=http://cern.ch/clhep
- clhep_version_dot=$(
- v=$(echo ${package_version} | sed -e 's/[vrp]/\./g' -e 's/^\.//g' -e 's/_/./g')
- clhep_version_dot=$v
-
- echo $v
-)
- clhep_tgz=clhep-${clhep_version_dot}.tgz
- clhep_config_opts="--prefix=\$(PACKAGE_BASEDIR) --disable-shared"
-
-
-
-f=$sim_packages_dir/clhep/package.gmk.in
-
-echo "export PACKAGE = @clhep@" >> $f ;
-
-if test -z "clhep"
-then
- v=`eval echo $clhep`
-else
- v=clhep
-fi
-
-clhep=$v
-
-
-
-
-
-f=$sim_packages_dir/clhep/package.gmk.in
-
-echo "export PACKAGE_VERSION = @clhep_version@" >> $f ;
-
-if test -z "${package_version}"
-then
- v=`eval echo $clhep_version`
-else
- v=${package_version}
-fi
-
-clhep_version=$v
-
-
-
-
-
-f=$sim_packages_dir/clhep/package.gmk.in
-
-echo "export PACKAGE_DIR = @clhep_package_dir@" >> $f ;
-
-if test -z "${package_dir}"
-then
- v=`eval echo $clhep_package_dir`
-else
- v=${package_dir}
-fi
-
-clhep_package_dir=$v
-
-
-
-
-
-f=$sim_packages_dir/clhep/package.gmk.in
-
-echo "export PACKAGE_BASEDIR = @clhep_base_dir@" >> $f ;
-
-if test -z "${package_base_dir}"
-then
- v=`eval echo $clhep_base_dir`
-else
- v=${package_base_dir}
-fi
-
-clhep_base_dir=$v
-
-
-
-
-
-f=$sim_packages_dir/clhep/package.gmk.in
-
-echo "export PACKAGE_BUILDDIR = @clep_build_dir@" >> $f ;
-
-if test -z "${package_base_dir}/CLHEP"
-then
- v=`eval echo $clep_build_dir`
-else
- v=${package_base_dir}/CLHEP
-fi
-
-clep_build_dir=$v
-
-
-
-
-
-f=$sim_packages_dir/clhep/package.gmk.in
-
-echo "export PACKAGE_TGZ_LOCAL = @clhep_tgz_local@" >> $f ;
-
-if test -z "clhep.tar.gz"
-then
- v=`eval echo $clhep_tgz_local`
-else
- v=clhep.tar.gz
-fi
-
-clhep_tgz_local=$v
-
-
-
-
-
-f=$sim_packages_dir/clhep/package.gmk.in
-
-echo "export PACKAGE_DIR_ORIG = @clhep_dir_orig@" >> $f ;
-
-if test -z "${clhep_version_dot}"
-then
- v=`eval echo $clhep_dir_orig`
-else
- v=${clhep_version_dot}
-fi
-
-clhep_dir_orig=$v
-
-
-
-
-
-f=$sim_packages_dir/clhep/package.gmk.in
-
-echo "export PACKAGE_DOWNLOAD = @clhep_download@" >> $f ;
-
-if test -z "${clhep_url}/${clhep_tgz}"
-then
- v=`eval echo $clhep_download`
-else
- v=${clhep_url}/${clhep_tgz}
-fi
-
-clhep_download=$v
-
-
-
-
-
-f=$sim_packages_dir/clhep/package.gmk.in
-
-echo "export PACKAGE_CONFIG_OPTS = @clhep_config_opts@" >> $f ;
-
-if test -z "${clhep_config_opts}"
-then
- v=`eval echo $clhep_config_opts`
-else
- v=${clhep_config_opts}
-fi
-
-clhep_config_opts=$v
-
-
-
-
- ;;
-
-gdml )
-
- gdml_version=${package_version}
- gdml_url="http://simu.cvs.cern.ch/cgi-bin/simu.cgi/simu/GDML2/GDML2.tar.gz?tarball=1&only_with_tag="${package_version}
-
-
-
-f=$sim_packages_dir/gdml/package.gmk.in
-
-echo "export PACKAGE = @gdml@" >> $f ;
-
-if test -z "gdml"
-then
- v=`eval echo $gdml`
-else
- v=gdml
-fi
-
-gdml=$v
-
-
-
-
-
-f=$sim_packages_dir/gdml/package.gmk.in
-
-echo "export PACKAGE_VERSION = @gdml_version@" >> $f ;
-
-if test -z "${package_version}"
-then
- v=`eval echo $gdml_version`
-else
- v=${package_version}
-fi
-
-gdml_version=$v
-
-
-
-
-
-f=$sim_packages_dir/gdml/package.gmk.in
-
-echo "export PACKAGE_DIR = @gdml_package_dir@" >> $f ;
-
-if test -z "${package_dir}"
-then
- v=`eval echo $gdml_package_dir`
-else
- v=${package_dir}
-fi
-
-gdml_package_dir=$v
-
-
-
-
-
-f=$sim_packages_dir/gdml/package.gmk.in
-
-echo "export PACKAGE_BASEDIR = @gdml_base_dir@" >> $f ;
-
-if test -z "${package_base_dir}"
-then
- v=`eval echo $gdml_base_dir`
-else
- v=${package_base_dir}
-fi
-
-gdml_base_dir=$v
-
-
-
-
-
-f=$sim_packages_dir/gdml/package.gmk.in
-
-echo "export PACKAGE_BUILDDIR = @gdml_build_dir@" >> $f ;
-
-if test -z "${package_base_dir}/CPPGDML"
-then
- v=`eval echo $gdml_build_dir`
-else
- v=${package_base_dir}/CPPGDML
-fi
-
-gdml_build_dir=$v
-
-
-
-
-
-f=$sim_packages_dir/gdml/package.gmk.in
-
-echo "export PACKAGE_TGZ_LOCAL = @gdml_tgz_local@" >> $f ;
-
-if test -z "gdml.tar.gz"
-then
- v=`eval echo $gdml_tgz_local`
-else
- v=gdml.tar.gz
-fi
-
-gdml_tgz_local=$v
-
-
-
-
-
-f=$sim_packages_dir/gdml/package.gmk.in
-
-echo "export PACKAGE_DIR_ORIG = @gdml_dir_orig@" >> $f ;
-
-if test -z "GDML2"
-then
- v=`eval echo $gdml_dir_orig`
-else
- v=GDML2
-fi
-
-gdml_dir_orig=$v
-
-
-
-
-
-f=$sim_packages_dir/gdml/package.gmk.in
-
-echo "export PACKAGE_DOWNLOAD = @gdml_download@" >> $f ;
-
-if test -z "\"${gdml_url}\""
-then
- v=`eval echo $gdml_download`
-else
- v=\"${gdml_url}\"
-fi
-
-gdml_download=$v
-
-
-
- _c="--enable-shared-libs=no --enable-geant4-granular-libs"
-
-
-f=$sim_packages_dir/gdml/package.gmk.in
-
-echo "export PACKAGE_CONFIG_OPTS = @gdml_config_opts@" >> $f ;
-
-if test -z "${_c}"
-then
- v=`eval echo $gdml_config_opts`
-else
- v=${_c}
-fi
-
-gdml_config_opts=$v
-
-
-
-
- ;;
-
-geant4 )
-
- geant4_version=${package_version}
- geant4_url=http://geant4.cern.ch/support/source/
- geant4_version_download=$(
- v=$(echo ${geant4_version} | sed 's/[vr]/\./g' | sed 's/p/\.p/g')
- geant4_version_download=$v
-
- echo $v
-)
- geant4_tgz=geant4${geant4_version_download}.tar.gz
-
-
-
-f=$sim_packages_dir/geant4/package.gmk.in
-
-echo "export PACKAGE = @geant4@" >> $f ;
-
-if test -z "geant4"
-then
- v=`eval echo $geant4`
-else
- v=geant4
-fi
-
-geant4=$v
-
-
-
-
-
-f=$sim_packages_dir/geant4/package.gmk.in
-
-echo "export PACKAGE_VERSION = @geant4_version@" >> $f ;
-
-if test -z "${package_version}"
-then
- v=`eval echo $geant4_version`
-else
- v=${package_version}
-fi
-
-geant4_version=$v
-
-
-
-
-
-f=$sim_packages_dir/geant4/package.gmk.in
-
-echo "export PACKAGE_DIR = @geant4_package_dir@" >> $f ;
-
-if test -z "${package_dir}"
-then
- v=`eval echo $geant4_package_dir`
-else
- v=${package_dir}
-fi
-
-geant4_package_dir=$v
-
-
-
-
-
-f=$sim_packages_dir/geant4/package.gmk.in
-
-echo "export PACKAGE_BASEDIR = @geant4_base_dir@" >> $f ;
-
-if test -z "${package_base_dir}"
-then
- v=`eval echo $geant4_base_dir`
-else
- v=${package_base_dir}
-fi
-
-geant4_base_dir=$v
-
-
-
-
-
-f=$sim_packages_dir/geant4/package.gmk.in
-
-echo "export PACKAGE_BUILDDIR = @geant4_build_dir@" >> $f ;
-
-if test -z "${package_base_dir}/source"
-then
- v=`eval echo $geant4_build_dir`
-else
- v=${package_base_dir}/source
-fi
-
-geant4_build_dir=$v
-
-
-
-
-
-f=$sim_packages_dir/geant4/package.gmk.in
-
-echo "export PACKAGE_TGZ_LOCAL = @geant4_tgz_local@" >> $f ;
-
-if test -z "geant4.tar.gz"
-then
- v=`eval echo $geant4_tgz_local`
-else
- v=geant4.tar.gz
-fi
-
-geant4_tgz_local=$v
-
-
-
-
-
-f=$sim_packages_dir/geant4/package.gmk.in
-
-echo "export PACKAGE_DIR_ORIG = @geant4_dir_orig@" >> $f ;
-
-if test -z "geant4${geant4_version_download}"
-then
- v=`eval echo $geant4_dir_orig`
-else
- v=geant4${geant4_version_download}
-fi
-
-geant4_dir_orig=$v
-
-
-
-
-
-f=$sim_packages_dir/geant4/package.gmk.in
-
-echo "export PACKAGE_DOWNLOAD = @geant4_download@" >> $f ;
-
-if test -z "${geant4_url}/${geant4_tgz}"
-then
- v=`eval echo $geant4_download`
-else
- v=${geant4_url}/${geant4_tgz}
-fi
-
-geant4_download=$v
-
-
-
-
- G4INSTALL=$geant4_base_dir
- G4WORKDIR=$geant4_base_dir
-
-
-
-echo "$as_me:$LINENO: checking for G4SYSTEM setting" >&5
-echo $ECHO_N "checking for G4SYSTEM setting... $ECHO_C" >&6
-
-# G4SYSTEM
-case "$host_os" in
-
- linux* )
- G4SYSTEM=Linux
- ;;
- cygwin* )
- G4SYSTEM=WIN32
- ;;
- darwin* )
- G4SYSTEM=Darwin
- ;;
- * )
-
-esac
-
-if test -z "$G4SYSTEM"
-then
- { { echo "$as_me:$LINENO: error: platform $host_os is not supported" >&5
-echo "$as_me: error: platform $host_os is not supported" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
-G4SYSTEM=$G4SYSTEM"-"${CXX}
-
-echo "$as_me:$LINENO: result: $G4SYSTEM" >&5
-echo "${ECHO_T}$G4SYSTEM" >&6
-
-if test -n "$OGLHOME"
-then
-G4VIS_USE_OPENGLX=1
-G4VIS_BUILD_OPENGLX_DRIVER=1
-fi
-
-# terminal
-G4UI_USE_TCSH=
-G4UI_USE_CSH=
-
-case "$host_os" in
-
- linux*|darwin* )
- G4UI_USE_TCSH=1
- ;;
- cygwin* )
- G4UI_USE_CSH=1
- ;;
-
-esac
-
-# Built-in visualization.
-if test -z "$G4VIS_NONE"
-then
- G4VIS_BUILD_DAWN_DRIVER=1
- G4VIS_BUILD_RAYTRACERX_DRIVER=1
- G4VIS_BUILD_VRML_DRIVER=1
- G4VIS_USE_DAWN=1
- G4VIS_USE_VRML=1
- G4VIS_USE_RAYTRACERX=1
- G4LIB_USE_ZLIB=1
-fi
-
-# Variable substitutions.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ;;
-
-lcdd )
-
-
-
-f=$sim_packages_dir/lcdd/package.gmk.in
-
-echo "export PACKAGE = @lcdd@" >> $f ;
-
-if test -z "lcdd"
-then
- v=`eval echo $lcdd`
-else
- v=lcdd
-fi
-
-lcdd=$v
-
-
-
-
-
-f=$sim_packages_dir/lcdd/package.gmk.in
-
-echo "export PACKAGE_VERSION = @lcdd_version@" >> $f ;
-
-if test -z "${package_version}"
-then
- v=`eval echo $lcdd_version`
-else
- v=${package_version}
-fi
-
-lcdd_version=$v
-
-
-
-
-
-f=$sim_packages_dir/lcdd/package.gmk.in
-
-echo "export PACKAGE_DIR = @lcdd_package_dir@" >> $f ;
-
-if test -z "${package_dir}"
-then
- v=`eval echo $lcdd_package_dir`
-else
- v=${package_dir}
-fi
-
-lcdd_package_dir=$v
-
-
-
-
-
-f=$sim_packages_dir/lcdd/package.gmk.in
-
-echo "export PACKAGE_BASEDIR = @lcdd_base_dir@" >> $f ;
-
-if test -z "${package_base_dir}"
-then
- v=`eval echo $lcdd_base_dir`
-else
- v=${package_base_dir}
-fi
-
-lcdd_base_dir=$v
-
-
-
-
-
-f=$sim_packages_dir/lcdd/package.gmk.in
-
-echo "export PACKAGE_BUILDDIR = @lcdd_build_dir@" >> $f ;
-
-if test -z "${package_base_dir}"
-then
- v=`eval echo $lcdd_build_dir`
-else
- v=${package_base_dir}
-fi
-
-lcdd_build_dir=$v
-
-
-
-
-
-f=$sim_packages_dir/lcdd/package.gmk.in
-
-echo "export PACKAGE_CVSROOT = @lcdd_cvsroot@" >> $f ;
-
-if test -z "${cvsroot}"
-then
- v=`eval echo $lcdd_cvsroot`
-else
- v=${cvsroot}
-fi
-
-lcdd_cvsroot=$v
-
-
-
-
- ;;
-
-lcio )
-
-
-
-f=$sim_packages_dir/lcio/package.gmk.in
-
-echo "export PACKAGE = @lcio@" >> $f ;
-
-if test -z "lcio"
-then
- v=`eval echo $lcio`
-else
- v=lcio
-fi
-
-lcio=$v
-
-
-
-
-
-f=$sim_packages_dir/lcio/package.gmk.in
-
-echo "export PACKAGE_VERSION = @lcio_version@" >> $f ;
-
-if test -z "${package_version}"
-then
- v=`eval echo $lcio_version`
-else
- v=${package_version}
-fi
-
-lcio_version=$v
-
-
-
-
-
-f=$sim_packages_dir/lcio/package.gmk.in
-
-echo "export PACKAGE_DIR = @lcio_package_dir@" >> $f ;
-
-if test -z "${package_dir}"
-then
- v=`eval echo $lcio_package_dir`
-else
- v=${package_dir}
-fi
-
-lcio_package_dir=$v
-
-
-
-
-
-f=$sim_packages_dir/lcio/package.gmk.in
-
-echo "export PACKAGE_BASEDIR = @lcio_base_dir@" >> $f ;
-
-if test -z "${package_base_dir}"
-then
- v=`eval echo $lcio_base_dir`
-else
- v=${package_base_dir}
-fi
-
-lcio_base_dir=$v
-
-
-
-
-
-f=$sim_packages_dir/lcio/package.gmk.in
-
-echo "export PACKAGE_BUILDDIR = @lcio_build_dir@" >> $f ;
-
-if test -z "${package_base_dir}"
-then
- v=`eval echo $lcio_build_dir`
-else
- v=${package_base_dir}
-fi
-
-lcio_build_dir=$v
-
-
-
-
-
-f=$sim_packages_dir/lcio/package.gmk.in
-
-echo "export PACKAGE_CVSROOT = @lcio_cvsroot@" >> $f ;
-
-if test -z "${cvsroot}"
-then
- v=`eval echo $lcio_cvsroot`
-else
- v=${cvsroot}
-fi
-
-lcio_cvsroot=$v
-
-
-
-
- ;;
-
-lcphys )
-
-
-
-f=$sim_packages_dir/lcphys/package.gmk.in
-
-echo "export PACKAGE = @lcphys@" >> $f ;
-
-if test -z "lcphys"
-then
- v=`eval echo $lcphys`
-else
- v=lcphys
-fi
-
-lcphys=$v
-
-
-
-
-
-f=$sim_packages_dir/lcphys/package.gmk.in
-
-echo "export PACKAGE_VERSION = @lcphys_version@" >> $f ;
-
-if test -z "${package_version}"
-then
- v=`eval echo $lcphys_version`
-else
- v=${package_version}
-fi
-
-lcphys_version=$v
-
-
-
-
-
-f=$sim_packages_dir/lcphys/package.gmk.in
-
-echo "export PACKAGE_DIR = @lcphys_package_dir@" >> $f ;
-
-if test -z "${package_dir}"
-then
- v=`eval echo $lcphys_package_dir`
-else
- v=${package_dir}
-fi
-
-lcphys_package_dir=$v
-
-
-
-
-
-f=$sim_packages_dir/lcphys/package.gmk.in
-
-echo "export PACKAGE_BASEDIR = @lcphys_base_dir@" >> $f ;
-
-if test -z "${package_base_dir}"
-then
- v=`eval echo $lcphys_base_dir`
-else
- v=${package_base_dir}
-fi
-
-lcphys_base_dir=$v
-
-
-
-
-
-f=$sim_packages_dir/lcphys/package.gmk.in
-
-echo "export PACKAGE_BUILDDIR = @lcphys_base_dir@" >> $f ;
-
-if test -z "${package_base_dir}"
-then
[truncated at 1000 lines; 1148 more skipped]
SimDist
diff -u -r1.1 -r1.2
--- configure.in 22 Jun 2006 23:42:52 -0000 1.1
+++ configure.in 26 Jun 2006 23:56:38 -0000 1.2
@@ -1,4 +1,4 @@
-dnl $Header: /cvs/lcd/SimDist/configure.in,v 1.1 2006/06/22 23:42:52 jeremy Exp $
+dnl $Header: /cvs/lcd/SimDist/configure.in,v 1.2 2006/06/26 23:56:38 jeremy Exp $
dnl
dnl Process this file with autoconf to produce the configure script for SimDist.
dnl
@@ -40,7 +40,7 @@
AC_CONFIG_PACKAGES
dnl Individual package configuration.
-AC_CLHEP
+dnl AC_CLHEP
dnl AC_GEANT4
AC_MYSQL
SimDist/build
diff -u -r1.13 -r1.14
--- common.gmk.in 22 Jun 2006 23:50:04 -0000 1.13
+++ common.gmk.in 26 Jun 2006 23:56:39 -0000 1.14
@@ -1,12 +1,9 @@
-# $Id: common.gmk.in,v 1.13 2006/06/22 23:50:04 jeremy Exp $
+# $Id: common.gmk.in,v 1.14 2006/06/26 23:56:39 jeremy Exp $
#
# Common Make variables for SimDist
#
-# include package env vars
-#include @sim_packages_dir@/*/env.gmk
-
# autoconf vars
prefix=@prefix@
@@ -34,9 +31,6 @@
packages_dep_order=@packages_dep_order@
packages_reverse_dep_order=@packages_reverse_dep_order@
-# OpenGL
-OGLHOME=@OGLHOME@
-
# dist installation info
dist_tarball=@dist_tarball@
dist_tarball_current=@dist_tarball_current@
@@ -45,13 +39,18 @@
bin_tarball_current=@bin_tarball_current@
# name of slic binary
-slic_bin=$(sim_packages_dir)/@slic@/@slic_version@/bin/@g4system@/@slic_binname@
+slic_bin=@SLIC_BASEDIR@/bin/@G4SYSTEM@/@slic_binname@
slic_run_script=slic.sh
slic_run=$(sim_scripts_dir)/$(slic_run_script)
# files to include in binary distribution tarball
-bindist_files = $(sim_dist_dir_basename)/packages/@xerces@/@xerces_version@/lib/*
-bindist_files += $(sim_dist_dir_basename)/packages/slic/@slic_version@/bin/@g4system@/@slic_binname@
+bindist_files = @XERCES_BASEDIR@/lib/*
+bindist_files += @SLIC_BASEDIR@/bin/@G4SYSTEM@/@slic_binname@
bindist_files += $(sim_dist_dir_basename)/scripts/$(slic_run_script);:
-XERCES_OS = @XERCES_OS@
+# OpenGL
+OGLHOME=@OGLHOME@
+
+# SLAC CVS information.
+SLACCVSROOT=@SLACCVSROOT@
+SLACCVSUSER=@SLACCVSUSER@
\ No newline at end of file
SimDist/build
diff -u -r1.5 -r1.6
--- package.gmk.in 23 Jun 2006 19:50:32 -0000 1.5
+++ package.gmk.in 26 Jun 2006 23:56:39 -0000 1.6
@@ -1,72 +1,88 @@
-# $Id: package.gmk.in,v 1.5 2006/06/23 19:50:32 jeremy Exp $
+# $Id: package.gmk.in,v 1.6 2006/06/26 23:56:39 jeremy Exp $
#
# Generic package build rules.
#
+# This Makefile will include the following gmk files if
+# found in CURDIR.
+#
+# env.gmk - package's build environment settings
+# package.gmk - SimDist build system settings
+# deps.gmk - dependency information
+#
-# common build vars
+# Common build variables of SimDist.
include ../../build/common.gmk
-# package vars
-include $(CURDIR)/package.gmk
-
-# these expected to be included or defined externally
-ifndef PACKAGE
- $(error define PACKAGE to name of package)
-else
- ifndef PACKAGE_NAME
- PACKAGE_NAME = $(PACKAGE)
- endif
+# Name of the package.
+ifndef PACKAGE_NAME
+ PACKAGE_NAME = $(shell basename $(CURDIR))
endif
+# Package version.
ifndef PACKAGE_VERSION
- $(error define PACKAGE_VERSION)
+ PACKAGE_VERSION = $(shell cat VERSION | awk '{print $$2}')
endif
+# Package directory, which defaults to the current dir.
ifndef PACKAGE_DIR
- $(error define PACKAGE_DIR)
+ PACKAGE_DIR=$(CURDIR)
endif
+# Base directory of this package's source files.
ifndef PACKAGE_BASEDIR
- $(error define PACKAGE_BASEDIR)
+ PACKAGE_BASEDIR=$(PACKAGE_DIR)/$(PACKAGE_VERSION)
endif
+# Directory where build commands should be executed.
ifndef PACKAGE_BUILDDIR
- $(error define PACKAGE_BUILDDIR)
+ PACKAGE_BUILDDIR=$(PACKAGE_BASEDIR)
endif
-# default name of configure script
+# Name of the configure script.
ifndef PACKAGE_CONFIG
PACKAGE_CONFIG=./configure
endif
-# default name of CVS module
+# Default CVS is at SLAC.
+ifndef PACKAGE_CVSROOT
+ PACKAGE_CVSROOT = $(SLACCVSROOT)
+endif
+
+# Name of the CVS module.
ifndef PACKAGE_CVSMODULE
PACKAGE_CVSMODULE=$(PACKAGE_NAME)
endif
-# default CVS tag
+# The CVS tag that should be checked out.
ifndef PACKAGE_CVSVERSION
PACKAGE_CVSVERSION=$(PACKAGE_VERSION)
endif
-# OPTIONAL package dependencies
+# Name of local tarball file.
+ifndef PACKAGE_TGZ_LOCAL
+ PACKAGE_TGZ_LOCAL=$(PACKAGE_NAME).tar.gz
+endif
+
+# OPTIONAL customizations to PACKAGE variables.
+-include $(CURDIR)/package.gmk
+
+# OPTIONAL dependency information.
-include $(PACKAGE_DIR)/deps.gmk
-# OPTIONAL package make vars
+# OPTIONAL build environment for this packages build system or dependent external packages.
-include $(PACKAGE_DIR)/env.gmk
-# default rule
.DEFAULT: all
-# rules that should be forced
+# Rules that should be forced. (basically everything)
.PHONY: all download cvs config compile install srcclean packageclean distclean
-# default rule
default: all
-# download tgz file from WWW
+# Download a tarball containing package sources from the WWW.
download:
+ @echo "Downloading $(PACKAGE_NAME) from $(PACKAGE_DOWNLOAD) ..." ; \
if [ ! -d "$(PACKAGE_BASEDIR)" ]; then \
cd $(PACKAGE_DIR) ; \
$(WGET) $(PACKAGE_DOWNLOAD) -O $(PACKAGE_TGZ_LOCAL) ; \
@@ -77,8 +93,9 @@
echo "The directory $(PACKAGE_BASEDIR) already exists for package $(PACKAGE_NAME)." ; \
fi;:
-# check package out of CVS
+# Check package sources out of the CVS repository.
cvs:
+ @echo "Checking out $(PACKAGE_CVSMODULE) from $(PACKAGE_CVSROOT) ... " ; \
if [ ! -d "$(PACKAGE_BASEDIR)" ]; then \
cd $(PACKAGE_DIR) ; \
rm -rf $(PACKAGE_VERSION) ; \
@@ -87,33 +104,52 @@
echo "The directory $(PACKAGE_BASEDIR) already exists for package $(PACKAGE_NAME)." ; \
fi;:
-# patch the source if a patch script exists
+# Patch the source files.
patch:
- if [ -e "./@patch_script@" ]; then cd $(PACKAGE_DIR) && ./@patch_script@; fi;:
+ @echo "Patching $(PACKAGE_NAME) ..." ; \
+ if [ -e "./patch.sh" ]; then cd $(PACKAGE_DIR) && ./patch.sh; fi;:
-# run configure if a configure script exists
+# Run configure.
config:
- cd $(PACKAGE_BUILDDIR) && if [ -e "$(PACKAGE_CONFIG)" ]; then $(PACKAGE_CONFIG) $(PACKAGE_CONFIG_OPTS); fi;:
+ @cd $(PACKAGE_BUILDDIR) && if [ -e "$(PACKAGE_CONFIG)" ]; then $(PACKAGE_CONFIG) $(PACKAGE_CONFIG_OPTS); fi;:
-# default compile rule
+# Build the package by executing the default make rule on the sources.
compile:
+ @echo "Compiling $(PACKAGE_NAME) ..." ; \
cd $(PACKAGE_BUILDDIR) && $(MAKE);:
-# install package
+# Install the package by executing the install target.
install:
- echo "install: $(PACKAGE)" ; \
+ @echo "Installing $(PACKAGE_NAME) ..." ; \
cd $(PACKAGE_BUILDDIR) && $(MAKE) install;:
-# clean sources
+# Clean the package sources by executing the clean target.
srcclean:
- cd $(PACKAGE_BUILDDIR) && $(MAKE) clean;:
+ @cd $(PACKAGE_BUILDDIR) && $(MAKE) clean;:
-# delete the source dir
+# Delete the package's source directory.
packageclean:
- cd $(PACKAGE_DIR) && rm -rf $(PACKAGE_VERSION) ; :
+ @cd $(PACKAGE_DIR) && rm -rf $(PACKAGE_VERSION);:
-# clean the package
+# A clean target that returns to checkout state.
distclean:
- cd $(PACKAGE_DIR) ; \
- rm -rf $(PACKAGE_VERSION) ; \
- rm -rf package.gmk.in package.gmk env.gmk patch.sh Makefile $(PACKAGE_TGZ_LOCAL) &> /dev/null;:
+ @cd $(PACKAGE_DIR); \
+ rm -rf $(PACKAGE_VERSION); \
+ rm -rf package.gmk env.gmk patch.sh Makefile $(PACKAGE_TGZ_LOCAL) &> /dev/null;:
+
+# Print package information.
+packageinfo:
+ @echo Package information for $(PACKAGE_NAME) ... ; \
+ echo PACKAGE_NAME=$(PACKAGE_NAME); \
+ echo PACKAGE_BASEDIR=$(PACKAGE_BASEDIR); \
+ echo PACKAGE_BUILDDIR=$(PACKAGE_BASEDIR); \
+ echo PACKAGE_CONFIG=$(PACKAGE_CONFIG); \
+ echo PACKAGE_CONFIG_OPTS=$(PACKAGE_CONFIG_OPTS); \
+ echo PACKAGE_CVSMODULE=$(PACKAGE_CVSMODULE); \
+ echo PACKAGE_CVSROOT=$(PACKAGE_CVSROOT); \
+ echo PACKAGE_DIR=$(PACKAGE_DIR); \
+ echo PACKAGE_DIR_ORIG=$(PACKAGE_DIR_ORIG); \
+ echo PACKAGE_DOWNLOAD=$(PACKAGE_DOWNLOAD); \
+ echo PACKAGE_TGZ_LOCAL=$(PACKAGE_TGZ_LOCAL); \
+ echo PACKAGE_VERSION=$(PACKAGE_VERSION); \
+ echo
SimDist/build
diff -u -r1.16 -r1.17
--- packages.m4 22 Jun 2006 23:50:04 -0000 1.16
+++ packages.m4 26 Jun 2006 23:56:40 -0000 1.17
@@ -1,6 +1,7 @@
-
-dnl macro to do common configuration for each package
-AC_DEFUN(CONFIG_PACKAGE_BASE, [
+dnl
+dnl Macro to do common configuration for each package.
+dnl
+AC_DEFUN(AC_CONFIG_PACKAGE_BASE, [
if test -z $1
then
@@ -34,184 +35,241 @@
package_dir=${sim_packages_dir}/${package_name}
package_base_dir=${sim_packages_dir}/${package_name}/${package_version}
-dnl new package.gmk.in file for this package
-> ${sim_packages_dir}/${package_name}/package.gmk.in
-
-dnl Most package-specific substitutions and configuration happens here.
+dnl Setup the build variables for each package.
case "$package_name" in
clhep )
+ AC_CLHEP_PACKAGE
+ ;;
- clhep_url=http://cern.ch/clhep
- clhep_version_dot=$(VERSION_DOT(clhep_version_dot, ${package_version}))
- clhep_tgz=clhep-${clhep_version_dot}.tgz
- clhep_config_opts="--prefix=\$(PACKAGE_BASEDIR) --disable-shared"
-
- PACKAGE_MAKEVAR(clhep, PACKAGE, clhep, [clhep])
- PACKAGE_MAKEVAR(clhep, PACKAGE_VERSION, clhep_version, ${package_version})
- PACKAGE_MAKEVAR(clhep, PACKAGE_DIR, clhep_package_dir, ${package_dir})
- PACKAGE_MAKEVAR(clhep, PACKAGE_BASEDIR, clhep_base_dir, ${package_base_dir})
- PACKAGE_MAKEVAR(clhep, PACKAGE_BUILDDIR, clep_build_dir, ${package_base_dir}/CLHEP)
- PACKAGE_MAKEVAR(clhep, PACKAGE_TGZ_LOCAL, clhep_tgz_local, [clhep.tar.gz])
- PACKAGE_MAKEVAR(clhep, PACKAGE_DIR_ORIG, clhep_dir_orig, ${clhep_version_dot})
- PACKAGE_MAKEVAR(clhep, PACKAGE_DOWNLOAD, clhep_download, ${clhep_url}/${clhep_tgz})
- PACKAGE_MAKEVAR(clhep, PACKAGE_CONFIG_OPTS, clhep_config_opts, ${clhep_config_opts})
+gdml )
+ AC_GDML_PACKAGE
+ ;;
+geant4 )
+ AC_GEANT4_PACKAGE
;;
-gdml )
+lcdd )
+ AC_LCDD_PACKAGE
+ ;;
- gdml_version=${package_version}
- gdml_url="http://simu.cvs.cern.ch/cgi-bin/simu.cgi/simu/GDML2/GDML2.tar.gz?tarball=1&only_with_tag="${package_version}
+lcio )
+ AC_LCIO_PACKAGE
+ ;;
- PACKAGE_MAKEVAR(gdml, PACKAGE, gdml, [gdml])
- PACKAGE_MAKEVAR(gdml, PACKAGE_VERSION, gdml_version, ${package_version})
- PACKAGE_MAKEVAR(gdml, PACKAGE_DIR, gdml_package_dir, ${package_dir})
- PACKAGE_MAKEVAR(gdml, PACKAGE_BASEDIR, gdml_base_dir, ${package_base_dir})
- PACKAGE_MAKEVAR(gdml, PACKAGE_BUILDDIR, gdml_build_dir, ${package_base_dir}/CPPGDML)
- PACKAGE_MAKEVAR(gdml, PACKAGE_TGZ_LOCAL, gdml_tgz_local, [gdml.tar.gz])
- PACKAGE_MAKEVAR(gdml, PACKAGE_DIR_ORIG, gdml_dir_orig, GDML2)
- PACKAGE_MAKEVAR(gdml, PACKAGE_DOWNLOAD, gdml_download, [\"${gdml_url}\"])
- _c="--enable-shared-libs=no --enable-geant4-granular-libs"
- PACKAGE_MAKEVAR(gdml, PACKAGE_CONFIG_OPTS, gdml_config_opts, ${_c})
+lcphys )
+ AC_LCPHYS_PACKAGE
+ ;;
+slic )
+ AC_SLIC_PACKAGE
;;
-geant4 )
+mokka )
+ AC_MOKKA_PACKAGE
+ ;;
- geant4_version=${package_version}
- geant4_url=http://geant4.cern.ch/support/source/
- geant4_version_download=$(VERSION_GEANT4(geant4_version_download, ${geant4_version}))
- geant4_tgz=geant4${geant4_version_download}.tar.gz
-
- PACKAGE_MAKEVAR(geant4, PACKAGE, geant4, [geant4])
- PACKAGE_MAKEVAR(geant4, PACKAGE_VERSION, geant4_version, ${package_version})
- PACKAGE_MAKEVAR(geant4, PACKAGE_DIR, geant4_package_dir, ${package_dir})
- PACKAGE_MAKEVAR(geant4, PACKAGE_BASEDIR, geant4_base_dir, ${package_base_dir})
- PACKAGE_MAKEVAR(geant4, PACKAGE_BUILDDIR, geant4_build_dir, ${package_base_dir}/source)
- PACKAGE_MAKEVAR(geant4, PACKAGE_TGZ_LOCAL, geant4_tgz_local, [geant4.tar.gz])
- PACKAGE_MAKEVAR(geant4, PACKAGE_DIR_ORIG, geant4_dir_orig, geant4${geant4_version_download})
- PACKAGE_MAKEVAR(geant4, PACKAGE_DOWNLOAD, geant4_download, ${geant4_url}/${geant4_tgz})
+xerces )
+ AC_XERCES_PACKAGE
+ ;;
- G4INSTALL=$geant4_base_dir
- G4WORKDIR=$geant4_base_dir
+* )
+ AC_MSG_ERROR(package $package_name is unknown)
- AC_GEANT4
+esac
- ;;
+])
-lcdd )
+AC_DEFUN(AC_CONFIG_PACKAGES, [
- PACKAGE_MAKEVAR(lcdd, PACKAGE, lcdd, lcdd)
- PACKAGE_MAKEVAR(lcdd, PACKAGE_VERSION, lcdd_version, ${package_version})
- PACKAGE_MAKEVAR(lcdd, PACKAGE_DIR, lcdd_package_dir, ${package_dir})
- PACKAGE_MAKEVAR(lcdd, PACKAGE_BASEDIR, lcdd_base_dir, ${package_base_dir})
- PACKAGE_MAKEVAR(lcdd, PACKAGE_BUILDDIR, lcdd_build_dir, ${package_base_dir})
- PACKAGE_MAKEVAR(lcdd, PACKAGE_CVSROOT, lcdd_cvsroot, ${cvsroot})
+dnl setup common helper vars for each package
+for p in $(echo ${packages_list})
+do
+ AC_CONFIG_PACKAGE_BASE($p)
+done
- ;;
+])
-lcio )
+dnl
+dnl Macro for configuring the clhep package.
+dnl
+AC_DEFUN(AC_CLHEP_PACKAGE, [
+
+CLHEP_PACKAGE_NAME=clhep
+
+CLHEP_URL=http://cern.ch/clhep
+CLHEP_VERSION_DOT=$(VERSION_DOT(clhep_version_dot, ${package_version}))
+CLHEP_TGZ=clhep-${CLHEP_VERSION_DOT}.tgz
+
+CLHEP_BASEDIR=${package_base_dir}
+CLHEP_BUILDDIR=${package_base_dir}/CLHEP
+CLHEP_CONFIG_OPTS="--prefix=\$(PACKAGE_BASEDIR) --disable-shared"
+CLHEP_DIR_ORIG=${CLHEP_VERSION_DOT}
+CLHEP_DOWNLOAD=${CLHEP_URL}/${CLHEP_TGZ}
+
+AC_SUBST(CLHEP_BASEDIR)
+AC_SUBST(CLHEP_BUILDDIR)
+AC_SUBST(CLHEP_CONFIG_OPTS)
+AC_SUBST(CLHEP_DIR_ORIG)
+AC_SUBST(CLHEP_DOWNLOAD)
- PACKAGE_MAKEVAR(lcio, PACKAGE, lcio, lcio)
- PACKAGE_MAKEVAR(lcio, PACKAGE_VERSION, lcio_version, ${package_version})
- PACKAGE_MAKEVAR(lcio, PACKAGE_DIR, lcio_package_dir, ${package_dir})
- PACKAGE_MAKEVAR(lcio, PACKAGE_BASEDIR, lcio_base_dir, ${package_base_dir})
- PACKAGE_MAKEVAR(lcio, PACKAGE_BUILDDIR, lcio_build_dir, ${package_base_dir})
- PACKAGE_MAKEVAR(lcio, PACKAGE_CVSROOT, lcio_cvsroot, ${cvsroot})
+])
- ;;
+dnl
+dnl Macro for configuring the gdml package.
+dnl
+AC_DEFUN(AC_GDML_PACKAGE, [
+
+gdml_url="http://simu.cvs.cern.ch/cgi-bin/simu.cgi/simu/GDML2/GDML2.tar.gz?tarball=1&only_with_tag="${package_version}
+
+GDML_BASEDIR=${package_base_dir}
+GDML_BUILDDIR=${package_base_dir}/CPPGDML
+GDML_DIR_ORIG=GDML2
+GDML_DOWNLOAD=\"${gdml_url}\"
+GDML_CONFIG_OPTS="--enable-shared-libs=no --enable-geant4-granular-libs"
+
+AC_SUBST(GDML_BASEDIR)
+AC_SUBST(GDML_BUILDDIR)
+AC_SUBST(GDML_DIR_ORIG)
+AC_SUBST(GDML_DOWNLOAD)
+AC_SUBST(GDML_CONFIG_OPTS)
-lcphys )
+])
- PACKAGE_MAKEVAR(lcphys, PACKAGE, lcphys, lcphys)
- PACKAGE_MAKEVAR(lcphys, PACKAGE_VERSION, lcphys_version, ${package_version})
- PACKAGE_MAKEVAR(lcphys, PACKAGE_DIR, lcphys_package_dir, ${package_dir})
- PACKAGE_MAKEVAR(lcphys, PACKAGE_BASEDIR, lcphys_base_dir, ${package_base_dir})
- PACKAGE_MAKEVAR(lcphys, PACKAGE_BUILDDIR, lcphys_base_dir, ${package_base_dir})
- PACKAGE_MAKEVAR(lcphys, PACKAGE_CVSMODULE, lcphys_cvsmodule, [LCPhys])
- PACKAGE_MAKEVAR(lcphys, PACKAGE_CVSROOT, lcphys_cvsroot, ${cvsroot})
+dnl
+dnl Macro for configuring the geant4 package.
+dnl
+AC_DEFUN(AC_GEANT4_PACKAGE, [
+
+GEANT4_VERSION=${package_version}
+GEANT4_URL=http://geant4.cern.ch/support/source/
+GEANT4_VERSION_DOWNLOAD=$(VERSION_GEANT4(GEANT4_VERSION_DOWNLOAD, ${GEANT4_VERSION}))
+GEANT4_TGZ=geant4${GEANT4_VERSION_DOWNLOAD}.tar.gz
+
+GEANT4_BASEDIR=$package_base_dir
+GEANT4_BUILDDIR=${package_base_dir}/source
+GEANT4_DIR_ORIG=geant4${GEANT4_VERSION_DOWNLOAD}
+GEANT4_DOWNLOAD=${GEANT4_URL}/${GEANT4_TGZ}
+
+AC_SUBST(GEANT4_BUILDDIR)
+AC_SUBST(GEANT4_DIR_ORIG)
+AC_SUBST(GEANT4_DOWNLOAD)
+AC_SUBST(GEANT4_VERSION)
- ;;
+G4INSTALL=$GEANT4_BASEDIR
+G4WORKDIR=$G4INSTALL
-slic )
+AC_GEANT4
- dnl save this for dist tarball naming
- slic_version=${package_version}
+])
- PACKAGE_MAKEVAR(slic, PACKAGE, slic, [slic])
- PACKAGE_MAKEVAR(slic, PACKAGE_VERSION, slic_version, ${package_version})
- PACKAGE_MAKEVAR(slic, PACKAGE_DIR, slic_package_dir, ${package_dir})
- PACKAGE_MAKEVAR(slic, PACKAGE_BASEDIR, slic_base_dir, ${package_base_dir})
- PACKAGE_MAKEVAR(slic, PACKAGE_BUILDDIR, slic_base_dir, ${package_base_dir})
- PACKAGE_MAKEVAR(slic, PACKAGE_CVSROOT, slic_cvsroot, ${cvsroot})
-
- case "$host_os" in
- cygwin* )
- slic_binname=slic.exe
- ;;
- * )
- slic_binname=slic
- ;;
- esac
+dnl
+dnl Macro for configuring the lcdd package.
+dnl
+AC_DEFUN(AC_LCDD_PACKAGE, [
- AC_SUBST(slic_binname)
+LCDD_BASEDIR=$package_base_dir
+AC_SUBST(LCDD_BASEDIR)
- ;;
+])
-mokka )
- mokka_base_url=http://mokka.in2p3.fr/software/mokka_tags/
- mokka_tgz=Mokka-mokka-${package_version}.tgz
+dnl
+dnl Macro for configuring the lcio package.
+dnl
+AC_DEFUN(AC_LCIO_PACKAGE, [
- PACKAGE_MAKEVAR(mokka, PACKAGE, mokka, [mokka])
- PACKAGE_MAKEVAR(mokka, PACKAGE_VERSION, mokka_version, ${package_version})
- PACKAGE_MAKEVAR(mokka, PACKAGE_DIR, mokka_package_dir, ${package_dir})
- PACKAGE_MAKEVAR(mokka, PACKAGE_BASEDIR, mokka_base_dir, ${package_base_dir})
- PACKAGE_MAKEVAR(mokka, PACKAGE_BUILDDIR, mokka_build_dir, ${package_base_dir}/source)
- PACKAGE_MAKEVAR(mokka, PACKAGE_DOWNLOAD, mokka_download, ${mokka_base_url}/${mokka_tgz})
- PACKAGE_MAKEVAR(mokka, PACKAGE_DIR_ORIG, mokka_dir_orig, Mokka)
- PACKAGE_MAKEVAR(mokka, PACKAGE_TGZ_LOCAL, mokka_tgz_local, [mokka.tar.gz])
- ;;
+LCIO_BASEDIR=$package_base_dir
+AC_SUBST(LCIO_BASEDIR)
-xerces )
+])
- AC_XERCES
+dnl
+dnl Macro for configuring the slic package.
+dnl
+AC_DEFUN(AC_SLIC_PACKAGE, [
+
+dnl save this for dist tarball naming
+slic_version=${package_version}
+
+SLIC_BASEDIR=$package_base_dir
+
+case "$host_os" in
+ cygwin* )
+ slic_binname=slic.exe
+ ;;
+ * )
+ slic_binname=slic
+ ;;
+esac
- xerces_version=${package_version}
- xerces_url=http://www.apache.org/dist/xml/xerces-c/source
- xerces_version_underscore=$(VERSION_UNDERSCORE(xerces_version_underscore, ${xerces_version}))
- xerces_tgz=xerces-c-src_${xerces_version_underscore}.tar.gz
-
- PACKAGE_MAKEVAR(xerces, PACKAGE, xerces, [xerces])
- PACKAGE_MAKEVAR(xerces, PACKAGE_VERSION, xerces_version, ${package_version})
- PACKAGE_MAKEVAR(xerces, PACKAGE_DIR, xerces_package_dir, ${package_dir})
- PACKAGE_MAKEVAR(xerces, PACKAGE_BASEDIR, xerces_base_dir, ${package_base_dir})
- PACKAGE_MAKEVAR(xerces, PACKAGE_BUILDDIR, xerces_build_dir, ${package_base_dir}/src/xercesc)
- PACKAGE_MAKEVAR(xerces, PACKAGE_CONFIG, xerces_config, [./runConfigure])
- PACKAGE_MAKEVAR(xerces, PACKAGE_TGZ_LOCAL, xerces_tgz_local, [xerces.tar.gz])
- PACKAGE_MAKEVAR(xerces, PACKAGE_CONFIG_OPTS, XERCES_CONFIGURE_ARGS, ${XERCES_CONFIGURE_ARGS})
- PACKAGE_MAKEVAR(xerces, PACKAGE_DOWNLOAD, xerces_download, ${xerces_url}/${xerces_tgz})
- PACKAGE_MAKEVAR(xerces, PACKAGE_DIR_ORIG, xerces_dir_orig, xerces-c-src_${xerces_version_underscore})
+AC_SUBST(slic_binname)
- XERCES_OBJDIR=${xerces_base_dir}/obj/${XERCES_OS}
- AC_SUBST(XERCES_OBJDIR)
+AC_SUBST(SLIC_BASEDIR)
- ;;
+])
-* )
- AC_MSG_ERROR($package_name is an unknown package.)
+dnl
+dnl Macro for configuring the lcphys package.
+dnl
+AC_DEFUN(AC_LCPHYS_PACKAGE, [
-esac
+LCPHYS_CVSMODULE=LCPhys
+LCPHYS_BASEDIR=$package_base_dir
+
+AC_SUBST(LCPHYS_CVSMODULE)
+AC_SUBST(LCPHYS_BASEDIR)
])
-AC_DEFUN(AC_CONFIG_PACKAGES, [
+dnl
+dnl Macro for configuring the mokka package.
+dnl
+AC_DEFUN(AC_MOKKA_PACKAGE, [
+
+mokka_base_url=http://mokka.in2p3.fr/software/mokka_tags/
+mokka_tgz=Mokka-mokka-${package_version}.tgz
+
+MOKKA_BASEDIR=$package_base_dir
+MOKKA_BUILDDIR=${package_base_dir}/source
+MOKKA_DOWNLOAD=${mokka_base_url}/${mokka_tgz}
+MOKKA_DIR_ORIG=Mokka
+
+AC_SUBST(MOKKA_BASEDIR)
+AC_SUBST(MOKKA_BUILDDIR)
+AC_SUBST(MOKKA_DOWNLOAD)
+AC_SUBST(MOKKA_DIR_ORIG)
-dnl setup common helper vars for each package
-for p in $(echo ${packages_list})
-do
- CONFIG_PACKAGE_BASE($p)
-done
+])
+
+dnl
+dnl Macro for configuring the xerces package.
+dnl
+AC_DEFUN(AC_XERCES_PACKAGE, [
+
+AC_XERCES
+
+xerces_version=${package_version}
+xerces_url=http://www.apache.org/dist/xml/xerces-c/source
+xerces_version_underscore=$(VERSION_UNDERSCORE(xerces_version_underscore, ${xerces_version}))
+xerces_tgz=xerces-c-src_${xerces_version_underscore}.tar.gz
+
+XERCES_BASEDIR=$package_base_dir
+XERCES_BUILDDIR=${package_base_dir}/src/xercesc
+XERCES_CONFIG=./runConfigure
+XERCES_CONFIG_OPTS=${XERCES_CONFIGURE_ARGS}
+XERCES_DOWNLOAD=${xerces_url}/${xerces_tgz}
+XERCES_DIR_ORIG=xerces-c-src_${xerces_version_underscore}
+
+AC_SUBST(XERCES_BASEDIR)
+AC_SUBST(XERCES_BUILDDIR)
+AC_SUBST(XERCES_CONFIG)
+AC_SUBST(XERCES_CONFIG_OPTS)
+AC_SUBST(XERCES_DOWNLOAD)
+AC_SUBST(XERCES_DIR_ORIG)
+
+XERCES_OBJDIR=${XERCES_BASEDIR}/obj/${XERCES_OS}
+AC_SUBST(XERCES_OBJDIR)
])
@@ -219,23 +277,22 @@
dnl arg1 make variable name without "PACKAGE_" prefix
dnl arg2 autoconf substitution varible without @@ enclosing chars
dnl arg3 short name of package used to find package.gmk.in
-AC_DEFUN(PACKAGE_MAKEVAR, [
+#AC_DEFUN(PACKAGE_MAKEVAR, [
dnl package's gmk file
-f=$sim_packages_dir/$1/package.gmk.in
+#f=$sim_packages_dir/$1/package.gmk.in
dnl cat var to package's gmk file
-echo "export $2 = @$3@" >> $f ;
+#echo "export $2 = @$3@" >> $f ;
dnl evaluate arg3 for value or use arg4, if it exists
-if test -z "$4"
-then
- v=`eval echo $$3`
-else
- v=$4
-fi
+#if test -z "$4"
+#then
+# v=`eval echo $$3`
+#else
+# v=$4
+#fi
-AC_SUBST($3, $v)
-
-])
+#AC_SUBST($3, $v)
+#])
SimDist/build
diff -u -r1.3 -r1.4
--- util.m4 22 Jun 2006 23:50:04 -0000 1.3
+++ util.m4 26 Jun 2006 23:56:40 -0000 1.4
@@ -148,6 +148,12 @@
AC_MSG_RESULT($cvsroot)
+SLACCVSROOT=$cvsroot
+AC_SUBST(SLACCVSROOT)
+
+SLACCVSUSER=$cvsuser
+AC_SUBST(SLACCVSUSER)
+
])
dnl macro to set the variable which OS uses for locating shared libs at runtime
SimDist/packages
diff -u -r1.4 -r1.5
--- Makefile.in 10 May 2006 23:00:18 -0000 1.4
+++ Makefile.in 26 Jun 2006 23:56:41 -0000 1.5
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.4 2006/05/10 23:00:18 jeremy Exp $
+# $Id: Makefile.in,v 1.5 2006/06/26 23:56:41 jeremy Exp $
include @[log in to unmask]
@@ -14,31 +14,26 @@
cd $(sim_packages_dir)/$$pkg && $(MAKE) $(TARGET); \
done;:
-@clhep@ :
- cd @clhep_package_dir@ && $(MAKE) $(TARGET);:
+clhep :
+ cd clhep && $(MAKE) $(TARGET);:
-@geant4@ :
- cd @geant4_package_dir@ && $(MAKE) $(TARGET);:
-#@clhep@
-
-@lcphys@ :
- cd @lcphys_package_dir@ && $(MAKE) $(TARGET);:
-#@geant4@
-
-@lcio@ :
- cd @lcio_package_dir@ && $(MAKE) $(TARGET);:
-
-@gdml@ :
- cd @gdml_package_dir@ && $(MAKE) $(TARGET);:
-#@xerces@ @geant4@
-
-@lcdd@ :
- cd @lcdd_package_dir@ && $(MAKE) $(TARGET);:
-#@geant4@ @gdml@
-
-@slic@ :
- cd @slic@ && $(MAKE) $(TARGET);:
-#@geant4@ @lcdd@ @lcio@
+geant4 :
+ cd geant4 && $(MAKE) $(TARGET);:
-@xerces@ :
- cd @xerces@ && $(MAKE) $(TARGET);:
+lcphys :
+ cd lcphys && $(MAKE) $(TARGET);:
+
+lcio :
+ cd lcio && $(MAKE) $(TARGET);:
+
+gdml :
+ cd gdml && $(MAKE) $(TARGET);:
+
+lcdd :
+ cd lcdd && $(MAKE) $(TARGET);:
+
+slic :
+ cd slic && $(MAKE) $(TARGET);:
+
+xerces :
+ cd xerces && $(MAKE) $(TARGET);:
SimDist/packages/clhep
diff -N package.gmk.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ package.gmk.in 26 Jun 2006 23:56:42 -0000 1.4
@@ -0,0 +1,4 @@
+PACKAGE_CONFIG_OPTS=@CLHEP_CONFIG_OPTS@
+PACKAGE_DIR_ORIG=@CLHEP_DIR_ORIG@
+PACKAGE_DOWNLOAD=@CLHEP_DOWNLOAD@
+PACKAGE_BUILDDIR=@CLHEP_BUILDDIR@
SimDist/packages/clhep
diff -u -r1.3 -r1.4
--- Makefile.in 3 May 2006 22:47:55 -0000 1.3
+++ Makefile.in 26 Jun 2006 23:56:42 -0000 1.4
@@ -1,7 +1,7 @@
-# $Header: /cvs/lcd/SimDist/packages/clhep/Makefile.in,v 1.3 2006/05/03 22:47:55 jeremy Exp $
+# $Header: /cvs/lcd/SimDist/packages/clhep/Makefile.in,v 1.4 2006/06/26 23:56:42 jeremy Exp $
# generic package targets
include ../../build/package.gmk
# default rule
-all: download config compile install
+all: packageinfo download config compile install
SimDist/packages/clhep
diff -u -r1.1 -r1.2
--- env.gmk.in 18 Nov 2005 01:35:37 -0000 1.1
+++ env.gmk.in 26 Jun 2006 23:56:42 -0000 1.2
@@ -1,4 +1,4 @@
# CLHEP vars for dependent packages
-export CLHEP_BASE_DIR=@clhep_base_dir@
+export CLHEP_BASE_DIR=@CLHEP_BASEDIR@
export CLHEP_LIB_DIR=$(CLHEP_BASE_DIR)/lib
export CLHEP_INCLUDE_DIR=$(CLHEP_BASE_DIR)/include
SimDist/packages/gdml
diff -N package.gmk.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ package.gmk.in 26 Jun 2006 23:56:43 -0000 1.5
@@ -0,0 +1,4 @@
+PACKAGE_BUILDDIR=@GDML_BUILDDIR@
+PACKAGE_CONFIG_OPTS=@GDML_CONFIG_OPTS@
+PACKAGE_DIR_ORIG=@GDML_DIR_ORIG@
+PACKAGE_DOWNLOAD=@GDML_DOWNLOAD@
SimDist/packages/gdml
diff -u -r1.3 -r1.4
--- Makefile.in 3 May 2006 22:47:55 -0000 1.3
+++ Makefile.in 26 Jun 2006 23:56:43 -0000 1.4
@@ -1,7 +1,7 @@
-# $Header: /cvs/lcd/SimDist/packages/gdml/Makefile.in,v 1.3 2006/05/03 22:47:55 jeremy Exp $
+# $Header: /cvs/lcd/SimDist/packages/gdml/Makefile.in,v 1.4 2006/06/26 23:56:43 jeremy Exp $
-# package vars
+# package variables
include ../../build/package.gmk
# default rule
-all: download config compile
+all: packageinfo download config compile
SimDist/packages/gdml
diff -u -r1.1 -r1.2
--- env.gmk.in 18 Nov 2005 01:35:38 -0000 1.1
+++ env.gmk.in 26 Jun 2006 23:56:43 -0000 1.2
@@ -1,3 +1,3 @@
# GDML build system var
-export GDML_BASE=@gdml_base_dir@/CPPGDML
-export GDML_LIB_DIR=@gdml_build_dir@/build/@g4system@/lib
+export GDML_BASE=@GDML_BASEDIR@/CPPGDML
+export GDML_LIB_DIR=@GDML_BUILDDIR@/build/@G4SYSTEM@/lib
SimDist/packages/geant4
diff -N package.gmk.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ package.gmk.in 26 Jun 2006 23:56:44 -0000 1.4
@@ -0,0 +1,3 @@
+PACKAGE_BUILDDIR=@GEANT4_BUILDDIR@
+PACKAGE_DIR_ORIG=@GEANT4_DIR_ORIG@
+PACKAGE_DOWNLOAD=@GEANT4_DOWNLOAD@
SimDist/packages/geant4
diff -u -r1.5 -r1.6
--- Makefile.in 3 May 2006 22:47:55 -0000 1.5
+++ Makefile.in 26 Jun 2006 23:56:44 -0000 1.6
@@ -1,10 +1,10 @@
-# $Header: /cvs/lcd/SimDist/packages/geant4/Makefile.in,v 1.5 2006/05/03 22:47:55 jeremy Exp $
+# $Header: /cvs/lcd/SimDist/packages/geant4/Makefile.in,v 1.6 2006/06/26 23:56:44 jeremy Exp $
# package build
include ../../build/package.gmk
# default rule
-all: download patch config compile phys includes test
+all: packageinfo debuginfo download patch config compile phys includes test
# physics lists
phys:
@@ -17,3 +17,10 @@
# test geant4 installation by trying to compile one of the examples
test:
@cd $(PACKAGE_BASEDIR)/examples/novice/N01/ && export G4WORKDIR=`pwd` && $(MAKE) all;
+
+debuginfo:
+ @echo CLHEP_BASE_DIR=$(CLHEP_BASE_DIR) ; \
+ echo CLHEP_INCLUDE_DIR=$(CLHEP_INCLUDE_DIR) ; \
+ echo CLHEP_LIB_DIR=$(CLHEP_LIB_DIR) ; \
+ echo G4INSTALL=$(G4INSTALL) ; \
+ echo G4SYSTEM=$(G4SYSTEM) ;:
SimDist/packages/geant4
diff -u -r1.4 -r1.5
--- patch.sh.in 26 May 2006 22:23:50 -0000 1.4
+++ patch.sh.in 26 Jun 2006 23:56:44 -0000 1.5
@@ -1,17 +1,17 @@
# add flag for LCPhys into architecture.gmk
(
echo "Adding G4BERTINI_KAON flag to config/architecture.gmk ..."
-cd @geant4_version@/config
+cd @GEANT4_VERSION@/config
cp architecture.gmk architecture.gmk.orig
echo "CPPFLAGS += -DG4BERTINI_KAON" >> architecture.gmk
)
# apply patch tarball
-if [ "@geant4_version@" == "v8r0p01" ]
+if [ "@GEANT4_VERSION@" == "v8r0p01" ]
then
(
-echo "Applying Dennis's patches to Geant4 @geant4_version@ ..."
-cd @geant4_version@
+echo "Applying Dennis's patches to Geant4 @GEANT4_VERSION@ ..."
+cd @GEANT4_VERSION@
tar -zxvf ../patch.tar.gz
)
fi
SimDist/packages/lcdd
diff -u -r1.2 -r1.3
--- env.gmk.in 22 Nov 2005 01:48:21 -0000 1.2
+++ env.gmk.in 26 Jun 2006 23:56:45 -0000 1.3
@@ -1,3 +1,3 @@
# SLIC build var
-export LCDD_BASE=@lcdd_base_dir@
+export LCDD_BASE=@LCDD_BASEDIR@
export G4WORKDIR=$(LCDD_BASE)
SimDist/packages/lcio
diff -u -r1.5 -r1.6
--- Makefile.in 3 May 2006 22:47:56 -0000 1.5
+++ Makefile.in 26 Jun 2006 23:56:46 -0000 1.6
@@ -1,7 +1,4 @@
-# $Header: /cvs/lcd/SimDist/packages/lcio/Makefile.in,v 1.5 2006/05/03 22:47:56 jeremy Exp $
-
-# package build
-include ../../build/package.gmk
+# $Header: /cvs/lcd/SimDist/packages/lcio/Makefile.in,v 1.6 2006/06/26 23:56:46 jeremy Exp $
# default
all: cvs config compile_ant
@@ -11,3 +8,5 @@
compile_ant:
PATH="$(LCIO)/tools:$(LCIO)/bin:$(PATH)" ; cd $(PACKAGE_BUILDDIR) ; ant aid.generate cpp;:
+# package build
+include ../../build/package.gmk
SimDist/packages/lcio
diff -u -r1.1 -r1.2
--- env.gmk.in 18 Nov 2005 01:35:39 -0000 1.1
+++ env.gmk.in 26 Jun 2006 23:56:46 -0000 1.2
@@ -1,2 +1,2 @@
# LCIO build var
-export LCIO=@lcio_base_dir@
+export LCIO=@LCIO_BASEDIR@
SimDist/packages/lcphys
diff -N package.gmk.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ package.gmk.in 26 Jun 2006 23:56:54 -0000 1.4
@@ -0,0 +1 @@
+PACKAGE_CVSMODULE=@LCPHYS_CVSMODULE@
SimDist/packages/lcphys
diff -u -r1.1 -r1.2
--- env.gmk.in 18 Nov 2005 01:35:40 -0000 1.1
+++ env.gmk.in 26 Jun 2006 23:56:51 -0000 1.2
@@ -1,2 +1,2 @@
# LCPhys build var
-export LCPHYS_BASE=@lcphys_base_dir@
+export LCPHYS_BASE=@LCPHYS_BASEDIR@
SimDist/packages/mokka
diff -u -r1.2 -r1.3
--- env.gmk.in 25 May 2006 01:06:21 -0000 1.2
+++ env.gmk.in 26 Jun 2006 23:56:59 -0000 1.3
@@ -1,5 +1,5 @@
# Mokka env vars.
-export MOKKA_BASE=@mokka_base_dir@
+export MOKKA_BASE=@MOKKA_BASEDIR@
export G4WORKDIR=$(MOKKA_BASE)
export MYSQL_BASEDIR=@MYSQL_BASEDIR@
export MYSQL_INCLUDEDIR=@MYSQL_INCLUDEDIR@
SimDist/packages/mokka
diff -u -r1.1 -r1.2
--- package.gmk.in 10 May 2006 23:00:19 -0000 1.1
+++ package.gmk.in 26 Jun 2006 23:57:00 -0000 1.2
@@ -1,8 +1,3 @@
-export PACKAGE = @mokka@
-export PACKAGE_VERSION = @mokka_version@
-export PACKAGE_DIR = @mokka_package_dir@
-export PACKAGE_BASEDIR = @mokka_base_dir@
-export PACKAGE_BUILDDIR = @mokka_build_dir@
-export PACKAGE_DOWNLOAD = @mokka_download@
-export PACKAGE_DIR_ORIG = @mokka_dir_orig@
-export PACKAGE_TGZ_LOCAL = @mokka_tgz_local@
+PACKAGE_BUILDDIR=@MOKKA_BUILDDIR@
+PACKAGE_DIR_ORIG=@MOKKA_DIR_ORIG@
+PACKAGE_DOWNLOAD=@MOKKA_DOWNLOAD@
SimDist/packages/slic
diff -u -r1.1 -r1.2
--- env.gmk.in 18 Nov 2005 01:35:40 -0000 1.1
+++ env.gmk.in 26 Jun 2006 23:57:02 -0000 1.2
@@ -1,3 +1,3 @@
# SLIC build var
-export SLIC_BASE=@slic_base_dir@
+export SLIC_BASE=@SLIC_BASEDIR@
export G4WORKDIR=$(SLIC_BASE)
SimDist/packages/xerces
diff -N package.gmk.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ package.gmk.in 26 Jun 2006 23:57:03 -0000 1.4
@@ -0,0 +1,5 @@
+PACKAGE_BUILDDIR=@XERCES_BUILDDIR@
+PACKAGE_CONFIG=@XERCES_CONFIG@
+PACKAGE_CONFIG_OPTS=@XERCES_CONFIG_OPTS@
+PACKAGE_DIR_ORIG=@XERCES_DIR_ORIG@
+PACKAGE_DOWNLOAD=@XERCES_DOWNLOAD@
SimDist/packages/xerces
diff -u -r1.8 -r1.9
--- Makefile.in 22 Jun 2006 01:17:42 -0000 1.8
+++ Makefile.in 26 Jun 2006 23:57:03 -0000 1.9
@@ -1,10 +1,10 @@
-# $Header: /cvs/lcd/SimDist/packages/xerces/Makefile.in,v 1.8 2006/06/22 01:17:42 jeremy Exp $
+# $Header: /cvs/lcd/SimDist/packages/xerces/Makefile.in,v 1.9 2006/06/26 23:57:03 jeremy Exp $
# generic package targets
include ../../build/package.gmk
# default compile rule
-XERCES_TARGETS = download patch config compile install
+XERCES_TARGETS = packageinfo debuginfo download patch config compile install
# Determine the default target based on whether a static
# Xerces library was built.
@@ -24,3 +24,11 @@
ar -rc libxerces-c.a *.o; \
ranlib libxerces-c.a; \
cp libxerces-c.a $(PACKAGE_BASEDIR)/lib
+
+debuginfo:
+ @echo XERCESCROOT=$(XERCESCROOT) ; \
+ echo XERCES_LIB_DIR=$(XERCES_LIB_DIR) ; \
+ echo XERCES_OS=$(XERCES_OS) ; \
+ echo XERCES_OBJDIR=$(XERCES_OBJDIR) ; \
+ echo XERCES_USE_SHARED_LIB=$(XERCES_USE_SHARED_LIB) ; \
+ echo XERCES_USE_STATIC_LIB=$(XERCES_USE_STATIC_LIB) ;:
SimDist/packages/xerces
diff -u -r1.5 -r1.6
--- env.gmk.in 22 Jun 2006 23:50:05 -0000 1.5
+++ env.gmk.in 26 Jun 2006 23:57:03 -0000 1.6
@@ -1,7 +1,7 @@
# Xerces build var
-export XERCESCROOT=@xerces_base_dir@
-export XERCES_LIB_DIR=@xerces_base_dir@/lib
+export XERCESCROOT=@XERCES_BASEDIR@
+export XERCES_LIB_DIR=@XERCES_BASEDIR@/lib
export XERCES_OS=@XERCES_OS@
export XERCES_OBJDIR=@XERCES_OBJDIR@
export XERCES_USE_SHARED_LIB=@XERCES_USE_SHARED_LIB@
-epport XERCES_USE_STATIC_LIB=@XERCES_USE_STATIC_LIB@
+export XERCES_USE_STATIC_LIB=@XERCES_USE_STATIC_LIB@
CVSspam 0.2.8
