projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
communigate (phase 2): rules: start of adding conditions and actions to rule edit...
[freeside.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
6d0b2c0
..
bba2d79
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-149,7
+149,7
@@
help:
@echo " wikiman"
@echo " perl-modules"
#@echo
@echo " wikiman"
@echo " perl-modules"
#@echo
- #@echo " upload-docs release
update-webdemo
"
+ #@echo " upload-docs release"
masondocs: httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/*
masondocs: httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/*
@@
-171,6
+171,7
@@
install-docs: 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}
+ cp htetc/htpasswd.logout ${FREESIDE_CONF}
[ ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true
chown -R freeside ${MASONDATA}
[ ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true
chown -R freeside ${MASONDATA}
@@
-203,6
+204,7
@@
perl-modules:
s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\
" blib/lib/FS/Cron/*.pm;\
perl -p -i -e "\
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;\
s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\
s|%%%FREESIDE_LOG%%%|${FREESIDE_LOG}|g;\
" blib/lib/FS/part_export/*.pm;\
@@
-354,20
+356,23
@@
create-rt: configure-rt
[ -d /opt/rt3/share ] || mkdir /opt/rt3/share #
cd rt; make install
rt/sbin/rt-setup-database --dba '${DB_USER}' \
[ -d /opt/rt3/share ] || mkdir /opt/rt3/share #
cd rt; make install
rt/sbin/rt-setup-database --dba '${DB_USER}' \
- -dba-password '${DB_PASSWORD}' \
- -action schema \
+ -
-
dba-password '${DB_PASSWORD}' \
+ -
-
action schema \
|| true
|| true
- rt/sbin/rt-setup-database --action insert_initial \
- && rt/sbin/rt-setup-database --action insert --datafile ${RT_PATH}/etc/initialdata \
+ rt/sbin/rt-setup-database --dba-password '${DB_PASSWORD}' \
+ --action coredata \
+ && rt/sbin/rt-setup-database --dba-password '${DB_PASSWORD}' \
+ --action insert \
+ --datafile ${RT_PATH}/etc/initialdata \
|| true
install-rt:
|| true
install-rt:
- [ ${RT_ENABLED} -eq 1 ] && ( cd rt; make install ) || true
-
[ ${RT_ENABLED} -eq 1 ] &&
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;\
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_PATH}/etc/RT_SiteConfig.pm
; fi
clean:
rm -rf masondocs
clean:
rm -rf masondocs
@@
-399,6
+404,10
@@
release:
dch -v ${DEBVERSION} -p "New upstream release"
cvs commit -m "Updated for ${VERSION}" 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
+
+ # Tag the release
#cvs tag ${TAG}
cvs tag -F ${TAG}
#cvs tag ${TAG}
cvs tag -F ${TAG}
@@
-422,8
+431,3
@@
release:
#update web demo self-service?
#update web demo self-service?
-update-webdemo:
- ssh ivan@420.am '( cd freeside; cvs update -d -P )'
- #ssh root@420.am '( cd /home/ivan/freeside; make clean; make deploy )'
- ssh root@420.am '( cd /home/ivan/freeside; make deploy )'
-