LISTSERV 16.5 - LCD-CVS Archives

Commit in `SimDist` on MAIN
`configure`	[binary]		1.112 -> 1.113
`configure.in`	+2	-1	1.28 -> 1.29
`build/common.gmk.in`	+14	-9	1.23 -> 1.24
`/geant4.m4`	+47		1.17 -> 1.18
`/util.m4`	+10		1.28 -> 1.29
`packages/geant4/Makefile.in`	+16	-22	1.21 -> 1.22
`/env.gmk.in`	+2	-2	1.13 -> 1.14
	+91	-34

7 modified files

cleanup G4 data file config and download; replace Makefile target with call to download script; make proper autoconf vars for SimDist dirs

SimDist

configure.in 1.28 -> 1.29

diff -u -r1.28 -r1.29
--- configure.in	17 Jul 2012 21:16:49 -0000	1.28
+++ configure.in	18 Jul 2012 22:20:51 -0000	1.29
@@ -1,4 +1,4 @@

-dnl $Header: /cvs/lcd/SimDist/configure.in,v 1.28 2012/07/17 21:16:49 jeremy Exp $

+dnl $Header: /cvs/lcd/SimDist/configure.in,v 1.29 2012/07/18 22:20:51 jeremy Exp $

 dnl
 dnl Process this file with autoconf to produce the configure script for SimDist.
 dnl

@@ -132,6 +132,7 @@

 AC_ADD_CONFIG_FILE(scripts/slic-setup.sh)
 AC_ADD_CONFIG_FILE(scripts/slic-ldpath.sh)
 AC_ADD_CONFIG_FILE(scripts/install-libs.sh)

+AC_ADD_CONFIG_FILE(scripts/install-geant4-data.sh)

 
 dnl Remove trailing space from input file list.
 config_files=${config_files%\ }

SimDist/build

common.gmk.in 1.23 -> 1.24

diff -u -r1.23 -r1.24
--- common.gmk.in	23 Aug 2011 22:38:23 -0000	1.23
+++ common.gmk.in	18 Jul 2012 22:20:51 -0000	1.24
@@ -1,4 +1,4 @@

-# $Id: common.gmk.in,v 1.23 2011/08/23 22:38:23 jeremy Exp $

+# $Id: common.gmk.in,v 1.24 2012/07/18 22:20:51 jeremy Exp $

 
 #
 # Common Make variables for SimDist

@@ -7,18 +7,18 @@

 # autoconf vars
 prefix=@prefix@

-# general SimDist

+# SimDist dirs

 sim_dist_dir=@sim_dist_dir@
 sim_dist_dir_basename=@sim_dist_dir_basename@

-sim_build_dir=@sim_dist_dir@/build
-sim_packages_dir=@sim_dist_dir@/packages
-sim_scripts_dir=@sim_dist_dir@/scripts

+sim_build_dir=@sim_build_dir@
+sim_packages_dir=@sim_packages_dir@
+sim_scripts_dir=@sim_scripts_dir@

 
 # platform

-OS_SHARED_LIBS_VAR = @OS_SHARED_LIBS_VAR@
-HOST_OS = @host_os@
-#COMPILER = @compiler@
-#PLATFORM = @platform@

+OS_SHARED_LIBS_VAR=@OS_SHARED_LIBS_VAR@
+HOST_OS=@host_os@
+#COMPILER=@compiler@
+#PLATFORM=@platform@

 
 # Make vars for programs
 CVS=@CVS@

@@ -56,3 +56,8 @@

 
 # Variable to enable pacakge builds with shared rather than static libs.
 SIMDIST_ENABLE_SHARED=@SIMDIST_ENABLE_SHARED@

+
+# Geant4 data download
+SIMDIST_ENABLE_G4DATA=@SIMDIST_ENABLE_G4DATA@
+SIMDIST_G4DATA_URL=@SIMDIST_G4DATA_URL@
+SIMDIST_G4DATA_DIR=@SIMDIST_G4DATA_DIR@

