X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=Makefile;h=30c1654837496fae81e3b5dc231535ea0094509f;hp=34259737bba37f8175f4a030e0a66d8c843080ec;hb=768935cdc63dd2071941a26959a710bce3ba1de3;hpb=b35b650a6078d645d6f97620f3c79ae941915dd9

diff --git a/Makefile b/Makefile
index 34259737b..30c165483 100644
--- a/Makefile
+++ b/Makefile
@@ -6,27 +6,43 @@ DATASOURCE = DBI:Pg:host=localhost;dbname=freeside
 DB_USER = freeside
 DB_PASSWORD=
 
-<<<<<<< Makefile
-#TEMPLATE = asp
-#mason's a bit dodgy still
-TEMPLATE = mason
-=======
 TEMPLATE = asp
 #TEMPLATE = mason
->>>>>>> 1.27
 
 ASP_GLOBAL = /usr/local/etc/freeside/asp-global
 
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
 
+INIT_FILE = /etc/init.d/freeside
+
 HTTPD_RESTART = /etc/init.d/apache restart
-QUEUED_RESTART = /etc/init.d/freeside restart
+FREESIDE_RESTART = /etc/init.d/freeside restart
+
+INSTALLGROUP = root
+
+#edit the stuff below to have the daemons start
+
+QUEUED_USER=ivan
+
+#eventually this shouldn't be needed
+FREESIDE_PATH = `pwd`
+
+PASSWD_USER = nostart
+PASSWD_MACHINE = localhost
+
+SIGNUP_USER = nostart
+SIGNUP_MACHINE = localhost
+SIGNUP_AGENTNUM = 2
+SIGNUP_REFNUM = 2
 
 #---
 
 #not changable yet
 FREESIDE_CONF = /usr/local/etc/freeside
 
+VERSION=1.4.0beta2
+TAG=freeside_1_4_0_beta2
+
 help:
 	@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
 	@echo "                   htmlman"
@@ -58,11 +74,16 @@ htmlman:
 	[ -e ./httemplate/docs/man/bin ] || mkdir httemplate/docs/man/bin
 	[ -e ./httemplate/docs/man/FS ] || mkdir httemplate/docs/man/FS
 	[ -e ./httemplate/docs/man/FS/UI ] || mkdir httemplate/docs/man/FS/UI
+	[ -e ./httemplate/docs/man/FS/part_export ] || mkdir httemplate/docs/man/FS/part_export
 	[ -e DONT_REBUILD_DOCS ] || bin/pod2x
 
-upload-docs:
-	ssh cleanwhisker.420.am rm -rf /var/www/www.sisd.com/freeside/devdocs
-	scp -pr httemplate/docs cleanwhisker.420.am:/var/www/www.sisd.com/freeside/devdocs
+forcehtmlman:
+	[ -e ./httemplate/docs/man ] || mkdir httemplate/docs/man
+	[ -e ./httemplate/docs/man/bin ] || mkdir httemplate/docs/man/bin
+	[ -e ./httemplate/docs/man/FS ] || mkdir httemplate/docs/man/FS
+	[ -e ./httemplate/docs/man/FS/UI ] || mkdir httemplate/docs/man/FS/UI
+	[ -e ./httemplate/docs/man/FS/part_export ] || mkdir httemplate/docs/man/FS/part_export
+	bin/pod2x
 
 install-docs: docs
 	[ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S` || true
@@ -80,11 +101,25 @@ install-perl-modules: perl-modules
 	cd FS; \
 	make install UNINST=1
 
-install: install-perl-modules install-docs
+install-init:
+	#[ -e ${INIT_FILE} ] || install -o root -g ${INSTALLGROUP} -m 711 init.d/freeside-init ${INIT_FILE}
+	install -o root -g ${INSTALLGROUP} -m 711 init.d/freeside-init ${INIT_FILE}
+	perl -p -i -e "\
+	  s/%%%QUEUED_USER%%%/${QUEUED_USER}/g;\
+	  s'%%%FREESIDE_PATH%%%'${FREESIDE_PATH}'g;\
+	  s/%%%PASSWD_USER%%%/${PASSWD_USER}/g;\
+	  s/%%%PASSWD_MACHINE%%%/${PASSWD_MACHINE}/g;\
+	  s/%%%SIGNUP_USER%%%/${SIGNUP_USER}/g;\
+	  s/%%%SIGNUP_MACHINE%%%/${SIGNUP_MACHINE}/g;\
+	  s/%%%SIGNUP_AGENTNUM%%%/${SIGNUP_AGENTNUM}/g;\
+	  s/%%%SIGNUP_REFNUM%%%/${SIGNUP_REFNUM}/g;\
+	" ${INIT_FILE}
+
+install: install-perl-modules install-docs install-init
 
 deploy: install
 	${HTTPD_RESTART}
-	${QUEUED_RESTART}
+	${FREESIDE_RESTART}
 
 create-database:
 	perl -e 'use DBIx::DataSource qw( create_database ); create_database( "${DATASOURCE}", "${DB_USER}", "${DB_PASSWORD}" ) or die $$DBIx::DataSource::errstr;'
@@ -120,3 +155,26 @@ clean:
 	cd FS; \
 	make clean
 
+#these are probably only useful if you're me...
+
+upload-docs: forcehtmlman
+	ssh cleanwhisker.420.am rm -rf /var/www/www.sisd.com/freeside/devdocs
+	scp -pr httemplate/docs cleanwhisker.420.am:/var/www/www.sisd.com/freeside/devdocs
+
+release: upload-docs
+	cd /home/ivan/freeside_current
+	#cvs tag ${TAG}
+	cvs tag -F ${TAG}
+
+	#cd /home/ivan
+	cvs export -r ${TAG} -d freeside-${VERSION} freeside
+	tar czvf freeside-${VERSION}.tar.gz freeside-${VERSION}
+
+	scp freeside-${VERSION}.tar.gz ivan@cleanwhisker.420.am:/var/www/sisd.420.am/freeside/
+	mv freeside-${VERSION} freeside-${VERSION}.tar.gz ..
+
+update-webdemo:
+	ssh ivan@pouncequick.420.am '( cd freeside; cvs update -d -P )'
+	#ssh root@pouncequick.420.am '( cd /home/ivan/freeside; make clean; make deploy )'
+	ssh root@pouncequick.420.am '( cd /home/ivan/freeside; make deploy )'
+