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


1.14
date	2001.05.25.19.40.07;	author dlr;	state Exp;
branches;
next	1.13;

1.13
date	2001.05.24.17.35.11;	author dlr;	state Exp;
branches;
next	1.12;

1.12
date	2001.05.24.17.29.47;	author dlr;	state Exp;
branches;
next	1.11;

1.11
date	2001.02.21.01.56.42;	author edk;	state Exp;
branches;
next	1.10;

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

1.9
date	2000.09.20.17.28.42;	author kmaples;	state Exp;
branches;
next	1.8;

1.8
date	2000.09.20.01.30.19;	author kmaples;	state Exp;
branches;
next	1.7;

1.7
date	2000.07.13.21.41.50;	author dlr;	state Exp;
branches
	1.7.2.1;
next	1.6;

1.6
date	2000.07.11.07.19.24;	author dlr;	state Exp;
branches;
next	1.5;

1.5
date	2000.07.11.04.22.11;	author dlr;	state Exp;
branches;
next	1.4;

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

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

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

1.1
date	2000.05.23.20.35.04;	author jrobbins;	state Exp;
branches
	1.1.1.1;
next	;

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

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

1.7.2.1
date	2000.10.23.06.01.03;	author lucas;	state Exp;
branches;
next	1.7.2.2;

1.7.2.2
date	2000.10.24.18.01.20;	author lucas;	state Exp;
branches;
next	;


desc
@@


1.14
log
@No longer cooking templates.
@
text
@######################################################################
# -*- Makefile -*- developed for a Unix system.
# 
#  This cooks the templates (if necessary), and copies them into the 
#  installation location.
# $Id: Makefile,v 1.13 2001/05/24 17:35:11 dlr Exp $

include Makefile.config

default:

install:
	@@mkdir -p --verbose $(INSTALL_DIR); \
	echo 'Copying templates'; \
	rsync -ar --delete $(RAW_DIR)/$(PROJECT) $(INSTALL_DIR); \
	$(SANDBOX)/scripts/opersx 'ls *.wm &> /dev/null && \
	  $(SANDBOX)/scripts/link-cooker *.wm' '$(INSTALL_DIR)'
@


1.13
log
@Removed template cooking non-sense (deprecated by switch to Velocity).
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.12 2001/05/24 17:29:47 dlr Exp $
d14 1
a14 1
	echo 'Copying uncooked templates'; \
d16 2
a17 2
    echo "Cooking links in $(INSTALL_DIR)"; \
    $(SANDBOX)/scripts/opersx 'ls *.wm &> /dev/null && $(SANDBOX)/scripts/link-cooker *.wm' '$(INSTALL_DIR)'
@


1.12
log
@Removed template cooking non-sense (deprecated by switch to Velocity).
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.11 2001/02/21 01:56:42 edk Exp $
d14 4
a17 14
	if [ "$(USE_COOKED_TEMPLATES)" = 'true' ]; then \
	  if [ -d $(COOKED_DIR) ]; then \
	    echo 'Copying cooked templates'; \
	    rsync -ar --delete $(COOKED_DIR)/$(RAW_DIR)/$(PROJECT) $(INSTALL_DIR); \
	  else \
	    echo -n 'Cannot copy cooked templates: '; \
	    echo '$(COOKED_DIR) directory does not exist'; \
	  fi; \
	else \
	  echo 'Copying uncooked templates'; \
	  rsync -ar --delete $(RAW_DIR)/$(PROJECT) $(INSTALL_DIR); \
          echo "Cooking links in $(INSTALL_DIR)"; \
          $(SANDBOX)/scripts/opersx 'ls *.wm &> /dev/null && $(SANDBOX)/scripts/link-cooker *.wm' '$(INSTALL_DIR)'; \
	fi
@


1.11
log
@add new files from the branch to the head (there should be only added
files, ie. no modified files).
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.1.1.2 2001/02/21 00:36:37 dlr Exp $
d10 1
a10 16
cook: clean
ifeq (${USE_COOKED_TEMPLATES},true)
	  mkdir $(COOKED_DIR); \
	  rsync -ar --exclude CVS --delete $(RAW_DIR) $(COOKED_DIR); \
	  perl $(SANDBOX)/scripts/template-cooker; \
	  find $(COOKED_DIR) -type f -name '*.wm' | xargs perl -pi -e 's,\$$SERVLET_TEMPLATE_ROOT;,$(SITE_TEMPLATE_BRAND),g'; \
	  $(SANDBOX)/scripts/opersx '$(SANDBOX)/scripts/link-cooker *.wm' '$(COOKED_DIR)'
else
	@@echo "USE_COOKED_TEMPLATES is ${USE_COOKED_TEMPLATES}. Nothing to cook"
endif


clean:
ifeq (${USE_COOKED_TEMPLATES},true)
	- rm -rf $(COOKED_DIR)
endif
@


