head	1.10;
access;
symbols
	TIGRIS_1_1_0RC2:1.10
	TIGRIS_1_1_0RC1:1.10
	TIGRIS_1_1:1.10.0.4
	TIGRIS_1_0_8:1.10
	TIGRIS_1_0_8RC3:1.10
	TIGRIS_1_0_8RC2:1.10
	TIGRIS_1_0_8RC1:1.10
	TIGRIS_1_0_7:1.10
	TIGRIS_1_0_7RC3:1.10
	TIGRIS_1_0_7RC2:1.10
	TIGRIS_1_0_7RC1:1.10
	TIGRIS_1_0_6:1.10
	TIGRIS_1_0_6RC5:1.10
	TIGRIS_1_0_6RC4:1.10
	TIGRIS_1_0_6RC3:1.10
	TIGRIS_1_0_6RC2:1.10
	TIGRIS_1_0_6RC1:1.10
	TIGRIS_1_0_5:1.10
	TIGRIS_1_0_5RC6:1.10
	TIGRIS_1_0_5RC5:1.10
	TIGRIS_1_0_5RC4:1.10
	TIGRIS_1_0_5RC3:1.10
	TIGRIS_1_0_5RC2:1.10
	TIGRIS_1_0_5RC1:1.10
	TIGRIS_1_0_4:1.10
	TIGRIS_1_0_3:1.10
	TIGRIS_1_0_2:1.10
	TIGRIS_1_0_1:1.10
	TIGRIS_1_0:1.10.0.6
	TIGRIS_1_0_0:1.10
	TIGRIS_1_0_0_RC1:1.10.0.2
	dlr:1.1.1
	TIGRIS_0_9_2_4:1.7
	TIGRIS_0_9_2_3:1.7
	HELM_PEER_PORT_BRANCH:1.1.1.2
	TURBINE_PEER:1.7
	TIGRIS_0_9_2_1:1.7
	TIGRIS_0_9_2:1.7.0.6
	TIGRIS_0_9_0:1.7.0.4
	TIGRIS_0_8_4:1.7.0.2
	NEWHELM:1.1.1.1
	TIGRIS_NOV_12_2000:1.1.1
	OLDHELM:1.6.0.4
	TIGRIS_NOV_11_2000:1.6
	TIGRIS_SEP_13_2000:1.6.0.2
	TIGRIS_BASELINE:1.6;
locks; strict;
comment	@# @;


1.10
date	2001.03.01.02.13.43;	author dlr;	state Exp;
branches;
next	1.9;

1.9
date	2001.02.28.22.57.54;	author dlr;	state Exp;
branches;
next	1.8;

1.8
date	2001.02.13.12.30.38;	author ms;	state Exp;
branches;
next	1.7;

1.7
date	2000.11.12.22.57.30;	author dlr;	state Exp;
branches
	1.7.8.1;
next	1.6;

1.6
date	2000.08.28.18.02.17;	author ed;	state Exp;
branches;
next	1.5;

1.5
date	2000.08.23.17.25.08;	author ed;	state Exp;
branches;
next	1.4;

1.4
date	2000.07.04.04.52.46;	author dlr;	state Exp;
branches;
next	1.3;

1.3
date	2000.06.10.02.52.38;	author dlr;	state Exp;
branches;
next	1.2;

1.2
date	2000.06.06.21.32.58;	author dlr;	state Exp;
branches;
next	1.1;

1.1
date	2000.06.02.23.07.49;	author davidp;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2000.11.12.21.13.47;	author dlr;	state Exp;
branches;
next	1.1.1.2;

1.1.1.2
date	2001.02.21.00.28.07;	author dlr;	state Exp;
branches;
next	;

1.7.8.1
date	2001.02.17.22.12.06;	author leonardr;	state Exp;
branches;
next	;


desc
@@


1.10
log
@Reduce gratuitous output.
@
text
@######################################################################
# -*- Makefile -*- developed for a Unix system.
#

include Makefile.config

default: build

# Only install the configuration files when the install target is called.
build:

install:
	@@echo 'Installing project configuration files to sandbox'; \
	make install-conf-files CONF_FILES="$(HTTPD_CONF_FILES)" \
	  CONF_DIR="$(HTTPD_CONF_DIR)"; \
	make install-conf-files CONF_FILES="$(ZONE_CONF_FILES)" \
	  CONF_DIR="$(ZONE_CONF_DIR)"; \
	make install-conf-files CONF_FILES="$(SERVLETS_CONF_FILES)" \
	  CONF_DIR="$(SERVLETS_CONF_DIR)"; \
	make install-conf-files CONF_FILES="$(TURBINE_CONF_FILES)" \
	  CONF_DIR="$(TURBINE_CONF_DIR)"; \
	echo 'Installation of project configuration files complete'

