This commit was manufactured by cvs2svn to create tag 'freeside_1_4_1beta4'.

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index 3f5e18d..8b9280f 100644 (file)
--- 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
@@ -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 )'