show credit balance on invoices, #11564

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index 8bfc56a..478bb26 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -108,6 +108,8 @@ FREESIDE_URL = "http://localhost/freeside/"
 #for now, same db as specified in DATASOURCE... eventually, otherwise?
 RT_DB_DATABASE = freeside
 
+TORRUS_ENABLED = 0
+
 # for cvs-upgrade-deploy target, the username who checked out the CVS copy.
 CVS_USER = ivan
 
@@ -121,10 +123,10 @@ RT_PATH = /opt/rt3
 
 #only used for dev kludge now, not a big deal
 FREESIDE_PATH = `pwd`
-PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.10.0/
+PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.10.1/
 
-VERSION=2.1.0cvs
-TAG=freeside_2_1_0
+VERSION=2.3.0cvs
+TAG=freeside_2_3_0
 
 DEBVERSION = `echo ${VERSION} | perl -pe 's/(\d)([a-z])/\1~\2/'`-1
 
@@ -149,7 +151,7 @@ help:
        @echo "                   wikiman"
        @echo "                   perl-modules"
        #@echo
-       #@echo "                   upload-docs release update-webdemo"
+       #@echo "                   upload-docs release"
 
 
 masondocs: httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/*
@@ -210,7 +212,7 @@ perl-modules:
        " blib/lib/FS/part_export/*.pm;\
        perl -p -i -e "\
          s|%%%FREESIDE_CACHE%%%|${FREESIDE_CACHE}|g;\
-       " blib/lib/FS/cust_main/*.pm;\
+       " blib/lib/FS/cust_main/*.pm blib/lib/FS/cust_pkg/*.pm;\
        perl -p -i -e "\
          s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\
          s|%%%FREESIDE_LOG%%%|${FREESIDE_LOG}|g;\
@@ -261,6 +263,7 @@ install-apache:
        [ -d ${APACHE_CONF} ] && \
          ( install -o root -m 755 htetc/freeside-base${APACHE_VERSION}.conf ${APACHE_CONF} && \
            ( [ ${RT_ENABLED} -eq 1 ] && install -o root -m 755 htetc/freeside-rt.conf ${APACHE_CONF} || true ) && \
+           ( [ ${TORRUS_ENABLED} -eq 1 ] && install -o root -m 755 htetc/freeside-torrus.conf ${APACHE_CONF} || true ) && \
            perl -p -i -e "\
              s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
              s'%%%FREESIDE_CONF%%%'${FREESIDE_CONF}'g; \
@@ -287,7 +290,7 @@ update-selfservice:
          ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; sudo make install" ;\
        done
 
-install: install-perl-modules install-docs install-init install-apache install-rt install-texmf
+install: install-perl-modules install-docs install-init install-apache install-rt install-torrus install-texmf
 
 deploy: install
        ${HTTPD_RESTART}
@@ -312,7 +315,7 @@ create-config: install-perl-modules
        chown freeside ${FREESIDE_CONF}/secrets
        chmod 600 ${FREESIDE_CONF}/secrets
 
-       echo -e "${DATASOURCE}\n${DB_USER}\n${DB_PASSWORD}" >${FREESIDE_CONF}/secrets
+       /bin/echo -e "${DATASOURCE}\n${DB_USER}\n${DB_PASSWORD}" >${FREESIDE_CONF}/secrets
        chmod 600 ${FREESIDE_CONF}/secrets
        chown freeside ${FREESIDE_CONF}/secrets
 
@@ -367,12 +370,26 @@ create-rt: configure-rt
        || true
 
 install-rt:
-       [ ${RT_ENABLED} -eq 1 ] && ( cd rt; make install ) || true
-       [ ${RT_ENABLED} -eq 1 ] && perl -p -i -e "\
+       if [ ${RT_ENABLED} -eq 1 ]; then ( cd rt; make install ); fi
+       if [ ${RT_ENABLED} -eq 1 ]; then perl -p -i -e "\
          s'%%%RT_DOMAIN%%%'${RT_DOMAIN}'g;\
          s'%%%RT_TIMEZONE%%%'${RT_TIMEZONE}'g;\
          s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\
-       " ${RT_PATH}/etc/RT_SiteConfig.pm
+       " ${RT_PATH}/etc/RT_SiteConfig.pm; fi
+
+configure-torrus:
+       cd torrus; \
+       torrus_user=freeside var_user=freeside var_group=freeside ./configure
+
+install-torrus:
+       if [ ${TORRUS_ENABLED} -eq 1 ]; then ( cd torrus; \
+         make; \
+         make install; \
+         perl -p -i -e "\
+           s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\
+         " /usr/local/etc/torrus/conf/torrus-siteconfig.pl; \
+         torrus clearcache \
+       );fi
 
 clean:
        rm -rf masondocs
@@ -404,6 +421,10 @@ release:
        dch -v ${DEBVERSION} -p "New upstream release"
        cvs commit -m "Updated for ${VERSION}" debian/changelog
 
+       # Make sure other people's changes are pulled in!
+       cvs update -d -P || true #it exits 1...
+
+       # Tag the release
        #cvs tag ${TAG}
        cvs tag -F ${TAG}
 
@@ -427,8 +448,3 @@ release:
 
        #update web demo self-service?
 
-update-webdemo:
-       ssh ivan@420.am '( cd freeside; cvs update -d -P )'
-       #ssh root@420.am '( cd /home/ivan/freeside; make clean; make deploy )'
-       ssh root@420.am '( cd /home/ivan/freeside; make deploy )'
-