# Install a single set of configuration files CONF_FILES to directory CONF_DIR.
install-conf-files:
	@@for f in $(CONF_FILES); do \
	  echo "  $${f}"; \
	  if [ -f $(CONF_DIR)/$${f}.orig ]; then \
	    rm -f $(CONF_DIR)/$${f}.orig; \
	  fi; \
	  if [ -f $(CONF_DIR)/$${f} ]; then \
	    mv $(CONF_DIR)/$${f} $(CONF_DIR)/$${f}.orig; \
	  fi; \
	  cp -f $${f}* $(CONF_DIR); \
	done; \
	unset f

clean:
@


1.9
log
@Refactored Makefiles to remove redundancy and reorganized decl/def of constants in the config file to match dependancies.  Additionally, now baking TurbineResources.properties from multiple properties files.
@
text
@d26 1
a26 1
	for f in $(CONF_FILES); do \
@


1.8
log
@Top-level makefile organizes it's dependancies for eyebrowse more
efficiently.

conf/Makefile had useless target, now removed

helm_daily_cron should not have been in CVS - removed

PR:
Obtained from:
Submitted by:
Reviewed by:
@
text
@d9 1
a9 1
# only install the conf files on make install
d14 13
a26 21
	for f in $(PROPERTIES_CONF_FILES); do \
	  echo "  $${f}"; \
	  if [ -f $(PROPERTIES_CONF_DIR)/$${f}.orig ]; then \
	    rm -f $(PROPERTIES_CONF_DIR)/$${f}.orig; \
	  fi; \
	  if [ -f $(PROPERTIES_CONF_DIR)/$${f} ]; then \
	    mv -f $(PROPERTIES_CONF_DIR)/$${f} $(PROPERTIES_CONF_DIR)/$${f}.orig; \
	  fi; \
	  cp -f $${f}* $(PROPERTIES_CONF_DIR); \
	done; \
	for f in $(SERVLETS_CONF_FILES); do \
	  echo "  $${f}"; \
	  if [ -f $(SERVLETS_CONF_DIR)/$${f}.orig ]; then \
	    rm -f $(SERVLETS_CONF_DIR)/$${f}.orig; \
	  fi; \
	  if [ -f $(SERVLETS_CONF_DIR)/$${f} ]; then \
	    mv $(SERVLETS_CONF_DIR)/$${f} $(SERVLETS_CONF_DIR)/$${f}.orig; \
	  fi; \
	  cp -f $${f}* $(SERVLETS_CONF_DIR); \
	done; \
	for f in $(HTTPD_CONF_FILES); do \
d28 2
a29 2
	  if [ -f $(HTTPD_CONF_DIR)/$${f}.orig ]; then \
	    rm -f $(HTTPD_CONF_DIR)/$${f}.orig; \
d31 2
a32 2
	  if [ -f $(HTTPD_CONF_DIR)/$${f} ]; then \
	    mv $(HTTPD_CONF_DIR)/$${f} $(HTTPD_CONF_DIR)/$${f}.orig; \
d34 1
a34 1
	  cp -f $${f}* $(HTTPD_CONF_DIR); \
d36 1
a36 2
	echo 'Installation of project configuration files complete'; \
	unset f ; true
@


1.7
log
@Resolved merge conflicts.
@
text
@a46 12
include-trace:
	@@file=$(FILE); \
	while [ "$$file" ]; do \
	  last=$$file; \
	  file=`grep -i "^ *include *. *.*$${file} *$$" * 2> /dev/null | \
	    grep -v "registry\.$${file}" | \
	    perl -p -e 's/^(.*):.*$$/$$1/i' | \
	    grep -v '.*\.in$$'`; \
	done; \
	echo $$last; \
	unset last

@


1.7.8.1
log
@Ported head changes to branch.
@
text
@d47 12
@


1.6
log
@switch to using servlets.d and zone.properties.d ; move servlets.helm.in
to 40helm.servlets.in and zone.properties.helm.in to
40helm.zone.properties.in
@
text
@d16 3
d20 1
a20 1
	    mv $(PROPERTIES_CONF_DIR)/$${f} $(PROPERTIES_CONF_DIR)/$${f}.orig; \
d26 3
d36 3
d58 2
@


