[prev in list] [next in list] [prev in thread] [next in thread] 

List:       monetdb-sql-checkins
Subject:    [Monetdb-sql-checkins] sql/NT rules.msc, , 1.80,
From:       Stefan Manegold <stmane () users ! sourceforge ! net>
Date:       2010-03-31 8:12:22
Message-ID: E1Nwt2i-0002ka-9f () sfp-cvsdas-1 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Update of /cvsroot/monetdb/sql/NT
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10381/sql/NT

Modified Files:
	rules.msc sql_config.h.in 
Log Message:
Made compilation of "testing" (and "java") independent of MonetDB.

This is mainy for Windows, but also on other systems, "testing" can now be
built independently of (and hence before) "MonetDB".

(These changes require a complete rebuild from scratch on Windows.)


1)
Moving files that mimic configure functionality on Windows from "MonetDB" to
"testing"; in detail:
MonetDB/conf/configure.py      -> buildtools/conf/configure.py
MonetDB/NT/winrules.msc        -> buildtools/conf/winrules.msc
MonetDB/NT/monetdb_winconfig.h -> buildtools/conf/winconfig.h

With winrules.msc & monetdb_winconfig.h no longer distribute in the MonetDB
tarball, this now prohibits compilation on Windows from tarballs. However,
this has never been tested, let alone supported, and most probably did not
work, anyway, as configure.py was never distributed in any tarball.

In fact, now there are only two places (see hereafter) where the location of
the above three files it specified.  All three are guarded by compile time
option "NEED_MX" to indicate whether "Mx" is required or not, and hence,
whether we build from CVS sources or tarballs.  The location is given for
the former case.  For the latter case, we'd "simply" need to ensure that
these three files are included in some (or each) tarball and specify there
location in case we build from tarballs.

buildtools/conf/winrules.msc:
!IFDEF NEED_MX
CONFIGURE_PY = "$(TOPDIR)\..\..\buildtools\conf\configure.py"
WINCONFIG_INCS = "-I$(TOPDIR)\..\..\buildtools\conf"
!ELSE
CONFIGURE_PY = ToBeDefined
WINCONFIG_INCS = ToBeDefined
!ENDIF

*/NT/rules.msc:
!IFDEF NEED_MX
RULESMSC = $(TOPDIR)\..\..\buildtools\conf\winrules.msc
!ELSE
RULESMSC = ToBeDefined
!ENDIF


2)
Replicating the getopt code from
buildtools/Mx/mx_getopt.h & buildtools/Mx/getopt.c
into
testing/src/testing_getopt.{h,c}
--- at least for the time being.

A better solution than replicating source files needs to be found, not only
for testing, but for getopt in general, as we now have already 4 copies of
some (different) getopt implementations in our code base.


3)
Making the remaining code aware of the above changes.

buildtools/doc/windowsbuild.rst,
*/NT/rules.msc:
	new location of "winrules.msc"

*/NT/*_config.h.in:
	renamed "monetdb_winconfig.h" into "winconfig.h"

MonetDB/NT/Makefile:
	removed "winrules.msc" & "monetdb_winconfig.h"

testing/configure.ag,
testing/MonetDB-testing.spec,
testing/vertoo.config,
testing/vertoo.data,
testing/NT/rules.msc:
	removed MonetDB build requirement

testing/src/Makefile.ag,
testing/src/Mdiff.c:
	use local "testing_getopt.{h,c}"

testing/conf/monetdb-testing-config.in,
testing/conf/monetdb-testing-config.bat.in:
	removed conditional "HAVE_MONETDB"

clients/conf/Tests/monetdb-testing-conds.stable.out.*:
	updated stable output accordingly

TestTools/*:
	build "testing" before "MonetDB"

monetweb/Development/TestWeb//*:
	"testing" before "MonetDB"


Index: sql_config.h.in
===================================================================
RCS file: /cvsroot/monetdb/sql/NT/sql_config.h.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- sql_config.h.in	7 Jan 2010 15:24:31 -0000	1.12
+++ sql_config.h.in	31 Mar 2010 08:12:20 -0000	1.13
@@ -19,7 +19,7 @@
 
 /* Manual config.h. needed for win32 .  */
 
-#include <monetdb_winconfig.h>
+#include <winconfig.h>
 
 /* ! Should be replaced by `monetdb5-config --prefix` ! */
 #define MONETDB5_PREFIX "@QXprefix@"

Index: rules.msc
===================================================================
RCS file: /cvsroot/monetdb/sql/NT/rules.msc,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- rules.msc	13 Jan 2010 11:08:31 -0000	1.80
+++ rules.msc	31 Mar 2010 08:12:14 -0000	1.81
@@ -20,7 +20,11 @@
 # treat warnings as errors
 W_CFLAGS = -WX
 
-RULESMSC = $(MONETDB_PREFIX)\share\MonetDB\winrules.msc
+!IFDEF NEED_MX
+RULESMSC = $(TOPDIR)\..\..\buildtools\conf\winrules.msc
+!ELSE
+RULESMSC = ToBeDefined
+!ENDIF
 !INCLUDE $(RULESMSC)
 
 VERSION = 2.37.0


------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Monetdb-sql-checkins mailing list
Monetdb-sql-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
[prev in list] [next in list] [prev in thread] [next in thread]