head	1.25;
access;
symbols
	TIGRIS_1_1_0RC2:1.20.6.2
	TIGRIS_1_1_0RC1:1.20.6.2
	TIGRIS_1_1:1.20.6.2.0.2
	TIGRIS_1_0_8:1.20.6.2
	TIGRIS_1_0_8RC3:1.20.6.2
	TIGRIS_1_0_8RC2:1.20.6.2
	TIGRIS_1_0_8RC1:1.20.6.2
	TIGRIS_1_0_7:1.20.6.2
	TIGRIS_1_0_7RC3:1.20.6.2
	TIGRIS_1_0_7RC2:1.20.6.2
	TIGRIS_1_0_7RC1:1.20.6.2
	TIGRIS_1_0_6:1.20.6.2
	TIGRIS_1_0_6RC5:1.20.6.2
	TIGRIS_1_0_6RC4:1.20.6.2
	TIGRIS_1_0_6RC3:1.20.6.2
	TIGRIS_1_0_6RC2:1.20.6.2
	TIGRIS_1_0_6RC1:1.20.6.2
	TIGRIS_1_0_5:1.20.6.1
	TIGRIS_1_0_5RC6:1.20.6.1
	TIGRIS_1_0_5RC5:1.20.6.1
	TIGRIS_1_0_5RC4:1.20.6.1
	TIGRIS_1_0_5RC3:1.20.6.1
	TIGRIS_1_0_5RC2:1.20.6.1
	TIGRIS_1_0_5RC1:1.20.6.1
	TIGRIS_1_0_4:1.20.6.1
	TIGRIS_1_0_3:1.20.6.1
	TIGRIS_1_0_2:1.20.6.1
	TIGRIS_1_0_1:1.20.6.1
	TIGRIS_1_0:1.20.0.6
	TIGRIS_1_0_0:1.20
	TIGRIS_1_0_0_RC1:1.20.0.2
	dlr:1.1.1
	TIGRIS_0_9_2_5:1.15
	TIGRIS_0_9_2_4:1.12
	TIGRIS_0_9_2_3:1.12
	HELM_PEER_PORT_BRANCH:1.1.1.2
	TURBINE_PEER:1.12
	TIGRIS_0_9_2_1:1.12
	TIGRIS_0_9_2:1.12.0.6
	TIGRIS_0_9_0:1.12.0.4
	TIGRIS_0_8_4:1.12.0.2
	NEWHELM:1.1.1.1
	TIGRIS_NOV_12_2000:1.1.1
	OLDHELM:1.8.0.2
	TIGRIS_NOV_11_2000:1.8
	TIGRIS_SEP_13_2000:1.3.0.2
	TIGRIS_BASELINE:1.3;
locks; strict;
comment	@# @;


1.25
date	2001.06.26.19.41.36;	author ms;	state Exp;
branches;
next	1.24;

1.24
date	2001.06.06.16.15.29;	author edk;	state Exp;
branches;
next	1.23;

1.23
date	2001.05.16.01.41.01;	author dlr;	state Exp;
branches;
next	1.22;

1.22
date	2001.04.17.18.50.39;	author dlr;	state Exp;
branches;
next	1.21;

1.21
date	2001.04.17.18.05.24;	author kmaples;	state Exp;
branches;
next	1.20;

1.20
date	2001.03.26.22.28.37;	author ms;	state Exp;
branches
	1.20.6.1;
next	1.19;

1.19
date	2001.03.21.22.13.39;	author ms;	state Exp;
branches;
next	1.18;

1.18
date	2001.03.21.21.59.05;	author ms;	state Exp;
branches;
next	1.17;

1.17
date	2001.03.15.19.51.33;	author ms;	state Exp;
branches;
next	1.16;

1.16
date	2001.02.21.01.08.19;	author dlr;	state Exp;
branches;
next	1.15;

1.15
date	2001.02.13.12.30.38;	author ms;	state Exp;
branches;
next	1.14;

1.14
date	2001.02.06.12.06.00;	author ms;	state Exp;
branches;
next	1.13;

