slic
diff -u -r1.9 -r1.10
--- aclocal.m4 28 Jun 2005 20:28:03 -0000 1.9
+++ aclocal.m4 4 Aug 2005 00:04:59 -0000 1.10
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/slic/aclocal.m4,v 1.9 2005/06/28 20:28:03 jeremy Exp $
+# $Header: /cvs/lcd/slic/aclocal.m4,v 1.10 2005/08/04 00:04:59 jeremy Exp $
#
# local m4 macros for SLIC autoconf
#
@@ -26,7 +26,7 @@
# enable debugging
AC_MSG_CHECKING(whether SLIC code debugging should be enabled)
-AC_ARG_ENABLE(slic-debug,
+AC_ARG_ENABLE(slic-debug,
AC_HELP_STRING([--enable-slic-debug], [Enable debugging in code by setting SLIC_DEBUG, G4DEBUG and G4PROFILE]),
[SLIC_DEBUG_ENABLE="$enable_slic_debug"] )
@@ -35,7 +35,7 @@
AC_MSG_RESULT(Yes)
# GNUmakefile vars
- G4DEBUG_SET="G4DEBUG_SET=1"
+ G4DEBUG_SET="G4DEBUG_SET=1"
AC_SUBST(G4DEBUG_SET)
G4PROFILE_SET="G4PROFILE_SET=1"
@@ -43,8 +43,8 @@
# compiler defines
AC_DEFINE(SLIC_DEBUG)
- AC_DEFINE(G4DEBUG)
- AC_DEFINE(G4PROFILE)
+ AC_DEFINE(G4DEBUG)
+ AC_DEFINE(G4PROFILE)
# make sure to compile with debugging switches
CXXFLAGS="${CXXFLAGS} -g -ggdb -pg"
@@ -64,18 +64,18 @@
AC_MSG_RESULT(Yes)
# compiler defines
- AC_DEFINE(G4VERBOSE)
+ AC_DEFINE(G4VERBOSE)
AC_DEFINE(SLIC_VERBOSE)
-
+
# GNUmakefile vars
G4VERBOSE_SET="G4VERBOSE=1"
AC_SUBST(G4VERBOSE_SET)
SLIC_VERBOSE_SET="SLIC_VERBOSE=1"
- AC_SUBST(SLIC_VERBOSE_SET)
+ AC_SUBST(SLIC_VERBOSE_SET)
else
- AC_MSG_RESULT(No)
+ AC_MSG_RESULT(No)
fi
])
@@ -92,12 +92,12 @@
if test -n "${SLIC_COMPILE_VERBOSE_ENABLE}" && test "${SLIC_COMPILE_VERBOSE_ENABLE}" != "no"; then
AC_MSG_RESULT(Yes)
-
+
# verbose compiler commands into cpp flags
CXXFLAGS="${CXXFLAGS} -Wall -v -Wl,--verbose"
else
- AC_MSG_RESULT(No)
+ AC_MSG_RESULT(No)
fi
])
@@ -112,9 +112,9 @@
[LCIO_PREFIX=$with_lcio])
if test -z "${with_lcio}"; then
- if test -n "$LCIO"; then
+ if test -n "$LCIO"; then
LCIO_PREFIX=${LCIO} # env
- else
+ else
AC_MSG_RESULT(No)
AC_MSG_ERROR(LCIO installation was not found) # not found
fi
@@ -180,12 +180,12 @@
AC_MSG_RESULT(No)
g4system_os=`uname`
- g4system_compiler=${CXX}
+ g4system_compiler=${CXX}
g4system=`echo "${g4system_os}"-"${g4system_compiler}"`
echo "guessing G4SYSTEM=${g4system}."
-
+
G4SYSTEM_TEST_FILE=${G4INSTALL}/.config/${g4system}/bin/env.sh
if ! test -e "${G4SYSTEM_TEST_FILE}"; then
@@ -215,7 +215,7 @@
CLHEP_PREFIX=${CLHEP_BASE_DIR} # env
else
AC_MSG_RESULT(No)
- AC_MSG_ERROR(CLHEP installation was not found) # not found
+ AC_MSG_ERROR(CLHEP installation was not found) # not found
fi
fi
@@ -239,7 +239,7 @@
AC_MSG_CHECKING(for LCDD installation)
-AC_ARG_WITH(lcdd,
+AC_ARG_WITH(lcdd,
AC_HELP_STRING([--with-lcdd=<path>],[LCDD installation base [[LCDD_BASE]] ]),
[LCDD_PREFIX=$with_lcdd])
@@ -308,7 +308,7 @@
AC_MSG_CHECKING(for Xerces libname)
-AC_ARG_WITH(xerces-libname,
+AC_ARG_WITH(xerces-libname,
AC_HELP_STRING([--with-xerces-libname=<name>],[Xerces libname without lib or .a/.so]),
[XERCES_LIBNAME=$with_xerces_libname],
[XERCES_LIBNAME=xerces-c])
@@ -379,7 +379,7 @@
GDML_PREFIX=${GDML_BASE} # env
else
AC_MSG_RESULT(No)
- AC_MSG_ERROR(GDML installation was not found) # not found
+ AC_MSG_ERROR(GDML installation was not found) # not found
fi
fi
@@ -405,7 +405,7 @@
if test -n "$PLATFORM"; then
GDML_PLATFORM=${PLATFORM} # env
else
- GDML_PLATFORM=${host_os}"-"${CXX}
+ GDML_PLATFORM=${host_os}"-"${CXX}
fi
fi
@@ -423,7 +423,7 @@
])
AC_DEFUN([SIM_SETUP_DOXYGEN], [
-
+
AC_CHECK_PROGS(DOXYGEN, doxygen)
AC_SUBST(DOXYGEN)
])
@@ -461,3 +461,15 @@
])
+AC_DEFUN(SIM_DEFINE_PACKAGE_VARS, [
+
+pkg_date=`date`
+AC_DEFINE_UNQUOTED(PACKAGE_DATE, "${pkg_date}")
+
+AC_DEFINE(PACKAGE_INSTITUTION, "SLAC")
+AC_DEFINE(PACKAGE_WWW, "http://www.lcsim.org/software/slic")
+AC_DEFINE(PACKAGE_FULLNAME, "Simulator for the Linear Collider")
+AC_DEFINE(PACKAGE_AUTHORS, "Jeremy McCormick and Ron Cassell")
+
+])
+
slic
diff -u -r1.14 -r1.15
--- configure.ac 19 Jul 2005 02:14:49 -0000 1.14
+++ configure.ac 4 Aug 2005 00:04:59 -0000 1.15
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/slic/configure.ac,v 1.14 2005/07/19 02:14:49 jeremy Exp $
+# $Header: /cvs/lcd/slic/configure.ac,v 1.15 2005/08/04 00:04:59 jeremy Exp $
#
# Process this file with autoconf to produce a configure script for SLIC.
#
@@ -17,8 +17,8 @@
# package info
AC_PREREQ(2.57)
-AC_INIT(SLIC,
- v1r9p3,
+AC_INIT(SLIC,
+ v1r9p3,
[log in to unmask])
AC_CONFIG_SRCDIR([slic.cc])
@@ -33,9 +33,12 @@
#AC_PROG_INSTALL
AC_PROG_MAKE_SET
+# define additional PACKAGE_ vars
+SIM_DEFINE_PACKAGE_VARS()
+
# check for dependent packages
-# set OS string
+# set OS string
CHECK_OS()
# Setup Default CPPFLAGS
@@ -99,7 +102,7 @@
echo "Finally, to build SLIC."
echo
echo " gmake all"
-echo
+echo
echo "The executable should be found at $SLIC_BASE/bin/$G4SYSTEM/slic once the build completes."
echo
echo "Thank you for using the SLIC simulator package."
slic/include
diff -u -r1.26 -r1.27
--- SlicApplication.hh 3 Aug 2005 23:22:26 -0000 1.26
+++ SlicApplication.hh 4 Aug 2005 00:04:59 -0000 1.27
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/include/SlicApplication.hh,v 1.26 2005/08/03 23:22:26 jeremy Exp $
+// $Header: /cvs/lcd/slic/include/SlicApplication.hh,v 1.27 2005/08/04 00:04:59 jeremy Exp $
#ifndef slic_SlicApplication_hh
#define slic_SlicApplication_hh 1
@@ -12,10 +12,12 @@
class SlicMessenger;
/**
- @class SlicApplication
- @brief SLIC application class for control, CL options, and app metadata.
- @note G4-based control flow is implemented in the G4Application parent class.
- */
+ * @class SlicApplication
+ * @brief SLIC application class for control, CL options, and app metadata.
+ * @note G4-based control flow is implemented in the G4Application parent class.
+ *
+ * This class uses the PACKAGE vars defined by Autoconf for all the "meta" info.
+ */
class SlicApplication : public G4Application
{
public:
@@ -25,59 +27,56 @@
public:
virtual void setupFromCommandLine(int argc, char** argv);
-
+
virtual void initialize();
virtual void run();
virtual void registerCmdLineOpts();
- virtual const std::string& getVersionString() const
+ virtual const std::string& getVersionString() const
{
- // get version from autoconf
static const std::string ver_str = PACKAGE_VERSION;
return ver_str;
- }
+ }
virtual const std::string& getAuthorString() const
{
- static const std::string auth_str = "Jeremy McCormick, Ron Cassell";
+ static const std::string auth_str = PACKAGE_AUTHORS;
return auth_str;
}
- virtual const std::string& getNameString() const
+ virtual const std::string& getNameString() const
{
- static const std::string name_str = "Simulator for the Linear Collider";
+ static const std::string name_str = PACKAGE_FULLNAME;
return name_str;
}
virtual const std::string& getAbbrevString() const
{
- // get package short name from autoconf
static const std::string abbrev_str = PACKAGE_NAME;
return abbrev_str;
}
virtual const std::string& getInstitutionString() const
{
- static const std::string inst_str = "SLAC";
+ static const std::string inst_str = PACKAGE_INSTITUTION;
return inst_str;
}
virtual const std::string& getChangeDateString() const
{
- static const std::string inst_str = "$Date: 2005/08/03 23:22:26 $";
+ static const std::string inst_str = PACKAGE_DATE;
return inst_str;
- }
+ }
- virtual const std::string& getWWW() const
+ virtual const std::string& getWWW() const
{
- static const std::string www_str = "http://www.lcsim.org/software/slic";
+ static const std::string www_str = PACKAGE_WWW;
return www_str;
}
-
- virtual const std::string& getEmail() const
+
+ virtual const std::string& getEmail() const
{
- // get email contact from autoconf
static const std::string email_str = PACKAGE_BUGREPORT;
return email_str;
}