this should fix columns not showing up in receivables report... not surea bout #3801...

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index a138285..5d68cbc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,11 +22,11 @@ MASON_HANDLER = ${FREESIDE_CONF}/handler.pl
 MASONDATA = ${FREESIDE_CACHE}/masondata
 
 #mod_perl v1
-APACHE_VERSION = 1
+#APACHE_VERSION = 1
 #mod_perl v2 prereleases up to and including 1.999_21
 #APACHE_VERSON = 1.99
 #mod_perl v2 proper and prereleases 1.999_22 and after
-#APACHE_VERSION = 2
+APACHE_VERSION = 2
 
 #deb
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
@@ -54,9 +54,9 @@ INIT_INSTALL = /usr/sbin/update-rc.d freeside defaults 21 20
 #INIT_INSTALL = /usr/bin/true
 
 #deb, suse
-HTTPD_RESTART = /etc/init.d/apache restart
+#HTTPD_RESTART = /etc/init.d/apache restart
 #deb w/apache2
-#HTTPD_RESTART = /etc/init.d/apache2 restart
+HTTPD_RESTART = /etc/init.d/apache2 restart
 #redhat, fedora, mandrake
 #HTTPD_RESTART = /etc/init.d/httpd restart
 #freebsd
@@ -68,9 +68,9 @@ HTTPD_RESTART = /etc/init.d/apache restart
 
 #(an include directory, not a file, "Include /etc/apache/conf.d" in httpd.conf)
 #deb (3.1+), apache1
-APACHE_CONF = /etc/apache/conf.d
+#APACHE_CONF = /etc/apache/conf.d
 #deb (3.1+), apache2
-#APACHE_CONF = /etc/apache2/conf.d
+APACHE_CONF = /etc/apache2/conf.d
 
 FREESIDE_RESTART = ${INIT_FILE} restart
 
@@ -117,8 +117,10 @@ RT_PATH = /opt/rt3
 FREESIDE_PATH = `pwd`
 PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.8.8/
 
-VERSION=1.7.3rc2
-TAG=freeside_1_7_3rc2
+VERSION=1.7.3
+TAG=freeside_1_7_3
+
+DEBVERSION = `echo ${VERSION} | perl -pe 's/(\d)([a-z])/\1~\2/'`-1
 
 help:
        @echo "supported targets:"
@@ -256,7 +258,7 @@ install-selfservice:
 update-selfservice:
        for MACHINE in ${SELFSERVICE_MACHINES}; do \
          RSYNC_RSH=ssh rsync -rlptz fs_selfservice/FS-SelfService/ ${SELFSERVICE_INSTALL_USER}@$$MACHINE:FS-SelfService ;\
-         ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; perl Makefile.PL && make" ;\
+         ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; make clean; perl Makefile.PL && make" ;\
          ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; sudo make install" ;\
        done
 
@@ -349,13 +351,22 @@ clean:
 #these are probably only useful if you're me...
 
 #release: upload-docs
+.PHONY: release
 release:
-       cd /home/ivan/freeside
+       # Update the changelog
+       ./CVS2CL
+       cvs commit -m "Updated for ${VERSION}" ChangeLog
 
        # Update the RPM specfile
+       cvs edit ${RPM_SPECFILE}
        perl -p -i -e "s/\d+[^\}]+/${VERSION}/ if /%define\s+version\s+(\d+[^\}]+)\}/;" ${RPM_SPECFILE}
        cvs commit -m "Updated for ${VERSION}" ${RPM_SPECFILE}
 
+       # Update the Debian changelog
+       cvs edit debian/changelog
+       dch -v ${DEBVERSION} -p "New upstream release"
+       cvs commit -m "Updated for ${VERSION}" debian/changelog
+
        #cvs tag ${TAG}
        cvs tag -F ${TAG}
 
@@ -366,6 +377,19 @@ release:
        scp freeside-${VERSION}.tar.gz ivan@420.am:/var/www/www.sisd.com/freeside/
        mv freeside-${VERSION} freeside-${VERSION}.tar.gz ..
 
+       #these things failing should not make release target fail, so: "|| true"
+
+       #kick off vmware update
+       #./BUILD_VMWARE_APPLIANCE ${$TAG} || true
+
+       #kick off deb package update
+
+       #kick off rpm package update too?
+
+       #update web demo?
+
+       #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 )'