projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix config option to for redirecting to ticket display after quick create
[freeside.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
1c167ef
..
903c0eb
100644
(file)
--- 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_FILE = /usr/local/etc/rc.d/011.freeside.sh
#deb
-INIT_INSTALL = /usr/sbin/update-rc.d freeside defaults 23 01
+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)
#redhat, fedora
#INIT_INSTALL = /sbin/chkconfig freeside on
#not necessary (freebsd)
@@
-103,9
+103,6
@@
RT_DB_DATABASE = freeside
TORRUS_ENABLED = 0
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
# for auto-version updates, so we can "make release" more things automatically
RPM_SPECFILE = rpm/freeside.spec
@@
-116,20
+113,25
@@
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.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"
TEXMFHOME := "\$$TEXMFHOME"
+ver:
+ @echo "${VERSION}"
+
+tag:
+ @echo "${TAG}"
+
help:
@echo "supported targets:"
@echo " create-database create-config"
@echo " install deploy"
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
@echo " configure-rt create-rt"
@echo " clean help"
@echo
@@
-166,6
+168,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}
@@
-184,9
+192,6
@@
perl-modules:
[ -e Makefile ] || perl Makefile.PL; \
make; \
perl -p -i -e "\
[ -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; \
s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\
s|%%%FREESIDE_CACHE%%%|${FREESIDE_CACHE}|g;\
s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
@@
-296,12
+301,6
@@
deploy: install
${HTTPD_RESTART}
${FREESIDE_RESTART}
${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:
dev: dev-perl-modules dev-docs
create-database:
@@
-347,7
+346,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 \
@@
-418,33
+417,31
@@
check-conflicts:
.PHONY: release
release:
# Update the changelog
.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
# 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
# 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!
# Make sure other people's changes are pulled in!
- cvs update -d -P || true #it exits 1...
+ git pull
# Tag the release
# Tag the release
- #cvs tag ${TAG}
- cvs tag -F ${TAG}
+ git tag -f ${TAG}
#cd /home/ivan
#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/
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"