1.13
date	2001.02.04.07.10.53;	author ms;	state Exp;
branches;
next	1.12;

1.12
date	2000.11.13.23.13.58;	author lucas;	state Exp;
branches
	1.12.8.1;
next	1.11;

1.11
date	2000.11.13.23.00.43;	author jrobbins;	state Exp;
branches;
next	1.10;

1.10
date	2000.11.13.22.26.48;	author jrobbins;	state Exp;
branches;
next	1.9;

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

1.8
date	2000.10.02.05.55.48;	author dlr;	state Exp;
branches;
next	1.7;

1.7
date	2000.10.01.07.08.51;	author lucas;	state Exp;
branches;
next	1.6;

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

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

1.4
date	2000.09.30.06.30.24;	author lucas;	state Exp;
branches;
next	1.3;

1.3
date	2000.07.12.04.52.47;	author jrobbins;	state Exp;
branches
	1.3.2.1;
next	1.2;

1.2
date	2000.07.12.03.51.08;	author jrobbins;	state Exp;
branches;
next	1.1;

1.1
date	2000.07.04.04.55.17;	author dlr;	state Exp;
branches
	1.1.1.1;
next	;

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

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

1.3.2.1
date	2000.10.23.06.01.02;	author lucas;	state Exp;
branches;
next	;

1.12.8.1
date	2001.02.09.19.59.43;	author dlr;	state Exp;
branches;
next	1.12.8.2;

1.12.8.2
date	2001.02.09.20.11.58;	author dlr;	state Exp;
branches;
next	1.12.8.3;

1.12.8.3
date	2001.02.13.13.03.58;	author ms;	state Exp;
branches;
next	1.12.8.4;

1.12.8.4
date	2001.02.19.14.40.13;	author ms;	state Exp;
branches;
next	1.12.8.5;

1.12.8.5
date	2001.02.20.07.24.49;	author dlr;	state Exp;
branches;
next	1.12.8.6;

1.12.8.6
date	2001.02.20.23.03.12;	author dlr;	state Exp;
branches;
next	;

1.20.6.1
date	2001.04.12.18.32.14;	author edk;	state Exp;
branches;
next	1.20.6.2;

1.20.6.2
date	2001.06.07.02.33.32;	author edk;	state Exp;
branches;
next	;


desc
@@


1.25
log
@removed bashism
@
text
@######################################################################
# -*- Makefile -*- developed for a Unix system.
#

include Makefile.config

default: build

build: FORCE eyebrowse-install
	@@echo 'Building $(PROJECT)'; \
	if [ ! -e $$SANDBOX/site/lib/eyebrowse.jar ]; then \
	  echo 'Eyebrowse not installed in $(SANDBOX)/site/lib, failing'; \
	  exit; \
	fi; \
	for d in $(BUILD_DIRS); do \
	  cd $${d}; \
	  make $(TARGET); \
	  cd ..; \
	done; \
	unset d; \
	echo 'Done building $(PROJECT)'

install: 
	@@make TARGET=install | grep -v 'Entering directory '

clean:
	@@make TARGET=clean | grep -v 'Entering directory '

install-data:
	@@echo 'Installing data files for $(PROJECT)' ; \
	cd data; \
	make install; \
	cd .. ;\
	echo 'Done installing data files'

FORCE:


####################################################################
# Eyebrowse targets
#

eb-check:
	@@if [ ! -d $$SANDBOX/eyebrowse ]; then \
	    echo "build impossible, eyebrowse doesnt exist at $$SANDBOX/eyebrowse"; \
	    exit; \
	fi

eyebrowse: eb-check
	@@cd $$SANDBOX/eyebrowse; \
	$${MAKE:-make}; \

eyebrowse-install: eyebrowse
	@@cd build; \
	make eyebrowse-install

eyebrowse-clean: eb-check
	@@cd $${SANDBOX}/eyebrowse; \
	make clean

eyebrowse-distclean: eb-check eyebrowse-clean
	@@cd $${SANDBOX}/helm/build; \
	make eyebrowse-distclean

eyebrowse-most: eyebrowse-clean eyebrowse

