projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix localization cache, #27276
[freeside.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
856e315
..
7ce3d44
100644
(file)
--- 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
#(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
FREESIDE_RESTART = ${INIT_FILE} restart
@@
-113,15
+114,21
@@
RT_PATH = /opt/rt3
#only used for dev kludge now, not a big deal
FREESIDE_PATH = `pwd`
#only used for dev kludge now, not a big deal
FREESIDE_PATH = `pwd`
-PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.1
0.1
/
+PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.1
4.2
/
-VERSION
=2.3.2git
-TAG
=freeside_2_3_2
+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"
TEXMFHOME := "\$$TEXMFHOME"
+ver:
+ @echo "${VERSION}"
+
+tag:
+ @echo "${TAG}"
+
help:
@echo "supported targets:"
@echo " create-database create-config"
help:
@echo "supported targets:"
@echo " create-database create-config"
@@
-162,6
+169,12
@@
install-docs: check-conflicts docs
cp -r masondocs ${FREESIDE_DOCUMENT_ROOT}
chown -R freeside:freeside ${FREESIDE_DOCUMENT_ROOT}
cp htetc/handler.pl ${MASON_HANDLER}
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;\
+ 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}
cp htetc/htpasswd.logout ${FREESIDE_CONF}
[ ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true
chown -R freeside ${MASONDATA}
@@
-179,9
+192,6
@@
perl-modules:
cd FS; \
[ -e Makefile ] || perl Makefile.PL; \
make; \
cd FS; \
[ -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;\
perl -p -i -e "\
s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\
s|%%%FREESIDE_CACHE%%%|${FREESIDE_CACHE}|g;\
@@
-235,9
+245,9
@@
dev-perl-modules: perl-modules
ln -sf ${FREESIDE_PATH}/FS/blib/lib/FS ${PERL_INC_DEV_KLUDGE}/FS
install-texmf:
ln -sf ${FREESIDE_PATH}/FS/blib/lib/FS ${PERL_INC_DEV_KLUDGE}/FS
install-texmf:
- install -D -o freeside -m 444 etc/
fs
longtable.sty \
-
`kpsewhich -expand-var \\\$$TEXMFLOCAL`/tex/generic/fs
longtable.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}
install-init:
#[ -e ${INIT_FILE} ] || install -o root -g ${INSTALLGROUP} -m 711 init.d/freeside-init ${INIT_FILE}
@@
-261,6
+271,7
@@
install-apache:
s'%%%MASON_HANDLER%%%'${MASON_HANDLER}'g; \
" ${APACHE_CONF}/freeside-*.conf \
) || true
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
install-selfservice:
[ -e ~freeside ] || cp -pr /etc/skel ~freeside && chown -R freeside ~freeside
@@
-337,7
+348,7
@@
configure-rt:
--with-db-dba=${DB_USER} \
--with-db-database=${RT_DB_DATABASE} \
--with-db-rt-user=${DB_USER} \
--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 \
--with-web-user=freeside \
--with-web-group=freeside \
--with-rt-group=freeside \
@@
-426,13
+437,13
@@
release:
git pull
# Tag the release
git pull
# Tag the release
- git tag ${TAG}
+ git tag
-f
${TAG}
#cd /home/ivan
#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/
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"
#these things failing should not make release target fail, so: "|| true"