gunnar: server/perl-kolab MANIFEST,1.9,1.10 Makefile.PL,1.17,1.18

cvs at kolab.org cvs at kolab.org
Fri Dec 4 12:23:21 CET 2009


Author: gunnar

Update of /kolabrepository/server/perl-kolab
In directory doto:/tmp/cvs-serv10694

Modified Files:
	MANIFEST Makefile.PL 
Log Message:
Complete  kolab/issue3952 (Version in kolabconf is not replaced in the build process)

Index: MANIFEST
===================================================================
RCS file: /kolabrepository/server/perl-kolab/MANIFEST,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- MANIFEST	16 Mar 2009 17:17:34 -0000	1.9
+++ MANIFEST	4 Dec 2009 11:23:19 -0000	1.10
@@ -1,4 +1,5 @@
 AUTHORS
+Base.mk
 ChangeLog
 INSTALL
 bin/kolabdcachetool.in

Index: Makefile.PL
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Makefile.PL,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Makefile.PL	4 Dec 2009 11:09:38 -0000	1.17
+++ Makefile.PL	4 Dec 2009 11:23:19 -0000	1.18
@@ -4,6 +4,7 @@
 
 use ExtUtils::MakeMaker;
 use Getopt::Long;
+use File::Copy;
 
 my $HELP = 0;
 my $CONFIG = '/kolab/etc/kolab';
@@ -95,12 +96,24 @@
 }
 
 sub MY::postamble {
-    
-    my $add = "bin/%: bin/%.in
+    if (-e "../Base.mk")
+    {
+        copy("../Base.mk", "./") or die "Could not copy ../Base.mk";
+    }
+    my $add = "include Base.mk
+
+PACKAGE = \$(shell [ -r \"perl-kolab.spec\" ] && grep '%define[ ]*V_package' perl-kolab.spec | sed -e 's/.*V_package\\s*\\([a-z\\_-]*\\).*/\\1/')
+VERSION = \$(shell perl -I lib -e 'use Kolab;print \$\$Kolab::KOLAB_VERSION;')
+RELEASE = \$(shell perl -I lib -e 'use Kolab;print \$\$Kolab::KOLAB_RELEASE;')
+SOURCE_TAG = \$(shell perl -I lib -e 'use Kolab;print \$\$Kolab::VERSION;')
+
+bin/%: bin/%.in
 	cat \$< | sed -e 's#\@CONFIG_DIR@#$CONFIG#g' > \$@
 
 sbin/%: sbin/%.in
-	cat \$< | sed -e 's#\@CONFIG_DIR@#$CONFIG#g' > \$@
+	cat \$< | sed -e 's#\@CONFIG_DIR@#$CONFIG#g' > \$@.tmp
+	cat \$@.tmp | sed -e 's#\@VERSION@#\$(VERSION)#g' > \$@
+	rm \$@.tmp
 	\$(FIXIN) \$@
 
 SBIN_TARGETS=sbin/kolabconf sbin/kolab_bootstrap sbin/kolab_imappartitions sbin/kolabd sbin/kolabcheckperm





More information about the commits mailing list