projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2e3d2bf
)
keep version in FS.pm instead of Makefile
author
Ivan Kohler
<ivan@freeside.biz>
Sat, 2 Jun 2012 23:46:04 +0000
(16:46 -0700)
committer
Ivan Kohler
<ivan@freeside.biz>
Sat, 2 Jun 2012 23:46:04 +0000
(16:46 -0700)
FS/FS.pm
patch
|
blob
|
history
Makefile
patch
|
blob
|
history
diff --git
a/FS/FS.pm
b/FS/FS.pm
index
e169166
..
8bbff12
100644
(file)
--- a/
FS/FS.pm
+++ b/
FS/FS.pm
@@
-3,7
+3,7
@@
package FS;
use strict;
use vars qw($VERSION);
use strict;
use vars qw($VERSION);
-$VERSION = '
%%%VERSION%%%
';
+$VERSION = '
3.0git
';
#find missing entries in this file with:
# for a in `ls *pm | cut -d. -f1`; do grep 'L<FS::'$a'>' ../FS.pm >/dev/null || echo "missing $a" ; done
#find missing entries in this file with:
# for a in `ls *pm | cut -d. -f1`; do grep 'L<FS::'$a'>' ../FS.pm >/dev/null || echo "missing $a" ; done
diff --git
a/Makefile
b/Makefile
index
b603b8c
..
dc86c60
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-115,8
+115,8
@@
RT_PATH = /opt/rt3
FREESIDE_PATH = `pwd`
PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.14.2/
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_
`echo ${VERSION} | 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
@@
-180,9
+180,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; \