Update of /cvsroot/monetdb/java/NT
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29765/java/NT
Modified Files:
.cvsignore Makefile rules.msc
Log Message:
Summary:
--------
Separated MonetDB-releated Java code from "MonetDB Clients"
clients/src/java
into its own "MonetDB Java" CVS module
java
(For time being?) "MonetDB Java" compiles just like the remaining
MonetDB-related code, and required buildtools only when compiled from CVS
source.
"MonetDB Java" does not require an other MonetDB package.
No other MonetDB package requires "MonetDB Java".
Hence, "MonetDB Java" cn be built independently of the other MonetDB
packages.
Details & Background:
---------------------
To allow implementation of versioning-, packaging-, & release-schemes for
MonetDB's Java/JDBC Support & Interface that are decoupled from the
respective schemes used for the (mainly C-based) remainder of the MonetDB
product family,
I implemented a move of the code from "clients/src/java/" into "java/", a
new separate CVS module for "MonetDB Java".
(For now?) it comes with all the infrastructure of the usual MonetDB
building process (stripped-down, though, to the limited requirements),
including `./bootstrap`, `configure`, `make`, `make check`, `sh RunMtest`,
`make dist`, `make rpm`, `make install`, & .`Mtest.py -rq`.
Version number maintenance within "java/" is done exclusively by
java/version.sh, no vertoo involved, here.
To build. the new "MonetDB Java" requires only the buildtools (and that only
when building straight from CVS).
To run `make check` and/or `Mtest.py -rq`, Mtest.py from MonetDB Common must
be available in the PATH, though.
sql and pathfinder now check for the availability of MonetDB Java before
running their Java/JDBC tests.
On the live web site, the related Current-TestWeb pages have been updated.
Updating the build documentation in the development web site still has to be
done.
Caveat:
-------
`make rpm` requesting "noarch" does not work, yet.
Index: .cvsignore
===================================================================
RCS file: /cvsroot/monetdb/java/NT/.cvsignore,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- .cvsignore 28 Nov 2007 14:54:05 -0000 1.1.1.1
+++ .cvsignore 28 Nov 2007 16:23:57 -0000 1.2
@@ -11,7 +11,6 @@
lib
libexec
man
-clients_config.h
sbin
scripts
share
Index: rules.msc
===================================================================
RCS file: /cvsroot/monetdb/java/NT/rules.msc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- rules.msc 28 Nov 2007 14:54:05 -0000 1.1.1.1
+++ rules.msc 28 Nov 2007 16:23:57 -0000 1.2
@@ -25,10 +25,6 @@
MONETDB_LIBS=/libpath:"$(MONETDB_PREFIX)\lib"
pkg = MonetDB
-CONFIG_H=clients_config.h
-VERSION=1.21.0
-# ^^^^^^
-# Maintained via vertoo. Please don't modify by hand!
-# Contact [EMAIL PROTECTED] for details and/or assistance.
+VERSION=1.7.1
ODBC_LIBS = odbccp32.lib user32.lib
Index: Makefile
===================================================================
RCS file: /cvsroot/monetdb/java/NT/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Makefile 28 Nov 2007 14:54:05 -0000 1.1.1.1
+++ Makefile 28 Nov 2007 16:23:57 -0000 1.2
@@ -11,26 +11,19 @@
UNISTD_H = unistd.h
-all: "$(SRCDIR)\Makefile.msc" all-msc $(UNISTD_H) Runmclient.bat RunMtest.bat
RunMapprove.bat
- $(MAKE) /nologo /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)"
"bits=$(bits)" all
+all: "$(SRCDIR)\Makefile.msc" $(UNISTD_H) RunMtest.bat RunMapprove.bat
+ $(MAKE) /nologo /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)" all
check: "$(SRCDIR)\Makefile.msc"
- $(MAKE) /nologo /i /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)"
"bits=$(bits)" check
+ $(MAKE) /nologo /i /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)" check
call RunMtest.bat
-install: targetdirs clients_config.h all
- $(INSTALL) clients_config.h "$(includedir)"
- $(MAKE) /nologo /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)"
"bits=$(bits)" install
- if not "$(MAKEDIR)" == "$(prefix)" $(INSTALL) mclient.bat "$(prefix)"
+install: targetdirs all
+ $(MAKE) /nologo /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)" install
$(SRCDIR)\Makefile.msc: "$(SRCDIR)\Makefile.ag"
$(CD) "$(SRCDIR)" && autogen.py
-all-msc: clients_config.h
-
-clients_config.h: clients_config.h.in
- $(CONFIGURE) clients_config.h.in > clients_config.h
-
unistd.h:
$(ECHO) #ifndef UNISTD_H > unistd.h
$(ECHO) #define UNISTD_H >> unistd.h
@@ -43,9 +36,6 @@
$(ECHO) #define umask _umask >> unistd.h
$(ECHO) #endif >> unistd.h
-Runmclient.bat: "$(SRCDIR)\Runmclient.bat.in"
- $(CONFIGURE) "$(SRCDIR)\Runmclient.bat.in" > Runmclient.bat
-
RunMtest.bat: "$(SRCDIR)\RunMtest.bat.in"
$(CONFIGURE) "$(SRCDIR)\RunMtest.bat.in" > RunMtest.bat
-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell. From the desktop to the data center, Linux is going
mainstream. Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
