head	1.19;
access;
symbols
	TIGRIS_1_1_0RC2:1.19
	TIGRIS_1_1_0RC1:1.19
	EB_WM:1.19
	TIGRIS_1_1:1.19.0.6
	TIGRIS_1_0_8:1.19
	TIGRIS_1_0_8RC3:1.19
	TIGRIS_1_0_8RC2:1.19
	TIGRIS_1_0_8RC1:1.19
	TIGRIS_1_0_7:1.19
	TIGRIS_1_0_7RC3:1.19
	TIGRIS_1_0_7RC2:1.19
	TIGRIS_1_0_7RC1:1.19
	TIGRIS_1_0_6:1.19
	TIGRIS_1_0_6RC5:1.19
	TIGRIS_1_0_6RC4:1.19
	TIGRIS_1_0_6RC3:1.19
	TIGRIS_1_0_6RC2:1.19
	TIGRIS_1_0_6RC1:1.19
	TIGRIS_1_0_5:1.19
	TIGRIS_1_0_5RC6:1.19
	TIGRIS_1_0_5RC5:1.19
	TIGRIS_1_0_5RC4:1.19
	TIGRIS_1_0_5RC3:1.19
	TIGRIS_1_0_5RC2:1.19
	TIGRIS_1_0_5RC1:1.19
	TIGRIS_1_0_4:1.19
	TIGRIS_1_0_3:1.19
	TIGRIS_1_0_2:1.19
	TIGRIS_1_0_1:1.19
	TIGRIS_1_0:1.19.0.8
	TIGRIS_1_0_0:1.19
	TIGRIS_1_0_0_RC1:1.19.0.4
	HELM_PEER_PORT_BRANCH:1.19.0.2
	TIGRIS_0_9_2_4:1.18
	TIGRIS_0_9_2_3:1.18
	TIGRIS_0_9_2:1.18.0.6
	TIGRIS_0_9_0:1.18.0.4
	TIGRIS_0_8_4:1.18.0.2
	EYEBROWSE_WM_0_89:1.16;
locks; strict;
comment	@# @;


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

1.18
date	2000.11.07.22.25.20;	author edk;	state Exp;
branches;
next	1.17;

1.17
date	2000.11.07.02.04.27;	author edk;	state Exp;
branches;
next	1.16;

1.16
date	2000.10.11.18.47.39;	author ms;	state Exp;
branches;
next	1.15;

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

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

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

1.12
date	2000.09.28.00.04.30;	author ms;	state Exp;
branches;
next	1.11;

1.11
date	2000.09.27.23.54.22;	author ms;	state Exp;
branches;
next	1.10;

1.10
date	2000.09.27.23.43.55;	author ms;	state Exp;
branches;
next	1.9;

1.9
date	2000.09.27.23.36.25;	author ms;	state Exp;
branches;
next	1.8;

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

1.7
date	2000.09.27.20.40.55;	author ms;	state Exp;
branches;
next	1.6;

1.6
date	2000.09.27.20.13.40;	author ms;	state Exp;
branches;
next	1.5;

1.5
date	2000.09.27.19.53.29;	author ms;	state Exp;
branches;
next	1.4;

1.4
date	2000.09.20.02.17.45;	author ms;	state Exp;
branches;
next	1.3;

1.3
date	2000.09.20.02.17.45;	author ms;	state Exp;
branches;
next	1.2;

1.2
date	2000.09.08.21.42.37;	author ms;	state Exp;
branches;
next	1.1;

1.1
date	2000.09.08.18.23.18;	author ms;	state Exp;
branches;
next	;


desc
@@


1.19
log
@Here is the move we've all been waiting for. No more confusing (well 1 :\)
references to SANDBOX all over the place, extra config files that are collabnet
specific and what not.
The 60* files have been moved to helm/conf/eyebrowse and the logic removed from
the Makefiles (which only were useful to tigris instantiations) is now in
build-helm.xml (antfile).
Changed conf data to match documentation and make more sense in general.
The only SANDBOX ref is in the "eyebrowse" wrapper script, this can go away also,
I just havent gotten around to that.
The next thing to go are the helmservlets and templates.
@
text
@#####################################
# 	Eyebrowse Master Makefile   #
#####################################

