Changeset: 5f6006f454da for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5f6006f454da
Added Files:
debian/monetdb-client-tools.docs
debian/monetdb5-server.docs
Modified Files:
MonetDB.spec
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
debian/monetdb5-sql.docs
sql/Makefile.ag
tools/mserver/Makefile.ag
vertoo.config
Branch: Jul2015
Log Message:
Install some documentation; remove version from documentation directories.
diffs (212 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -265,6 +265,9 @@ tools can be used to monitor the MonetDB
%{_bindir}/stethoscope
%{_bindir}/tachograph
%{_bindir}/tomograph
+%dir %{_datadir}/doc/MonetDB-client-tools
+%docdir %{_datadir}/doc/MonetDB-client-tools
+%{_datadir}/doc/MonetDB-client-tools/*
%package client-devel
Summary: MonetDB - Monet Database Management System Client Programs
@@ -664,6 +667,9 @@ fi
%exclude %{_libdir}/monetdb5/lib_sql.so
%{_libdir}/monetdb5/*.so
%doc %{_mandir}/man1/mserver5.1.gz
+%dir %{_datadir}/doc/MonetDB
+%docdir %{_datadir}/doc/MonetDB
+%{_datadir}/doc/MonetDB/*
%package -n MonetDB5-server-hugeint
Summary: MonetDB - 128-bit integer support for MonetDB5-server
@@ -763,15 +769,9 @@ systemd-tmpfiles --create %{_sysconfdir}
%{_libdir}/monetdb5/sql*.mal
%doc %{_mandir}/man1/monetdb.1.gz
%doc %{_mandir}/man1/monetdbd.1.gz
-%if (0%{?fedora} >= 20)
%dir %{_datadir}/doc/MonetDB-SQL
%docdir %{_datadir}/doc/MonetDB-SQL
%{_datadir}/doc/MonetDB-SQL/*
-%else
-%dir %{_datadir}/doc/MonetDB-SQL-%{version}
-%docdir %{_datadir}/doc/MonetDB-SQL-%{version}
-%{_datadir}/doc/MonetDB-SQL-%{version}/*
-%endif
%package SQL-server5-hugeint
Summary: MonetDB5 128 bit integer (hugeint) support for SQL
@@ -961,10 +961,6 @@ rm -f %{buildroot}%{_libdir}/monetdb5/*.
# internal development stuff
rm -f %{buildroot}%{_bindir}/Maddlog
-%if 0%{?fedora} >= 20
-mv %{buildroot}%{_datadir}/doc/MonetDB-SQL-%{version}
%{buildroot}%{_datadir}/doc/MonetDB-SQL
-%endif
-
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -2390,7 +2390,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.21.0\\dump-restore.txt"
+ "SourcePath" = "8:share\\doc\\MonetDB-SQL\\dump-restore.txt"
"TargetName" = "8:dump-restore.txt"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -2970,7 +2970,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.21.0\\dump-restore.html"
+ "SourcePath" = "8:share\\doc\\MonetDB-SQL\\dump-restore.html"
"TargetName" = "8:dump-restore.html"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -4194,7 +4194,7 @@
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
{
- "Name" = "8:MonetDB-SQL-11.21.0"
+ "Name" = "8:MonetDB-SQL"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj
b/NT/installer64/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer64/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj
@@ -2390,7 +2390,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.21.0\\dump-restore.txt"
+ "SourcePath" = "8:share\\doc\\MonetDB-SQL\\dump-restore.txt"
"TargetName" = "8:dump-restore.txt"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -2970,7 +2970,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.21.0\\dump-restore.html"
+ "SourcePath" = "8:share\\doc\\MonetDB-SQL\\dump-restore.html"
"TargetName" = "8:dump-restore.html"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -4194,7 +4194,7 @@
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
{
- "Name" = "8:MonetDB-SQL-11.21.0"
+ "Name" = "8:MonetDB-SQL"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
diff --git a/debian/monetdb-client-tools.docs b/debian/monetdb-client-tools.docs
new file mode 100644
--- /dev/null
+++ b/debian/monetdb-client-tools.docs
@@ -0,0 +1,1 @@
+debian/tmp/usr/share/doc/MonetDB-client-tools/*
diff --git a/debian/monetdb5-server.docs b/debian/monetdb5-server.docs
new file mode 100644
--- /dev/null
+++ b/debian/monetdb5-server.docs
@@ -0,0 +1,1 @@
+debian/tmp/usr/share/doc/MonetDB/*
diff --git a/debian/monetdb5-sql.docs b/debian/monetdb5-sql.docs
--- a/debian/monetdb5-sql.docs
+++ b/debian/monetdb5-sql.docs
@@ -1,1 +1,1 @@
-debian/tmp/usr/share/doc/MonetDB-SQL-*/*
+debian/tmp/usr/share/doc/MonetDB-SQL/*
diff --git a/sql/Makefile.ag b/sql/Makefile.ag
--- a/sql/Makefile.ag
+++ b/sql/Makefile.ag
@@ -10,12 +10,12 @@ EXTRA_DIST_DIR = test benchmarks odbc/sa
headers_txt = {
HEADERS = txt
- SOURCES = dump-restore.txt
- DIR = datadir/doc/MonetDB-SQL-$(VERSION)
+ SOURCES = dump-restore.txt
+ DIR = datadir/doc/MonetDB-SQL
}
headers_html = {
HEADERS = html
SOURCES = dump-restore.html
- DIR = datadir/doc/MonetDB-SQL-$(VERSION)
+ DIR = datadir/doc/MonetDB-SQL
}
diff --git a/tools/mserver/Makefile.ag b/tools/mserver/Makefile.ag
--- a/tools/mserver/Makefile.ag
+++ b/tools/mserver/Makefile.ag
@@ -8,7 +8,7 @@ MTSAFE
man_MANS = mserver5.1
-EXTRA_DIST = monetdblogo.png $(man_MANS)
+EXTRA_DIST = $(man_MANS)
INCLUDES = ../../monetdb5/mal \
../../gdk \
@@ -17,10 +17,28 @@ INCLUDES = ../../monetdb5/mal \
../../common/options \
$(openssl_CFLAGS) $(pcre_CFLAGS) $(libxml2_CFLAGS)
+headers_docx = {
+ HEADERS = docx
+ SOURCES = tomographintro.docx
+ DIR = datadir/doc/MonetDB-client-tools
+}
+
+headers_pdf = {
+ HEADERS = pdf
+ SOURCES = tomographintro.pdf
+ DIR = datadir/doc/MonetDB-client-tools
+}
+
+headers_png = {
+ HEADERS = png
+ SOURCES = monetdblogo.png
+ DIR = datadir/doc/MonetDB
+}
+
bin_mserver5 = {
# hack: include mserver5.1.in here to get it expanded
SOURCES = mserver5.c monet_version.h monet_version.c.in \
- mserver5.1.in
+ mserver5.1.in
LIBS = ../../monetdb5/tools/libmonetdb5 \
../../gdk/libbat \
$(curl_LIBS) $(pcre_LIBS) $(openssl_LIBS) $(PSAPILIB) \
diff --git a/vertoo.config b/vertoo.config
--- a/vertoo.config
+++ b/vertoo.config
@@ -60,19 +60,7 @@ main.addAnchors("NT/installer64/MonetDB5
format = "@normal"))
main.addAnchors("NT/installer32/MonetDB5-SQL-Installer.vdproj",
arguments(pattern = '"ProductVersion" = "8:%v"',
- format = "@normal"),
- arguments(pattern = r'MonetDB-SQL-%v\\dump-restore.txt',
- format = "@normal"),
- arguments(pattern = r'MonetDB-SQL-%v\\dump-restore.html',
- format = "@normal"),
- arguments(pattern = '"8:MonetDB-SQL-%v"',
format = "@normal"))
main.addAnchors("NT/installer64/MonetDB5-SQL-Installer.vdproj",
arguments(pattern = '"ProductVersion" = "8:%v"',
- format = "@normal"),
- arguments(pattern = r'MonetDB-SQL-%v\\dump-restore.txt',
- format = "@normal"),
- arguments(pattern = r'MonetDB-SQL-%v\\dump-restore.html',
- format = "@normal"),
- arguments(pattern = '"8:MonetDB-SQL-%v"',
format = "@normal"))
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
