6 added + 5 modified, total 11 files
SimDist
diff -u -r1.46 -r1.47
--- configure 12 Jul 2006 17:51:57 -0000 1.46
+++ configure 15 Sep 2006 21:10:04 -0000 1.47
@@ -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 OGLHOME 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_DOWNL!
OAD GEANT4_VERSION GEANT4_BUILDDIR 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 G4VIS_BUILD_OPENGL_DRVIER G4VIS_USE_OPENGL G4VIS_BUILD_OPENGL LCDD_BASEDIR LCIO_BASEDIR LCIO_BUILDDIR LCPHYS_CVSMODULE LCPHYS_BASEDIR SLIC_BINNAME SLIC_VERSION SLIC_BASE!
DIR MOKKA_VERSION MOKKA_BASEDIR MOKKA_BUILDDIR MOKKA_DOWNLOAD !
MOKKA_DI
R_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_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 OGLHOME 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_DOWNLOA!
D GEANT4_VERSION GEANT4_BUILDDIR 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 G4VIS_BUILD_OPENGL_DRVIER G4VIS_USE_OPENGL G4VIS_BUILD_OPENGL LCDD_BASEDIR LCIO_BASEDIR LCIO_BUILDDIR LCPHYS_CVSMODULE LCPHYS_BASEDIR SLIC_BINNAME SLIC_VERSION SLIC_BASEDI!
R MOKKA_VERSION MOKKA_BASEDIR MOKKA_BUILDDIR MOKKA_DOWNLOAD MO!
KKA_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 BDSIM_BASEDIR BDSIM_DIR_ORIG BDSIM_DOWNLOAD BDSIM_BUILDDIR BDSIM_VERSION ROOTSYS USE_ROOT 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.
@@ -2781,6 +2781,59 @@
;;
+bdsim )
+
+
+
+bdsim_url=http://cvs.pp.rhul.ac.uk/cvsweb.cgi/BDSIM/BDSIM.tar.gz?tarball=1
+
+BDSIM_BASEDIR=$package_base_dir
+BDSIM_BUILDDIR=$package_base_dir
+BDSIM_DOWNLOAD=$bdsim_url
+BDSIM_DIR_ORIG=BDSIM
+BDSIM_VERSION=$package_version
+
+
+
+
+
+
+
+
+
+if test -z packages/bdsim/Makefile.bdsim
+then
+ { { echo "$as_me:$LINENO: error: \"Missing config file to add.\"" >&5
+echo "$as_me: error: \"Missing config file to add.\"" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+config_files="$config_files"packages/bdsim/Makefile.bdsim" "
+
+
+
+echo "$as_me:$LINENO: checking for ROOTSYS" >&5
+echo $ECHO_N "checking for ROOTSYS... $ECHO_C" >&6
+
+if test -n "$ROOTSYS"
+then
+
+ cat >>confdefs.h <<\_ACEOF
+#define USE_ROOT 1
+_ACEOF
+
+ USE_ROOT="USE_ROOT"
+
+ echo "$as_me:$LINENO: result: $ROOTSYS" >&5
+echo "${ECHO_T}$ROOTSYS" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+
+ ;;
+
* )
{ { echo "$as_me:$LINENO: error: package $package_name is unknown" >&5
echo "$as_me: error: package $package_name is unknown" >&2;}
@@ -2977,6 +3030,18 @@
+if test -z scripts/bdsim.sh
+then
+ { { echo "$as_me:$LINENO: error: \"Missing config file to add.\"" >&5
+echo "$as_me: error: \"Missing config file to add.\"" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+config_files="$config_files"scripts/bdsim.sh" "
+
+
+
+
if test -z Makefile
then
{ { echo "$as_me:$LINENO: error: \"Missing config file to add.\"" >&5
@@ -3778,6 +3843,13 @@
s,@XERCES_DOWNLOAD@,$XERCES_DOWNLOAD,;t t
s,@XERCES_DIR_ORIG@,$XERCES_DIR_ORIG,;t t
s,@XERCES_OBJDIR@,$XERCES_OBJDIR,;t t
+s,@BDSIM_BASEDIR@,$BDSIM_BASEDIR,;t t
+s,@BDSIM_DIR_ORIG@,$BDSIM_DIR_ORIG,;t t
+s,@BDSIM_DOWNLOAD@,$BDSIM_DOWNLOAD,;t t
+s,@BDSIM_BUILDDIR@,$BDSIM_BUILDDIR,;t t
+s,@BDSIM_VERSION@,$BDSIM_VERSION,;t t
+s,@ROOTSYS@,$ROOTSYS,;t t
+s,@USE_ROOT@,$USE_ROOT,;t t
s,@MYSQL_BASEDIR@,$MYSQL_BASEDIR,;t t
s,@MYSQL_INCLUDEDIR@,$MYSQL_INCLUDEDIR,;t t
s,@MYSQL_LIBDIR@,$MYSQL_LIBDIR,;t t
SimDist
diff -u -r1.2 -r1.3
--- configure.in 26 Jun 2006 23:56:38 -0000 1.2
+++ configure.in 15 Sep 2006 21:10:11 -0000 1.3
@@ -1,4 +1,4 @@
-dnl $Header: /cvs/lcd/SimDist/configure.in,v 1.2 2006/06/26 23:56:38 jeremy Exp $
+dnl $Header: /cvs/lcd/SimDist/configure.in,v 1.3 2006/09/15 21:10:11 jeremy Exp $
dnl
dnl Process this file with autoconf to produce the configure script for SimDist.
dnl
@@ -53,6 +53,7 @@
dnl Add additional input files.
AC_ADD_CONFIG_FILE(scripts/slic.sh)
AC_ADD_CONFIG_FILE(scripts/mokka.sh)
+AC_ADD_CONFIG_FILE(scripts/bdsim.sh)
AC_ADD_CONFIG_FILE(Makefile)
AC_ADD_CONFIG_FILE(packages/Makefile)
AC_ADD_CONFIG_FILE(build/package.gmk)
SimDist/build
diff -u -r1.6 -r1.7
--- package.gmk.in 26 Jun 2006 23:56:39 -0000 1.6
+++ package.gmk.in 15 Sep 2006 21:10:12 -0000 1.7
@@ -1,4 +1,4 @@
-# $Id: package.gmk.in,v 1.6 2006/06/26 23:56:39 jeremy Exp $
+# $Id: package.gmk.in,v 1.7 2006/09/15 21:10:12 jeremy Exp $
#
# Generic package build rules.
@@ -113,11 +113,16 @@
config:
@cd $(PACKAGE_BUILDDIR) && if [ -e "$(PACKAGE_CONFIG)" ]; then $(PACKAGE_CONFIG) $(PACKAGE_CONFIG_OPTS); fi;:
-# Build the package by executing the default make rule on the sources.
+# Build the package by executing the default make rule.
compile:
@echo "Compiling $(PACKAGE_NAME) ..." ; \
cd $(PACKAGE_BUILDDIR) && $(MAKE);:
+# Build the package by executing the all make rule.
+compile_all:
+ @echo "Compiling $(PACKAGE_NAME) ..." ; \
+ cd $(PACKAGE_BUILDDIR) && $(MAKE) all;:
+
# Install the package by executing the install target.
install:
@echo "Installing $(PACKAGE_NAME) ..." ; \
SimDist/build
diff -u -r1.21 -r1.22
--- packages.m4 12 Jul 2006 17:51:59 -0000 1.21
+++ packages.m4 15 Sep 2006 21:10:12 -0000 1.22
@@ -1,4 +1,4 @@
-dnl
+ ..dnl
dnl Macro to do common configuration for each package.
dnl
AC_DEFUN(AC_CONFIG_PACKAGE_BASE, [
@@ -74,6 +74,11 @@
AC_XERCES_PACKAGE
;;
+bdsim )
+
+ AC_BDSIM_PACKAGE
+ ;;
+
* )
AC_MSG_ERROR(package $package_name is unknown)
@@ -281,6 +286,42 @@
])
+dnl
+dnl Macro for configuring the BDSIM package.
+dnl
+AC_DEFUN(AC_BDSIM_PACKAGE, [
+
+bdsim_url=http://cvs.pp.rhul.ac.uk/cvsweb.cgi/BDSIM/BDSIM.tar.gz?tarball=1
+
+BDSIM_BASEDIR=$package_base_dir
+BDSIM_BUILDDIR=$package_base_dir
+BDSIM_DOWNLOAD=$bdsim_url
+BDSIM_DIR_ORIG=BDSIM
+BDSIM_VERSION=$package_version
+
+AC_SUBST(BDSIM_BASEDIR)
+AC_SUBST(BDSIM_DIR_ORIG)
+AC_SUBST(BDSIM_DOWNLOAD)
+AC_SUBST(BDSIM_BUILDDIR)
+AC_SUBST(BDSIM_VERSION)
+
+AC_ADD_CONFIG_FILE(packages/bdsim/Makefile.bdsim)
+
+AC_MSG_CHECKING(for ROOTSYS)
+
+if test -n "$ROOTSYS"
+then
+ AC_SUBST(ROOTSYS)
+ AC_DEFINE(USE_ROOT)
+ USE_ROOT="USE_ROOT"
+ AC_SUBST(USE_ROOT)
+ AC_MSG_RESULT($ROOTSYS)
+else
+ AC_MSG_RESULT(no)
+fi
+
+])
+
dnl Define a package make var using autoconf substitution.
dnl arg1 make variable name without "PACKAGE_" prefix
dnl arg2 autoconf substitution varible without @@ enclosing chars
SimDist/packages/bdsim
diff -N Makefile.bdsim.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Makefile.bdsim.in 15 Sep 2006 21:10:14 -0000 1.1
@@ -0,0 +1,78 @@
+name=bdsim
+G4TARGET=$(name)
+G4EXLIB=true
+
+#G4BINDIR=@BINDIR@
+G4INSTALL=@G4INSTALL@
+ROOTSYS=@ROOTSYS@
+
+.PHONY: all
+all: gmad lib bin
+
+# stuff required for hadronic lists
+
+ifndef G4LISTS_BASE
+ EXTRALIBS += -L$(G4LIB)/plists/$(G4SYSTEM)
+ G4LISTS_BASE = $(G4INSTALL)/physics_lists
+else
+ EXTRALIBS += -L$(G4LISTS_BASE)/hadronic/plists/lib/$(G4SYSTEM)
+endif
+
+CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/Packaging/include
+#CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/QGSP_BERT/include
+#CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/QGSP_BIC/include
+#CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/QGSP_HP/include
+#CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/LHEP_BERT/include
+#CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/LHEP_BERT_HP/include
+#CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/LHEP_BIC/include
+#CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/LHEP_BIC_HP/include
+CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/LHEP_LEAD/include
+CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/LHEP/include
+
+#EXTRALIBS += -lQGSP_BERT
+#EXTRALIBS += -lQGSP_BIC
+#EXTRALIBS += -lQGSP_HP
+#EXTRALIBS += -lLHEP_BIC
+#EXTRALIBS += -lLHEP_BIC_HP
+#EXTRALIBS += -lLHEP_BERT
+#EXTRALIBS += -lLHEP_BERT_HP
+EXTRALIBS += -lLHEP_LEAD
+EXTRALIBS += -lLHEP
+EXTRALIBS += -lPackaging
+
+
+
+ROOTLIBS=`$(ROOTSYS)/bin/root-config --libs`
+ROOTCFLAGS=`$(ROOTSYS)/bin/root-config --cflags`
+
+LDLIBS3 += $(ROOTLIBS)
+
+# standard Geant4 make procedure
+include $(G4INSTALL)/config/binmake.gmk
+
+
+CPPFLAGS += -DG4VERSION=$(G4VERSION) -D@USE_ROOT@ -DCLHEP_VERSION=$(CLHEP_VERSION)
+CPPFLAGS += -I./parser
+CPPFLAGS += $(ROOTCFLAGS)
+CPPFLAGS += -g -Wall $(ROOTINCS) -I.
+
+LDFLAGS += -L$(G4LIBDIR) -L./parser -lgmad
+
+
+install:
+
+distrib:
+ tar --ignore-failed-read -C .. -czvf BDSIM.tar.gz BDSIM/src BDSIM/include \
+ BDSIM/bdsim.cc BDSIM/bdsimrun BDSIM/Makefile.in \
+ BDSIM/configure BDSIM/README \
+ BDSIM/parser/*.h BDSIM/examples \
+ BDSIM/docs BDSIM/parser \
+ BDSIM/examples BDSIM/utils
+
+docs:
+ $(MAKE) -C docs
+
+gmad: parser/parser.h parser/parser.y parser/parser.l parser/gmad.h \
+ parser/gmad.cc parser/sym_table.h
+ echo "Making gmad parser..."
+ $(MAKE) -C parser
SimDist/packages/bdsim
diff -N Makefile.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Makefile.in 15 Sep 2006 21:10:14 -0000 1.1
@@ -0,0 +1,16 @@
+# $Id: Makefile.in,v 1.1 2006/09/15 21:10:14 jeremy Exp $
+
+# generic package build
+include ../../build/package.gmk
+
+# default rule
+all: download patch_makefile compile_parser compile
+
+compile_parser:
+ cd $(PACKAGE_BUILDDIR)/parser && $(MAKE) clean && $(MAKE);:
+
+patch_makefile:
+ cp Makefile.bdsim $(PACKAGE_BUILDDIR)/Makefile;:
+
+
+
SimDist/packages/bdsim
diff -N VERSION
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ VERSION 15 Sep 2006 21:10:15 -0000 1.1
@@ -0,0 +1 @@
+bdsim v02
SimDist/packages/bdsim
diff -N deps.gmk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ deps.gmk 15 Sep 2006 21:10:15 -0000 1.1
@@ -0,0 +1,2 @@
+include ../clhep/env.gmk
+include ../geant4/env.gmk
\ No newline at end of file
SimDist/packages/bdsim
diff -N env.gmk.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ env.gmk.in 15 Sep 2006 21:10:15 -0000 1.1
@@ -0,0 +1,7 @@
+# Mokka env vars.
+export BDSIM_BASE=@BDSIM_BASEDIR@
+export G4WORKDIR=$(BDSIM_BASE)
+export G4VERSION=8
+export CLHEP_VERSION=8
+export USE_ROOT=1
+
SimDist/packages/bdsim
diff -N package.gmk.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ package.gmk.in 15 Sep 2006 21:10:15 -0000 1.1
@@ -0,0 +1,3 @@
+PACKAGE_BUILDDIR=@BDSIM_BUILDDIR@
+PACKAGE_DIR_ORIG=@BDSIM_DIR_ORIG@
+PACKAGE_DOWNLOAD=@BDSIM_DOWNLOAD@
SimDist/packages/slic
diff -u -r1.4 -r1.5
--- Makefile.in 22 Jun 2006 23:50:05 -0000 1.4
+++ Makefile.in 15 Sep 2006 21:10:17 -0000 1.5
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/SimDist/packages/slic/Makefile.in,v 1.4 2006/06/22 23:50:05 jeremy Exp $
+# $Header: /cvs/lcd/SimDist/packages/slic/Makefile.in,v 1.5 2006/09/15 21:10:17 jeremy Exp $
# generic package build
include ../../build/package.gmk
@@ -9,8 +9,6 @@
# custom compile rule
# OVERRIDES package
.PHONY: compile_all
-compile_all:
- cd $(PACKAGE_BUILDDIR) && $(MAKE) all;:
test:
../../scripts/slic.sh;:
CVSspam 0.2.8