default: build

dummy:

clean:
	@@cd build; \
	./build.sh clean;

build: dummy
	@@cd build; \
	./build.sh;

install:
	@@echo "Read the documentation in docs/ to show you how to install eyebrowse\
	for your servlet environment";
most:
	@@cd build; \
	./build.sh most;
@


1.18
log
@install the sql files
@
text
@a4 3
INSTALL_DIRS=src/webmacro lib src/scripts conf src/sql


d11 1
a11 1
	make clean;
d15 1
a15 4
	make

install-notworking:
	@@make TARGET=install | grep -v 'Entering directory '
d18 2
a19 9
	@@echo 'Installing $(PROJECT)'; \
	for d in $(INSTALL_DIRS); do \
	  pushd $${d} >/dev/null 2>&1 ; \
	  make install; \
	  popd  >/dev/null 2>&1 ; \
	done; \
	unset d; \
	echo 'Done installing $(PROJECT)'

d22 1
a22 3
	make most;

all: most install
@


1.17
log
@minor changes to the Makefiles to reduce noise & make them work w/in
the "sandbox"
@
text
@d5 1
a5 1
INSTALL_DIRS=src/webmacro lib src/scripts conf
@


1.16
log
@A Makefile that does the job
Submitted by:	Michael Salmon
@
text
@d26 1
a26 1
	  pushd $${d}; \
d28 1
a28 1
	  popd ; \
@


1.15
log
@CVS problem ...
@
text
@d5 3
d20 3
d24 8
a31 1
	@@make TARGET=install | grep -v 'Entering directory '
@


1.14
log
@CVS problems...
Submitted by:	Michael Salmon
@
text
@d2 1
a2 1
# Call ant on build.xml 	    #
a4 1

d10 2
a11 1
	./build.sh clean
d14 5
a18 1
	./build.sh main
d21 4
a24 1
	./build.sh most
@


1.13
log
@Continous cvs problems, hopefully coming to conclusion.
Submitted by:	Michael Salmon
@
text
@d2 1
a2 1
# 	Eyebrowse Master Makefile   #
a4 1
include Makefile.config
d11 1
a11 2
	@@cd build; \
	make clean;
d14 1
a14 5
	@@cd build; \
	make

install:
	@@make TARGET=install | grep -v 'Entering directory '
d17 1
a17 4
	@@cd build; \
	make most;

all: most install
@


1.12
log
@Makefile that was stored in build was not the correct one.
Submitted by:	Michael Salmon
@
text
@d2 1
a2 1
# Call ant on build.xml 	    #
d5 1
d12 2
a13 1
	./build.sh clean
d16 5
a20 1
	./build.sh main
d23 4
a26 1
	./build.sh most
@


1.11
log
@Wasn't able to merge local copy, so I just redid the entire file.
Submitted by:	Michael Salmon
@
text
@d2 1
a2 1
# 	Eyebrowse Master Makefile   #
a4 1
include Makefile.config
d11 1
a11 2
	@@cd build; \
	make clean;
d14 1
a14 5
	@@cd build; \
	make

install:
	@@make TARGET=install | grep -v 'Entering directory '
d17 1
a17 4
	@@cd build; \
	make most;

all: most install
@


1.10
log
@Changed default target
Submitted by:	Michael Salmon
@
text
@d2 1
a2 1
#	Call ant on build.xml	    #
d4 3
d9 2
d12 2
a13 1
	./build.sh clean
d15 6
a20 2
build:
	./build.sh main
d23 4
a26 1
	./build.sh most
@


1.9
log
@Fixed a munge from a bad merge.
Submitted by:	Michael Salmon
@
text
@d4 1
a4 4
default: nothing

nothing:
	@@echo ""
d10 1
a10 1
	./build.sh build
@


1.8
log
@Small edit to targets.
Submitted by:	Michael Salmon
@
text
@d2 3
d6 2
a7 3
default: build