eyebrowse-all:  eyebrowse-distclean eyebrowse-install
@


1.24
log
@separate out the operation of installing data -- make install installs
conf files, templates, and java code; make install-data installs data.
explicitly call this in the install scripts.
@
text
@d50 1
a50 1
	@@pushd $$SANDBOX/eyebrowse; \
a51 1
	popd
@


1.23
log
@Added missing tabs (a necessary Make-ism).
@
text
@d29 7
@


1.22
log
@Make use of the make variable inheritted from the environment instead
of using gmake-specific notation to access the env var directly.
@
text
@d11 4
a14 4
        if [ ! -e $$SANDBOX/site/lib/eyebrowse.jar ]; then \
           echo 'Eyebrowse not installed in $(SANDBOX)/site/lib, failing'; \
           exit; \
        fi; \
@


1.21
log
@Fixed typo that was preventing the error message from correctly displaying
$SANDBOX.
@
text
@d12 1
a12 1
           echo "Eyebrowse not installed in $$SANDBOX/site/lib, failing"; \
@


1.20
log
@debug message was wrong
@
text
@d38 1
a38 1
	    echo 'build impossible, eyebrowse doesnt exist at $SANDBOX/eyebrowse'; \
@


1.20.6.1
log
@portability changes:
* use -f test instead of -e
* use cd instead of pushd/popd
@
text
@d11 1
a11 1
        if [ ! -f $$SANDBOX/site/lib/eyebrowse.jar ]; then \
d43 1
a43 2
	@@OLDDIR=`pwd` ; \
	cd $$SANDBOX/eyebrowse; \
d45 1
a45 1
	cd $$OLDDIR
@


1.20.6.2
log
@port changes which separate out the install of data from the install of
code, templates, conf, and sql files
@
text
@d11 4
a14 4
	if [ ! -f $$SANDBOX/site/lib/eyebrowse.jar ]; then \
	   echo "Eyebrowse not installed in $$SANDBOX/site/lib, failing"; \
	   exit; \
	fi; \
a24 7

install-data:
	@@echo 'Installing data files for $(PROJECT)' ; \
	cd data; \
	make install; \
	cd .. ;\
	echo 'Done installing data files'
@


1.19
log
@fail if eyebrowse doesnt exist
@
text
@d38 1
a38 1
	    echo 'build impossible, eyebrowse doesnt exist at \$SANDBOX/eyebrowse'; \
@


1.18
log
@force install of eyebrowse
@
text
@d11 4
@


1.17
log
@make helm depend on eb
@
text
@d9 1
a9 1
build: FORCE eyebrowse
@


1.16
log
@This is the highest revision from the HELM_PEER_PORT_BRANCH.  The previous import caused too many conflicts to resolve manually
@
text
@d9 1
a9 1
build: FORCE
@


1.15
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
@a5 2
PATCH_PERMISSIONS=scripts/patch_permissions
ID_CMD=id
d36 1
a36 15
	fi; \

eyebrowse-x: build install eb-check
	@@echo 'Building eyebrowse'; \
	JOIST=$${SANDBOX}/site/lib/joist.jar; \
	if [ -f "$${JOIST}" ] ; then \
	    CLASSPATH="$${CLASSPATH}:$${JOIST}"; \
	fi; \
	HELM=$${SANDBOX}/site/lib/helm.jar; \
	if [ -f "$${HELM}" ] ; then \
	    CLASSPATH="$${CLASSPATH}:$${HELM}"; \
	fi; \
	eval "export CLASSPATH=$$CLASSPATH"; \
	cd $$SANDBOX/eyebrowse; \
	$${MAKE:-make}; \
d41 1
a41 1
	popd; \
d45 2
a46 2
	make eyebrowse-install;
	
d49 1
a49 1
	make clean;
d53 1
a53 1
	make eyebrowse-distclean;
@


