[Monetdb-developers] [Monetdb-pf-checkins] pathfinder MonetDB-XQuery.spec.in, 1.16, 1.17 Makefile.ag, 1.22, 1.23 extra.mk, 1.18, 1.19

Stefan Manegold Stefan.Manegold at cwi.nl
Sat Dec 9 15:22:10 CET 2006


Niels,

these changes are not meant for the release?

Stefan


On Sat, Dec 09, 2006 at 11:13:52AM +0000, Niels Nes wrote:
> Update of /cvsroot/monetdb/pathfinder
> In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv22364
> 
> Modified Files:
> 	MonetDB-XQuery.spec.in Makefile.ag extra.mk 
> Log Message:
> install howtos is done within the monetweb tools
> 
> 
> Index: Makefile.ag
> ===================================================================
> RCS file: /cvsroot/monetdb/pathfinder/Makefile.ag,v
> retrieving revision 1.22
> retrieving revision 1.23
> diff -u -d -r1.22 -r1.23
> --- Makefile.ag	30 Nov 2006 11:56:57 -0000	1.22
> +++ Makefile.ag	9 Dec 2006 11:13:50 -0000	1.23
> @@ -26,11 +26,21 @@
>  
>  EXTRA_DIST = rules.mk extra.mk RunMtest.in RunMtest.bat.in \
>  		RunMapprove.in RunMapprove.bat.in \
> -		MonetDB-XQuery.spec.in MonetDB-XQuery.spec rpm.mk.in \
> -		HowToStart-PF HowToStart-MinGW.txt
> +		MonetDB-XQuery.spec.in MonetDB-XQuery.spec rpm.mk.in 
>  EXTRA_DIST_DIR = NT tests
>  
>  EXTRA_HEADERS = pf_config.h
>  
> +scripts_txt = {
> +	SOURCES = HowToStart-MinGW.txt
> +	DIR = datadir/doc/MonetDB-XQuery-${VERSION}
> +}
> +
> +scripts_docs = {
> +	EXT = ""
> +	SOURCES = HowToStart-PF 
> +	DIR = datadir/doc/MonetDB-XQuery-${VERSION}
> +}
> +
>  TESTS = RunMtest
>  TESTS_ENVIRONMENT = $(SHELL)
> 
> Index: extra.mk
> ===================================================================
> RCS file: /cvsroot/monetdb/pathfinder/extra.mk,v
> retrieving revision 1.18
> retrieving revision 1.19
> diff -u -d -r1.18 -r1.19
> --- extra.mk	8 Nov 2006 13:16:44 -0000	1.18
> +++ extra.mk	9 Dec 2006 11:13:50 -0000	1.19
> @@ -68,19 +68,3 @@
>  #
>  doc:
>  	cd $(top_srcdir) ; doc/gen_doc.sh
> -
> -#
> -# Stefan's automated test system uses `make docs', not `make doc'.
> -# Make him happy as well.
> -#
> -docs: \
> -	$(prefix)/doc/MonetDB/GetGoing/Setup/XQuery/Unix/index.html \
> -	$(prefix)/doc/MonetDB/GetGoing/Setup/XQuery/Windows/index.html
> -
> -$(prefix)/doc/MonetDB/GetGoing/Setup/XQuery/Unix/index.html: $(top_srcdir)/HowToStart-PF
> -	mkdir -p $(prefix)/doc/MonetDB/GetGoing/Setup/XQuery/Unix
> -	rst2html.py --stylesheet http://monetdb.cwi.nl/MonetDB.css --link-stylesheet $(top_srcdir)/HowToStart-PF > $(prefix)/doc/MonetDB/GetGoing/Setup/XQuery/Unix/index.html
> -
> -$(prefix)/doc/MonetDB/GetGoing/Setup/XQuery/Windows/index.html: $(top_srcdir)/HowToStart-MinGW.txt
> -	mkdir -p $(prefix)/doc/MonetDB/GetGoing/Setup/XQuery/Windows
> -	rst2html.py --stylesheet http://monetdb.cwi.nl/MonetDB.css --link-stylesheet $(top_srcdir)/HowToStart-MinGW.txt > $(prefix)/doc/MonetDB/GetGoing/Setup/XQuery/Windows/index.html
> 
> Index: MonetDB-XQuery.spec.in
> ===================================================================
> RCS file: /cvsroot/monetdb/pathfinder/MonetDB-XQuery.spec.in,v
> retrieving revision 1.16
> retrieving revision 1.17
> diff -u -d -r1.16 -r1.17
> --- MonetDB-XQuery.spec.in	1 Nov 2006 17:48:37 -0000	1.16
> +++ MonetDB-XQuery.spec.in	9 Dec 2006 11:13:50 -0000	1.17
> @@ -21,8 +21,6 @@
>  
>  %define comp_cc @CC@
>  
> -%define builddoc 0
> -
>  # groups of related archs
>  %define all_x86 i386 i586 i686
>  
> @@ -47,15 +45,6 @@
>  Requires: %{name}-server
>  Requires: MonetDB-devel
>  
> -%if %{builddoc}
> -%package docu
> -Summary: MonetDB XQuery documentation package 
> -Group: System 
> -
> -%description docu
> -Add the MonetDB documentaion description here
> -%endif
> -
>  %prep
>  rm -rf $RPM_BUILD_ROOT
>  
> @@ -95,18 +84,8 @@
>  %{_libdir}/MonetDB/*.mil
>  %{prefix}/bin/Mbeddedxq
>  %{_libdir}/libembeddedxq.*
> +%{_datadir}/doc/%{name}-%{version}/*
>  
>  %files devel
>  %defattr(-,monetdb,monetdb) 
>  %{prefix}/include/pathfinder/*.h
> -
> -%if %{builddoc}
> -%files docu
> -%defattr(-,monetdb,monetdb) 
> -%{prefix}/share/MonetDB/docs/pathfinder/*.html
> -%{prefix}/share/MonetDB/docs/pathfinder/*.pdf
> -%{prefix}/share/MonetDB/docs/pathfinder/*.ps
> -%{prefix}/share/MonetDB/docs/pathfinder/*/*.html
> -%{prefix}/share/MonetDB/docs/pathfinder/*/*.pdf
> -%{prefix}/share/MonetDB/docs/pathfinder/*/*.ps
> -%endif
> 
> 
> -------------------------------------------------------------------------
> Take Surveys. Earn Cash. Influence the Future of IT
> Join SourceForge.net's Techsay panel and you'll get the chance to share your
> opinions on IT & business topics through brief surveys - and earn cash
> http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
> _______________________________________________
> Monetdb-pf-checkins mailing list
> Monetdb-pf-checkins at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins

-- 
| Dr. Stefan Manegold | mailto:Stefan.Manegold at cwi.nl |
| CWI,  P.O.Box 94079 | http://www.cwi.nl/~manegold/  |
| 1090 GB Amsterdam   | Tel.: +31 (20) 592-4212       |
| The Netherlands     | Fax : +31 (20) 592-4312       |




More information about the developers-list mailing list