FS/FS/Trace.pm

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index 067bf36..864d9c2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -115,13 +115,19 @@ RT_PATH = /opt/rt3
 FREESIDE_PATH = `pwd`
 PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.14.2/
 
-VERSION=3.0git
-TAG=freeside_3_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"
@@ -162,6 +168,11 @@ install-docs: check-conflicts docs
        cp -r masondocs ${FREESIDE_DOCUMENT_ROOT}
        chown -R freeside:freeside ${FREESIDE_DOCUMENT_ROOT}
        cp htetc/handler.pl ${MASON_HANDLER}
+       perl -p -i -e "\
+         s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|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}
@@ -180,9 +191,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; \
@@ -337,7 +345,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 \
@@ -426,13 +434,13 @@ release:
        git pull
 
        # Tag the release
-       git tag ${TAG}
+       git tag -f ${TAG}
 
        #cd /home/ivan
-        git archive ${TAG} | gzip -9 >freeside-${VERSION}.tar.gz
+       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"