7 added + 11 modified, total 18 files
SimDist
diff -u -r1.1 -r1.2
--- Makefile.in 27 Jan 2006 09:05:45 -0000 1.1
+++ Makefile.in 28 Jan 2006 01:32:18 -0000 1.2
@@ -1,19 +1,19 @@
-# $Header: /cvs/lcd/SimDist/Makefile.in,v 1.1 2006/01/27 09:05:45 jeremy Exp $
+# $Header: /cvs/lcd/SimDist/Makefile.in,v 1.2 2006/01/28 01:32:18 jeremy Exp $
-# include some common build vars
+# include the common build vars
include $(CURDIR)/build/common.gmk
# force these targets to execute without dep checking
-.PHONY: build package_versions distclean package_distclean baseclean tgz tgz_upload tgz_upload_current
-#$(PACKAGE)
+.PHONY: build package_versions distclean package_distclean baseclean tgz tgz_upload tgz_upload_current
-# default to building all the packages
+# default to building all the packages, testing, and installing
.DEFAULT: build
-build: build_packages test
+# build the packages, test, and install
+build: build_packages test install
# build the packages
-build_packages:
+build_packages:
@cd packages && make;:
# remake the versions list
@@ -23,11 +23,11 @@
# completely clean the packages and the base area
distclean: package_distclean baseclean
-# remove configure-generated files from package areas
+# remove configure-generated files from each package
package_distclean:
@for dir in $(packages_reverse_dep_order); do (cd $(sim_packages_dir)/$$dir && $(MAKE) distclean); done;:
-# remove configure-generated files from base area
+# remove configure-generated files from the base area
baseclean:
@cd $(sim_dist_dir) && rm -rf GNUmakefile common/common.gmk;:
@@ -39,10 +39,11 @@
tgz_upload: tar
@$(SCP) ../$(dist_tarball) $(dist_dir);:
-# copy a versioned tarball to a current tarball and then upload to distribution area
+# copy a versioned tarball to a "current" tarball and then upload to distribution area
tgz_upload_current: tar
@cp ../$(dist_tarball) ../$(dist_tarball_current); $(SCP) ../$(dist_tarball_current) $(dist_dir);:
+# test for and run slic binary, if found
test:
@echo "checking for $(slic_bin) ..." ; \
if [ -f "$(slic_bin)" ] ; then \
@@ -50,3 +51,7 @@
else \
echo "check FAILED: $(slic_bin) does not exist." ; \
fi;:
+
+# install target that just puts the run script someplace
+install:
+ @mkdir $(prefix)/bin && cp $(sim_scripts_dir)/$(slic_run_script) $(prefix)/bin
SimDist
diff -u -r1.9 -r1.10
--- TODO 27 Jan 2006 09:05:45 -0000 1.9
+++ TODO 28 Jan 2006 01:32:18 -0000 1.10
@@ -1,3 +1,5 @@
+-GDML should use actual version
+ -http://simu.cvs.cern.ch/cgi-bin/simu.cgi/simu/GDML2/?only_with_tag=v2r3p0_slic
-allow to set cvs login name (slic, lcdd, lcphys)
-usage of existing (external) packages
-clhep, geant4
SimDist
diff -u -r1.10 -r1.11
--- aclocal.m4 27 Jan 2006 09:05:45 -0000 1.10
+++ aclocal.m4 28 Jan 2006 01:32:19 -0000 1.11
@@ -1,591 +1,8 @@
-dnl Change a version with letters and underscores to one containing dots, only
-AC_DEFUN(VERSION_DOT, [
- v=$(echo $2 | sed -e 's/[[vrp]]/\./g' -e 's/^\.//g' -e 's/_/./g')
- AC_SUBST($1, $v)
- echo $v
-])
-
-dnl Change version with letters and underscores to one containing underscores, only
-AC_DEFUN(VERSION_UNDERSCORE, [
- v=$(echo $2 | sed -e 's/[[vrp]]/_/g' -e 's/^_//g')
- AC_SUBST($1, $v)
- echo $v
-])
-
-dnl
-AC_DEFUN(VERSION_GEANT4, [
- v=$(echo $2 | sed 's/[[vr]]/\./g' | sed 's/p/\.p/g')
- AC_SUBST($1, $v)
- echo $v
-])
-
-dnl macro to add .in files for each package
-AC_DEFUN(MAKE_CONFIG_FILES_LIST, [
-
-if test -z "${packages_list}"; then
- AC_MSG_ERROR("packages_list is not set.")
-fi
-
-for p in $(echo ${packages_list})
-do
-
- dnl Makefile
- SIM_ADD_CONFIG_FILE(packages/$p/Makefile)
-
- dnl variables for the build system
- SIM_ADD_CONFIG_FILE(packages/$p/package.gmk)
-
- dnl vars required by the package itself (e.g. SLIC_BASE)
- SIM_ADD_CONFIG_FILE(packages/$p/env.gmk)
-
- dnl download script if exists
- if test -e "$sim_packages_dir/$p/${download_script}.in"
- then
- SIM_ADD_CONFIG_FILE(packages/$p/${download_script})
- fi
-
- dnl cvs script if exists
- if test -e "$sim_packages_dir/$p/${cvs_script}.in"
- then
- SIM_ADD_CONFIG_FILE(packages/$p/${cvs_script})
- fi
-
- dnl patch script if exists
- if test -e "$sim_packages_dir/$p/${patch_script}.in"
- then
- SIM_ADD_CONFIG_FILE(packages/$p/${patch_script})
- fi
-
-done
-
-])
-
-dnl macro to add a file to the list of .in files
-AC_DEFUN(SIM_ADD_CONFIG_FILE, [
-
-#echo "add config file: $1"
-
-if test -z $1
-then
- AC_MSG_ERROR("Missing config file to add.")
-fi
-
-config_files="$config_files"$1" "
-
-])
-
-dnl macro to check for necessary installation/build programs
-AC_DEFUN(SIM_CHECK_PROGS, [
-
-dnl make
-AC_PROG_MAKE_SET
-
-dnl g++
-AC_PROG_CXX
-
-dnl cvs
-AC_CHECK_PROG(have_cvs, cvs, yes, no)
-
-if test $have_cvs == "no"
-then
- AC_MSG_ERROR(cvs not found)
-else
- CVS=cvs
- AC_SUBST(CVS)
-fi
-
-dnl java (for ant bundled with LCIO)
-AC_CHECK_PROG(have_java, java, yes, no)
-
-if test $have_java == "no"
-then
- AC_MSG_ERROR(java not found)
-else
- JAVA=java
- AC_SUBST(JAVA)
-fi
-
-dnl ant
-AC_CHECK_PROG(have_ant, ant, yes, no)
-
-if test $have_ant == "no"
-then
- AC_MSG_ERROR(ant not found)
-else
- ANT=ant
- AC_SUBST(ANT)
-fi
-
-dnl wget
-AC_CHECK_PROG(have_wget, wget, yes, no)
-
-if test $have_wget == "no"
-then
- AC_MSG_ERROR(wget not found)
-else
- WGET=wget
- AC_SUBST(WGET)
-fi
-
-dnl scp
-AC_CHECK_PROG(have_scp, scp, yes, no)
-
-if test $have_scp == "no"
-then
- AC_MSG_ERROR(scp not found)
-else
- SCP=scp
- AC_SUBST(SCP)
-fi
-
-])
-
-dnl macro to do top-level initialization of the build system and set some common variables and substitutions
-AC_DEFUN(SIM_INIT, [
-
-cvsuser=anonymous
-cvsroot=:pserver:[log in to unmask]:/cvs/lcd
-
-packages_dep_order="clhep geant4 lcphys xerces gdml lcio lcdd slic"
-AC_SUBST(packages_dep_order)
-
-packages_reverse_dep_order=""
-for p in $(echo $packages_dep_order)
-do
- packages_reverse_dep_order=${p}" "${packages_reverse_dep_order}
-done
-
-AC_SUBST(packages_reverse_dep_order)
-
-download_script=download.sh
-AC_SUBST(download_script)
-
-cvs_script=cvs.sh
-AC_SUBST(cvs_script)
-
-patch_script=patch.sh
-AC_SUBST(patch_script)
-
-gen_files="package.gmk env.gmk download.sh cvs.sh patch.sh GNUmakefile *.tar.gz *.tgz"
-AC_SUBST(gen_files)
-
-sim_dist_dir=$(pwd)
-
-AC_SUBST(sim_dist_dir)
-
-SIM_ADD_CONFIG_FILE("build/common.gmk")
-
-sim_packages_dir=$(pwd)/packages
-AC_SUBST(sim_packages_dir)
-
-sim_build_dir=$(pwd)/build
-AC_SUBST(sim_build_dir)
-
-sim_scripts_dir=$(pwd)/scripts
-AC_SUBST(sim_scripts_dir)
-
-sim_package_default_versions_file="${sim_build_dir}/package_versions.txt"
-
-AC_MSG_CHECKING(for packages list)
-
-for p in $(ls -1 packages | grep -v CVS)
-do
- if test -d $sim_packages_dir/$p
- then
- packages_list="$packages_list"${p}" "
- fi
-done
-
-packages_list=${packages_list%\ }
-
-AC_MSG_RESULT($packages_list)
-
-MAKE_CONFIG_FILES_LIST
-
-])
-
-dnl macro to do common configuration for each package
-AC_DEFUN(SIM_CONFIG_PACKAGE_BASE, [
-
-if test -z $1
-then
- AC_MSG_ERROR("Name of the package to configure is missing.")
-fi
-
-dnl name of package is first arg
-package_name="$1"
-
-AC_MSG_CHECKING(for $package_name version)
-
-dnl root package area with no version tag
-package_root_dir=${sim_packages_dir}/${package_name}
-
-if ! test -e ${package_root_dir}
-then
- AC_MSG_ERROR("$package_name root package area does not exist!")
-fi
-
-dnl get the version string for this package from the default packages file
-package_version=$(grep "^${package_name} " ${sim_package_default_versions_file} | awk '{print [$]2}')
-
-if test -z $package_version
-then
- AC_MSG_ERROR($package_name default version not found in ${sim_package_default_versions_file}.)
-else
- AC_MSG_RESULT($package_version)
-fi
-
-dnl fully qualified base dir
-package_dir=${sim_packages_dir}/${package_name}
-package_base_dir=${sim_packages_dir}/${package_name}/${package_version}
-
-dnl set package name, version, base dir and build dir for each dep
-dnl FIXME: should be a way to do this without explicitly naming each package here
-case "$package_name" in
-
-clhep )
-
- # package vars
- AC_SUBST(clhep, clhep)
- AC_SUBST(clhep_package_dir, ${package_dir})
- AC_SUBST(clhep_base_dir, ${package_base_dir})
- AC_SUBST(clhep_version, ${package_version})
- AC_SUBST(clhep_package_name, ${package_name})
- AC_SUBST(clhep_build_dir, ${package_base_dir}/CLHEP)
-
- # url
- clhep_url=http://cern.ch/clhep
- AC_SUBST(clhep_url, http://cern.ch/clhep)
-
- # local tgz
-dnl clhep_tgz_local=clhep.tar.gz
- AC_SUBST(clhep_tgz_local, clhep.tar.gz)
-
- # version with dots
- clhep_version_dot=$(VERSION_DOT(clhep_version_dot, ${package_version}))
-
- # remote tgz
- clhep_tgz=clhep-${clhep_version_dot}.tgz
- AC_SUBST(clhep_tgz)
-
- # original dir from tgz
-dnl clhep_dir_orig=$clhep_version_dot
- AC_SUBST(clhep_dir_orig, $clhep_version_dot)
-
- # full download url
-dnl clhep_download=${clhep_url}/clhep-${clhep_version_dot}.tgz
- AC_SUBST(clhep_download, ${clhep_url}/${clhep_tgz})
-
- clhep_config_opts="--prefix=@clhep_base_dir@ --disable-shared"
- AC_SUBST(clhep_config_opts)
-
- ;;
-
-gdml )
-
- # package vars
- AC_SUBST(gdml, gdml)
- AC_SUBST(gdml_package_dir, ${package_dir})
- AC_SUBST(gdml_base_dir, ${package_base_dir})
- AC_SUBST(gdml_version, ${package_version})
- AC_SUBST(gdml_package_name, ${package_name})
- AC_SUBST(gdml_build_dir, ${package_base_dir}/CPPGDML)
-
- gdml_url=http://simu.cvs.cern.ch/cgi-bin/simu.cgi/simu/GDML2
- AC_SUBST(gdml_url)
-
- AC_SUBST(gdml_tgz_local, gdml.tar.gz)
-
- gdml_tgz=GDML2.tar.gz?tarball=1
- AC_SUBST(gdml_tgz, $gdml_tgz)
-
- AC_SUBST(gdml_dir_orig, GDML2)
-
- AC_SUBST(gdml_download, $gdml_url/$gdml_tgz)
-
- AC_SUBST(gdml_config_opts, "--enable-shared-libs=no")
-
- ;;
-
-dnl AC_SUBST(gdml_url)
-dnl AC_SUBST(gdml_tgz_local)
-dnl AC_SUBST(gdml_tgz)
-dnl AC_SUBST(gdml_dir_orig)
-dnl AC_SUBST(gdml_download)
-dnl
-dnl
-
-geant4 )
- geant4_version=${package_version}
- AC_SUBST(geant4, geant4)
- AC_SUBST(geant4_package_dir, ${package_dir})
- AC_SUBST(geant4_url, http://geant4.cern.ch/geant4/source/source)
- AC_SUBST(geant4_base_dir, ${package_base_dir})
- AC_SUBST(geant4_version, ${package_version})
- AC_SUBST(geant4_package_name, ${package_name})
- AC_SUBST(geant4_build_dir, ${package_base_dir}/source)
- AC_SUBST(geant4_url, http://geant4.cern.ch/geant4/source/source)
- AC_SUBST(geant4_tgz_local, geant4.tar.gz)
- geant4_version_download=$(VERSION_GEANT4(geant4_version_download, ${geant4_version}))
-
- geant4_tgz=geant4${geant4_version_download}.tar.gz
- AC_SUBST(geant4_tgz, $geant4_tgz)
- AC_SUBST(geant4_dir_orig, geant4${geant4_version_download})
- AC_SUBST(geant4_download, ${geant4_url}/${geant4_tgz})
-
- ;;
-
-lcdd )
- AC_SUBST(lcdd, lcdd)
- AC_SUBST(lcdd_package_dir, ${package_dir})
- AC_SUBST(lcdd_base_dir, ${package_base_dir})
- AC_SUBST(lcdd_version, ${package_version})
- AC_SUBST(lcdd_package_name, ${package_name})
- AC_SUBST(lcdd_build_dir, ${package_base_dir})
- AC_SUBST(lcdd_cvsroot, ${cvsroot})
-
- ;;
-
-lcio )
- AC_SUBST(lcio, lcio)
- AC_SUBST(lcio_package_dir, ${package_dir})
- AC_SUBST(lcio_base_dir, ${package_base_dir})
- AC_SUBST(lcio_version, ${package_version})
- AC_SUBST(lcio_package_name, ${package_name})
- AC_SUBST(lcio_build_dir, ${package_base_dir})
- AC_SUBST(lcio_cvsroot,${cvsroot})
- ;;
-
-lcphys )
- AC_SUBST(lcphys, lcphys)
- AC_SUBST(lcphys_package_dir, ${package_dir})
- AC_SUBST(lcphys_base_dir, ${package_base_dir})
- AC_SUBST(lcphys_version, ${package_version})
- AC_SUBST(lcphys_package_name, ${package_name})
- AC_SUBST(lcphys_build_dir, ${package_base_dir})
- AC_SUBST(lcphys_cvsroot,${cvsroot})
- AC_SUBST(lcphys_cvsmodule, LCPhys)
- ;;
-
-slic )
- slic_version=${package_version} dnl save this for dist tarball naming
- AC_SUBST(slic, slic)
- AC_SUBST(slic_package_dir, ${package_dir})
- AC_SUBST(slic_base_dir, ${package_base_dir})
- AC_SUBST(slic_version, ${package_version})
- AC_SUBST(slic_package_name, ${package_name})
- AC_SUBST(slic_build_dir, ${package_base_dir})
- AC_SUBST(slic_cvsroot,${cvsroot})
- ;;
-
-xerces )
- AC_SUBST(xerces, xerces)
- AC_SUBST(xerces_package_dir, ${package_dir})
- AC_SUBST(xerces_base_dir, ${package_base_dir})
- AC_SUBST(xerces_url, http://www.apache.org/dist/xml/xerces-c/source)
- AC_SUBST(xerces_base_dir, ${package_base_dir})
-
- xerces_version=${package_version}
- AC_SUBST(xerces_version)
- AC_SUBST(xerces_package_name, ${package_name})
- AC_SUBST(xerces_build_dir, ${package_base_dir}/src/xercesc)
-
- xerces_version_underscore=$(VERSION_UNDERSCORE(xerces_version_underscore, ${xerces_version}))
- xerces_tgz=xerces-c-src_${xerces_version_underscore}.tar.gz
- AC_SUBST(xerces_tgz)
-
- AC_SUBST(xerces_dir_orig, xerces-c-src_${xerces_version_underscore})
-
- AC_SUBST(xerces_download, ${xerces_url}/${xerces_tgz})
-
- xerces_config_opts="@xerces_configure_args@"
- AC_SUBST(xerces_config_opts)
-
- AC_SUBST(xerces_config, ./runConfigure)
-
- AC_SUBST(xerces_tgz_local, xerces.tar.gz)
-
- ;;
-
-* )
- AC_MSG_ERROR($package_name is an unknown package.)
-
-esac
-
-])
-
-AC_DEFUN(SIM_CONFIG_PACKAGES, [
-
-dnl setup common helper vars for each package
-for p in $(echo ${packages_list})
-do
- SIM_CONFIG_PACKAGE_BASE($p)
-done
-
-dnl extras for each package
-SIM_CONFIG_XERCES
-SIM_CONFIG_GEANT4
-
-])
-
-dnl macro to set the platform=os"-"compiler
-AC_DEFUN(SIM_CONFIG_PLATFORM, [
-
-platform=${host_os}"-"${CXX}
-
-AC_SUBST(platform)
-
-])
-
-dnl macro to setup Geant4
-AC_DEFUN(SIM_CONFIG_GEANT4, [
-
-g4system=$platform
-
-AC_SUBST(g4system)
-
-])
-
-dnl macro to setup Xerces
-AC_DEFUN(SIM_CONFIG_XERCES, [
-
-if test $host_os == "Linux"
-then
- xerces_configure_args="-plinux -cgcc -xg++ -minmem -nsocket -tnative -rpthread -P \$(PACKAGE_BASEDIR)"
-elif test $host_os == "WIN32"
-then
- xerces_configure_args="-pcygwin -cgcc -xg++ -minmem -nsocket -tnative -rpthread -P \$(PACKAGE_BASEDIR)"
-elif test $host_os == "Darwin"
-then
- xerces_configure_args="-p macosx -nnative -tnative -P \$(xerces_base_dir)"
-fi
-
-AC_SUBST(xerces_configure_args)
-
-])
-
-dnl macro to set the variable which OS uses for locating shared libs at runtime
-AC_DEFUN(SIM_OS_SHARED_LIBS_VAR, [
-
-if test $host_os == "Linux"
-then
- os_shared_libs_var=LD_LIBRARY_PATH
-elif test $host_os == "WIN32"
-then
- os_shared_libs_var=PATH
-elif test $host_os == "Darwin"
-then
- os_shared_libs_var=DYLD_LIBRARY_PATH
-fi
-
-AC_SUBST(os_shared_libs_var)
-
-])
-
-dnl macro to set string of host OS
-AC_DEFUN(SIM_HOST_OS, [
-
-AC_MSG_CHECKING(for supported OS)
-
-dnl to lowercase
-host_os=`uname | tr [[:upper:]] [[:lower:]]`
-supported_os=yes
-
-dnl The host_os var is designed to match Geant4's conventions.
-case "$host_os" in
-
-dnl Linux flavor
-linux* ) host_os="Linux";;
-dnl Cygwin which is only supported Windows platform
-cygwin* ) host_os="WIN32";;
-dnl Mac OSX
-darwin* ) host_os="Darwin";;
-* ) supported_os=no;;
-
-esac
-
-if test "$supported_os" = "no"; then
- AC_MSG_ERROR( [$host_os is not in the list of supported operating systems] )
-else
- AC_MSG_RESULT([$host_os])
-fi
-
-])
-
-dnl macro to configure OpenGL
-AC_DEFUN(SIM_CONFIG_OGL, [
-
-AC_MSG_CHECKING(for OpenGL)
-
-if test -z $OGLHOME
-then
- case "$host_os" in
- Linux ) _ogldir=/usr;;
- WIN32 ) _ogldir=/usr/X11R6;;
- Darwin ) _ogldir=/usr/X11R6;;
- * ) ;;
- esac
-else
- _ogldir=$OGLHOME
-fi
-
-if test -e $OGLHOME
-then
- dnl check header file to see if OpenGL is installed
- if test -e ${_ogldir}/include/gl.h}
- then
- HAVE_OGL=1
- fi
-fi
-
-if test -n $HAVE_OGL
-then
- OGLHOME=${_ogldir}
- USE_OGL=yes
- AC_SUBST(USE_OGL)
- AC_SUBST(OGLHOME)
- AC_DEFINE(HAVE_OGL)
-fi
-
-AC_MSG_RESULT(yes)
-
-])
-
-dnl macro to set the name of the dist tarball
-AC_DEFUN(SIM_CONFIG_DIST_TARBALL, [
-
-dnl dist version is the same as slic version
-dist_version=$(echo ${slic_version} | sed -e 's/[[a-z]]/\_/g' -e 's/^_//g')
-
-dnl versioned tarball name
-dist_tarball="slic-"${dist_version}"-"${platform}"-bin".tar.gz
-
-dnl non-versioned tarball name
-dist_tarball_current="slic-current-"${platform}"-bin".tar.gz
-
-dnl substitute to common.gmk
-AC_SUBST(dist_tarball)
-AC_SUBST(dist_tarball_current)
-AC_SUBST(dist_version)
-
-])
-
-dnl macro to allow selection of where tarball should be copied; default to SLAC location
-AC_DEFUN(SIM_WITH_DIST_DIR, [
-
-AC_MSG_CHECKING(for dist directory)
-
-dnl This won't work for anyone but Jeremy McCormick (SLAC).
-slac_dist="[log in to unmask]:/nfs/slac/g/lcd/mc/prj/www/lcsim/dist/slic"
-
-dnl Set the SCP-style destination directory
-AC_ARG_WITH(distdir,
- AC_HELP_STRING([--with-distdir=<path>], [Set SCP-style dist directory in form username@host:dir]),
- dist_dir=$with_distdir,
- dist_dir=$slac_dist)
-
-AC_SUBST(dist_dir)
-
-AC_MSG_RESULT($dist_dir)
-
-])
+dnl include m4 macros from build area
+builtin(include, build/cvs.m4)
+builtin(include, build/util.m4)
+builtin(include, build/platform.m4)
+builtin(include, build/packages.m4)
+builtin(include, build/ogl.m4)
+builtin(include, build/init.m4)
+builtin(include, build/tgz.m4)
SimDist
diff -u -r1.13 -r1.14
--- configure 27 Jan 2006 09:05:45 -0000 1.13
+++ configure 28 Jan 2006 01:32:19 -0000 1.14
@@ -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 SET_MAKE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT have_cvs CVS have_java JAVA have_ant ANT have_wget WGET have_scp SCP platform 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 USE_OGL OGLHOME clhep clhep_package_dir clhep_base_dir clhep_version clhep_package_name clhep_build_dir clhep_url clhep_tgz_local clhep_version_dot clhep_tgz clhep_dir_orig clhep_download clhep_config_opts gdml gdml_package_dir gdml_base_dir gdml_version gdml_package_name gdml_build_dir gdml_url gdml_tgz_loca!
l gdml_tgz gdml_dir_orig gdml_download gdml_config_opts geant4 geant4_package_dir geant4_url geant4_base_dir geant4_version geant4_package_name geant4_build_dir geant4_tgz_local geant4_version_download geant4_tgz geant4_dir_orig geant4_download lcdd lcdd_package_dir lcdd_base_dir lcdd_version lcdd_package_name lcdd_build_dir lcdd_cvsroot lcio lcio_package_dir lcio_base_dir lcio_version lcio_package_name lcio_build_dir lcio_cvsroot lcphys lcphys_package_dir lcphys_base_dir lcphys_version lcphys_package_name lcphys_build_dir lcphys_cvsroot lcphys_cvsmodule slic slic_package_dir slic_base_dir slic_version slic_package_name slic_build_dir slic_cvsroot xerces xerces_package_dir xerces_base_dir xerces_url xerces_version xerces_package_name xerces_build_dir xerces_version_underscore xerces_tgz xerces_dir_orig xerces_download xerces_config_opts xerces_config xerces_tgz_local xerces_configure_args g4system os_shared_libs_var dist_tarball dist_tarball_current dist_version dist_dir LI!
BOBJS 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 SET_MAKE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT have_cvs CVS have_java JAVA have_ant ANT have_wget WGET have_scp SCP host_os platform compiler os_shared_libs_var 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 USE_OGL OGLHOME 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 gdm!
l_config_opts g4system geant4_version_download geant4 geant4_version geant4_package_dir geant4_base_dir geant4_build_dir geant4_tgz_local geant4_dir_orig geant4_download lcdd lcdd_version lcdd_package_dir lcdd_base_dir lcdd_build_dir lcdd_cvsroot lcio lcio_version lcio_package_dir lcio_base_dir lcio_build_dir lcio_cvsroot lcphys lcphys_version lcphys_package_dir lcphys_base_dir lcphys_cvsroot slic slic_version slic_package_dir slic_base_dir slic_cvsroot xerces_configure_args xerces_version_underscore xerces xerces_version xerces_package_dir xerces_base_dir xerces_build_dir xerces_config xerces_tgz_local xerces_config_opts xerces_download xerces_dir_orig dist_tarball dist_tarball_current dist_version dist_dir LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -801,6 +801,8 @@
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--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-distdir=<path> Set SCP-style dist directory in form
username@host:dir
@@ -2024,7 +2026,61 @@
-# set the var host_os to determine basic OS (Linux, Mac, Windows)
+# set the SLAC CVS username
+
+
+echo "$as_me:$LINENO: checking for SLAC CVS user" >&5
+echo $ECHO_N "checking for SLAC CVS user... $ECHO_C" >&6
+
+
+# Check whether --with-cvsuser or --without-cvsuser was given.
+if test "${with_cvsuser+set}" = set; then
+ withval="$with_cvsuser"
+ cvsuser=$with_cvsuser
+else
+ cvsuser=anonymous
+fi;
+
+echo "$as_me:$LINENO: result: $cvsuser" >&5
+echo "${ECHO_T}$cvsuser" >&6
+
+cvsroot=:pserver:[log in to unmask]:/cvs/lcd
+
+echo "$as_me:$LINENO: checking for CVSROOT" >&5
+echo $ECHO_N "checking for CVSROOT... $ECHO_C" >&6
+
+echo "$as_me:$LINENO: result: $cvsroot" >&5
+echo "${ECHO_T}$cvsroot" >&6
+
+
+
+# set the installation prefix
+
+
+echo "$as_me:$LINENO: checking for installation prefix" >&5
+echo $ECHO_N "checking for installation prefix... $ECHO_C" >&6
+
+
+# Check whether --with-prefix or --without-prefix was given.
+if test "${with_prefix+set}" = set; then
+ withval="$with_prefix"
+ prefix=$with_prefix
+else
+ prefix=/usr/local
+fi;
+
+if test -d "$prefix" ; then
+ echo "$as_me:$LINENO: result: $prefix" >&5
+echo "${ECHO_T}$prefix" >&6
+else
+ { { echo "$as_me:$LINENO: error: $prefix is not a directory" >&5
+echo "$as_me: error: $prefix is not a directory" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+
+
+# set the var host_os to determine basic OS flavor (Linux, Mac, Windows)
echo "$as_me:$LINENO: checking for supported OS" >&5
@@ -2053,6 +2109,8 @@
+
+
# set the variable platform to host_os"-"compiler
@@ -2060,13 +2118,31 @@
+compiler=${CXX}
-# initialize required autoconf vars for sim setup
-cvsuser=anonymous
-cvsroot=:pserver:[log in to unmask]:/cvs/lcd
+# set which variable to use for runtime location of shared libs
+
+
+if test $host_os == "Linux"
+then
+ os_shared_libs_var=LD_LIBRARY_PATH
+elif test $host_os == "WIN32"
+then
+ os_shared_libs_var=PATH
+elif test $host_os == "Darwin"
+then
+ os_shared_libs_var=DYLD_LIBRARY_PATH
+fi
+
+
+
+
+
+# initialize SimDist config
+
packages_dep_order="clhep geant4 lcphys xerces gdml lcio lcdd slic"
@@ -2097,8 +2173,6 @@
-#echo "add config file: "build/common.gmk""
-
if test -z "build/common.gmk"
then
{ { echo "$as_me:$LINENO: error: \"Missing config file to add.\"" >&5
@@ -2119,8 +2193,6 @@
sim_scripts_dir=$(pwd)/scripts
-sim_package_default_versions_file="${sim_build_dir}/package_versions.txt"
-
echo "$as_me:$LINENO: checking for packages list" >&5
echo $ECHO_N "checking for packages list... $ECHO_C" >&6
@@ -2150,8 +2222,6 @@
-#echo "add config file: packages/$p/Makefile"
-
if test -z packages/$p/Makefile
then
{ { echo "$as_me:$LINENO: error: \"Missing config file to add.\"" >&5
@@ -2165,8 +2235,6 @@
-#echo "add config file: packages/$p/package.gmk"
-
if test -z packages/$p/package.gmk
then
{ { echo "$as_me:$LINENO: error: \"Missing config file to add.\"" >&5
@@ -2180,8 +2248,6 @@
-#echo "add config file: packages/$p/env.gmk"
-
if test -z packages/$p/env.gmk
then
{ { echo "$as_me:$LINENO: error: \"Missing config file to add.\"" >&5
@@ -2197,8 +2263,6 @@
then
-#echo "add config file: packages/$p/${download_script}"
-
if test -z packages/$p/${download_script}
then
{ { echo "$as_me:$LINENO: error: \"Missing config file to add.\"" >&5
@@ -2215,8 +2279,6 @@
then
-#echo "add config file: packages/$p/${cvs_script}"
-
if test -z packages/$p/${cvs_script}
then
{ { echo "$as_me:$LINENO: error: \"Missing config file to add.\"" >&5
@@ -2224,415 +2286,1253 @@
{ (exit 1); exit 1; }; }
fi
-config_files="$config_files"packages/$p/${cvs_script}" "
+config_files="$config_files"packages/$p/${cvs_script}" "
+
+
+ fi
+
+ if test -e "$sim_packages_dir/$p/${patch_script}.in"
+ then
+
+
+if test -z packages/$p/${patch_script}
+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/$p/${patch_script}" "
+
+
+ fi
+
+done
+
+
+
+
+
+# setup OpenGL if found
+
+
+echo "$as_me:$LINENO: checking for OpenGL" >&5
+echo $ECHO_N "checking for OpenGL... $ECHO_C" >&6
+
+if test -z $OGLHOME
+then
+ case "$host_os" in
+ Linux ) _ogldir=/usr;;
+ WIN32 ) _ogldir=/usr/X11R6;;
+ Darwin ) _ogldir=/usr/X11R6;;
+ * ) ;;
+ esac
+else
+ _ogldir=$OGLHOME
+fi
+
+if test -e $OGLHOME
+then
+ if test -e ${_ogldir}/include/gl.h}
+ then
+ HAVE_OGL=1
+ fi
+fi
+
+if test -n $HAVE_OGL
+then
+ OGLHOME=${_ogldir}
+ USE_OGL=yes
+
+
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_OGL 1
+_ACEOF
+
+fi
+
+echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+
+
+# config the individual packages
+
+
+for p in $(echo ${packages_list})
+do
+
+
+if test -z $p
+then
+ { { echo "$as_me:$LINENO: error: \"Name of the package to configure is missing.\"" >&5
+echo "$as_me: error: \"Name of the package to configure is missing.\"" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+package_name="$p"
+
+echo "$as_me:$LINENO: checking for $package_name version" >&5
+echo $ECHO_N "checking for $package_name version... $ECHO_C" >&6
+
+package_root_dir=${sim_packages_dir}/${package_name}
+
+if ! test -e ${package_root_dir}
+then
+ { { echo "$as_me:$LINENO: error: \"$package_name root package area does not exist!\"" >&5
+echo "$as_me: error: \"$package_name root package area does not exist!\"" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+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_url=http://simu.cvs.cern.ch/cgi-bin/simu.cgi/simu/GDML2
+ gdml_tgz=GDML2.tar.gz?tarball=1
+
+
+
+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}"
+then
+ v=`eval echo $gdml_build_dir`
+else
+ v=${package_base_dir}
+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}/${gdml_tgz}"
+then
+ v=`eval echo $gdml_download`
+else
+ v=${gdml_url}/${gdml_tgz}
+fi
+
+gdml_download=$v
+
+
+
+
+
+f=$sim_packages_dir/gdml/package.gmk.in
+
+echo "export PACKAGE_CONFIG_OPTS = @gdml_config_opts@" >> $f ;
+
+if test -z "--enable-shared-libs=no"
+then
+ v=`eval echo $gdml_config_opts`
+else
+ v=--enable-shared-libs=no
+fi
+
+gdml_config_opts=$v
+
+
+
+
+ ;;
+
+geant4 )
+
+
+
+g4system=$platform
+
+
+
+
+
+ geant4_version=${package_version}
+ geant4_url=http://geant4.cern.ch/geant4/source/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_base_dir}"
+then
+ v=`eval echo $geant4_package_dir`
+else
+ v=${package_base_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
+
+
+
+ ;;
+
+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}"
[truncated at 1000 lines; 817 more skipped]
SimDist
diff -u -r1.7 -r1.8
--- configure.ac 27 Jan 2006 09:05:46 -0000 1.7
+++ configure.ac 28 Jan 2006 01:32:19 -0000 1.8
@@ -1,19 +1,8 @@
-# $Header: /cvs/lcd/SimDist/configure.ac,v 1.7 2006/01/27 09:05:46 jeremy Exp $
+# $Header: /cvs/lcd/SimDist/configure.ac,v 1.8 2006/01/28 01:32:19 jeremy Exp $
#
# Process this file with autoconf to produce a configure script for SimDist.
#
-# _standard order_
-# information on the package
-# checks for programs
-# checks for libraries
-# checks for header files
-# checks for types
-# checks for structures
-# checks for compiler characteristics
-# checks for library functions
-# checks for system services
-
# package info
AC_PREREQ(2.57)
@@ -21,38 +10,48 @@
v1r0p0,
[log in to unmask])
+#AC_CANONICAL_BUILD
+#AC_CANONICAL_HOST
+#AC_CANONICAL_TARGET
+
# check for required progs
-SIM_CHECK_PROGS
+CHECK_PROGS
+
+# set the SLAC CVS username
+WITH_CVSUSER
+
+# set the installation prefix
+WITH_PREFIX
-# set the var host_os to determine basic OS (Linux, Mac, Windows)
-SIM_HOST_OS
+# set the var host_os to determine basic OS flavor (Linux, Mac, Windows)
+CONFIG_HOST_OS
# set the variable platform to host_os"-"compiler
-SIM_CONFIG_PLATFORM
+CONFIG_PLATFORM
-# initialize required autoconf vars for sim setup
-SIM_INIT
+# set which variable to use for runtime location of shared libs
+OS_SHARED_LIBS_VAR
-# config OpenGL
-SIM_CONFIG_OGL
+# initialize SimDist config
+SIMDIST_INIT
-# config the individual packages
-SIM_CONFIG_PACKAGES
+# setup OpenGL if found
+CONFIG_OGL
-# set which variable to use for runtime location of shared libs
-SIM_OS_SHARED_LIBS_VAR
+# config the individual packages
+CONFIG_PACKAGES
# setup name of tarball
-SIM_CONFIG_DIST_TARBALL
+DIST_TGZ
# select location for dist tarball
-SIM_WITH_DIST_DIR
+WITH_UPLOAD_DIR
# add input files
-SIM_ADD_CONFIG_FILE(scripts/slic.sh)
-SIM_ADD_CONFIG_FILE(Makefile)
-SIM_ADD_CONFIG_FILE(packages/Makefile)
-SIM_ADD_CONFIG_FILE(build/package.gmk)
+ADD_CONFIG_FILE(scripts/slic.sh)
+ADD_CONFIG_FILE(Makefile)
+ADD_CONFIG_FILE(packages/Makefile)
+ADD_CONFIG_FILE(build/package.gmk)
# remove trailing space from input file list
config_files=${config_files%\ }
SimDist
diff -u -r1.1 -r1.2
--- re.sh 25 Jan 2006 18:50:51 -0000 1.1
+++ re.sh 28 Jan 2006 01:32:19 -0000 1.2
@@ -1,9 +1,12 @@
#!/bin/sh
-# $Id: re.sh,v 1.1 2006/01/25 18:50:51 jeremy Exp $
+# $Id: re.sh,v 1.2 2006/01/28 01:32:19 jeremy Exp $
+
+# destroy the cache
+rm -rf autom4te.cache/
# rebuild configure
./ac.sh
# rerun configure
-./configure
+./configure --with-cvsuser=jeremy --with-prefix=$HOME/test/
SimDist/build
diff -N cvs.m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ cvs.m4 28 Jan 2006 01:32:20 -0000 1.1
@@ -0,0 +1,18 @@
+AC_DEFUN(WITH_CVSUSER, [
+
+AC_MSG_CHECKING(for SLAC CVS user)
+
+AC_ARG_WITH(cvsuser,
+ AC_HELP_STRING([--with-cvsuser=<path>], [SLAC CVS user name. (Default is anonymous)]),
+ [cvsuser=$with_cvsuser],
+ [cvsuser=anonymous])
+
+AC_MSG_RESULT([$cvsuser])
+
+cvsroot=:pserver:[log in to unmask]:/cvs/lcd
+
+AC_MSG_CHECKING(for CVSROOT)
+
+AC_MSG_RESULT($cvsroot)
+
+])
\ No newline at end of file
SimDist/build
diff -N init.m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ init.m4 28 Jan 2006 01:32:20 -0000 1.1
@@ -0,0 +1,75 @@
+dnl macro to do top-level initialization of the build system and set some common variables and substitutions
+AC_DEFUN(SIMDIST_INIT, [
+
+packages_dep_order="clhep geant4 lcphys xerces gdml lcio lcdd slic"
+AC_SUBST(packages_dep_order)
+
+packages_reverse_dep_order=""
+for p in $(echo $packages_dep_order)
+do
+ packages_reverse_dep_order=${p}" "${packages_reverse_dep_order}
+done
+
+AC_SUBST(packages_reverse_dep_order)
+
+download_script=download.sh
+AC_SUBST(download_script)
+
+cvs_script=cvs.sh
+AC_SUBST(cvs_script)
+
+patch_script=patch.sh
+AC_SUBST(patch_script)
+
+gen_files="package.gmk env.gmk download.sh cvs.sh patch.sh GNUmakefile *.tar.gz *.tgz"
+AC_SUBST(gen_files)
+
+sim_dist_dir=$(pwd)
+
+AC_SUBST(sim_dist_dir)
+
+ADD_CONFIG_FILE("build/common.gmk")
+
+sim_packages_dir=$(pwd)/packages
+AC_SUBST(sim_packages_dir)
+
+sim_build_dir=$(pwd)/build
+AC_SUBST(sim_build_dir)
+
+sim_scripts_dir=$(pwd)/scripts
+AC_SUBST(sim_scripts_dir)
+
+AC_MSG_CHECKING(for packages list)
+
+for p in $(ls -1 packages | grep -v CVS)
+do
+ if test -d $sim_packages_dir/$p
+ then
+ packages_list="$packages_list"${p}" "
+ fi
+done
+
+packages_list=${packages_list%\ }
+
+AC_MSG_RESULT($packages_list)
+
+MAKE_CONFIG_FILES_LIST
+
+])
+
+AC_DEFUN(WITH_PREFIX, [
+
+AC_MSG_CHECKING(for installation prefix)
+
+AC_ARG_WITH(prefix,
+ AC_HELP_STRING([--with-prefix=<path>],[binary installation base area]),
+ [prefix=$with_prefix],
+ [prefix=/usr/local])
+
+if test [ -d "$prefix" ]; then
+ AC_MSG_RESULT($prefix)
+else
+ AC_MSG_ERROR($prefix is not a directory)
+fi
+
+])
\ No newline at end of file
SimDist/build
diff -N ogl.m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ogl.m4 28 Jan 2006 01:32:20 -0000 1.1
@@ -0,0 +1,38 @@
+dnl macro to configure OpenGL
+AC_DEFUN(CONFIG_OGL, [
+
+AC_MSG_CHECKING(for OpenGL)
+
+if test -z $OGLHOME
+then
+ case "$host_os" in
+ Linux ) _ogldir=/usr;;
+ WIN32 ) _ogldir=/usr/X11R6;;
+ Darwin ) _ogldir=/usr/X11R6;;
+ * ) ;;
+ esac
+else
+ _ogldir=$OGLHOME
+fi
+
+if test -e $OGLHOME
+then
+ dnl check header file to see if OpenGL is installed
+ if test -e ${_ogldir}/include/gl.h}
+ then
+ HAVE_OGL=1
+ fi
+fi
+
+if test -n $HAVE_OGL
+then
+ OGLHOME=${_ogldir}
+ USE_OGL=yes
+ AC_SUBST(USE_OGL)
+ AC_SUBST(OGLHOME)
+ AC_DEFINE(HAVE_OGL)
+fi
+
+AC_MSG_RESULT(yes)
+
+])
\ No newline at end of file
SimDist/build
diff -N packages.m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ packages.m4 28 Jan 2006 01:32:20 -0000 1.1
@@ -0,0 +1,237 @@
+dnl macro to do common configuration for each package
+AC_DEFUN(CONFIG_PACKAGE_BASE, [
+
+if test -z $1
+then
+ AC_MSG_ERROR("Name of the package to configure is missing.")
+fi
+
+dnl name of package is first arg
+package_name="$1"
+
+AC_MSG_CHECKING(for $package_name version)
+
+dnl root package area with no version tag
+package_root_dir=${sim_packages_dir}/${package_name}
+
+if ! test -e ${package_root_dir}
+then
+ AC_MSG_ERROR("$package_name root package area does not exist!")
+fi
+
+dnl get the version string for this package from the default packages file
+package_version=$(grep "^${package_name} " ${package_root_dir}/VERSION | awk '{print [$]2}')
+
+if test -z $package_version
+then
+ AC_MSG_ERROR($package_name version tag was not found in ${package_root_dir}/VERSION.)
+else
+ AC_MSG_RESULT($package_version)
+fi
+
+dnl fully qualified base dir
+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 TODO: Each package should have its own m4 file with specific config options.
+case "$package_name" in
+
+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_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 )
+
+ gdml_url=http://simu.cvs.cern.ch/cgi-bin/simu.cgi/simu/GDML2
+ gdml_tgz=GDML2.tar.gz?tarball=1
+
+ 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})
+ 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}/${gdml_tgz})
+ PACKAGE_MAKEVAR(gdml, PACKAGE_CONFIG_OPTS, gdml_config_opts, [--enable-shared-libs=no])
+
+ ;;
+
+geant4 )
+
+ CONFIG_GEANT4
+
+ geant4_version=${package_version}
+ geant4_url=http://geant4.cern.ch/geant4/source/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_base_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})
+ ;;
+
+lcdd )
+
+ 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})
+
+ ;;
+
+lcio )
+
+ 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})
+
+ ;;
+
+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_CVSROOT, lcphys_cvsroot, ${cvsroot})
+
+ ;;
+
+slic )
+
+ 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})
+
+ ;;
+
+xerces )
+
+ CONFIG_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
+
+ 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_config_opts, ${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_MSG_ERROR($package_name is an unknown package.)
+
+esac
+
+])
+
+AC_DEFUN(CONFIG_PACKAGES, [
+
+dnl setup common helper vars for each package
+for p in $(echo ${packages_list})
+do
+ CONFIG_PACKAGE_BASE($p)
+done
+
+dnl extras for these packages
+#CONFIG_XERCES
+#CONFIG_GEANT4
+
+])
+
+dnl macro to setup Geant4
+AC_DEFUN(CONFIG_GEANT4, [
+
+g4system=$platform
+
+AC_SUBST(g4system)
+
+])
+
+dnl macro to setup Xerces
+AC_DEFUN(CONFIG_XERCES, [
+
+if test $host_os == "Linux"
+then
+ xerces_configure_args="-plinux -cgcc -xg++ -minmem -nsocket -tnative -rpthread -P \$(PACKAGE_BASEDIR)"
+elif test $host_os == "WIN32"
+then
+ xerces_configure_args="-pcygwin -cgcc -xg++ -minmem -nsocket -tnative -rpthread -P \$(PACKAGE_BASEDIR)"
+elif test $host_os == "Darwin"
+then
+ xerces_configure_args="-p macosx -nnative -tnative -P \$(xerces_base_dir)"
+fi
+
+AC_SUBST(xerces_configure_args)
+
+])
+
+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
+dnl arg3 short name of package used to find package.gmk.in
+AC_DEFUN(PACKAGE_MAKEVAR, [
+
+dnl package's gmk file
+f=$sim_packages_dir/$1/package.gmk.in
+
+dnl cat var to package's gmk file
+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
+
+AC_SUBST($3, $v)
+
+])
+
SimDist/build
diff -N platform.m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ platform.m4 28 Jan 2006 01:32:20 -0000 1.1
@@ -0,0 +1,60 @@
+dnl macro to set the variable which OS uses for locating shared libs at runtime
+AC_DEFUN(OS_SHARED_LIBS_VAR, [
+
+if test $host_os == "Linux"
+then
+ os_shared_libs_var=LD_LIBRARY_PATH
+elif test $host_os == "WIN32"
+then
+ os_shared_libs_var=PATH
+elif test $host_os == "Darwin"
+then
+ os_shared_libs_var=DYLD_LIBRARY_PATH
+fi
+
+AC_SUBST(os_shared_libs_var)
+
+])
+
+dnl macro to set string of host OS
+AC_DEFUN(CONFIG_HOST_OS, [
+
+AC_MSG_CHECKING(for supported OS)
+
+dnl to lowercase
+host_os=`uname | tr [[:upper:]] [[:lower:]]`
+supported_os=yes
+
+dnl The host_os var is designed to match Geant4's conventions.
+case "$host_os" in
+
+dnl Linux flavor
+linux* ) host_os="Linux";;
+dnl Cygwin which is only supported Windows platform
+cygwin* ) host_os="WIN32";;
+dnl Mac OSX
+darwin* ) host_os="Darwin";;
+* ) supported_os=no;;
+
+esac
+
+if test "$supported_os" = "no"; then
+ AC_MSG_ERROR( [$host_os is not in the list of supported operating systems] )
+else
+ AC_MSG_RESULT([$host_os])
+fi
+
+AC_SUBST(host_os)
+
+])
+
+dnl macro to set the platform=os"-"compiler
+AC_DEFUN(CONFIG_PLATFORM, [
+
+platform=${host_os}"-"${CXX}
+
+AC_SUBST(platform)
+
+AC_SUBST(compiler, ${CXX})
+
+])
\ No newline at end of file
SimDist/build
diff -N tgz.m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ tgz.m4 28 Jan 2006 01:32:20 -0000 1.1
@@ -0,0 +1,38 @@
+dnl macro to set the name of the dist tarball
+AC_DEFUN(DIST_TGZ, [
+
+dnl dist version is the same as slic version
+dist_version=$(echo ${slic_version} | sed -e 's/[[a-z]]/\_/g' -e 's/^_//g')
+
+dnl versioned tarball name
+dist_tarball="slic-"${dist_version}"-"${platform}"-bin".tar.gz
+
+dnl non-versioned tarball name
+dist_tarball_current="slic-current-"${platform}"-bin".tar.gz
+
+dnl substitute to common.gmk
+AC_SUBST(dist_tarball)
+AC_SUBST(dist_tarball_current)
+AC_SUBST(dist_version)
+
+])
+
+dnl macro to allow selection of where tarball should be copied; default to SLAC location
+AC_DEFUN(WITH_UPLOAD_DIR, [
+
+AC_MSG_CHECKING(for dist directory)
+
+dnl This won't work for anyone but Jeremy McCormick (SLAC).
+slac_dist="[log in to unmask]:/nfs/slac/g/lcd/mc/prj/www/lcsim/dist/slic"
+
+dnl Set the SCP-style destination directory
+AC_ARG_WITH(distdir,
+ AC_HELP_STRING([--with-distdir=<path>], [Set SCP-style dist directory in form username@host:dir]),
+ dist_dir=$with_distdir,
+ dist_dir=$slac_dist)
+
+AC_SUBST(dist_dir)
+
+AC_MSG_RESULT($dist_dir)
+
+])
\ No newline at end of file
SimDist/build
diff -N util.m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ util.m4 28 Jan 2006 01:32:20 -0000 1.1
@@ -0,0 +1,139 @@
+dnl Change a version with letters and underscores to one containing dots, only
+AC_DEFUN(VERSION_DOT, [
+ v=$(echo $2 | sed -e 's/[[vrp]]/\./g' -e 's/^\.//g' -e 's/_/./g')
+ AC_SUBST($1, $v)
+ echo $v
+])
+
+dnl Change version with letters and underscores to one containing underscores, only
+AC_DEFUN(VERSION_UNDERSCORE, [
+ v=$(echo $2 | sed -e 's/[[vrp]]/_/g' -e 's/^_//g')
+ AC_SUBST($1, $v)
+ echo $v
+])
+
+dnl
+AC_DEFUN(VERSION_GEANT4, [
+ v=$(echo $2 | sed 's/[[vr]]/\./g' | sed 's/p/\.p/g')
+ AC_SUBST($1, $v)
+ echo $v
+])
+
+dnl macro to add .in files for each package
+AC_DEFUN(MAKE_CONFIG_FILES_LIST, [
+
+if test -z "${packages_list}"; then
+ AC_MSG_ERROR("packages_list is not set.")
+fi
+
+for p in $(echo ${packages_list})
+do
+
+ dnl Makefile
+ ADD_CONFIG_FILE(packages/$p/Makefile)
+
+ dnl variables for the build system
+ ADD_CONFIG_FILE(packages/$p/package.gmk)
+
+ dnl vars required by the package itself (e.g. SLIC_BASE)
+ ADD_CONFIG_FILE(packages/$p/env.gmk)
+
+ dnl download script if exists
+ if test -e "$sim_packages_dir/$p/${download_script}.in"
+ then
+ ADD_CONFIG_FILE(packages/$p/${download_script})
+ fi
+
+ dnl cvs script if exists
+ if test -e "$sim_packages_dir/$p/${cvs_script}.in"
+ then
+ ADD_CONFIG_FILE(packages/$p/${cvs_script})
+ fi
+
+ dnl patch script if exists
+ if test -e "$sim_packages_dir/$p/${patch_script}.in"
+ then
+ ADD_CONFIG_FILE(packages/$p/${patch_script})
+ fi
+
+done
+
+])
+
+dnl macro to add a file to the list of .in files
+AC_DEFUN(ADD_CONFIG_FILE, [
+
+if test -z $1
+then
+ AC_MSG_ERROR("Missing config file to add.")
+fi
+
+config_files="$config_files"$1" "
+
+])
+
+dnl macro to check for necessary installation/build programs
+AC_DEFUN(CHECK_PROGS, [
+
+dnl make
+AC_PROG_MAKE_SET
+
+dnl g++
+AC_PROG_CXX
+
+dnl cvs
+AC_CHECK_PROG(have_cvs, cvs, yes, no)
+
+if test $have_cvs == "no"
+then
+ AC_MSG_ERROR(cvs not found)
+else
+ CVS=cvs
+ AC_SUBST(CVS)
+fi
+
+dnl java (for ant bundled with LCIO)
+AC_CHECK_PROG(have_java, java, yes, no)
+
+if test $have_java == "no"
+then
+ AC_MSG_ERROR(java not found)
+else
+ JAVA=java
+ AC_SUBST(JAVA)
+fi
+
+dnl ant
+AC_CHECK_PROG(have_ant, ant, yes, no)
+
+if test $have_ant == "no"
+then
+ AC_MSG_ERROR(ant not found)
+else
+ ANT=ant
+ AC_SUBST(ANT)
+fi
+
+dnl wget
+AC_CHECK_PROG(have_wget, wget, yes, no)
+
+if test $have_wget == "no"
+then
+ AC_MSG_ERROR(wget not found)
+else
+ WGET=wget
+ AC_SUBST(WGET)
+fi
+
+dnl scp
+AC_CHECK_PROG(have_scp, scp, yes, no)
+
+if test $have_scp == "no"
+then
+ AC_MSG_ERROR(scp not found)
+else
+ SCP=scp
+ AC_SUBST(SCP)
+fi
+
+])
\ No newline at end of file
SimDist/build
diff -u -r1.5 -r1.6
--- common.gmk.in 27 Jan 2006 09:05:46 -0000 1.5
+++ common.gmk.in 28 Jan 2006 01:32:20 -0000 1.6
@@ -1,9 +1,24 @@
+# $Id: common.gmk.in,v 1.6 2006/01/28 01:32:20 jeremy Exp $
+
+#
+# Common Make variables for SimDist
+#
+
+# autoconf vars
+prefix=@prefix@
+
# general SimDist
sim_dist_dir=@sim_dist_dir@
sim_build_dir=@sim_dist_dir@/build
sim_packages_dir=@sim_dist_dir@/packages
sim_scripts_dir=@sim_dist_dir@/scripts
+# platform
+OS_SHARED_LIBS_VAR = @os_shared_libs_var@
+HOST_OS = @host_os@
+COMPILER = @compiler@
+PLATFORM = @platform@
+
# Make vars for programs
CVS=@CVS@
JAVA=@JAVA@
@@ -19,7 +34,6 @@
OGLHOME=@OGLHOME@
# dist installation info
-dist_install_prog=@dist_install_prog@
dist_tarball=@dist_tarball@
dist_tarball_current=@dist_tarball_current@
dist_dir=@dist_dir@
SimDist/build
diff -u -r1.1 -r1.2
--- package.gmk.in 27 Jan 2006 09:05:46 -0000 1.1
+++ package.gmk.in 28 Jan 2006 01:32:20 -0000 1.2
@@ -1,4 +1,8 @@
-# $Id: package.gmk.in,v 1.1 2006/01/27 09:05:46 jeremy Exp $
+# $Id: package.gmk.in,v 1.2 2006/01/28 01:32:20 jeremy Exp $
+
+#
+# Generic package build rules.
+#
# common build vars
include @[log in to unmask]
@@ -6,6 +10,10 @@
# 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
endif
ifndef PACKAGE_VERSION
@@ -46,21 +54,29 @@
.DEFAULT: build
# build package
-build: src patch config compile install
+build: src config compile install
# download tgz file from WWW
download:
- cd $(PACKAGE_DIR) && \
- $(WGET) $(PACKAGE_DOWNLOAD) -O $(PACKAGE_TGZ_LOCAL) && \
- echo "Decompressing $(PACKAGE_TGZ_LOCAL) ..." && \
- tar -zxf $(PACKAGE_TGZ_LOCAL) && \
- mv $(PACKAGE_DIR_ORIG) $(PACKAGE_VERSION);:
+ @if [ ! -d "$(PACKAGE_BASEDIR)" ]; then \
+ cd $(PACKAGE_DIR) ; \
+ $(WGET) $(PACKAGE_DOWNLOAD) -O $(PACKAGE_TGZ_LOCAL) ; \
+ echo "Decompressing $(PACKAGE_TGZ_LOCAL) ..." ; \
+ tar -zxf $(PACKAGE_TGZ_LOCAL) ; \
+ mv $(PACKAGE_DIR_ORIG) $(PACKAGE_VERSION); \
+ else \
+ echo "The directory $(PACKAGE_BASEDIR) already exists for package $(PACKAGE_NAME)." ; \
+ fi;:
# check package out of CVS
cvs:
- cd $(PACKAGE_DIR) && \
- rm -rf $(PACKAGE_VERSION) && \
- cvs -d $(PACKAGE_CVSROOT) co -d $(PACKAGE_VERSION) -r $(PACKAGE_CVSVERSION) $(PACKAGE_CVSMODULE);:
+ @if [ ! -d "$(PACKAGE_BASEDIR)" ]; then \
+ cd $(PACKAGE_DIR) ; \
+ rm -rf $(PACKAGE_VERSION) ; \
+ cvs -d $(PACKAGE_CVSROOT) co -d $(PACKAGE_VERSION) -r $(PACKAGE_CVSVERSION) $(PACKAGE_CVSMODULE); \
+ else \
+ echo "The directory $(PACKAGE_BASEDIR) already exists for package $(PACKAGE_NAME)." ; \
+ fi;:
# patch the source if a patch script exists
patch:
@@ -68,26 +84,26 @@
# run configure if a configure script exists
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
compile_default:
- cd $(PACKAGE_BUILDDIR) && $(MAKE);:
+ @cd $(PACKAGE_BUILDDIR) && $(MAKE);:
compile: compile_default
# install package
install_default:
- cd $(PACKAGE_BUILDDIR) && $(MAKE) install;:
+ -cd $(PACKAGE_BUILDDIR) && $(MAKE) install;:
install: install_default
# clean sources
srcclean:
- cd $(PACKAGE_BUILDDIR) && $(MAKE) clean;:
+ @cd $(PACKAGE_BUILDDIR) && $(MAKE) clean;:
# clean the package
distclean:
- cd $(PACKAGE_DIR) && \
+ @cd $(PACKAGE_DIR) && \
rm -rf $(PACKAGE_VERSION) \
- && rm -rf package.gmk env.gmk download.sh cvs.sh patch.sh GNUmakefile $(PACKAGE_TGZ_LOCAL) &> /dev/null;:
+ && rm -rf package.gmk.in package.gmk env.gmk patch.sh GNUmakefile $(PACKAGE_TGZ_LOCAL) &> /dev/null;:
SimDist/packages/geant4
diff -u -r1.2 -r1.3
--- Makefile.in 28 Jan 2006 00:27:02 -0000 1.2
+++ Makefile.in 28 Jan 2006 01:32:21 -0000 1.3
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/SimDist/packages/geant4/Makefile.in,v 1.2 2006/01/28 00:27:02 jeremy Exp $
+# $Header: /cvs/lcd/SimDist/packages/geant4/Makefile.in,v 1.3 2006/01/28 01:32:21 jeremy Exp $
# package vars
include $(PWD)/package.gmk
@@ -12,9 +12,9 @@
# G4 environment vars
include $(PWD)/env.gmk
-# source is downloaded
+# source is downloaded and patched
.PHONY: src
-src: download
+src: download patch
# compile is default + physics lists + includes
compile: compile_default phys includes
SimDist/packages/xerces
diff -u -r1.1 -r1.2
--- Makefile.in 27 Jan 2006 09:05:51 -0000 1.1
+++ Makefile.in 28 Jan 2006 01:32:21 -0000 1.2
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/SimDist/packages/xerces/Makefile.in,v 1.1 2006/01/27 09:05:51 jeremy Exp $
+# $Header: /cvs/lcd/SimDist/packages/xerces/Makefile.in,v 1.2 2006/01/28 01:32:21 jeremy Exp $
# package vars
include $(PWD)/package.gmk
@@ -9,9 +9,9 @@
# environment
include $(PWD)/env.gmk
-# source is downloaded
+# source is downloaded and patched
.PHONY: src
-src: download
+src: download patch
# use default compile rule
.PHONY: compile
SimDist/scripts
diff -u -r1.4 -r1.5
--- slic.sh.in 20 Dec 2005 00:23:12 -0000 1.4
+++ slic.sh.in 28 Jan 2006 01:32:22 -0000 1.5
@@ -3,37 +3,15 @@
#
# Portable run script for SLIC.
#
-# Directory resolution is taken from Apache Ant -> src/script/ant.
-#
-# name of script
-PRG="$0"
-
-# directory of script
-progname=`basename "$0"`
-
-# resolve relative symlinks
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
-done
-
-# sim dir is one back from scripts
-SIM_HOME=`dirname "$PRG"`/..
-
-# make it fully qualified
-SIM_HOME=`cd "$SIM_HOME" && pwd`
+# dist
+distdir=@sim_dist_dir@
# slic base
-SLIC_BASE=${SIM_HOME}/packages/slic/@slic_version@
+SLIC_BASE=@slic_base_dir@
# xerces lib
-XERCES_LIB_DIR=${SIM_HOME}/packages/xerces/@xerces_version@/lib
+XERCES_LIB_DIR=@xerces_base_dir@/lib
export @os_shared_libs_var@=$XERCES_LIB_DIR:$@os_shared_libs_var@
# run slic with CL args
CVSspam 0.2.8
