diff options
| author | schnetter <schnetter@83718e91-0e4f-0410-abf4-91180603181f> | 2005-06-03 10:59:28 +0000 |
|---|---|---|
| committer | schnetter <schnetter@83718e91-0e4f-0410-abf4-91180603181f> | 2005-06-03 10:59:28 +0000 |
| commit | 1cd519b8ce53b12c316494d82ed9fa92385e209c (patch) | |
| tree | faac0fef42ec6c27254bc04d123d22ca06fa0112 | |
| parent | 5bcd21f2c456d4012fc04f204a3cda7759d50ed1 (diff) | |
Recreate all tarballs when any of the bindings change, because these
changes may be due to changes in some thorn.
git-svn-id: http://svn.cactuscode.org/arrangements/CactusUtils/Formaline/trunk@34 83718e91-0e4f-0410-abf4-91180603181f
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | src/make.configuration.deps | 14 |
2 files changed, 12 insertions, 6 deletions
@@ -48,6 +48,10 @@ put stuff into namespace (move from C to C++?) rename "file", "storage" do something more unique +update the source tarballs not only when the thorn library changes, +but also when a *.ccl or make.* file changes. +do not necessarily update them all when the bindings change. + Here is a suggestion for handling sockets in perl. diff --git a/src/make.configuration.deps b/src/make.configuration.deps index cc42948..4dd8b74 100644 --- a/src/make.configuration.deps +++ b/src/make.configuration.deps @@ -32,7 +32,7 @@ $(CCTK_LIBDIR)/$(LIBNAME_PREFIX)$(CCTK_LIBNAME_PREFIX)Formaline-cactus-source$(L $(TARBALL_DIR)/build-id.o: $(TARBALL_DIR)/build-id.c $(CC) $(CFLAGS) -c -o $@ $^ -# (force a new to be created every time) +# (force a new ID to be created every time) .PHONY: $(TARBALL_DIR)/build-id.c $(TARBALL_DIR)/build-id.c: { \ @@ -41,7 +41,7 @@ $(TARBALL_DIR)/build-id.c: user="$$USER"; \ timestamp=`date +%Y%m%d-%H%M%S`; \ pid="$$$$"; \ - id="build-$$hostname-$$USER-$$timestamp-$$pid"; \ + id="build-$$hostname-$$user-$$timestamp-$$pid"; \ echo 'char const build_id[] = "'$$id'";'; \ } > $@ @@ -71,8 +71,9 @@ $(TARBALL_DIR)/cactus-flesh-source.tar.gz: $(TARBALL_DIR)/cactus-flesh-source.fi # This dependency means that the tarball for a thorn is only updated # if the thorn is actually recompiled. This does not catch changes to -# files that do not influence the executable, but that is okay. -$(TARBALL_DIR)/cactus-flesh-source.files: $(CCTK_LIBDIR)/$(LIBNAME_PREFIX)$(CCTK_LIBNAME_PREFIX)Cactus$(LIBNAME_SUFFIX) +# files that do not influence the executable. +# Update the tarball also when the CST stage is rerun. +$(TARBALL_DIR)/cactus-flesh-source.files: $(CCTK_LIBDIR)/$(LIBNAME_PREFIX)$(CCTK_LIBNAME_PREFIX)$(FLESHLIB)$(LIBNAME_SUFFIX) $(CCTK_LIBDIR)/$(LIBNAME_PREFIX)$(CCTK_LIBNAME_PREFIX)$(BINDINGSLIB)$(LIBNAME_SUFFIX) cd $(CCTK_HOME) && \ find CONTRIBUTORS COPYRIGHT Makefile lib src \ configs/$(notdir $(TOP))/config-info \ @@ -99,8 +100,9 @@ $(TARBALL_DIR)/cactus-thorn-source-%.tar.gz: $(TARBALL_DIR)/cactus-thorn-source- # This dependency means that the tarball for a thorn is only updated # if the thorn is actually recompiled. This does not catch changes to -# files that do not influence the executable, but that is okay. -$(TARBALL_DIR)/cactus-thorn-source-%.files: $(CCTK_LIBDIR)/$(LIBNAME_PREFIX)$(CCTK_LIBNAME_PREFIX)%$(LIBNAME_SUFFIX) +# files that do not influence the executable. +# Update the tarball also when the CST stage is rerun. +$(TARBALL_DIR)/cactus-thorn-source-%.files: $(CCTK_LIBDIR)/$(LIBNAME_PREFIX)$(CCTK_LIBNAME_PREFIX)%$(LIBNAME_SUFFIX) $(CCTK_LIBDIR)/$(LIBNAME_PREFIX)$(CCTK_LIBNAME_PREFIX)$(BINDINGSLIB)$(LIBNAME_SUFFIX) cd $(CCTK_HOME) && \ find arrangements/$(filter %/$(@:$(TARBALL_DIR)/cactus-thorn-source-%.files=%),$(THORNS)) \ -path 'arrangements/*/*/doc' -prune -o \ |