Changeset: 9755edaea143 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9755edaea143
Modified Files:
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
buildtools/ChangeLog.Jan2014
buildtools/doc/windowsbuild.rst
clients/mapiclient/tomograph.c
Branch: default
Log Message:
Merge with Jan2014 branch.
diffs (96 lines):
diff --git a/NT/installer32/MonetDB5-Geom-Module.vdproj
b/NT/installer32/MonetDB5-Geom-Module.vdproj
--- a/NT/installer32/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer32/MonetDB5-Geom-Module.vdproj
@@ -231,7 +231,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6C07D912740F414490DD35D5A179D268"
{
- "SourcePath" =
"8:C:\\Libraries\\geos-3.3.0.win32-vs10\\bin\\geos_c.dll"
+ "SourcePath" =
"8:C:\\Libraries\\geos-3.4.2.win32-vs10\\bin\\geos_c.dll"
"TargetName" = "8:geos_c.dll"
"Tag" = "8:"
"Folder" = "8:_4D9CE65EDD774551869CFD46B59B4F9E"
diff --git a/NT/installer64/MonetDB5-Geom-Module.vdproj
b/NT/installer64/MonetDB5-Geom-Module.vdproj
--- a/NT/installer64/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer64/MonetDB5-Geom-Module.vdproj
@@ -231,7 +231,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6C07D912740F414490DD35D5A179D268"
{
- "SourcePath" =
"8:C:\\Libraries\\geos-3.3.0.win64-vs10\\bin\\geos_c.dll"
+ "SourcePath" =
"8:C:\\Libraries\\geos-3.4.2.win64-vs10\\bin\\geos_c.dll"
"TargetName" = "8:geos_c.dll"
"Tag" = "8:"
"Folder" = "8:_4D9CE65EDD774551869CFD46B59B4F9E"
diff --git a/buildtools/ChangeLog.Jan2014 b/buildtools/ChangeLog.Jan2014
--- a/buildtools/ChangeLog.Jan2014
+++ b/buildtools/ChangeLog.Jan2014
@@ -1,3 +1,7 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
+* Mon Mar 24 2014 Sjoerd Mullender <sjo...@acm.org>
+- On Windows we now build the geom module against version 3.4.2 of the
+ geos library.
+
diff --git a/buildtools/doc/windowsbuild.rst b/buildtools/doc/windowsbuild.rst
--- a/buildtools/doc/windowsbuild.rst
+++ b/buildtools/doc/windowsbuild.rst
@@ -372,21 +372,23 @@ in the instructions.
.. The actual commands were::
autogen.bat
- nmake /f makefile.vc MSCV_VER=1600
+ nmake /f makefile.vc MSVC_VER=1600
+
+.. On Windows64, add WIN64=YES to the nmake command line.
After this, install the library somewhere, e.g. in
-``C:\geos-3.3.0.win32``::
+``C:\geos-3.4.2.win32``::
- mkdir C:\geos-3.3.0.win32
- mkdir C:\geos-3.3.0.win32\lib
- mkdir C:\geos-3.3.0.win32\bin
- mkdir C:\geos-3.3.0.win32\include
- mkdir C:\geos-3.3.0.win32\include\geos
- copy src\geos_c_i.lib C:\geos-3.3.0.win32\lib
- copy src\geos_c.dll C:\geos-3.3.0.win32\bin
- copy src\include C:\geos-3.3.0.win32\include
- copy src\include\geos C:\geos-3.3.0.win32\include\geos
- copy capi\geos_c.h C:\geos-3.3.0.win32\include
+ mkdir C:\geos-3.4.2.win32
+ mkdir C:\geos-3.4.2.win32\lib
+ mkdir C:\geos-3.4.2.win32\bin
+ mkdir C:\geos-3.4.2.win32\include
+ mkdir C:\geos-3.4.2.win32\include\geos
+ copy src\geos_c_i.lib C:\geos-3.4.2.win32\lib
+ copy src\geos_c.dll C:\geos-3.4.2.win32\bin
+ copy include C:\geos-3.4.2.win32\include
+ copy include\geos C:\geos-3.4.2.win32\include\geos
+ copy capi\geos_c.h C:\geos-3.4.2.win32\include
__ http://geos.refractions.net/
__ http://trac.osgeo.org/geos/wiki/BuildingOnWindowsWithNMake
diff --git a/clients/mapiclient/tomograph.c b/clients/mapiclient/tomograph.c
--- a/clients/mapiclient/tomograph.c
+++ b/clients/mapiclient/tomograph.c
@@ -1005,8 +1005,18 @@ showio(void)
fprintf(gnudata, "unset ylabel\n");
fprintf(gnudata, "set y2tics in (0, "LLFMT".0) nomirror\n", max / beat);
fprintf(gnudata, "set y2label \"IO per ms\"\n");
+#ifdef GNUPLOT_463_BUG_ON_FEDORA_20
+/* this is the original version, but on Fedora 20 with
+ * gnuplot-4.6.3-6.fc20.x86_64 it produces a red background on most of
+ * the page */
fprintf(gnudata, "plot \"%s.dat\" using 1:(($4+$5)/%d.0) title
\"reads\" with boxes fs solid linecolor rgb \"gray\" ,\\\n", (tracefile ?
"scratch" : filename), beat);
fprintf(gnudata, "\"%s.dat\" using 1:($5/%d.0) title \"writes\" with
boxes fs solid linecolor rgb \"red\" \n", (tracefile ? "scratch" : filename),
beat);
+#else
+/* this is a slightly modified version that produces decent results on
+ * all platforms */
+ fprintf(gnudata, "plot \"%s.dat\" using 1:(($4+$5)/%d.0) title
\"reads\" with impulses linecolor rgb \"gray\" ,\\\n", (tracefile ? "scratch" :
filename), beat);
+ fprintf(gnudata, "\"%s.dat\" using 1:($5/%d.0) title \"writes\" with
impulses linecolor rgb \"red\" \n", (tracefile ? "scratch" : filename), beat);
+#endif
fprintf(gnudata, "unset y2label\n");
fprintf(gnudata, "unset y2tics\n");
fprintf(gnudata, "unset y2range\n");
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
