X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=Makefile;h=dd7adb0bd6cd3adc54e9af8f8c5885ebe7d3796a;hp=65ab50a8cbda945195b9510d84f3b3d10509919e;hb=48d11a4d32eb84e13961a2f18aff1a0fb17b041b;hpb=b6d3ccf1ac55d80480f1e0d7a6e977b168d1bddc

diff --git a/Makefile b/Makefile
index 65ab50a8c..dd7adb0bd 100644
--- a/Makefile
+++ b/Makefile
@@ -67,6 +67,7 @@ HTTPD_RESTART = /etc/init.d/apache2 restart
 #(an include directory, not a file, "Include /etc/apache/conf.d" in httpd.conf)
 #deb (3.1+), apache2
 APACHE_CONF = /etc/apache2/conf.d
+INSSERV_OVERRIDE = /etc/insserv/overrides
 
 FREESIDE_RESTART = ${INIT_FILE} restart
 
@@ -103,9 +104,6 @@ RT_DB_DATABASE = freeside
 
 TORRUS_ENABLED = 0
 
-# for cvs-upgrade-deploy target, the username who checked out the CVS copy.
-CVS_USER = ivan
-
 # for auto-version updates, so we can "make release" more things automatically
 RPM_SPECFILE = rpm/freeside.spec
 
@@ -116,20 +114,25 @@ 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.1/
+PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.14.2/
 
-VERSION=2.5.0cvs
-TAG=freeside_2_5_0
+VERSION := `grep '^$$VERSION' FS/FS.pm | cut -d\' -f2`
+TAG := freeside_`grep '^$$VERSION' FS/FS.pm | cut -d\' -f2 | perl -pe 's/\./_/g'`
 
-DEBVERSION = `echo ${VERSION} | perl -pe 's/(\d)([a-z])/\1~\2/'`-1
+#DEBVERSION = `echo ${VERSION} | perl -pe 's/(\d)([a-z])/\1~\2/'`-1
 
 TEXMFHOME := "\$$TEXMFHOME"
 
+ver:
+	@echo "${VERSION}"
+
+tag:
+	@echo "${TAG}"
+
 help:
 	@echo "supported targets:"
 	@echo "                   create-database create-config"
 	@echo "                   install deploy"
-	@echo "                   cvs-upgrade-deploy"
 	@echo "                   configure-rt create-rt"
 	@echo "                   clean help"
 	@echo
@@ -161,11 +164,21 @@ wikiman:
 	chmod a+rx ./bin/pod2x
 	./bin/pod2x
 
