X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=Makefile;h=b603b8cb7a285401b115908a66bb0430db57d4b7;hp=d5576a30e652986dc7477ca1fb140c609f4a3d9c;hb=2e3d2bfad1cea570978aec44441fd79ec75c28ec;hpb=2e371325e229755e33c04b8a173cd456944698ba diff --git a/Makefile b/Makefile index d5576a30e..b603b8cb7 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,7 @@ INIT_FILE = /etc/init.d/freeside #INIT_FILE = /usr/local/etc/rc.d/011.freeside.sh #deb -INIT_INSTALL = /usr/sbin/update-rc.d freeside defaults 21 20 +INIT_INSTALL = PATH=$PATH:/sbin /usr/sbin/update-rc.d freeside defaults 23 01 #redhat, fedora #INIT_INSTALL = /sbin/chkconfig freeside on #not necessary (freebsd) @@ -103,9 +103,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,10 +113,10 @@ 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.3.0cvs -TAG=freeside_2_3_0 +VERSION=3.0git +TAG=freeside_3_0 DEBVERSION = `echo ${VERSION} | perl -pe 's/(\d)([a-z])/\1~\2/'`-1 @@ -129,7 +126,6 @@ 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,7 +157,7 @@ wikiman: chmod a+rx ./bin/pod2x ./bin/pod2x -install-docs: docs +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} chown -R freeside:freeside ${FREESIDE_DOCUMENT_ROOT} @@ -191,7 +187,9 @@ perl-modules: s|%%%FREESIDE_CACHE%%%|${FREESIDE_CACHE}|g;\ s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \ s'%%%RT_ENABLED%%%'${RT_ENABLED}'g; \ + s'%%%RT_PATH%%%'${RT_PATH}'g; \ s'%%%MASONDATA%%%'${MASONDATA}'g;\ + s/%%%SELFSERVICE_USER%%%/${SELFSERVICE_USER}/g;\ " blib/lib/FS/*.pm;\ perl -p -i -e "\ s/%%%SELFSERVICE_USER%%%/${SELFSERVICE_USER}/g;\ @@ -215,7 +213,7 @@ perl-modules: s|%%%DIST_CONF%%%|${DIST_CONF}|g;\ " blib/script/* -install-perl-modules: perl-modules +install-perl-modules: check-conflicts 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 \ @@ -283,18 +281,17 @@ 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-torrus install-texmf +install-chown: + chown freeside "${FREESIDE_CACHE}/counters.${DATASOURCE}" + chown freeside "${FREESIDE_CACHE}/cache.${DATASOURCE}" + chown freeside "${FREESIDE_EXPORT}/export.${DATASOURCE}" + +install: install-perl-modules install-docs install-init install-apache install-rt install-torrus install-texmf install-chown 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: @@ -362,13 +359,21 @@ create-rt: configure-rt --datafile ${RT_PATH}/etc/initialdata \ || true -install-rt: +install-rt: check-conflicts 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; fi + if [ ${RT_ENABLED} -eq 1 ]; then \ + chown -R freeside:freeside ${RT_PATH}/etc; fi + +install-rt-initialdata: + if [ ${RT_ENABLED} -eq 1 ] && [ -d ${RT_PATH} ]; then \ + chown -R freeside:freeside ${RT_PATH}/etc; \ + install -D -o freeside -g freeside -m 0440 rt/etc/initialdata \ + ${RT_PATH}/etc/initialdata; fi configure-torrus: cd torrus; \ @@ -394,39 +399,40 @@ 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"