SimDist/build
diff -u -r1.13 -r1.14
--- package.gmk.in 25 Jun 2009 18:49:28 -0000 1.13
+++ package.gmk.in 14 Jul 2010 18:01:09 -0000 1.14
@@ -1,4 +1,4 @@
-# $Id: package.gmk.in,v 1.13 2009/06/25 18:49:28 jeremy Exp $
+# $Id: package.gmk.in,v 1.14 2010/07/14 18:01:09 jeremy Exp $
#
# Generic package build rules.
@@ -142,6 +142,7 @@
config:
@export CXX=$(CXX); \
cd $(PACKAGE_BUILDDIR); \
+ echo "$(PACKAGE_CONFIG) $(PACKAGE_CONFIG_OPTS)"; \
if [ -e "$(PACKAGE_CONFIG)" ]; then $(PACKAGE_CONFIG) $(PACKAGE_CONFIG_OPTS); fi;:
# Build the package by executing the default make rule.
@@ -165,7 +166,7 @@
# Delete the package's source directory.
packageclean:
- @cd $(PACKAGE_DIR) && rm -rf $(PACKAGE_VERSION);:
+ @cd $(PACKAGE_DIR) && rm -rf $(PACKAGE_VERSION) && rm -rf $(PACKAGE).tar.gz;:
# A clean target that returns to checkout state.
distclean:
SimDist/build
diff -u -r1.37 -r1.38
--- packages.m4 23 Nov 2009 23:13:51 -0000 1.37
+++ packages.m4 14 Jul 2010 18:01:09 -0000 1.38
@@ -139,22 +139,23 @@
dnl
AC_DEFUN(AC_GDML_PACKAGE, [
-gdml_url="http://simu.cvs.cern.ch/cgi-bin/simu.cgi/simu/GDML2.tar.gz?view=tar"
+dnl gdml_url="http://simu.cvs.cern.ch/cgi-bin/simu.cgi/simu/GDML2.tar.gz?view=tar"
-if test "${package_version}" != "HEAD"; then
- gdml_url="${gdml_url}&pathrev=${package_version}"
-fi
+dnl if test "${package_version}" != "HEAD"; then
+dnl gdml_url="${gdml_url}&pathrev=${package_version}"
+dnl fi
GDML_BASEDIR=${package_base_dir}
GDML_BUILDDIR=${package_base_dir}/CPPGDML
GDML_DIR_ORIG=GDML2
-GDML_DOWNLOAD=\"${gdml_url}\"
+dnl GDML_DOWNLOAD=\"${gdml_url}\"
GDML_CONFIG_OPTS="--enable-shared=no --enable-geant4-granular-libs --enable-examples=no --enable-nist=no"
+GDML_CVSMODULE=gdml2
AC_SUBST(GDML_BASEDIR)
AC_SUBST(GDML_BUILDDIR)
-AC_SUBST(GDML_DIR_ORIG)
-AC_SUBST(GDML_DOWNLOAD)
+dnl AC_SUBST(GDML_DIR_ORIG)
+dnl AC_SUBST(GDML_DOWNLOAD)
AC_SUBST(GDML_CONFIG_OPTS)
])
@@ -277,32 +278,35 @@
dnl
AC_DEFUN(AC_XERCES_PACKAGE, [
-AC_XERCES
+dnl AC_SUBST(XERCES_OS)
+dnl AC_SUBST(XERCES_USE_SHARED_LIB)
+dnl AC_SUBST(XERCES_USE_STATIC_LIB)
+
+XERCES_VERSION=${package_version}
+XERCES_BASEDIR=${package_base_dir}
+XERCES_BUILDDIR=${package_base_dir}
+XERCES_CONFIG=./configure
+
+XERCES_CONFIG_OPTS="--prefix=${XERCES_BASEDIR}"
+
+xerces_url=http://www.apache.org/dist/xerces/c/3/sources/
+xerces_version_dot=$(VERSION_DOT(xerces_version_dot, ${XERCES_VERSION}))
+xerces_tgz=xerces-c-${xerces_version_dot}.tar.gz
-xerces_version=${package_version}
-dnl xerces_url=http://www.apache.org/dist/xerces/c/sources/
-xerces_url=http://www.apache.org/dist/xerces/c/2/sources/
-xerces_version_underscore=$(VERSION_UNDERSCORE(xerces_version_underscore, ${xerces_version}))
-xerces_tgz=xerces-c-src_${xerces_version_underscore}.tar.gz
-
-XERCES_VERSION=$package_version
-XERCES_BASEDIR=$package_base_dir
-XERCES_BUILDDIR=${package_base_dir}/src/xercesc
-XERCES_CONFIG=./runConfigure
-XERCES_CONFIG_OPTS=${XERCES_CONFIGURE_ARGS}
XERCES_DOWNLOAD=${xerces_url}/${xerces_tgz}
-XERCES_DIR_ORIG=xerces-c-src_${xerces_version_underscore}
+XERCES_DIR_ORIG=xerces-c-${xerces_version_dot}
+
+dnl XERCES_OBJDIR=${XERCES_BASEDIR}/obj/${XERCES_OS}
AC_SUBST(XERCES_VERSION)
AC_SUBST(XERCES_BASEDIR)
AC_SUBST(XERCES_BUILDDIR)
+AC_SUBST(XERCES_DIR_ORIG)
+AC_SUBST(XERCES_DOWNLOAD)
AC_SUBST(XERCES_CONFIG)
AC_SUBST(XERCES_CONFIG_OPTS)
-AC_SUBST(XERCES_DOWNLOAD)
-AC_SUBST(XERCES_DIR_ORIG)
-XERCES_OBJDIR=${XERCES_BASEDIR}/obj/${XERCES_OS}
-AC_SUBST(XERCES_OBJDIR)
+dnl AC_SUBST(XERCES_OBJDIR)
])
SimDist/build
diff -u -r1.5 -r1.6
--- xerces.m4 19 Jun 2007 19:41:48 -0000 1.5
+++ xerces.m4 14 Jul 2010 18:01:09 -0000 1.6
@@ -5,24 +5,26 @@
XERCES_USE_SHARED_LIB=
XERCES_USE_STATIC_LIB=1
-case "$host_os" in
+dnl case "$host_os" in
- linux* )
- XERCES_CONFIGURE_ARGS="-plinux -cgcc -xg++ -minmem -nsocket -tnative -rnone -P \$(PACKAGE_BASEDIR)"
- ;;
- cygwin* )
- XERCES_CONFIGURE_ARGS="-pcygwin -cgcc -xg++ -minmem -nsocket -tnative -rnone -P \$(PACKAGE_BASEDIR)"
- ;;
- darwin* )
- XERCES_CONFIGURE_ARGS="-pmacosx -nnative -tnative -rnone -P \$(PACKAGE_BASEDIR)"
- XERCES_OS=MACOSX
- XERCES_USE_SHARED_LIB=1
- XERCES_USE_STATIC_LIB=
- ;;
+dnl linux* )
+dnl XERCES_CONFIGURE_ARGS="-plinux -cgcc -xg++ -minmem -nsocket -tnative -rnone -P \$(PACKAGE_BASEDIR)"
+dnl ;;
+dnl cygwin* )
+dnl XERCES_CONFIGURE_ARGS="-pcygwin -cgcc -xg++ -minmem -nsocket -tnative -rnone -P \$(PACKAGE_BASEDIR)"
+dnl ;;
+dnl darwin* )
+dnl XERCES_CONFIGURE_ARGS="-pmacosx -nnative -tnative -rnone -P \$(PACKAGE_BASEDIR)"
+dnl XERCES_OS=MACOSX
+dnl XERCES_USE_SHARED_LIB=1
+dnl XERCES_USE_STATIC_LIB=
+dnl ;;
-esac
+dnl esac
-AC_SUBST(XERCES_CONFIGURE_ARGS)
+XERCES_CONFIG_OPTS="-nsocket -tnative -rnone --prefix=${XERCES_BASEDIR}"
+
+AC_SUBST(XERCES_CONFIG_OPTS)
AC_SUBST(XERCES_OS)
AC_SUBST(XERCES_USE_SHARED_LIB)
AC_SUBST(XERCES_USE_STATIC_LIB)