Changeset: 2c294ece5222 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2c294ece5222 Modified Files: Branch: default Log Message:
Merged from Jun2010 diffs (252 lines): diff -r 2c61c25c8af9 -r 2c294ece5222 MonetDB4/license.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/MonetDB4/license.txt Fri May 28 17:04:21 2010 +0200 @@ -0,0 +1,16 @@ +The contents of this file are subject to the MonetDB Public License +Version 1.1 (the "License"); you may not use this file except in +compliance with the License. You may obtain a copy of the License at +http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html + +Software distributed under the License is distributed on an "AS IS" +basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the +License for the specific language governing rights and limitations +under the License. + +The Original Code is the MonetDB Database System. + +The Initial Developer of the Original Code is CWI. +Portions created by CWI are Copyright (C) 1997-July 2008 CWI. +Copyright August 2008-2010 MonetDB B.V. +All Rights Reserved. diff -r 2c61c25c8af9 -r 2c294ece5222 MonetDB5/license.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/MonetDB5/license.txt Fri May 28 17:04:21 2010 +0200 @@ -0,0 +1,16 @@ +The contents of this file are subject to the MonetDB Public License +Version 1.1 (the "License"); you may not use this file except in +compliance with the License. You may obtain a copy of the License at +http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html + +Software distributed under the License is distributed on an "AS IS" +basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the +License for the specific language governing rights and limitations +under the License. + +The Original Code is the MonetDB Database System. + +The Initial Developer of the Original Code is CWI. +Portions created by CWI are Copyright (C) 1997-July 2008 CWI. +Copyright August 2008-2010 MonetDB B.V. +All Rights Reserved. diff -r 2c61c25c8af9 -r 2c294ece5222 buildtools/Mx/Code.c --- a/buildtools/Mx/Code.c Fri May 28 15:42:03 2010 +0200 +++ b/buildtools/Mx/Code.c Fri May 28 17:04:21 2010 +0200 @@ -375,6 +375,7 @@ case Clex: case CCyacc: case CClex: + case MALcode: break; case Haskell: diff -r 2c61c25c8af9 -r 2c294ece5222 buildtools/Mx/Mx.h --- a/buildtools/Mx/Mx.h Fri May 28 15:42:03 2010 +0200 +++ b/buildtools/Mx/Mx.h Fri May 28 17:04:21 2010 +0200 @@ -83,6 +83,7 @@ char *ext; } Directive; +extern char *inputdir; extern char *outputdir; extern Directive str2dir[]; diff -r 2c61c25c8af9 -r 2c294ece5222 buildtools/Mx/disclaimer.c --- a/buildtools/Mx/disclaimer.c Fri May 28 15:42:03 2010 +0200 +++ b/buildtools/Mx/disclaimer.c Fri May 28 17:04:21 2010 +0200 @@ -23,23 +23,50 @@ #include <string.h> #include <limits.h> +#include "Mx.h" #include "disclaimer.h" -int disclaimer = 0; +int disclaimer = 1; char *disclaimerfile; -static const char defaultfile[] = "COPYRIGHT"; +static const char defaultfile[] = "license.txt"; static FILE * openDisclaimerFile(const char *filename) { - FILE *fp; + FILE *fp = NULL; if (!filename || strlen(filename) < 1) filename = defaultfile; - if ((fp = fopen(filename, "r")) == 0) - fprintf(stderr, "Mx: can't open disclaimer file '%s' (skipping).\n", filename); + if (*filename == DIR_SEP) { + fp = fopen(filename, "r"); + } else { + char buf[8096]; + size_t len; + buf[0] = '\0'; + strncat(buf, inputdir, 8096 - 1); + len = strlen(buf); + if (len < 8095 && buf[len - 1] != DIR_SEP) + buf[len++] = DIR_SEP; + /* search backwards, such that we can find the license.txt + * file in the root of each module */ + strncat(buf, filename, 8095 - len); + while (len > 0 && (fp = fopen(buf, "r")) == 0) { + /* remove last path */ + len--; /* the trailing slash */ + while (len > 0) { + if (buf[--len] == '/') { + buf[++len] = '\0'; + break; + } + } + strncat(buf, filename, 8096 - len - 1); + } + } + + if (fp == NULL) + fprintf(stderr, "Mx: can't open licence file '%s' (skipping).\n", filename); return fp; } @@ -104,8 +131,9 @@ "c", "/*", " * ", " */",}, { "h", "/*", " * ", " */",}, { MX_CXX_SUFFIX, "/*", " * ", " */",}, { - "html", "<!--", " + ", " -->",}, { + "html", "<!--", "", " -->",}, { "tex", "", "% ", "",}, { + "mal", "", "# ", "",}, { "mil", "", "# ", "",}, { "m", "", "# ", "",}, { "mx", "", "@' ", ""}, { diff -r 2c61c25c8af9 -r 2c294ece5222 clients/license.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/clients/license.txt Fri May 28 17:04:21 2010 +0200 @@ -0,0 +1,16 @@ +The contents of this file are subject to the MonetDB Public License +Version 1.1 (the "License"); you may not use this file except in +compliance with the License. You may obtain a copy of the License at +http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html + +Software distributed under the License is distributed on an "AS IS" +basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the +License for the specific language governing rights and limitations +under the License. + +The Original Code is the MonetDB Database System. + +The Initial Developer of the Original Code is CWI. +Portions created by CWI are Copyright (C) 1997-July 2008 CWI. +Copyright August 2008-2010 MonetDB B.V. +All Rights Reserved. diff -r 2c61c25c8af9 -r 2c294ece5222 geom/license.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/geom/license.txt Fri May 28 17:04:21 2010 +0200 @@ -0,0 +1,16 @@ +The contents of this file are subject to the MonetDB Public License +Version 1.1 (the "License"); you may not use this file except in +compliance with the License. You may obtain a copy of the License at +http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html + +Software distributed under the License is distributed on an "AS IS" +basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the +License for the specific language governing rights and limitations +under the License. + +The Original Code is the MonetDB Database System. + +The Initial Developer of the Original Code is CWI. +Portions created by CWI are Copyright (C) 1997-July 2008 CWI. +Copyright August 2008-2010 MonetDB B.V. +All Rights Reserved. diff -r 2c61c25c8af9 -r 2c294ece5222 java/license.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java/license.txt Fri May 28 17:04:21 2010 +0200 @@ -0,0 +1,16 @@ +The contents of this file are subject to the MonetDB Public License +Version 1.1 (the "License"); you may not use this file except in +compliance with the License. You may obtain a copy of the License at +http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html + +Software distributed under the License is distributed on an "AS IS" +basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the +License for the specific language governing rights and limitations +under the License. + +The Original Code is the MonetDB Database System. + +The Initial Developer of the Original Code is CWI. +Portions created by CWI are Copyright (C) 1997-July 2008 CWI. +Copyright August 2008-2010 MonetDB B.V. +All Rights Reserved. diff -r 2c61c25c8af9 -r 2c294ece5222 sql/license.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sql/license.txt Fri May 28 17:04:21 2010 +0200 @@ -0,0 +1,16 @@ +The contents of this file are subject to the MonetDB Public License +Version 1.1 (the "License"); you may not use this file except in +compliance with the License. You may obtain a copy of the License at +http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html + +Software distributed under the License is distributed on an "AS IS" +basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the +License for the specific language governing rights and limitations +under the License. + +The Original Code is the MonetDB Database System. + +The Initial Developer of the Original Code is CWI. +Portions created by CWI are Copyright (C) 1997-July 2008 CWI. +Copyright August 2008-2010 MonetDB B.V. +All Rights Reserved. diff -r 2c61c25c8af9 -r 2c294ece5222 template/license.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/template/license.txt Fri May 28 17:04:21 2010 +0200 @@ -0,0 +1,16 @@ +The contents of this file are subject to the MonetDB Public License +Version 1.1 (the "License"); you may not use this file except in +compliance with the License. You may obtain a copy of the License at +http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html + +Software distributed under the License is distributed on an "AS IS" +basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the +License for the specific language governing rights and limitations +under the License. + +The Original Code is the MonetDB Database System. + +The Initial Developer of the Original Code is CWI. +Portions created by CWI are Copyright (C) 1997-July 2008 CWI. +Copyright August 2008-2010 MonetDB B.V. +All Rights Reserved. diff -r 2c61c25c8af9 -r 2c294ece5222 testing/license.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/testing/license.txt Fri May 28 17:04:21 2010 +0200 @@ -0,0 +1,16 @@ +The contents of this file are subject to the MonetDB Public License +Version 1.1 (the "License"); you may not use this file except in +compliance with the License. You may obtain a copy of the License at +http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html + +Software distributed under the License is distributed on an "AS IS" +basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the +License for the specific language governing rights and limitations +under the License. + +The Original Code is the MonetDB Database System. + +The Initial Developer of the Original Code is CWI. +Portions created by CWI are Copyright (C) 1997-July 2008 CWI. +Copyright August 2008-2010 MonetDB B.V. +All Rights Reserved. _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
