X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=7596c5b7cb5520ffab0c74d82900548ad5a182a9;hb=69f252e5353483662c81b1d6d0e750ae08577649;hp=34259737bba37f8175f4a030e0a66d8c843080ec;hpb=b35b650a6078d645d6f97620f3c79ae941915dd9;p=freeside.git

diff --git a/Makefile b/Makefile
index 34259737b..7596c5b7c 100644
--- a/Makefile
+++ b/Makefile
@@ -6,14 +6,8 @@ DATASOURCE = DBI:Pg:host=localhost;dbname=freeside
 DB_USER = freeside
 DB_PASSWORD=
 
-<<<<<<< Makefile
-#TEMPLATE = asp
-#mason's a bit dodgy still
-TEMPLATE = mason
-=======
 TEMPLATE = asp
 #TEMPLATE = mason
->>>>>>> 1.27
 
 ASP_GLOBAL = /usr/local/etc/freeside/asp-global
 
@@ -27,6 +21,9 @@ QUEUED_RESTART = /etc/init.d/freeside restart
 #not changable yet
 FREESIDE_CONF = /usr/local/etc/freeside
 
+VERSION="1.4.0pre11"
+TAG="1_4_0_PRE11"
+
 help:
 	@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
 	@echo "                   htmlman"
@@ -60,9 +57,6 @@ htmlman:
 	[ -e ./httemplate/docs/man/FS/UI ] || mkdir httemplate/docs/man/FS/UI
 	[ -e DONT_REBUILD_DOCS ] || bin/pod2x
 
-upload-docs:
-	ssh cleanwhisker.420.am rm -rf /var/www/www.sisd.com/freeside/devdocs
-	scp -pr httemplate/docs cleanwhisker.420.am:/var/www/www.sisd.com/freeside/devdocs
 
 install-docs: docs
 	[ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S` || true
@@ -120,3 +114,24 @@ clean:
 	cd FS; \
 	make clean
 
+#these are probably only useful if you're me...
+
+upload-docs:
+	ssh cleanwhisker.420.am rm -rf /var/www/www.sisd.com/freeside/devdocs
+	scp -pr httemplate/docs cleanwhisker.420.am:/var/www/www.sisd.com/freeside/devdocs
+
+release: upload-docs
+	cd /home/ivan/freeside_current
+	cvs tag ${TAG}
+
+	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/
+
+update-webdemo:
+	ssh ivan@pouncequick.420.am '( cd freeside; cvs update -d -P )'
+	#ssh root@pouncequick.420.am '( cd /home/ivan/freeside; make clean; make deploy )'
+	ssh root@pouncequick.420.am '( cd /home/ivan/freeside; make deploy )'
+