1.14
log
@Fixed make targets to call eyebrowse build and integrate with our sandbox struct.
Corrected target eyebrowse-install and eyebrowse-distclean in both make and Ant.
to install eyebrowse in a sandbox you'll have to build from helm.
new targets:
eyebrowse		# build helm, link it (add to CP) and build eb
eyebrowse-install	# copy config files and jar into $SANDBOX
eyebrowse-clean		# rm files only from eyebrowse/
eyebrowse-distclean    	# do eyebrowse-clean and also rm files in site/
@
text
@d40 1
a40 1
eyebrowse: build install eb-check
d54 6
a59 1
eyebrowse-install: eb-check
@


1.13
log
@moving SANDBOX specific data to helm
@
text
@d40 1
a40 1
eyebrowse: eb-check
d44 1
a44 1
	    CP="$${CLASSPATH}:$${JOIST}"; \
d48 1
a48 1
	    CP="$${CLASSPATH}:$${HELM}"; \
d50 1
a50 1
	export $$CLASSPATH; \
d54 1
a54 1
eyebrowse-install: eb-check eyebrowse
d56 1
a56 1
	make TARGET=eyebrowse-install | grep -v 'Entering directory'; 
d59 1
a59 2
	@@make TARGET=eyebrowse-clean | grep -v 'Entering directory'; \
	cd $${SANDBOX}/eyebrowse; \
d61 5
a65 1
	
d68 1
a68 1
eyebrowse-all:  eyebrowse-clean eyebrowse eyebrowse-install
@


1.12
log
@Moved logic for calling patch_permissions to the proper directory

PR:
Obtained from:
Submitted by:
Reviewed by:
@
text
@d28 38
@


1.12.8.1
log
@Removed unused variables.
@
text
@d6 2
@


1.12.8.2
log
@Merged ms' changes from the HEAD.
@
text
@a25 41


####################################################################
# Eyebrowse targets
#

eb-check:
	@@if [ ! -d $$SANDBOX/eyebrowse ]; then \
	    echo 'build impossible, eyebrowse doesnt exist at \$SANDBOX/eyebrowse'; \
	    exit; \
	fi; \

eyebrowse: build install eb-check
	@@echo 'Building eyebrowse'; \
	JOIST=$${SANDBOX}/site/lib/joist.jar; \
	if [ -f "$${JOIST}" ] ; then \
	    CLASSPATH="$${CLASSPATH}:$${JOIST}"; \
	fi; \
	HELM=$${SANDBOX}/site/lib/helm.jar; \
	if [ -f "$${HELM}" ] ; then \
	    CLASSPATH="$${CLASSPATH}:$${HELM}"; \
	fi; \
	eval "export CLASSPATH=$$CLASSPATH"; \
	cd $$SANDBOX/eyebrowse; \
	$${MAKE:-make}; \

eyebrowse-install: eb-check
	@@cd build; \
	make eyebrowse-install;

eyebrowse-clean: eb-check
	@@cd $${SANDBOX}/eyebrowse; \
	make clean;

eyebrowse-distclean: eb-check eyebrowse-clean
	@@cd $${SANDBOX}/helm/build; \
	make eyebrowse-distclean;

eyebrowse-most: eyebrowse-clean eyebrowse

eyebrowse-all:  eyebrowse-distclean eyebrowse-install
@


1.12.8.3
log
@Ported changes to HEAD to branch. Moved servlets into logical container
of org.tigris.helm.tool.mail and changed build system and jserv config
to match changes.
@
text
@a5 2
PATCH_PERMISSIONS=scripts/patch_permissions
ID_CMD=id
d38 1
a38 1
eyebrowse-x: build install eb-check
d52 1
a52 6
eyebrowse: eb-check
	@@pushd $$SANDBOX/eyebrowse; \
	$${MAKE:-make}; \
	popd; \

eyebrowse-install: eyebrowse
d55 1
a55 1
	
@


1.12.8.4
log
@removed old target
@
text
@d38 15
a52 1
	fi; 
@


1.12.8.5
log
@Removed unused Makefile variables.
@
text
@d6 2
@


1.12.8.6
log
@Corrected Makefile syntax errors.
@
text
@d36 1
a36 1
	fi
d41 1
a41 1
	popd
