Changeset: 4bc31c42d210 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4bc31c42d210
Added Files:
monetdb5/modules/mal/batcalc.c
monetdb5/modules/mal/batcalc.mal
monetdb5/modules/mal/batcalc.mal.sh
monetdb5/modules/mal/calc.c
monetdb5/modules/mal/calc.mal
monetdb5/modules/mal/calc.mal.sh
Removed Files:
monetdb5/modules/kernel/batcalc.c
monetdb5/modules/kernel/batcalc.mal
monetdb5/modules/kernel/batcalc.mal.sh
monetdb5/modules/kernel/calc.c
monetdb5/modules/kernel/calc.mal
monetdb5/modules/kernel/calc.mal.sh
Modified Files:
monetdb5/modules/kernel/Makefile.ag
monetdb5/modules/mal/Makefile.ag
Branch: default
Log Message:
Moved calc and batcalc modules to modules/mal.
modules in modules/kernel should not contain "pattern" calls.
diffs (73 lines):
diff --git a/monetdb5/modules/kernel/Makefile.ag
b/monetdb5/modules/kernel/Makefile.ag
--- a/monetdb5/modules/kernel/Makefile.ag
+++ b/monetdb5/modules/kernel/Makefile.ag
@@ -42,13 +42,11 @@ lib_kernel = {
algebra.mx \
array.c array.h \
bat5.c bat5.h \
- batcalc.c \
batcolor.c batcolor.h \
batifthen.c batifthen.h \
batmmath.c batmmath.h \
batmtime.mx \
batstr.c batstr.h \
- calc.c \
counters.c counters.h \
group.mx \
lock.c lock.h \
@@ -63,9 +61,9 @@ lib_kernel = {
headers_mal = {
HEADERS = mal
DIR = libdir/monetdb5
- SOURCES = calc.mal bat5.mal algebra.mx status.mal unix.mal \
+ SOURCES = bat5.mal algebra.mx status.mal unix.mal \
mmath.mal lock.mal sema.mal alarm.mal batstr.mal batmtime.mx \
- batcolor.mal batifthen.mal batcalc.mal batmmath.mal \
+ batcolor.mal batifthen.mal batmmath.mal \
group.mx aggr.mx array.mal \
counters.mal logger.mal microbenchmark.mal
}
diff --git a/monetdb5/modules/mal/Makefile.ag b/monetdb5/modules/mal/Makefile.ag
--- a/monetdb5/modules/mal/Makefile.ag
+++ b/monetdb5/modules/mal/Makefile.ag
@@ -61,7 +61,8 @@ lib_mal = {
txtsim.c txtsim.h \
urlbox.c urlbox.h \
zorder.c zorder.h \
- sample.c sample.h
+ sample.c sample.h \
+ calc.c batcalc.c
}
headers_mal = {
@@ -76,9 +77,10 @@ headers_mal = {
mal_mapi.mal sabaoth.mal remote.mal \
txtsim.mal recycle.mal \
cluster.mal trader.mal \
- tokenizer.mal zorder.mal sample.mal
+ tokenizer.mal zorder.mal sample.mal \
+ calc.mal batcalc.mal
}
-EXTRA_DIST = attach.mal batExtensions.mal iterator.mal constraints.mal
groupby.mal histogram.mal mal_init.mal manual.mal mkey.mal pcre.mal
profiler.mal recycle.mal remote.mal sabaoth.mal trader.mal transaction.mal
txtsim.mal tablet.mal tablet.h sample.mal mal_mapi.mal mat.mal tokenizer.mal
pqueue.mal
+EXTRA_DIST = attach.mal batExtensions.mal iterator.mal constraints.mal
groupby.mal histogram.mal mal_init.mal manual.mal mkey.mal pcre.mal
profiler.mal recycle.mal remote.mal sabaoth.mal trader.mal transaction.mal
txtsim.mal tablet.mal tablet.h sample.mal mal_mapi.mal mat.mal tokenizer.mal
pqueue.mal calc.mal batcalc.mal
EXTRA_DIST_DIR = Tests
diff --git a/monetdb5/modules/kernel/batcalc.c b/monetdb5/modules/mal/batcalc.c
rename from monetdb5/modules/kernel/batcalc.c
rename to monetdb5/modules/mal/batcalc.c
diff --git a/monetdb5/modules/kernel/batcalc.mal
b/monetdb5/modules/mal/batcalc.mal
rename from monetdb5/modules/kernel/batcalc.mal
rename to monetdb5/modules/mal/batcalc.mal
diff --git a/monetdb5/modules/kernel/batcalc.mal.sh
b/monetdb5/modules/mal/batcalc.mal.sh
rename from monetdb5/modules/kernel/batcalc.mal.sh
rename to monetdb5/modules/mal/batcalc.mal.sh
diff --git a/monetdb5/modules/kernel/calc.c b/monetdb5/modules/mal/calc.c
rename from monetdb5/modules/kernel/calc.c
rename to monetdb5/modules/mal/calc.c
diff --git a/monetdb5/modules/kernel/calc.mal b/monetdb5/modules/mal/calc.mal
rename from monetdb5/modules/kernel/calc.mal
rename to monetdb5/modules/mal/calc.mal
diff --git a/monetdb5/modules/kernel/calc.mal.sh
b/monetdb5/modules/mal/calc.mal.sh
rename from monetdb5/modules/kernel/calc.mal.sh
rename to monetdb5/modules/mal/calc.mal.sh
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
