SimDist
diff -u -r1.38 -r1.39
--- configure 26 Jun 2006 23:56:37 -0000 1.38
+++ configure 27 Jun 2006 19:16:37 -0000 1.39
@@ -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 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 GEAN!
T4_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 XERCE!
S_USE_SH
ARED_LIB XERCES_USE_STATIC_LIB xerces_version_underscore XERCES_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_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_VERSION SLIC_BASEDIR MOKKA_BASEDIR MOKKA_BUILDDIR MOKKA_DOWNL!
OAD MOKKA_DIR_ORIG XERCES_CONFIGURE_ARGS XERCES!
_OS
;XERCES_USE_SHARED_LIB XERCES_USE_STATIC_LIB xerces_version_underscore XERCES_VERSION XERCES_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.
@@ -2665,7 +2665,7 @@
slic )
-slic_version=${package_version}
+SLIC_VERSION=${package_version}
SLIC_BASEDIR=$package_base_dir
@@ -2747,6 +2747,7 @@
)
xerces_tgz=xerces-c-src_${xerces_version_underscore}.tar.gz
+XERCES_VERSION=$package_version
XERCES_BASEDIR=$package_base_dir
XERCES_BUILDDIR=${package_base_dir}/src/xercesc
XERCES_CONFIG=./runConfigure
@@ -2761,6 +2762,7 @@
+
XERCES_OBJDIR=${XERCES_BASEDIR}/obj/${XERCES_OS}
@@ -3735,6 +3737,7 @@
s,@LCPHYS_CVSMODULE@,$LCPHYS_CVSMODULE,;t t
s,@LCPHYS_BASEDIR@,$LCPHYS_BASEDIR,;t t
s,@slic_binname@,$slic_binname,;t t
+s,@SLIC_VERSION@,$SLIC_VERSION,;t t
s,@SLIC_BASEDIR@,$SLIC_BASEDIR,;t t
s,@MOKKA_BASEDIR@,$MOKKA_BASEDIR,;t t
s,@MOKKA_BUILDDIR@,$MOKKA_BUILDDIR,;t t
@@ -3745,6 +3748,7 @@
s,@XERCES_USE_SHARED_LIB@,$XERCES_USE_SHARED_LIB,;t t
s,@XERCES_USE_STATIC_LIB@,$XERCES_USE_STATIC_LIB,;t t
s,@xerces_version_underscore@,$xerces_version_underscore,;t t
+s,@XERCES_VERSION@,$XERCES_VERSION,;t t
s,@XERCES_BASEDIR@,$XERCES_BASEDIR,;t t
s,@XERCES_BUILDDIR@,$XERCES_BUILDDIR,;t t
s,@XERCES_CONFIG@,$XERCES_CONFIG,;t t
SimDist/build
diff -u -r1.17 -r1.18
--- packages.m4 26 Jun 2006 23:56:40 -0000 1.17
+++ packages.m4 27 Jun 2006 19:16:38 -0000 1.18
@@ -190,7 +190,7 @@
AC_DEFUN(AC_SLIC_PACKAGE, [
dnl save this for dist tarball naming
-slic_version=${package_version}
+SLIC_VERSION=${package_version}
SLIC_BASEDIR=$package_base_dir
@@ -204,7 +204,7 @@
esac
AC_SUBST(slic_binname)
-
+AC_SUBST(SLIC_VERSION)
AC_SUBST(SLIC_BASEDIR)
])
@@ -254,6 +254,7 @@
xerces_version_underscore=$(VERSION_UNDERSCORE(xerces_version_underscore, ${xerces_version}))
xerces_tgz=xerces-c-src_${xerces_version_underscore}.tar.gz
+XERCES_VERSION=$package_version
XERCES_BASEDIR=$package_base_dir
XERCES_BUILDDIR=${package_base_dir}/src/xercesc
XERCES_CONFIG=./runConfigure
@@ -261,6 +262,7 @@
XERCES_DOWNLOAD=${xerces_url}/${xerces_tgz}
XERCES_DIR_ORIG=xerces-c-src_${xerces_version_underscore}
+AC_SUBST(XERCES_VERSION)
AC_SUBST(XERCES_BASEDIR)
AC_SUBST(XERCES_BUILDDIR)
AC_SUBST(XERCES_CONFIG)
SimDist/scripts
diff -u -r1.7 -r1.8
--- slic.sh.in 22 Jun 2006 23:50:06 -0000 1.7
+++ slic.sh.in 27 Jun 2006 19:16:39 -0000 1.8
@@ -30,11 +30,11 @@
SIM_HOME=`cd "$SIM_HOME" && pwd`
# slic base
-SLIC_BASE=${SIM_HOME}/packages/slic/@slic_version@
+SLIC_BASE=${SIM_HOME}/packages/slic/@SLIC_VERSION@
# xerces lib
-XERCES_LIB_DIR=${SIM_HOME}/packages/xerces/@xerces_version@/lib
+XERCES_LIB_DIR=${SIM_HOME}/packages/xerces/@XERCES_VERSION@/lib
export @OS_SHARED_LIBS_VAR@=$XERCES_LIB_DIR:$@OS_SHARED_LIBS_VAR@
# run slic with CL args
-${SLIC_BASE}/bin/@g4system@/slic $@
+${SLIC_BASE}/bin/@G4SYSTEM@/slic $@