dummy:
d10 1
a10 9
	@@cd build; \
	make clean;

build: dummy
	@@cd build; \
	make

install:
	@@make TARGET=install | grep -v 'Entering directory '
d12 2
a13 1
all: most install
d16 1
a16 2
	@@cd build; \
	make most;
@


1.7
log
@Edited how the database info was found for eyebrowse, and edited the joist-servlet.properties
to work with the template-cooker. While not making them dependant on it.
Submitted by:	Michael Salmon
@
text
@d12 2
a13 2
	@@cd build;
	./build.sh main;
@


1.6
log
@Removal of duplicate copies and sanity checking of Makefiles for all of eyebrowse
Submitted by:	Michael Salmon
@
text
@a1 2
#	call ant on build.xml       #
#####################################
d6 5
a10 1
	
d12 1
d15 2
a16 2
clean: dummy
	./build.sh clean;
d18 1
a18 2
install:
	cp ../src/scripts/eyebrowse $$SANDBOX/site/scripts;
d20 3
a22 2
most: dummy
	./build.sh most;
@


1.5
log
@Removed a few useless targets, and a useless Makefile.config.
Submitted by:	Michael Salmon
@
text
@d14 1
d17 3
@


1.4
log
@Everything is now under org.tigris.eyebrowse rather then com.quiotix.
Assorted small changes in the build structure to reflect these changes were also made.
Submitted by:Michael Salmon
Reviewed by:Daniel Rall
@
text
@d15 1
a15 1
	cp ../src/scripts/eyebrowse $$SANDBOX/site/scripts
@


1.3
log
@Everything is now under org.tigris.eyebrowse rather then com.quiotix.
Assorted small changes in the build structure to reflect these changes were also made.
Submitted by:Michael Salmon
Reviewed by:Daniel Rall
@
text
@d1 3
a3 3
######################################################################
# -*- Makefile -*- developed for a Unix system.
#
a4 7
include Makefile.config

# TODO: Determine whether a make install is necessary when the install target 
# is used.  Currently, not all Makefiles need both actions, as for some 
# Makefies the default target *is* install.  The current setup is horribly 
# inefficient, as some targets will be excercised twice upon a 
# `make; make install`.
a8 1

d10 1
a10 8
	@@echo 'Building $(PROJECT)'; \
	for d in $(BUILD_DIRS); do \
	  cd $${d}; \
	  make $(TARGET); \
	  cd ..; \
	done; \
	unset d; \
	echo 'Done building $(PROJECT)'
d12 2
d15 1
a15 7
	@@make TARGET=install | grep -v 'Entering directory '

clean:
	@@cd build; \
	make clean;

all:clean build install
@


1.2
log
@
PR:
Obtained from:
Submitted by:
Reviewed by:
@
text
@d29 6
@


1.1
log
@Added project Makefile to install binaries in sandbox and call subdirectory Makefiles in turn.
@
text
@d7 5
a13 1
# only install the conf files on make install
d18 1
a18 1
	@@echo "Building for Eyebrowse Version $(VERSION)"; \
d28 1
a28 22
	@@echo 'Installing eyebrowse.jar and configuration files'; \
	for f in $(PROPERTIES_CONF_FILES); do \
	  echo "  $${f}"; \
	  if [ -f $(PROPERTIES_CONF_DIR)/$${f} ]; then \
	    mv $(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} ]; then \
	    mv $(SERVLETS_CONF_DIR)/$${f} $(SERVLETS_CONF_DIR)/$${f}.orig; \
	  fi; \
	  cp -f $${f}* $(SERVLETS_CONF_DIR); \
	done; \
	echo 'Installation of project configuration files complete'; \
	unset f ; true; \
	cp $(LIB_BIR)/eyebrowse.jar $(SITE_LIB)
	echo "Now would Probably be a good time to run \
	      $SANDBOX/scripts/configure, to reset add the eyebrowse \
	      zone.properties and servlet.propteries to your sandbox';
	echo "Installation complete. Restart sXc to use\n"
@

