NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commit0215dc9

committed

Well, this patch makes Makefile for contrib/rserv use the

contrib/contrib-global.mk library and _generally_ behave like Makefiles for other contrib modules. Besides it fixes Perl's interpolation of $libdir variable, which should be passed to backend instead. This patch is done against PostgreSQL 7.3b2 Besides, I want to thank Peter Eisentraut for his very friendly and helpful attitude and politely ask him to check whether contrib modules actually continue to work after he implements another major change to their build process.Alexey Borzov

1 parent33a6b67 commit0215dc9Copy full SHA for 0215dc9

File tree

2 files changed

+20

-32

lines changed

contrib/rserv
- Makefile
- MasterInit.in

2 files changed

+20

-32

lines changed

`‎contrib/rserv/Makefile`

Lines changed: 15 additions & 29 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,47 +6,33 @@ top_builddir = ../..`
`6`	`6`	`include$(top_builddir)/src/Makefile.global`
`7`	`7`
`8`	`8`	`NAME= rserv`
`9`		`-SONAME=$(NAME)$(DLSUFFIX)`
`10`		`-SQLS= master.sql slave.sql`
`11`		`-TCLS= RservTest`
`12`		`-PERLS= MasterInit MasterAddTable Replicate MasterSync CleanLog`
`13`		`-PERLS+= SlaveInit SlaveAddTable GetSyncID`
`14`		`-PERLS+= PrepareSnapshot ApplySnapshot`
`15`		`-SCRIPTS= InitRservTest`
	`9`	`+MODULES= rserv`
	`10`	`+DATA= RServ.pm`
	`11`	`+DATA_built= master.sql slave.sql`
	`12`	`+SQLS=$(DATA_built)`
	`13`	`+DOCS= README.rserv`
	`14`	`+SCRIPTS= RservTest`
	`15`	`+SCRIPTS+= MasterInit MasterAddTable Replicate MasterSync CleanLog`
	`16`	`+SCRIPTS+= SlaveInit SlaveAddTable GetSyncID`
	`17`	`+SCRIPTS+= PrepareSnapshot ApplySnapshot`
	`18`	`+SCRIPTS+= InitRservTest`
	`19`	`+EXTRA_CLEAN=$(SCRIPTS)`
`16`	`20`
`17`	`21`	`overrideCPPFLAGS := -I$(srcdir)$(CPPFLAGS)`
`18`	`22`	`overrideCFLAGS +=$(CFLAGS_SL)`
`19`	`23`	`SHLIB_LINK =$(BE_DLLLIBS)`
`20`	`24`
`21`	`25`
`22`		`-all:$(SQLS)$(TCLS)$(PERLS)$(SCRIPTS)$(SONAME)`
	`26`	`+all:$(SCRIPTS)$(SQLS)$(addsuffix$(DLSUFFIX),$(MODULES))`
`23`	`27`
`24`		`-%.sql:%.sql.in`
	`28`	`+$(SQLS):%.sql:%.sql.in`
`25`	`29`	`sed's,@MODULE_FILENAME@,$$libdir/$(NAME),g'$<>$@`
`26`	`30`
`27`		`-$(PERLS)$(TCLS)$(SCRIPTS):%:%.in`
	`31`	`+$(SCRIPTS):%:%.in`
`28`	`32`	`sed -e's,@MODULE_FILENAME@,$$libdir/$(NAME),g'\`
`29`	`33`	`-e's:@SQLDIR@:$(datadir)/contrib:g'\`
`30`	`34`	`-e's:@BINDIR@:$(bindir):g'\`
`31`	`35`	`-e's:@LIBDIR@:$(datadir)/contrib:g'$<>$@`
`32`	`36`	`chmod a+x$@`
`33`	`37`
`34`		`-`
`35`		`-install: all installdirs`
`36`		`-forfilein$(SQLS);do \`
`37`		`-$(INSTALL_DATA)$$file$(DESTDIR)$(datadir)/contrib\|\|exit;\`
`38`		`-done`
`39`		`-forfilein$(TCLS)$(PERLS)$(SCRIPTS);do \`
`40`		`-$(INSTALL_SCRIPT)$$file$(DESTDIR)$(bindir)\|\|exit;\`
`41`		`-done`
`42`		`-$(INSTALL_DATA)$(srcdir)/RServ.pm$(DESTDIR)$(datadir)/contrib`
`43`		`-$(INSTALL_SHLIB)$(SONAME)$(DESTDIR)$(pkglibdir)`
`44`		`-$(INSTALL_DATA)$(srcdir)/README.$(NAME)$(DESTDIR)$(docdir)/contrib`
`45`		`-`
`46`		`-installdirs:`
`47`		`-$(mkinstalldirs)$(DESTDIR)$(bindir)$(DESTDIR)$(datadir)/contrib\`
`48`		`-$(DESTDIR)$(pkglibdir)$(DESTDIR)$(docdir)/contrib`
`49`		`-`
`50`		`-`
`51`		`-cleandistcleanmaintainer-clean:`
`52`		`-rm -f$(SQLS)$(TCLS)$(PERLS)$(SCRIPTS)$(SONAME)$(NAME).o`
	`38`	`+include$(top_srcdir)/contrib/contrib-global.mk`

`‎contrib/rserv/MasterInit.in`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@ if (defined($opt_help) \|\| (scalar(@ARGV) < 1)) {`
`22`	`22`	`exit ((scalar(@ARGV) < 1)? 1:0);`
`23`	`23`	`}`
`24`	`24`
	`25`	`+my$module_filename ='@MODULE_FILENAME@';`
	`26`	`+`
`25`	`27`	`my$master =$ARGV[0] \|\|"master";`
`26`	`28`
`27`	`29`	`my$minfo ="dbname=$master";`
`@@ -90,15 +92,15 @@ $result = $conn->exec("create sequence _rserv_sync_seq_");`
`90`	`92`	`RollbackAndQuit($conn)if ($result->resultStatusne PGRES_COMMAND_OK);`
`91`	`93`
`92`	`94`	`$result =$conn->exec("CREATE FUNCTION _rserv_log_() RETURNS trigger" .`
`93`		`-" AS '@MODULE_FILENAME@' LANGUAGE 'c'");`
	`95`	`+" AS '$module_filename' LANGUAGE 'c'");`
`94`	`96`	`RollbackAndQuit($conn)if ($result->resultStatusne PGRES_COMMAND_OK);`
`95`	`97`
`96`	`98`	`$result =$conn->exec("CREATE FUNCTION _rserv_sync_(int4) RETURNS int4" .`
`97`		`-" AS '@MODULE_FILENAME@' LANGUAGE 'c'");`
	`99`	`+" AS '$module_filename' LANGUAGE 'c'");`
`98`	`100`	`RollbackAndQuit($conn)if ($result->resultStatusne PGRES_COMMAND_OK);`
`99`	`101`
`100`	`102`	`$result =$conn->exec("CREATE FUNCTION _rserv_debug_(int4) RETURNS int4" .`
`101`		`-" AS '@MODULE_FILENAME@' LANGUAGE 'c'");`
	`103`	`+" AS '$module_filename' LANGUAGE 'c'");`
`102`	`104`	`RollbackAndQuit($conn)if ($result->resultStatusne PGRES_COMMAND_OK);`
`103`	`105`
`104`	`106`	`$result =$conn->exec("COMMIT");`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit0215dc9

File tree

2 files changed

2 files changed

`‎contrib/rserv/Makefile`

`‎contrib/rserv/MasterInit.in`

0 commit comments