1.4.0pre14

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index 315d430..19bc0f3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,8 @@ DATASOURCE = DBI:Pg:host=localhost;dbname=freeside
 DB_USER = freeside
 DB_PASSWORD=
 
-#TEMPLATE = asp
-TEMPLATE = mason
+TEMPLATE = asp
+#TEMPLATE = mason
 
 ASP_GLOBAL = /usr/local/etc/freeside/asp-global
 
@@ -18,13 +18,32 @@ INIT_FILE = /etc/init.d/freeside
 HTTPD_RESTART = /etc/init.d/apache 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 = ivan
+PASSWD_MACHINE = localhost
+
+SIGNUP_USER = ivan
+SIGNUP_MACHINE = localhost
+SIGNUP_AGENTNUM = 2
+SIGNUP_REFNUM = 2
+
 #---
 
 #not changable yet
 FREESIDE_CONF = /usr/local/etc/freeside
 
-VERSION="1.4.0pre12"
-TAG="1_4_0_PRE12"
+VERSION=1.4.0pre14
+TAG=freeside_1_4_0_pre14
+#VERSION=1.4.0beta1
+#TAG=freeside_1_4_0_beta1
 
 help:
        @echo "supported targets: aspdocs masondocs alldocs docs install-docs"
@@ -77,7 +96,18 @@ install-perl-modules: perl-modules
        make install UNINST=1
 
 install-init:
-       [ -e ${INIT_FILE} ] || install -o root -g root -m 711 init.d/freeside-init ${INIT_FILE}
+       #[ -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
 
@@ -127,13 +157,15 @@ upload-docs:
 
 release: upload-docs
        cd /home/ivan/freeside_current
-       cvs tag ${TAG}
+       #cvs tag ${TAG}
+       cvs tag -F ${TAG}
 
-       cd /home/ivan
-       cvs export -r $TAG -d freeside-${VERSION} freeside
+       #cd /home/ivan
+       cvs export -r ${TAG} -d freeside-${VERSION} freeside
        tar czvf freeside-${VERSION}.tar.gz freeside-${VERSION}
 
-       scp freeside-${VERSION} ivan@cleanwhisker.420.am:/var/www/sisd.420.am/freeside/
+       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 )'