\ No newline at end of file

SimDist/build

geant4.m4 1.17 -> 1.18

diff -u -r1.17 -r1.18
--- geant4.m4	13 Jul 2012 21:59:27 -0000	1.17
+++ geant4.m4	18 Jul 2012 22:20:51 -0000	1.18
@@ -210,6 +210,8 @@

 dnl Debugging support.
 ENABLE_G4DEBUG

+ENABLE_G4DATA
+

 dnl Variable substitutions for Geant4 environment.
 AC_SUBST(G4SYSTEM)
 AC_SUBST(G4INSTALL)

@@ -329,3 +331,48 @@

 AC_SUBST(G4NEUTRONHP_NEGLECT_DOPPLER)
 
 ])

+
+
+dnl
+dnl Check if G4's embedded GDML should be enabled, and
+dnl also set some convenient output variables for scripts.
+dnl
+AC_DEFUN(ENABLE_G4DATA, [
+
+AC_MSG_CHECKING(whether to download Geant4 data files)
+
+AC_ARG_ENABLE([g4data],
+              AC_HELP_STRING([--enable-g4data],
+                             [download Geant4 data files])
+             )
+
+if test "${enable_g4data}" != "no"; then
+  SIMDIST_ENABLE_G4DATA=1
+  AC_MSG_RESULT(yes)
+else
+  SIMDIST_ENABLE_G4DATA=
+  AC_MSG_RESULT(no)
+fi
+
+AC_SUBST(SIMDIST_ENABLE_G4DATA)
+
+dnl URL for data download.
+SIMDIST_G4DATA_URL="http://geant4.cern.ch/support/source"
+AC_SUBST(SIMDIST_G4DATA_URL)
+
+dnl Local data dir based on current package setting.
+SIMDIST_G4DATA_DIR=${package_dir}/data
+AC_SUBST(SIMDIST_G4DATA_DIR)
+
+dnl Names of data tarballs to be downloaded from G4 data URL.
+G4NDL_FILE=G4NDL.4.0.tar.gz
+G4EMLOW_FILE=G4EMLOW.6.23.tar.gz
+G4RadioactiveDecay_FILE=G4RadioactiveDecay.3.4.tar.gz
+G4PhotonEvaporation_FILE=G4PhotonEvaporation.2.2.tar.gz
+AC_SUBST(G4NDL_FILE)
+AC_SUBST(G4EMLOW_FILE)
+AC_SUBST(G4radioactiveDecay_FILE)
+AC_SUBST(G4PhotonEvaporation_FILE)
+
+])
+

SimDist/build

util.m4 1.28 -> 1.29

diff -u -r1.28 -r1.29
--- util.m4	10 Jan 2012 19:23:21 -0000	1.28
+++ util.m4	18 Jul 2012 22:20:51 -0000	1.29
@@ -327,9 +327,19 @@

 gen_files="package.gmk env.gmk download.sh cvs.sh patch.sh GNUmakefile *.tar.gz *.tgz"
 AC_SUBST(gen_files)

+dnl SimDist directories.

 sim_dist_dir=$(pwd)

+sim_dist_build_dir=${sim_dist_dir}/build
+sim_packages_dir=${sim_dist_dir}/packages
+sim_scripts_dir=${sim_dist_dir}/scripts

 
 AC_SUBST(sim_dist_dir)

+AC_SUBST(sim_dist_build_dir)
+AC_SUBST(sim_packages_dir)
+AC_SUBST(sim_scripts_dir)
+
+# general SimDist
+

 
 AC_ADD_CONFIG_FILE("build/common.gmk")

SimDist/packages/geant4

Makefile.in 1.21 -> 1.22

