X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=81cefdcfaf004eb054c78c4c711971bdf0b4bdc7;hb=07fb8497d68fa723dfa3d4ea9a326ffb913e8a2e;hp=a820cb1e6f7b043344340de58d2d0421fa422c8b;hpb=c648976f0b7975f2328ebd7ba8c711fad0ca4195;p=freeside.git

diff --git a/Makefile b/Makefile
index a820cb1e6..81cefdcfa 100644
--- a/Makefile
+++ b/Makefile
@@ -66,8 +66,8 @@ HTTPD_RESTART = /etc/init.d/apache2 restart
 #apache
 #HTTPD_RESTART = /usr/local/apache/bin/apachectl stop; sleep 10; /usr/local/apache/bin/apachectl startssl
 
-#(an include directory, not a file, "Include /etc/apachew/conf.d" in httpd.conf)
-#deb (3.1+), 
+#(an include directory, not a file, "Include /etc/apache/conf.d" in httpd.conf)
+#deb (3.1+), apache2
 APACHE_CONF = /etc/apache2/conf.d
 
 FREESIDE_RESTART = ${INIT_FILE} restart
@@ -103,6 +103,8 @@ FREESIDE_URL = "http://localhost/freeside/"
 #for now, same db as specified in DATASOURCE... eventually, otherwise?
 RT_DB_DATABASE = freeside
 
+RPM_SPECFILE = rpm/freeside.spec
+
 #---
 
 
@@ -116,6 +118,8 @@ PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.8.8/
 VERSION=1.9.0cvs
 TAG=freeside_1_9_0
 
+DEBVERSION = `echo $VERSION | perl -pe 's/(\d)([a-z])/\1~\2/'`-1
+
 help:
 	@echo "supported targets:"
 	@echo "                   create-database create-config"
@@ -232,6 +236,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
@@ -344,8 +349,20 @@ 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
+	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
+	dch -v ${DEBVERSION} -p "New upstream release"
+	cvs commit -m "Updated for ${VERSION}" debian/changelog
+
 	#cvs tag ${TAG}
 	cvs tag -F ${TAG}
 
@@ -356,6 +373,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 )'