oops, fix minor refactoring of auto sqlradius upgrade

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index cb2a320..f068395 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -105,6 +105,8 @@ FREESIDE_URL = "http://localhost/freeside/"
 #for now, same db as specified in DATASOURCE... eventually, otherwise?
 RT_DB_DATABASE = freeside
 
+RPM_SPECFILE = install/rpm/freeside.spec
+
 #---
 
 
@@ -115,8 +117,10 @@ RT_PATH = /opt/rt3
 FREESIDE_PATH = `pwd`
 PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.8.8/
 
-VERSION=1.7.3rc1
-TAG=freeside_1_7_3rc1
+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:"
@@ -233,6 +237,7 @@ install-apache:
            ( [ ${RT_ENABLED} -eq 1 ] && install -o root -m 755 htetc/freeside-rt.conf ${APACHE_CONF} || true ) && \
            perl -p -i -e "\
              s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
+             s'%%%FREESIDE_CONF%%%'${FREESIDE_CONF}'g; \
              s'%%%MASON_HANDLER%%%'${MASON_HANDLER}'g; \
            " ${APACHE_CONF}/freeside-*.conf \
          ) || true
@@ -253,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
 
@@ -346,8 +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}
 
@@ -358,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 )'