4 modified files
SimDist
diff -u -r1.9 -r1.10
--- Makefile.in 6 Jul 2006 23:44:10 -0000 1.9
+++ Makefile.in 11 Jul 2006 23:07:58 -0000 1.10
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/SimDist/Makefile.in,v 1.9 2006/07/06 23:44:10 jeremy Exp $
+# $Header: /cvs/lcd/SimDist/Makefile.in,v 1.10 2006/07/11 23:07:58 jeremy Exp $
# include the common build vars
include $(CURDIR)/build/common.gmk
@@ -52,6 +52,7 @@
# Make a versioned tarball with binary and runtime deps.
dist_tgz_bin:
@echo "Making versioned binary tarball $(bin_tarball) ... " ; \
+ echo "binary files: $(bindist_files)" ; \
cd ..; rm -rf $(bin_tarball) ; \
tar zcf $(bin_tarball) $(bindist_files) ;
SimDist
diff -u -r1.43 -r1.44
--- configure 6 Jul 2006 23:44:10 -0000 1.43
+++ configure 11 Jul 2006 23:07:58 -0000 1.44
@@ -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 LCIO_BUILDDIR LCPHYS_CVSMODULE LCPHYS_BASEDIR slic_binname SLIC_VERSION SLIC_BASEDIR MOKKA_VERSION MOKKA_BASEDIR MOKKA_B!
UILDDIR MOKKA_DOWNLOAD MOKKA_DIR_ORIG XERCES_CONFIGURE_ARGS XE!
RCES_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 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 LCIO_BUILDDIR LCPHYS_CVSMODULE LCPHYS_BASEDIR SLIC_BINNAME SLIC_VERSION SLIC_BASEDIR MOKKA_VERSION MOKKA_BASEDIR MOKKA_BUILD!
DIR MOKKA_DOWNLOAD MOKKA_DIR_ORIG XERCES_CONFIGURE_ARGS XERCES!
_OS XERC
ES_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.
@@ -2674,10 +2674,10 @@
case "$host_os" in
cygwin* )
- slic_binname=slic.exe
+ SLIC_BINNAME=slic.exe
;;
* )
- slic_binname=slic
+ SLIC_BINNAME=slic
;;
esac
@@ -3742,7 +3742,7 @@
s,@LCIO_BUILDDIR@,$LCIO_BUILDDIR,;t t
s,@LCPHYS_CVSMODULE@,$LCPHYS_CVSMODULE,;t t
s,@LCPHYS_BASEDIR@,$LCPHYS_BASEDIR,;t t
-s,@slic_binname@,$slic_binname,;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_VERSION@,$MOKKA_VERSION,;t t
SimDist/build
diff -u -r1.15 -r1.16
--- common.gmk.in 6 Jul 2006 23:44:12 -0000 1.15
+++ common.gmk.in 11 Jul 2006 23:08:01 -0000 1.16
@@ -1,4 +1,4 @@
-# $Id: common.gmk.in,v 1.15 2006/07/06 23:44:12 jeremy Exp $
+# $Id: common.gmk.in,v 1.16 2006/07/11 23:08:01 jeremy Exp $
#
# Common Make variables for SimDist
@@ -39,14 +39,14 @@
bin_tarball_current=@bin_tarball_current@
# name of slic binary
-slic_bin=@SLIC_BASEDIR@/bin/@G4SYSTEM@/@slic_binname@
+slic_bin=@SLIC_BASEDIR@/bin/@G4SYSTEM@/@SLIC_BINNAME@
slic_run_script=slic.sh
slic_run=$(sim_scripts_dir)/$(slic_run_script)
-# files to include in binary distribution tarball
-bindist_files = @XERCES_BASEDIR@/lib/*
-bindist_files += @SLIC_BASEDIR@/bin/@G4SYSTEM@/@slic_binname@
-bindist_files += $(sim_dist_dir_basename)/scripts/$(slic_run_script);:
+# Relative paths of files to include in binary distribution tarball.
+bindist_files = $(sim_dist_dir_basename)/packages/xerces/@XERCES_VERSION@/lib/*
+bindist_files += $(sim_dist_dir_basename)/packages/slic/@SLIC_VERSION@/bin/@G4SYSTEM@/@SLIC_BINNAME@
+bindist_files += $(sim_dist_dir_basename)/scripts/slic.sh;:
# OpenGL
OGLHOME=@OGLHOME@
SimDist/build
diff -u -r1.19 -r1.20
--- packages.m4 6 Jul 2006 23:44:12 -0000 1.19
+++ packages.m4 11 Jul 2006 23:08:02 -0000 1.20
@@ -199,14 +199,14 @@
case "$host_os" in
cygwin* )
- slic_binname=slic.exe
+ SLIC_BINNAME=slic.exe
;;
* )
- slic_binname=slic
+ SLIC_BINNAME=slic
;;
esac
-AC_SUBST(slic_binname)
+AC_SUBST(SLIC_BINNAME)
AC_SUBST(SLIC_VERSION)
AC_SUBST(SLIC_BASEDIR)
CVSspam 0.2.8