1.5
log
@big changes as part of the conf file rationalization.   everything in
data/helm/apache is obsolete now (so ApacheConfig is unneeded, though
it hasn't been removed yet).  the apache conf files are now installed in
a new location, and they are fairly different: instead of vhosts,
we use rewritecond to support dynamic virtual hosts.   the file in
helm/perl/cgi/local was moved up to helm/perl/cgi
@
text
@d7 5
d14 1
a14 1
	for f in $(CONF_FILES); do \
d16 2
a17 2
	  if [ -f $(CONF_DIR)/$${f} ]; then \
	    mv $(CONF_DIR)/$${f} $(CONF_DIR)/$${f}.orig; \
d19 6
a24 11
	  cp -f $${f} $(CONF_DIR); \
	  registry=`echo $${f} | perl -pw -e 's/(.+)\.$(PROJECT)/$$1/'`; \
	  registry=$(CONF_DIR)/registry.$${registry}; \
	  if [ -r "$${registry}" ]; then \
	    if [ ! "`grep -v '^#' $${registry} | grep $${f}`" ]; then \
	      if [ "`make include-trace FILE=$$f | grep httpd`" ]; then \
	        echo "Include conf/$${f}" >> $${registry}; \
	      else \
	        echo "include=$(CONF_DIR)/$${f}" >> $${registry}; \
	      fi; \
	    fi; \
d26 1
d36 1
a36 1
	unset registry f
@


1.4
log
@Added an 'unset' line for one of the variables used in the
'include-trace' target.
@
text
@d27 7
@


1.3
log
@Fixed sandbox/conf registry bug by adding a gnarly regex pipe to
trace file inclusion back to top level.  Shouts out to Manoj and Ed
for the regex suggestions.
@
text
@d39 2
a40 1
	echo $$last
@


1.2
log
@Migrated Makefile and its config file to explicit list of the configuration files to be copied into the sandbox.
@
text
@d19 3
a21 1
	      if [ "`grep '=' $${registry}`" ]; then \
a22 2
	      else \
	        echo "Include conf/$${f}" >> $${registry}; \
d29 11
@


1.1
log
@initial checking of revised helm config files by jrobbins
@
text
@d9 2
a10 1
	for f in `ls | egrep -v $(IGNORE_REGEX)`; do \
d27 1
@


1.1.1.1
log
@Merging newhelm tree into helm, as per IZ issue #557.  Previous major version of helm is tagged TIGRIS_NOV_11_2000.
@
text
@a6 5
default: build

# only install the conf files on make install
build:

d9 15
a23 4
	for f in $(PROPERTIES_CONF_FILES); do \
	  echo "  $${f}"; \
	  if [ -f $(PROPERTIES_CONF_DIR)/$${f}.orig ]; then \
	    rm -f $(PROPERTIES_CONF_DIR)/$${f}.orig; \
a24 36
	  if [ -f $(PROPERTIES_CONF_DIR)/$${f} ]; then \
	    mv -f $(PROPERTIES_CONF_DIR)/$${f} $(PROPERTIES_CONF_DIR)/$${f}.orig; \
	  fi; \
	  cp -f $${f}* $(PROPERTIES_CONF_DIR); \
	done; \
	for f in $(SERVLETS_CONF_FILES); do \
	  echo "  $${f}"; \
	  if [ -f $(SERVLETS_CONF_DIR)/$${f}.orig ]; then \
	    rm -f $(SERVLETS_CONF_DIR)/$${f}.orig; \
	  fi; \
	  if [ -f $(SERVLETS_CONF_DIR)/$${f} ]; then \
	    mv $(SERVLETS_CONF_DIR)/$${f} $(SERVLETS_CONF_DIR)/$${f}.orig; \
	  fi; \
	  cp -f $${f}* $(SERVLETS_CONF_DIR); \
	done; \
	for f in $(HTTPD_CONF_FILES); do \
	  echo "  $${f}"; \
	  if [ -f $(HTTPD_CONF_DIR)/$${f}.orig ]; then \
	    rm -f $(HTTPD_CONF_DIR)/$${f}.orig; \
	  fi; \
	  if [ -f $(HTTPD_CONF_DIR)/$${f} ]; then \
	    mv $(HTTPD_CONF_DIR)/$${f} $(HTTPD_CONF_DIR)/$${f}.orig; \
	  fi; \
	  cp -f $${f}* $(HTTPD_CONF_DIR); \
	done; \
	echo 'Installation of project configuration files complete'; \
	unset f ; true

include-trace:
	@@file=$(FILE); \
	while [ "$$file" ]; do \
	  last=$$file; \
	  file=`grep -i "^ *include *. *.*$${file} *$$" * 2> /dev/null | \
	    grep -v "registry\.$${file}" | \
	    perl -p -e 's/^(.*):.*$$/$$1/i' | \
	    grep -v '.*\.in$$'`; \
d26 1
a26 4
	echo $$last; \
	unset last

clean:
@


1.1.1.2
log
@Replacing the HEAD with the HELM_PEER_PORT_BRANCH.
@
text
@d47 12
@


