X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=b7b355c729edd99dab267eeaeae2238298a0b4a1;hb=e5f8b2825c80552b803afe35edc9df074f577e48;hp=2ad1915aca291965721fe2a5c3928ef62aa3876a;hpb=9a90f2af0663c9b4e9611e044fd25349425d1aec;p=freeside.git diff --git a/Makefile b/Makefile index 2ad1915ac..b7b355c72 100644 --- a/Makefile +++ b/Makefile @@ -3,8 +3,8 @@ #solaris and perhaps other very weirdass /bin/sh #SHELL="/bin/ksh" -#DB_TYPE = Pg -DB_TYPE = mysql +DB_TYPE = Pg +#DB_TYPE = mysql DB_USER = freeside DB_PASSWORD= @@ -88,7 +88,7 @@ QUEUED_USER=fs_queue SELFSERVICE_USER = fs_selfservice #never run on the same machine in production!!! -SELFSERVICE_MACHINES = localhost +SELFSERVICE_MACHINES = # SELFSERVICE_MACHINES = www.example.com # SELFSERVICE_MACHINES = web1.example.com web2.example.com @@ -121,13 +121,15 @@ 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.8.8/ +PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.10.0/ -VERSION=1.9.0cvs -TAG=freeside_1_9_0 +VERSION=1.9.2 +TAG=freeside_1_9_2 DEBVERSION = `echo ${VERSION} | perl -pe 's/(\d)([a-z])/\1~\2/'`-1 +TEXMFHOME := "\$$TEXMFHOME" + help: @echo "supported targets:" @echo " create-database create-config" @@ -138,7 +140,7 @@ help: @echo @echo " install-docs install-perl-modules" @echo " install-init install-apache" - @echo " install-rt" + @echo " install-rt install-texmf" @echo " install-selfservice update-selfservice" @echo @echo " dev dev-docs dev-perl-modules" @@ -196,9 +198,19 @@ perl-modules: s'%%%MASONDATA%%%'${MASONDATA}'g;\ " blib/lib/FS/*.pm;\ perl -p -i -e "\ + s/%%%SELFSERVICE_USER%%%/${SELFSERVICE_USER}/g;\ + s/%%%SELFSERVICE_MACHINES%%%/${SELFSERVICE_MACHINES}/g;\ s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\ + " blib/lib/FS/Cron/*.pm;\ + perl -p -i -e "\ + s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\ + s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\ + s|%%%FREESIDE_LOG%%%|${FREESIDE_LOG}|g;\ " blib/lib/FS/part_export/*.pm;\ perl -p -i -e "\ + s|%%%FREESIDE_CACHE%%%|${FREESIDE_CACHE}|g;\ + " blib/lib/FS/cust_main/*.pm;\ + perl -p -i -e "\ s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\ s|%%%FREESIDE_LOG%%%|${FREESIDE_LOG}|g;\ s|%%%FREESIDE_LOCK%%%|${FREESIDE_LOCK}|g;\ @@ -218,7 +230,7 @@ install-perl-modules: perl-modules install -d $(DIST_CONF) #install conf/[a-z]* $(DEFAULT_CONF) #CVS is not [a-z] - install `ls -d conf/[a-z]* | grep -v CVS` $(DIST_CONF) + install `ls -d conf/[a-z]* | grep -v CVS | grep -v '^conf/registries'` $(DIST_CONF) dev-perl-modules: perl-modules [ -d ${PERL_INC_DEV_KLUDGE}/FS -a ! -L ${PERL_INC_DEV_KLUDGE}/FS ] \ @@ -228,6 +240,11 @@ dev-perl-modules: perl-modules rm -rf ${PERL_INC_DEV_KLUDGE}/FS 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-init: #[ -e ${INIT_FILE} ] || install -o root -g ${INSTALLGROUP} -m 711 init.d/freeside-init ${INIT_FILE} install -o root -g ${INSTALLGROUP} -m 711 init.d/freeside-init ${INIT_FILE} @@ -252,7 +269,7 @@ install-apache: install-selfservice: [ -e ~freeside ] || cp -pr /etc/skel ~freeside && chown -R freeside ~freeside - [ -e ~freeside/.ssh/id_dsa.pub ] || su - freeside -c 'ssh-keygen -t dsa' + [ -e ~freeside/.ssh/id_dsa.pub ] || [ -e ~freeside/.ssh/id_rsa.pub ] || su - freeside -c 'ssh-keygen -t dsa' for MACHINE in ${SELFSERVICE_MACHINES}; do \ scp -r fs_selfservice/FS-SelfService ${SELFSERVICE_INSTALL_USER}@$$MACHINE:. ;\ ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; perl Makefile.PL && make" ;\ @@ -269,7 +286,7 @@ update-selfservice: ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; sudo make install" ;\ done -install: install-perl-modules install-docs install-init install-apache install-rt +install: install-perl-modules install-docs install-init install-apache install-rt install-texmf deploy: install ${HTTPD_RESTART} @@ -298,12 +315,6 @@ create-config: install-perl-modules chmod 600 ${FREESIDE_CONF}/secrets chown freeside ${FREESIDE_CONF}/secrets - mkdir "${FREESIDE_CONF}/conf.${DATASOURCE}" - rm -rf conf/registries #old dirs just won't go away - #cp conf/[a-z]* "${FREESIDE_CONF}/conf.${DATASOURCE}" - cp `ls -d conf/[a-z]* | grep -v CVS` "${FREESIDE_CONF}/conf.${DATASOURCE}" - chown -R freeside "${FREESIDE_CONF}/conf.${DATASOURCE}" - mkdir "${FREESIDE_CACHE}/counters.${DATASOURCE}" chown freeside "${FREESIDE_CACHE}/counters.${DATASOURCE}" @@ -313,6 +324,13 @@ create-config: install-perl-modules mkdir "${FREESIDE_EXPORT}/export.${DATASOURCE}" chown freeside "${FREESIDE_EXPORT}/export.${DATASOURCE}" + #install this for freeside-setup + install -d $(DIST_CONF) + #install conf/[a-z]* $(DEFAULT_CONF) + #CVS is not [a-z] + install `ls -d conf/[a-z]* | grep -v CVS | grep -v '^conf/registries'` $(DIST_CONF) + + configure-rt: cd rt; \ cp config.layout.in config.layout; \ @@ -344,12 +362,12 @@ create-rt: configure-rt || true install-rt: - perl -p -i -e "\ + 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;\ s'%%%RT_TIMEZONE%%%'${RT_TIMEZONE}'g;\ s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\ - " ${RT_PATH}/etc/RT_SiteConfig.pm - [ ${RT_ENABLED} -eq 1 ] && ( cd rt; make install ) || true + " ${RT_PATH}/etc/RT_SiteConfig.pm; fi clean: rm -rf masondocs @@ -367,12 +385,13 @@ clean: .PHONY: release release: # Update the changelog - ./CVS2CL + ./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} # Update the Debian changelog