1.10
log
@Resolved merge conflicts.
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.1.1.1 2000/11/12 21:17:57 dlr Exp $
@


1.9
log
@Typo - move the '@@' to the beginning of the conditional.
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.8 2000/09/20 01:30:19 kmaples Exp $
d11 1
a11 1
	@@if [ "$(USE_COOKED_TEMPLATES)" = 'true' ]; then \
d16 5
a20 2
	  $(SANDBOX)/scripts/opersx '$(SANDBOX)/scripts/link-cooker *.wm' '$(COOKED_DIR)'; \
	fi
d23 1
d25 1
d40 2
@


1.8
log
@Modified so that files get cooked only if the USE_COOKED_TEMPLATES flag is
set (previously the files were being cooked, even if they were discarded
in the 'make install' step)
@
text
@d6 1
a6 1
# $Id: $
d11 2
a12 2
	if [ "$(USE_COOKED_TEMPLATES)" = 'true' ]; then \
	  @@mkdir $(COOKED_DIR); \
@


1.7
log
@The USE_COOKED_TEMPLATES env var now toggles between cooked and uncooked templates.
@
text
@d6 1
a6 1
#
d11 7
a17 5
	@@mkdir $(COOKED_DIR); \
	rsync -ar --exclude CVS --delete $(RAW_DIR) $(COOKED_DIR); \
	perl $(SANDBOX)/scripts/template-cooker; \
	find $(COOKED_DIR) -type f -name '*.wm' | xargs perl -pi -e 's,\$$SERVLET_TEMPLATE_ROOT;,$(SITE_TEMPLATE_BRAND),g'; \
	$(SANDBOX)/scripts/opersx '$(SANDBOX)/scripts/link-cooker *.wm' '$(COOKED_DIR)'
@


1.7.2.1
log
@Adjusted project Makefile to use Ant.

Added helm.jar to repositories.

Modified templates/Makefile to appropiate directory structure.

PR:
Obtained from:
Submitted by:
Reviewed by:
@
text
@d32 1
a32 1
	  rsync -ar --delete $(RAW_DIR)/$(BRAND)/$(PROJECT) $(INSTALL_DIR); \
@


1.7.2.2
log
@Updated to use the org/tigris/helm tree

PR:
Obtained from:
Submitted by:
Reviewed by:
@
text
@d32 1
a32 1
	  rsync -ar --delete $(RAW_DIR)/$(PROJECT) $(INSTALL_DIR); \
@


1.6
log
@Applied davidp's fix for some install target bugs.
@
text
@d22 8
a29 3
	if [ -d $(COOKED_DIR) ]; then \
	  echo 'Copying cooked templates'; \
	  rsync -ar --delete $(COOKED_DIR)/$(RAW_DIR)/$(PROJECT) $(INSTALL_DIR); \
@


1.5
log
@Changed SITE_ROOT to $SERVLET_TEMPLATE_ROOT and $BRAND_TEMPLATE_ROOT.
@
text
@d14 1
a14 1
	find . -type f -name '*.wm' | xargs perl -pi -e 's,\$$SERVLET_TEMPLATE_ROOT;,$(SITE_TEMPLATE_BRAND),g'; \
d24 1
a24 1
	  rsync -ar --delete $(COOKED_DIR)/$(RAW_DIR)/ $(INSTALL_DIR); \
d27 1
a27 1
	  rsync -ar --delete $(RAW_DIR)/ $(INSTALL_DIR); \
@


1.4
log
@Fixed cooking problem!  Templates now install properly either raw or cooked.
@
text
@d12 4
a15 5
	perl $(SANDBOX)/scripts/template-cooker;  \
	$(SANDBOX)/scripts/editsx -c 's,SITE_ROOT,$(SITE_TEMPLATE_BRAND),' \
	  '*.wm' '$(COOKED_DIR)'; \
	$(SANDBOX)/scripts/opersx '$(SANDBOX)/scripts/link-cooker *.wm' \
	  '$(COOKED_DIR)'
d24 1
a24 1
	  rsync -ar --delete $(COOKED_DIR)/ $(INSTALL_DIR); \
@


1.3
log
@Explicitly referenced editsx and opersx.
@
text
@d4 1
a4 1
#  This cooks the templates if necessary, and copies them into the 
d13 2
a14 2
	$(SANDBOX)/scripts/editsx -c 's,SITE_ROOT,$(INSTALL_DIR),' '*.wm' \
	  '$(COOKED_DIR)'; \
d22 2
a23 2
	@@if [ -d $(COOKED_DIR) ]; then \
	  cd $(COOKED_DIR); \
d25 1
d28 2
a29 3
	fi; \
	mkdir -p --verbose $(INSTALL_DIR); \
	rsync -ar --delete $(RAW_DIR)/$(PROJECT)/ $(INSTALL_DIR)
@


1.2
log
@Updated to install successfully into the sandbox.
@
text
@d13 1
a13 1
	editsx -c 's,SITE_ROOT,$(INSTALL_DIR),' '*.wm' \
