5 modified files
lcdd
diff -u -r1.19 -r1.20
--- GNUmakefile 17 Nov 2005 19:59:19 -0000 1.19
+++ GNUmakefile 30 Mar 2006 19:45:48 -0000 1.20
@@ -18,7 +18,7 @@
# include local settings from running configure
include $(PWD)/GNUmakefile.local
-# include G4 architecture
+# include G4 architecture
include $(G4INSTALL)/config/architecture.gmk
# setup the basic compiler defs from configure
@@ -46,7 +46,7 @@
# Geant4 binmake and a few special settings
include $(MAKEINCLUDES)/geant4.gmk
-# debugging symbols
+# debugging symbols
ifdef G4DEBUG
CPPFLAGS += -g -ggdb
endif
@@ -81,3 +81,25 @@
distclean: clean
rm -v $(LCDD_BASE)/GNUmakefile.local
+
+.DUMMY: schema_install
+schema_install:
+ @if test ! -e $(SCHEMA_INSTALL_DIR); then \
+ mkdir -p $(SCHEMA_INSTALL_DIR); \
+ fi && \
+ if test -d $(SCHEMA_INSTALL_DIR); then \
+ cp $(PWD)/schemas/**/**/**.xsd $(SCHEMA_INSTALL_DIR); \
+ echo "Installed schemas to $(SCHEMA_INSTALL_DIR). Set GDML_INSTALL_DIR=$(SCHEMA_INSTALL_DIR) in your environment for LCDD to use this location."; \
+ else \
+ echo "ERROR: Schema installation directory $(SCHEMA_INSTALL_DIR) does not exist and could not be created."; \
+ fi;:
+
+.DUMMY: version
+version:
+ ./ac.sh ; \
+ ./configure --enable-version --enable-package-info ; \
+ cvs commit -m "JM: Update for $$(cat VERSION)" VERSION configure configure.ac ; \
+ ./scripts/rtag.sh ;
+
+.DUMMY: install
+install: schema_install
\ No newline at end of file
lcdd
diff -u -r1.2 -r1.3
--- GNUmakefile.local.in 5 May 2005 02:40:13 -0000 1.2
+++ GNUmakefile.local.in 30 Mar 2006 19:45:48 -0000 1.3
@@ -1,8 +1,8 @@
-# $Header: /cvs/lcd/lcdd/GNUmakefile.local.in,v 1.2 2005/05/05 02:40:13 jeremy Exp $
+# $Header: /cvs/lcd/lcdd/GNUmakefile.local.in,v 1.3 2006/03/30 19:45:48 jeremy Exp $
#
# Local build settings generated by configure
#
-# *** DO NOT EDIT MANUALLY. ***
+# *** DO NOT EDIT MANUALLY. ***
#
# To change the settings in GNUmakefile.local, rerun configure.
#
@@ -33,5 +33,8 @@
# GDML lib dir
GDML_LIB_DIR = @GDML_PREFIX@/build/@GDML_PLATFORM@/lib
+# schema install dir
+SCHEMA_INSTALL_DIR = @SCHEMA_INSTALL_DIR@
+
# Doxygen exec path for docs
DOXYGEN = @DOXYGEN@
lcdd
diff -u -r1.8 -r1.9
--- aclocal.m4 9 Dec 2005 22:39:11 -0000 1.8
+++ aclocal.m4 30 Mar 2006 19:45:48 -0000 1.9
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/lcdd/aclocal.m4,v 1.8 2005/12/09 22:39:11 jeremy Exp $
+# $Header: /cvs/lcd/lcdd/aclocal.m4,v 1.9 2006/03/30 19:45:48 jeremy Exp $
#
# local m4 macros for SLIC autoconf
#
@@ -257,31 +257,6 @@
LCDD_BASE=`pwd`
LCDD_PREFIX=${LCDD_BASE}
-#AC_MSG_CHECKING(for LCDD installation)
-
-#AC_ARG_WITH(lcdd,
-# AC_HELP_STRING([--with-lcdd=<path>],[LCDD installation base [[LCDD_BASE]] ]),
-# [LCDD_PREFIX=$with_lcdd])
-
-#if test -z "${with_lcdd}"; then
-# if test -n "$LCDD_BASE"; then # env
-# ${LCDD_BASE}=`pwd`
-# else
-# AC_MSG_RESULT(No)
-# AC_MSG_ERROR(LCDD installation was not found)
-# fi
-# LCDD_PREFIX=${LCDD_BASE}
-#fi
-
-#LCDD_TEST_FILE=${LCDD_PREFIX}/src/LCDDDetectorConstruction.cc
-
-#if test -e ${LCDD_TEST_FILE}; then
-# AC_MSG_RESULT(Yes)
-# echo "found valid LCDD installation at ${LCDD_PREFIX}"
-#else
-# AC_MSG_ERROR(invalid LCDD installation at ${LCDD_PREFIX})
-#fi
-
AC_SUBST(LCDD_PREFIX)
])
@@ -425,9 +400,26 @@
])
+# macro to setup Doxygen for creating documentation
AC_DEFUN([SIM_SETUP_DOXYGEN], [
AC_CHECK_PROGS(DOXYGEN, doxygen)
AC_SUBST(DOXYGEN)
])
+# macro to set the GDML and LCDD schema installation directory
+AC_DEFUN([LCDD_WITH_SCHEMA_INSTALL_DIR], [
+
+ AC_MSG_CHECKING(for schema installation target directory)
+
+ AC_ARG_WITH(schema-install-dir,
+ AC_HELP_STRING([--with-schema-install-dir=<schema installation directory>],
+ [directory where schemas should be copied]),
+ [SCHEMA_INSTALL_DIR=${with_schema_install_dir}],
+ [SCHEMA_INSTALL_DIR=${HOME}/schemas])
+
+ AC_SUBST(SCHEMA_INSTALL_DIR)
+
+ AC_MSG_RESULT(${SCHEMA_INSTALL_DIR})
+])
+
lcdd
diff -u -r1.16 -r1.17
--- configure 21 Mar 2006 01:02:16 -0000 1.16
+++ configure 30 Mar 2006 19:45:48 -0000 1.17
@@ -273,7 +273,7 @@
[log in to unmask]
ac_unique_file="src/volumeExtendedSubscriber.cc"
-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 CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC SET_MAKE G4_PREFIX G4WORKDIR G4SYSTEM CLHEP_PREFIX XERCES_PREFIX XERCES_LIBNAME GDML_PREFIX GDML_PLATFORM GDML_SITE LCDD_PREFIX DOXYGEN 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 CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC SET_MAKE G4_PREFIX G4WORKDIR G4SYSTEM CLHEP_PREFIX XERCES_PREFIX XERCES_LIBNAME GDML_PREFIX GDML_PLATFORM GDML_SITE LCDD_PREFIX SCHEMA_INSTALL_DIR DOXYGEN LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -827,6 +827,8 @@
Linux_gcc323.[PLATFORM]
--with-gdml-site=<site description>
description of site, e.g. SLAC. [SITE]
+ --with-schema-install-dir=<schema installation directory>
+ directory where schemas should be copied
Some influential environment variables:
CXX C++ compiler command
@@ -2747,33 +2749,29 @@
LCDD_BASE=`pwd`
LCDD_PREFIX=${LCDD_BASE}
-#AC_MSG_CHECKING(for LCDD installation)
-#AC_ARG_WITH(lcdd,
-# AC_HELP_STRING([--with-lcdd=<path>],[LCDD installation base [[LCDD_BASE]] ]),
-# [LCDD_PREFIX=$with_lcdd])
-
-#if test -z "${with_lcdd}"; then
-# if test -n "$LCDD_BASE"; then # env
-# ${LCDD_BASE}=`pwd`
-# else
-# AC_MSG_RESULT(No)
-# AC_MSG_ERROR(LCDD installation was not found)
-# fi
-# LCDD_PREFIX=${LCDD_BASE}
-#fi
-
-#LCDD_TEST_FILE=${LCDD_PREFIX}/src/LCDDDetectorConstruction.cc
-
-#if test -e ${LCDD_TEST_FILE}; then
-# AC_MSG_RESULT(Yes)
-# echo "found valid LCDD installation at ${LCDD_PREFIX}"
-#else
-# AC_MSG_ERROR(invalid LCDD installation at ${LCDD_PREFIX})
-#fi
+# schema install
+
+
+ echo "$as_me:$LINENO: checking for schema installation target directory" >&5
+echo $ECHO_N "checking for schema installation target directory... $ECHO_C" >&6
+
+
+# Check whether --with-schema-install-dir or --without-schema-install-dir was given.
+if test "${with_schema_install_dir+set}" = set; then
+ withval="$with_schema_install_dir"
+ SCHEMA_INSTALL_DIR=${with_schema_install_dir}
+else
+ SCHEMA_INSTALL_DIR=${HOME}/schemas
+fi;
+
+
+
+ echo "$as_me:$LINENO: result: ${SCHEMA_INSTALL_DIR}" >&5
+echo "${ECHO_T}${SCHEMA_INSTALL_DIR}" >&6
# Doxygen
@@ -3510,6 +3508,7 @@
s,@GDML_PLATFORM@,$GDML_PLATFORM,;t t
s,@GDML_SITE@,$GDML_SITE,;t t
s,@LCDD_PREFIX@,$LCDD_PREFIX,;t t
+s,@SCHEMA_INSTALL_DIR@,$SCHEMA_INSTALL_DIR,;t t
s,@DOXYGEN@,$DOXYGEN,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
lcdd
diff -u -r1.13 -r1.14
--- configure.ac 21 Mar 2006 01:02:17 -0000 1.13
+++ configure.ac 30 Mar 2006 19:45:48 -0000 1.14
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/lcdd/configure.ac,v 1.13 2006/03/21 01:02:17 jeremy Exp $
+# $Header: /cvs/lcd/lcdd/configure.ac,v 1.14 2006/03/30 19:45:48 jeremy Exp $
#
# Process this file with autoconf to produce a configure script for LCDD.
#
@@ -47,6 +47,9 @@
# LCDD
SIM_SETUP_LCDD()
+# schema install
+LCDD_WITH_SCHEMA_INSTALL_DIR()
+
# Doxygen
SIM_SETUP_DOXYGEN()
CVSspam 0.2.8
