10 modified files
SimDist
diff -u -r1.10 -r1.11
--- Makefile.in 11 Jul 2006 23:07:58 -0000 1.10
+++ Makefile.in 15 Sep 2006 23:02:28 -0000 1.11
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/SimDist/Makefile.in,v 1.10 2006/07/11 23:07:58 jeremy Exp $
+# $Header: /cvs/lcd/SimDist/Makefile.in,v 1.11 2006/09/15 23:02:28 jeremy Exp $
# include the common build vars
include $(CURDIR)/build/common.gmk
@@ -49,18 +49,6 @@
@echo "Making current distribution tarball $(dist_tarball_current) ... " ; \
cp ../$(dist_tarball) ../$(dist_tarball_current) ;:
-# 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) ;
-
-# Local copy the verioned binary tarball to one labelled as "current".
-dist_tgz_bin_current: dist_tgz_bin
- @echo "Making current binary tarball $(bin_tarball_current)" ; \
- cp ../$(bin_tarball) ../$(bin_tarball_current) ;:
-
# Upload a versioned SimDist tgz to the distribution directory.
dist_scp_simdist: dist_tgz_simdist
@echo "Uploading versioned distribution tarball $(dist_tarball) to $(dist_dir) ... " ; \
@@ -71,18 +59,30 @@
@echo "Uploading current distribution tarball $(dist_tarball_current) to $(dist_dir) ... " ; \
$(SCP) ../$(dist_tarball_current) $(dist_dir);:
+# 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) ;
+
+# Local copy the verioned binary tarball to one labelled as "current".
+#dist_tgz_bin_current: dist_tgz_bin
+# @echo "Making current binary tarball $(bin_tarball_current)" ; \
+# cp ../$(bin_tarball) ../$(bin_tarball_current) ;:
+
# Upload versioned bin tarball to the distribution directory.
-dist_scp_bin: dist_tgz_bin
- @echo "Uploading versioned binary tarball $(bin_tarball) to $(dist_dir) ... " ; \
- $(SCP) ../$(bin_tarball) $(dist_dir);:
+#dist_scp_bin: dist_tgz_bin
+# @echo "Uploading versioned binary tarball $(bin_tarball) to $(dist_dir) ... " ; \
+# $(SCP) ../$(bin_tarball) $(dist_dir);:
# Upload current bin tarball to the distribution directory.
-dist_scp_bin_current: dist_tgz_bin_current
- @echo "Uploading current binary tarball $(bin_tarball_current) to $(dist_dir) ... " ; \
- $(SCP) ../$(bin_tarball_current) $(dist_dir);:
+#dist_scp_bin_current: dist_tgz_bin_current
+# @echo "Uploading current binary tarball $(bin_tarball_current) to $(dist_dir) ... " ; \
+# $(SCP) ../$(bin_tarball_current) $(dist_dir);:
# Execute the distribution targets to make a release on this platform.
-dist: dist_tgz_simdist_current dist_tgz_bin_current dist_scp_simdist dist_scp_simdist_current dist_scp_bin dist_scp_bin_current
+#dist: dist_tgz_simdist_current dist_tgz_bin_current dist_scp_simdist dist_scp_simdist_current dist_scp_bin dist_scp_bin_current
# test for and run slic binary
test:
SimDist
diff -u -r1.47 -r1.48
--- configure 15 Sep 2006 21:10:04 -0000 1.47
+++ configure 15 Sep 2006 23:02:28 -0000 1.48
@@ -2698,7 +2698,8 @@
mokka )
-mokka_base_url=http://mokka.in2p3.fr/software/mokka_tags/
+#mokka_base_url=http://mokka.in2p3.fr/software/mokka_tags/
+mokka_base_url=http://polywww.in2p3.fr/activites/physique/geant4/tesla/www/mokka/software/mokka_tags/
mokka_tgz=Mokka-mokka-${package_version}.tgz
MOKKA_VERSION=$package_version
@@ -2986,7 +2987,7 @@
echo "$as_me:$LINENO: checking for dist directory" >&5
echo $ECHO_N "checking for dist directory... $ECHO_C" >&6
-slac_dist="[log in to unmask]:/nfs/slac/g/lcd/mc/prj/www/lcsim/dist/slic"
+slac_dist="[log in to unmask]:/nfs/slac/g/lcd/mc/prj/www/lcsim/dist/"
# Check whether --with-distdir or --without-distdir was given.
SimDist/build
diff -u -r1.16 -r1.17
--- common.gmk.in 11 Jul 2006 23:08:01 -0000 1.16
+++ common.gmk.in 15 Sep 2006 23:02:34 -0000 1.17
@@ -1,4 +1,4 @@
-# $Id: common.gmk.in,v 1.16 2006/07/11 23:08:01 jeremy Exp $
+# $Id: common.gmk.in,v 1.17 2006/09/15 23:02:34 jeremy Exp $
#
# Common Make variables for SimDist
@@ -44,9 +44,9 @@
slic_run=$(sim_scripts_dir)/$(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;:
+#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.7 -r1.8
--- package.gmk.in 15 Sep 2006 21:10:12 -0000 1.7
+++ package.gmk.in 15 Sep 2006 23:02:34 -0000 1.8
@@ -1,4 +1,4 @@
-# $Id: package.gmk.in,v 1.7 2006/09/15 21:10:12 jeremy Exp $
+# $Id: package.gmk.in,v 1.8 2006/09/15 23:02:34 jeremy Exp $
#
# Generic package build rules.
@@ -70,13 +70,14 @@
# OPTIONAL dependency information.
-include $(PACKAGE_DIR)/deps.gmk
-# OPTIONAL build environment for this packages build system or dependent external packages.
+# OPTIONAL build environment variables for this package's build system
+# or for dependent external packages.
-include $(PACKAGE_DIR)/env.gmk
.DEFAULT: all
# Rules that should be forced. (basically everything)
-.PHONY: all download cvs config compile install srcclean packageclean distclean
+.PHONY: all download cvs config compile install srcclean packageclean distclean dist
default: all
@@ -157,4 +158,26 @@
echo PACKAGE_DOWNLOAD=$(PACKAGE_DOWNLOAD); \
echo PACKAGE_TGZ_LOCAL=$(PACKAGE_TGZ_LOCAL); \
echo PACKAGE_VERSION=$(PACKAGE_VERSION); \
+ echo PACKAGE_DIST_TGZ=$(PACKAGE_DIST_TGZ); \
+ echo PACKAGE_DIST_FILES=$(PACKAGE_DIST_FILES); \
echo
+
+# Dist tarball target, if the necessary variables are defined.
+ifdef PACKAGE_DIST_TGZ
+ifdef PACKAGE_DIST_FILES
+
+dist:
+ echo "Creating tarball $(PACKAGE_DIST_TGZ) for $(PACKAGE_NAME) ..."; \
+ cd ../../.. && tar -zcvf $(PACKAGE_DIST_TGZ) $(PACKAGE_DIST_FILES);:
+
+
+# Copy tarball to www-lcsim dist directory.
+ifdef PACKAGE_DIST_DIR
+
+dist_upload:
+ echo "Uploading $(PACKAGE_DIST_TGZ) to $(PACKAGE_DIST_DIR) ..."; \
+ $(SCP) ../../../$(PACKAGE_DIST_TGZ) $(PACKAGE_DIST_DIR)
+
+endif
+endif
+endif
SimDist/build
diff -u -r1.22 -r1.23
--- packages.m4 15 Sep 2006 21:10:12 -0000 1.22
+++ packages.m4 15 Sep 2006 23:02:35 -0000 1.23
@@ -236,7 +236,8 @@
dnl
AC_DEFUN(AC_MOKKA_PACKAGE, [
-mokka_base_url=http://mokka.in2p3.fr/software/mokka_tags/
+#mokka_base_url=http://mokka.in2p3.fr/software/mokka_tags/
+mokka_base_url=http://polywww.in2p3.fr/activites/physique/geant4/tesla/www/mokka/software/mokka_tags/
mokka_tgz=Mokka-mokka-${package_version}.tgz
MOKKA_VERSION=$package_version
SimDist/build
diff -u -r1.6 -r1.7
--- util.m4 12 Jul 2006 17:51:59 -0000 1.6
+++ util.m4 15 Sep 2006 23:02:35 -0000 1.7
@@ -11,7 +11,7 @@
AC_SUBST($1, $v)
echo $v
])
-
+\
dnl
AC_DEFUN(VERSION_GEANT4, [
v=$(echo $2 | sed 's/[[vr]]/\./g' | sed 's/p/\.p/g')
@@ -181,7 +181,7 @@
dnl Add slic version to dist name.
dist_version=$(echo ${SLIC_VERSION} | sed -e 's/[[a-z]]/\_/g' -e 's/^_//g')
-dnl Add Geant4 version to dist name.
+dnl Add Geant4 version to dist name.
dist_version=${dist_version}"-geant4-"$(echo ${GEANT4_VERSION} | sed -e 's/[[a-z]]/\_/g' -e 's/^_//g')
dnl versioned tarball name
@@ -216,7 +216,7 @@
AC_MSG_CHECKING(for dist directory)
dnl This won't work for anyone but Jeremy McCormick at SLAC.
-slac_dist="[log in to unmask]:/nfs/slac/g/lcd/mc/prj/www/lcsim/dist/slic"
+slac_dist="[log in to unmask]:/nfs/slac/g/lcd/mc/prj/www/lcsim/dist/"
dnl Set the SCP-style destination directory
AC_ARG_WITH(distdir,
SimDist/packages/bdsim
diff -u -r1.1 -r1.2
--- package.gmk.in 15 Sep 2006 21:10:15 -0000 1.1
+++ package.gmk.in 15 Sep 2006 23:02:35 -0000 1.2
@@ -1,3 +1,8 @@
PACKAGE_BUILDDIR=@BDSIM_BUILDDIR@
PACKAGE_DIR_ORIG=@BDSIM_DIR_ORIG@
PACKAGE_DOWNLOAD=@BDSIM_DOWNLOAD@
+PACKAGE_DIST_TGZ=bdsim_@BDSIM_VERSION@_geant4_@[log in to unmask]
+PACKAGE_DIST_FILES=@sim_dist_dir_basename@/packages/bdsim/@BDSIM_VERSION@/bin/@G4SYSTEM@/ \
+ @sim_dist_dir_basename@/packages/bdsim/@BDSIM_VERSION@/parser \
+ @[log in to unmask]
+PACKAGE_DIST_DIR=@dist_dir@/bdsim
\ No newline at end of file
SimDist/packages/mokka
diff -u -r1.2 -r1.3
--- package.gmk.in 26 Jun 2006 23:57:00 -0000 1.2
+++ package.gmk.in 15 Sep 2006 23:02:36 -0000 1.3
@@ -1,3 +1,7 @@
PACKAGE_BUILDDIR=@MOKKA_BUILDDIR@
PACKAGE_DIR_ORIG=@MOKKA_DIR_ORIG@
PACKAGE_DOWNLOAD=@MOKKA_DOWNLOAD@
+PACKAGE_DIST_TGZ=mokka_@MOKKA_VERSION@_geant4_@[log in to unmask]
+PACKAGE_DIST_FILES=@sim_dist_dir_basename@/packages/mokka/@MOKKA_VERSION@/bin/@G4SYSTEM@/ \
+ @[log in to unmask]
+PACKAGE_DIST_DIR=@dist_dir@/mokka
\ No newline at end of file
SimDist/packages/slic
diff -u -r1.5 -r1.6
--- Makefile.in 15 Sep 2006 21:10:17 -0000 1.5
+++ Makefile.in 15 Sep 2006 23:02:36 -0000 1.6
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/SimDist/packages/slic/Makefile.in,v 1.5 2006/09/15 21:10:17 jeremy Exp $
+# $Header: /cvs/lcd/SimDist/packages/slic/Makefile.in,v 1.6 2006/09/15 23:02:36 jeremy Exp $
# generic package build
include ../../build/package.gmk
@@ -12,3 +12,4 @@
test:
../../scripts/slic.sh;:
+
SimDist/packages/slic
diff -u -r1.4 -r1.5
--- package.gmk.in 26 Jun 2006 23:57:02 -0000 1.4
+++ package.gmk.in 15 Sep 2006 23:02:36 -0000 1.5
@@ -0,0 +1,5 @@
+PACKAGE_DIST_TGZ=slic_@SLIC_VERSION@_geant4_@[log in to unmask]
+PACKAGE_DIST_FILES=@sim_dist_dir_basename@/packages/slic/@SLIC_VERSION@/bin/@G4SYSTEM@/ \
+ @[log in to unmask] \
+ @sim_dist_dir_basename@/packages/xerces/@XERCES_VERSION@/lib/
+PACKAGE_DIST_DIR=@dist_dir@/slic
\ No newline at end of file
CVSspam 0.2.8