X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=c48f5e91a130010aa3e547fd73c4387973d3cc4f;hb=2dea7078530a565f2300b52b6d235b5eaf2df9e0;hp=68ef7946494d7ec697e85a88c6e1a3832ad8d2da;hpb=101f05b91c1c9b627d88a7e60347159781caed0b;p=freeside.git

diff --git a/Makefile b/Makefile
index 68ef79464..c48f5e91a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,17 @@
 #!/usr/bin/make
 
-DATASOURCE = DBI:Pg:host=localhost;dbname=freeside
+DATASOURCE = DBI:Pg:dbname=freeside
 #DATASOURCE=DBI:mysql:freeside
 
 DB_USER = freeside
 DB_PASSWORD=
 
-#TEMPLATE = asp
-TEMPLATE = mason
+TEMPLATE = asp
+#TEMPLATE = mason
 
 ASP_GLOBAL = /usr/local/etc/freeside/asp-global
+MASON_HANDLER = /usr/local/etc/freeside/handler.pl
+MASONDATA = /usr/local/etc/freeside/masondata
 
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
 
@@ -20,17 +22,31 @@ 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
+
+SELFSERVICE_USER = nostart
+SELFSERVICE_MACHINE = localhost
+
 #---
 
 #not changable yet
 FREESIDE_CONF = /usr/local/etc/freeside
 
-#VERSION=1.4.0pre12
-#TAG=freeside_1_4_0_pre12
-VERSION=1.4.0pre13
-TAG=freeside_1_4_0_pre13
-#VERSION=1.4.0beta1
-#TAG=freeside_1_4_0_beta1
+VERSION=1.4.1rc2
+TAG=freeside_1_4_1rc2
 
 help:
 	@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
@@ -43,14 +59,21 @@ help:
 aspdocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
 	rm -rf aspdocs
 	cp -pr httemplate aspdocs
+	perl -p -i -e "\
+	  s/%%%VERSION%%%/${VERSION}/g;\
+	" aspdocs/index.html
 	touch aspdocs
 
+
 masondocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
 	rm -rf masondocs
 	cp -pr httemplate masondocs
 	( cd masondocs; \
 	  ../bin/masonize; \
 	)
+	perl -p -i -e "\
+	  s/%%%VERSION%%%/${VERSION}/g;\
+	" masondocs/index.html
 	touch masondocs
 
 alldocs: aspdocs masondocs
@@ -63,8 +86,17 @@ 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
+	chmod a+rx bin/pod2x
 	[ -e DONT_REBUILD_DOCS ] || bin/pod2x
 
+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
@@ -72,6 +104,9 @@ install-docs: docs
 	[ "${TEMPLATE}" = "asp" -a ! -e ${ASP_GLOBAL} ] && mkdir ${ASP_GLOBAL} || true
 	[ "${TEMPLATE}" = "asp" ] && chown -R freeside ${ASP_GLOBAL} || true
 	[ "${TEMPLATE}" = "asp" ] && cp htetc/global.asa ${ASP_GLOBAL} || true
+	[ "${TEMPLATE}" = "mason" ] && cp htetc/handler.pl ${MASON_HANDLER} || true
+	[ "${TEMPLATE}" = "mason" -a ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true
+	[ "${TEMPLATE}" = "mason" ] && chown -R freeside ${MASONDATA} || true
 
 perl-modules:
 	cd FS; \
@@ -85,6 +120,18 @@ install-perl-modules: perl-modules
 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;\
+	  s/%%%SELFSERVICE_USER%%%/${SELFSERVICE_USER}/g;\
+	  s/%%%SELFSERVICE_MACHINE%%%/${SELFSERVICE_MACHINE}/g;\
+	" ${INIT_FILE}
 
 install: install-perl-modules install-docs install-init
 
@@ -109,6 +156,7 @@ create-config: install-perl-modules
 	chown freeside ${FREESIDE_CONF}/secrets
 
 	mkdir "${FREESIDE_CONF}/conf.${DATASOURCE}"
+	rm -rf conf/registries #old dirs just won't go away
 	cp conf/[a-z]* "${FREESIDE_CONF}/conf.${DATASOURCE}"
 	chown -R freeside "${FREESIDE_CONF}/conf.${DATASOURCE}"
 
@@ -128,12 +176,13 @@ clean:
 
 #these are probably only useful if you're me...
 
-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
+upload-docs: forcehtmlman
+	ssh cleanwhisker.420.am rm -rf /var/www/www.sisd.com/freeside/docs
+	scp -pr httemplate/docs cleanwhisker.420.am:/var/www/www.sisd.com/freeside/docs
 
+#release: upload-docs update-webdemo
 release: upload-docs
-	cd /home/ivan/freeside_current
+	cd /home/ivan/freeside1.4
 	#cvs tag ${TAG}
 	cvs tag -F ${TAG}
 
@@ -145,7 +194,7 @@ release: upload-docs
 	mv freeside-${VERSION} freeside-${VERSION}.tar.gz ..
 
 update-webdemo:
-	ssh ivan@pouncequick.420.am '( cd freeside; cvs update -d -P )'
+	ssh ivan@pouncequick.420.am '( cd freeside; cvs update -r FREESIDE_1_4_BRANCH -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 )'