d15 2
a16 1
	opersx '$(SANDBOX)/scripts/link-cooker *.wm' '$(COOKED_DIR)'
@


1.1
log
@added template makefiles by copying from sourcexchange
@
text
@d1 5
a5 3
#
#	This cooks the templates if necessary, and copies into the proper
#       installation location.
a9 2
all: cook

d12 4
a15 5
	perl $(SANDBOX)/scripts/template-cooker; 
	editsx -c "s,SITE_ROOT,$(SITE_TEMPLATE_BRAND)," '*.wm' "$(COOKED_DIR)"; \
	opersx '$(SANDBOX)/scripts/link-cooker *.wm' "$(COOKED_DIR)";
#	cp -r $(RAW_DIR) $(COOKED_DIR)/; \
#	find $(RAW_DIR) -name '*.wm' | cpio -adump $(COOKED_DIR)
d27 2
a28 25
	ls -ld $(SITE_TEMPLATE_DIR); \
	if [ ! -d $(SITE_TEMPLATE_DIR) ]; then \
	  echo ">> creating $(SITE_TEMPLATE_DIR)"; \
	  mkdir $(SITE_TEMPLATE_DIR); \
	fi; \
	ls -ld $(SITE_TEMPLATE_BRAND); \
	if [ ! -d $(SITE_TEMPLATE_BRAND) ]; then \
	  echo ">> creating $(SITE_TEMPLATE_BRAND)"; \
	  mkdir $(SITE_TEMPLATE_BRAND); \
	fi; \
	ls -ld $(SITE_TEMPLATE_BRAND)/$(RAW_DIR); \
	if [ ! -d $(SITE_TEMPLATE_BRAND)/$(RAW_DIR) ]; then \
	  echo ">> creating $(SITE_TEMPLATE_BRAND)/$(RAW_DIR)"; \
	  mkdir $(SITE_TEMPLATE_BRAND)/$(RAW_DIR); \
	fi; \
	ls -ld $(INSTALL_DIR); \
	if [ ! -d $(INSTALL_DIR) ]; then \
	  echo ">> creating $(INSTALL_DIR)"; \
	  mkdir $(INSTALL_DIR); \
	fi; \
	rsync -ar --delete $(RAW_DIR)/$(PRODUCT) $(INSTALL_DIR)


#	rm -rf $(INSTALL_DIR)/org/$(PROJECT); \
#	find . -name '*.wm' | cpio -adump $(INSTALL_DIR)
@


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
@d1 4
a4 6
######################################################################
# -*- Makefile -*- developed for a Unix system.
# 
#  This cooks the templates (if necessary), and copies them into the 
#  installation location.
# $Id: Makefile,v 1.2 2000/10/06 01:03:49 elicia Exp $
d8 2
d11 6
a16 10
ifeq (${USE_COOKED_TEMPLATES},true)
	  mkdir $(COOKED_DIR); \
	  rsync -ar --exclude CVS --delete $(RAW_DIR) $(COOKED_DIR); \
	  perl $(SANDBOX)/scripts/template-cooker; \
	  find $(COOKED_DIR) -type f -name '*.wm' | xargs perl -pi -e 's,\$$SERVLET_TEMPLATE_ROOT;,$(SITE_TEMPLATE_BRAND),g'; \
	  $(SANDBOX)/scripts/opersx '$(SANDBOX)/scripts/link-cooker *.wm' '$(COOKED_DIR)'
else
	@@echo "USE_COOKED_TEMPLATES is ${USE_COOKED_TEMPLATES}. Nothing to cook"
endif

a18 1
ifeq (${USE_COOKED_TEMPLATES},true)
a19 1
endif
d22 3
a24 9
	@@mkdir -p --verbose $(INSTALL_DIR); \
	if [ "$(USE_COOKED_TEMPLATES)" = 'true' ]; then \
	  if [ -d $(COOKED_DIR) ]; then \
	    echo 'Copying cooked templates'; \
	    rsync -ar --delete $(COOKED_DIR)/$(RAW_DIR)/$(PROJECT) $(INSTALL_DIR); \
	  else \
	    echo -n 'Cannot copy cooked templates: '; \
	    echo '$(COOKED_DIR) directory does not exist'; \
	  fi; \
d27 26
a52 4
	  rsync -ar --delete $(RAW_DIR)/$(PROJECT) $(INSTALL_DIR); \
          echo "Cooking links in $(INSTALL_DIR)"; \
          $(SANDBOX)/scripts/opersx 'ls *.wm &> /dev/null && $(SANDBOX)/scripts/link-cooker *.wm' '$(INSTALL_DIR)'; \
	fi
@


1.1.1.2
log
@Replacing the HEAD with the HELM_PEER_PORT_BRANCH.
@
text
@d6 1
a6 1
# $Id: Makefile,v 1.10 2000/11/12 22:57:35 dlr Exp $
@