diff -u -r1.21 -r1.22
--- Makefile.in	1 Feb 2012 12:51:01 -0000	1.21
+++ Makefile.in	18 Jul 2012 22:20:51 -0000	1.22
@@ -1,12 +1,18 @@

-# $Header: /cvs/lcd/SimDist/packages/geant4/Makefile.in,v 1.21 2012/02/01 12:51:01 jeremy Exp $

+# $Header: /cvs/lcd/SimDist/packages/geant4/Makefile.in,v 1.22 2012/07/18 22:20:51 jeremy Exp $

-# package build

+# package build settings

 include ../../build/package.gmk

-# default rule
-all: packageinfo debuginfo download config compile install_includes install_data_files

+# default build targets
+build_chain := packageinfo debuginfo download config compile install_includes

-#test

+# add G4 data download to targets 
+ifdef SIMDIST_ENABLE_G4DATA
+build_chain: $(build_chain) install_data_files 
+endif
+
+# set default make target
+all: $(build_chain)

 
 # physics lists
 phys:

@@ -16,10 +22,6 @@

 install_includes:
 	@cd $(PACKAGE_BUILDDIR) && $(MAKE) includes

-# test geant4 installation by trying to compile one of the examples
-#test:
-#	@cd $(PACKAGE_BASEDIR)/examples/novice/N01/ && export G4WORKDIR=`pwd` && $(MAKE) all;
-

 visclean:
 	cd $(G4INSTALL)/source/visualization; \
 	$(MAKE) clean;

@@ -34,21 +36,9 @@

 	cd $(G4INSTALL)/source; \
 	$(MAKE) libmap;

-GEANT4_DATA_URL := http://geant4.cern.ch/support/source
-

 install_data_files:
 	@echo "Installing Geant4 data files ..."; \

-	rm -rf $(PWD)/data/* ; \
-	wget -nv -P $(PWD)/data \
-	$(GEANT4_DATA_URL)/G4NDL.4.0.tar.gz \
-	$(GEANT4_DATA_URL)/G4EMLOW.6.23.tar.gz \
-	$(GEANT4_DATA_URL)/G4RadioactiveDecay.3.4.tar.gz \
-	$(GEANT4_DATA_URL)/G4PhotonEvaporation.2.2.tar.gz; \
-	cd $(PWD)/data && \
-	for t in $$(ls *.tar.gz); do \
-	tar -zxf $$t; \
-	done; \
-	rm -rf $(PWD)/data/*.tar.gz

+	$(shell @[log in to unmask]);

 
 debuginfo:
 	@echo CLHEP_BASE_DIR=$(CLHEP_BASE_DIR) ; \

@@ -57,3 +47,7 @@

 	echo G4INSTALL=$(G4INSTALL) ; \
 	echo G4SYSTEM=$(G4SYSTEM) ; \
 	echo OGLHOME=$(OGLHOME) ; :

+	
+# test geant4 installation by trying to compile one of the examples
+#test:
+#	@cd $(PACKAGE_BASEDIR)/examples/novice/N01/ && export G4WORKDIR=`pwd` && $(MAKE) all;

\ No newline at end of file

SimDist/packages/geant4

env.gmk.in 1.13 -> 1.14

diff -u -r1.13 -r1.14
--- env.gmk.in	2 May 2011 21:02:17 -0000	1.13
+++ env.gmk.in	18 Jul 2012 22:20:51 -0000	1.14
@@ -1,4 +1,4 @@

-# $Id: env.gmk.in,v 1.13 2011/05/02 21:02:17 jeremy Exp $

+# $Id: env.gmk.in,v 1.14 2012/07/18 22:20:51 jeremy Exp $

 
 # Environment variables for the Geant4 build system.

@@ -61,4 +61,4 @@

 
 export QTHOME=@QTHOME@

-export OGLHOME=@OGLHOME@

+export OGLHOME=@OGLHOME@

\ No newline at end of file

CVSspam 0.2.12

Use REPLY-ALL to reply to list

To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1