d45 2
a46 2
	make eyebrowse-install

d49 1
a49 1
	make clean
d53 1
a53 1
	make eyebrowse-distclean
@


1.11
log
@fixed errors
@
text
@d22 1
a22 5
	@@make TARGET=install | grep -v 'Entering directory ';\
	if [ `id -u` = "0" ] ; then \
		echo running patch_permissions ; \
		$(SANDBOX)/$(PATCH_PERMISSIONS); \
	fi
@


1.10
log
@trying an extra call to patch_permissions, to avoid a common error installers make...
@
text
@d22 1
a22 2
	@@make TARGET=install | grep -v 'Entering directory '\
	@@ID=`${ID_CMD} -u`; \
@


1.9
log
@Resolved merge conflicts.
@
text
@d6 2
d21 7
a27 2
install:
	@@make TARGET=install | grep -v 'Entering directory '
@


1.8
log
@Accounting for the make stupidity pointed out by Ed and Josh.
@
text
@d22 3
@


1.7
log
@Had to add this ugly redirection so that make would go into sub-directories
PR:
Obtained from:
Submitted by:
Reviewed by:
@
text
@d9 1
a9 3
build: build-real

build-real:
d21 2
@


1.6
log
@Removed warning--the proper place to handle this is in the
sub-directory Makefiles.
@
text
@d9 3
a11 1
build:
@


1.5
log
@Switched target names.
@
text
@a6 5
# FIX: Determine whether a make install is necessary when the install target 
# is used.  Currently, not all Makefiles need both actions, as for some 
# Makefiles the default target *is* install.  The current setup is horribly 
# inefficient, as some targets will be excercised twice upon a 
# `make; make install`.
@


1.4
log
@Adding support for Ant via make.

PR:
Obtained from:
Submitted by:
Reviewed by:
@
text
@d9 1
a9 1
# Makefies the default target *is* install.  The current setup is horribly 
d12 1
a12 1
build: build-real
d14 1
a14 1
build-real:
@


1.3
log
@Removed data-dest dependancy, since target was already removed.
@
text
@d12 1
a12 1
default: build
d14 1
a14 1
build:
@


1.3.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
@d14 1
a14 1
build: FORCE
a25 5

clean:
    @@make TARGET=clean | grep -v 'Entering directory '

FORCE:
@


1.2
log
@Changed install to accomodate for data directories.
@
text
@d12 1
a12 1
default: data-dest build
@


1.1
log
@Project-level Makefile.
@
text
@a25 9

data-dest:
	@@for d in $(DATA_DIR_LEAVES); do \
	  if [ ! -d $${d} ]; then \
	    echo "Creating user data directory $${d}"; \
	    mkdir -p $(DATA_DIR_BASE)/$${d}; \
	  fi; \
	done; \
	unset d
@


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
@d7 6
a12 1
default: build
d14 1
a14 1
build: FORCE
d27 8
a34 4
clean:
	@@make TARGET=clean | grep -v 'Entering directory '

FORCE:
@


1.1.1.2
log
@Replacing the HEAD with the HELM_PEER_PORT_BRANCH.
@
text
@d19 1
a19 1
install: 
a25 32


####################################################################
# Eyebrowse targets
#

eb-check:
	@@if [ ! -d $$SANDBOX/eyebrowse ]; then \
	    echo 'build impossible, eyebrowse doesnt exist at \$SANDBOX/eyebrowse'; \
	    exit; \
	fi

eyebrowse: eb-check
	@@pushd $$SANDBOX/eyebrowse; \
	$${MAKE:-make}; \
	popd

eyebrowse-install: eyebrowse
	@@cd build; \
	make eyebrowse-install

eyebrowse-clean: eb-check
	@@cd $${SANDBOX}/eyebrowse; \
	make clean

eyebrowse-distclean: eb-check eyebrowse-clean
	@@cd $${SANDBOX}/helm/build; \
	make eyebrowse-distclean

eyebrowse-most: eyebrowse-clean eyebrowse

eyebrowse-all:  eyebrowse-distclean eyebrowse-install
@


