X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=8b9280f61354015f499683036059ebf798f6a3dc;hb=86f41071c9f7a088e89998b87b65822ca32d3bcd;hp=66c83a0f50cc4f5aae6d305edc843d88de66423c;hpb=c5a358f8b8b0c7ac8f627f7042d81f4187bed57f;p=freeside.git

diff --git a/Makefile b/Makefile
index 66c83a0f5..8b9280f61 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #!/usr/bin/make
 
-DATASOURCE = DBI:Pg:host=localhost;dbname=freeside
+DATASOURCE = DBI:Pg:dbname=freeside
 #DATASOURCE=DBI:mysql:freeside
 
 DB_USER = freeside
@@ -27,10 +27,10 @@ QUEUED_USER=ivan
 #eventually this shouldn't be needed
 FREESIDE_PATH = `pwd`
 
-PASSWD_USER = ivan
+PASSWD_USER = nostart
 PASSWD_MACHINE = localhost
 
-SIGNUP_USER = ivan
+SIGNUP_USER = nostart
 SIGNUP_MACHINE = localhost
 SIGNUP_AGENTNUM = 2
 SIGNUP_REFNUM = 2
@@ -40,10 +40,8 @@ SIGNUP_REFNUM = 2
 #not changable yet
 FREESIDE_CONF = /usr/local/etc/freeside
 
-VERSION=1.4.0pre14
-TAG=freeside_1_4_0_pre14
-#VERSION=1.4.0beta1
-#TAG=freeside_1_4_0_beta1
+VERSION=1.4.1beta4
+TAG=freeside_1_4_1beta4
 
 help:
 	@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
@@ -56,14 +54,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
@@ -140,6 +145,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}"
 
@@ -160,11 +166,11 @@ 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
+	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
-	cd /home/ivan/freeside_current
+release: upload-docs update-webdemo
+	cd /home/ivan/freeside1.4
 	#cvs tag ${TAG}
 	cvs tag -F ${TAG}
 
@@ -176,7 +182,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 )'