-install-docs: check-conflicts docs
-	[ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S` || true
-	cp -r masondocs ${FREESIDE_DOCUMENT_ROOT}
+install-docs: docs
+	#ancient attempt to avoid overwriting customer modifications directly to production web files that's overlived its usefulness
+	#[ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S` || true
+	#cp -r masondocs ${FREESIDE_DOCUMENT_ROOT}
+	[ -h ${FREESIDE_DOCUMENT_ROOT} ] && rm ${FREESIDE_DOCUMENT_ROOT} || true
+	mkdir -p ${FREESIDE_DOCUMENT_ROOT}
+	cp -r masondocs/* masondocs/.htaccess ${FREESIDE_DOCUMENT_ROOT}
 	chown -R freeside:freeside ${FREESIDE_DOCUMENT_ROOT}
-	cp htetc/handler.pl ${MASON_HANDLER}
+	install -D htetc/handler.pl ${MASON_HANDLER}
+	perl -p -i -e "\
+	  s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\
+	  s'%%%RT_ENABLED%%%'${RT_ENABLED}'g; \
+	" ${MASON_HANDLER} || true
+	mkdir -p ${FREESIDE_EXPORT}/profile
+	chown freeside ${FREESIDE_EXPORT}/profile
 	cp htetc/htpasswd.logout ${FREESIDE_CONF}
 	[ ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true
 	chown -R freeside ${MASONDATA}
@@ -177,6 +190,8 @@ dev-docs:
 	perl -p -i -e "\
 	  s'###use Module::Refresh;###'use Module::Refresh;'; \
 	  s'###Module::Refresh->refresh;###'Module::Refresh->refresh;'; \
+	  s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\
+	  s'%%%RT_ENABLED%%%'${RT_ENABLED}'g; \
 	" ${MASON_HANDLER} || true
 
 perl-modules:
@@ -184,9 +199,6 @@ perl-modules:
 	[ -e Makefile ] || perl Makefile.PL; \
 	make; \
 	perl -p -i -e "\
-	  s/%%%VERSION%%%/${VERSION}/g;\
-	" blib/lib/FS.pm;\
-	perl -p -i -e "\
 	  s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\
 	  s|%%%FREESIDE_CACHE%%%|${FREESIDE_CACHE}|g;\
 	  s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
@@ -217,7 +229,7 @@ perl-modules:
 	  s|%%%DIST_CONF%%%|${DIST_CONF}|g;\
 	" blib/script/*
 
-install-perl-modules: check-conflicts perl-modules install-rt-initialdata
+install-perl-modules: perl-modules install-rt-initialdata
 	[ -L ${PERL_INC_DEV_KLUDGE}/FS ] \
 	  && rm ${PERL_INC_DEV_KLUDGE}/FS \
 	  && mv ${PERL_INC_DEV_KLUDGE}/FS.old ${PERL_INC_DEV_KLUDGE}/FS \
@@ -239,9 +251,9 @@ dev-perl-modules: perl-modules
 	ln -sf ${FREESIDE_PATH}/FS/blib/lib/FS ${PERL_INC_DEV_KLUDGE}/FS
 
 install-texmf:	
-	install -D -o freeside -m 444 etc/fslongtable.sty \
-          `kpsewhich -expand-var \\\$$TEXMFLOCAL`/tex/generic/fslongtable.sty
-	texhash `kpsewhich -expand-var \\\$$TEXMFLOCAL`
+	install -D -o freeside -m 444 etc/longtable.sty \
+	  /usr/local/share/texmf/tex/latex/longtable.sty
+	texhash /usr/local/share/texmf
 
 install-init:
 	#[ -e ${INIT_FILE} ] || install -o root -g ${INSTALLGROUP} -m 711 init.d/freeside-init ${INIT_FILE}
@@ -265,6 +277,7 @@ install-apache:
 	      s'%%%MASON_HANDLER%%%'${MASON_HANDLER}'g; \
 	    " ${APACHE_CONF}/freeside-*.conf \
 	  ) || true
+	[ -d ${INSSERV_OVERRIDE} ] && [ -x /sbin/insserv ] && ( install -o root -m 755 init.d/insserv-override-apache2 ${INSSERV_OVERRIDE}/apache2 && insserv -d ) || true
 
 install-selfservice:
 	[ -e ~freeside ] || cp -pr /etc/skel ~freeside && chown -R freeside ~freeside
@@ -296,12 +309,6 @@ deploy: install
 	${HTTPD_RESTART}
 	${FREESIDE_RESTART}
 
-cvs-upgrade-deploy:
-	su ${CVS_USER} -c 'cvs update -d -P'
-	make install-perl-modules
-	su freeside -c "freeside-upgrade ${CVS_USER}" #not really the same user
-	make deploy
-
 dev: dev-perl-modules dev-docs
 
 create-database:
@@ -347,7 +354,7 @@ configure-rt:
 	            --with-db-dba=${DB_USER} \
 	            --with-db-database=${RT_DB_DATABASE} \
 	            --with-db-rt-user=${DB_USER} \
-	            --with-db-rt-pass=${DB_PASSWORD} \
+	            --with-db-rt-pass="${DB_PASSWORD}" \
 	            --with-web-user=freeside \
 	            --with-web-group=freeside \
 	            --with-rt-group=freeside \
@@ -369,7 +376,7 @@ create-rt: configure-rt
 	                             --datafile ${RT_PATH}/etc/initialdata \
 	|| true
 
-install-rt: check-conflicts
+install-rt: 
 	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;\
@@ -409,42 +416,37 @@ clean:
 	-cd fs_selfservice/FS-SelfService; \
 	make clean
 
-check-conflicts:
-	! grep -r --exclude='*config.log*' '--exclude=*config.status*' --exclude=gnupg_details_on_output_formats '--exclude=*mason_handler*' '^=======$$' .
-
 #these are probably only useful if you're me...
 
 #release: upload-docs
 .PHONY: release
 release:
 	# Update the changelog
-	./bin/cvs2cl
-	cvs commit -m "Updated for ${VERSION}" ChangeLog
+	#./bin/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}
-	perl -p -i -e "s/\d+[^\}]+/1/ if /%define\s+release\s+(\d+[^\}]+)\}/;" ${RPM_SPECFILE}
-	cvs commit -m "Updated for ${VERSION}" ${RPM_SPECFILE}
+	#cvs edit ${RPM_SPECFILE}
+	#perl -p -i -e "s/\d+[^\}]+/${VERSION}/ if /%define\s+version\s+(\d+[^\}]+)\}/;" ${RPM_SPECFILE}
+	#perl -p -i -e "s/\d+[^\}]+/1/ if /%define\s+release\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 edit debian/changelog
+	#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...
+	git pull
 
 	# Tag the release
-	#cvs tag ${TAG}
-	cvs tag -F ${TAG}
+	git tag -f ${TAG}
 
 	#cd /home/ivan
-	cvs export -r ${TAG} -d freeside-${VERSION} freeside
-	tar czvf freeside-${VERSION}.tar.gz freeside-${VERSION}
+	git archive --prefix=freeside-${VERSION}/ ${TAG} | gzip -9 >freeside-${VERSION}.tar.gz
 
 	scp freeside-${VERSION}.tar.gz ivan@420.am:/var/www/www.sisd.com/freeside/
-	mv freeside-${VERSION} freeside-${VERSION}.tar.gz ..
+	mv freeside-${VERSION}.tar.gz ..
 
 	#these things failing should not make release target fail, so: "|| true"