Changeset: 60358b104fd5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=60358b104fd5
Modified Files:
Branch: sciql
Log Message:
Merged from default
diffs (85 lines):
diff --git a/monetdb5/misc/msabaoth.h b/monetdb5/misc/msabaoth.h
--- a/monetdb5/misc/msabaoth.h
+++ b/monetdb5/misc/msabaoth.h
@@ -56,20 +56,30 @@
double crashavg30; /* average of crashes in the last 30 start attempts
*/
} sabuplog;
-void msab_init(char *dbfarm, char *dbname);
-char *msab_getDBfarm(char **ret);
-char *msab_getDBname(char **ret);
-char *msab_marchScenario(const char *lang);
-char *msab_retreatScenario(const char *lang);
-char *msab_marchConnection(const char *host, const int port);
-char *msab_wildRetreat(void);
-char *msab_registerStart(void);
-char *msab_registerStop(void);
-char *msab_getMyStatus(sabdb** ret);
-char *msab_getStatus(sabdb** ret, char *dbname);
-char *msab_freeStatus(sabdb** ret);
-char *msab_getUplogInfo(sabuplog *ret, const sabdb *db);
-char *msab_serialise(char **ret, const sabdb *db);
-char *msab_deserialise(sabdb **ret, char *sabdb);
+#ifdef WIN32
+#if !defined(LIBMAL) && !defined(LIBATOMS) && !defined(LIBKERNEL) &&
!defined(LIBMAL) && !defined(LIBOPTIMIZER) && !defined(LIBSCHEDULER) &&
!defined(LIBMONETDB5) && !defined(LIBMSABAOTH)
+#define msab_export extern __declspec(dllimport)
+#else
+#define msab_export extern __declspec(dllexport)
+#endif
+#else
+#define msab_export extern
+#endif
+
+msab_export void msab_init(char *dbfarm, char *dbname);
+msab_export char *msab_getDBfarm(char **ret);
+msab_export char *msab_getDBname(char **ret);
+msab_export char *msab_marchScenario(const char *lang);
+msab_export char *msab_retreatScenario(const char *lang);
+msab_export char *msab_marchConnection(const char *host, const int port);
+msab_export char *msab_wildRetreat(void);
+msab_export char *msab_registerStart(void);
+msab_export char *msab_registerStop(void);
+msab_export char *msab_getMyStatus(sabdb** ret);
+msab_export char *msab_getStatus(sabdb** ret, char *dbname);
+msab_export char *msab_freeStatus(sabdb** ret);
+msab_export char *msab_getUplogInfo(sabuplog *ret, const sabdb *db);
+msab_export char *msab_serialise(char **ret, const sabdb *db);
+msab_export char *msab_deserialise(sabdb **ret, char *sabdb);
#endif
diff --git a/rpm.mk.in b/rpm.mk.in
--- a/rpm.mk.in
+++ b/rpm.mk.in
@@ -23,7 +23,7 @@
RPMBUILDARGS = --define="_tmppath /tmp" --define="_topdir $(rpmtopdir)"
--define="tmpdir %{_tmppath}" --define="rpmcflags -O2 " --define="packager
MonetDB Database System <[email protected]>" --define="oid@oids@ 1"
-$(top_builddir)/$(distdir).tar.gz:
+$(top_builddir)/$(distdir).tar.bz2:
$(MAKE) $(AM_MAKEFLAGS) dist
$(rpmtopdir)/rpmmacros:
@@ -33,8 +33,8 @@
mkdir -p $(rpmtopdir)/BUILD
mkdir -p $(rpmtopdir)/INSTALL
-rpm: MonetDB.spec $(top_builddir)/$(distdir).tar.gz $(rpmtopdir)/rpmmacros
- $(RPMBUILD) $(RPMBUILDARGS) --define="dist _@LINUX_DIST@" -ta --target
`uname -m` --define="comp_cc @CC@" $(top_builddir)/$(distdir).tar.gz
+rpm: MonetDB.spec $(top_builddir)/$(distdir).tar.bz2 $(rpmtopdir)/rpmmacros
+ $(RPMBUILD) $(RPMBUILDARGS) --define="dist _@LINUX_DIST@" -ta --target
`uname -m` --define="comp_cc @CC@" $(top_builddir)/$(distdir).tar.bz2
-srpm: MonetDB.spec $(top_builddir)/$(distdir).tar.gz $(rpmtopdir)/rpmmacros
- $(RPMBUILD) $(RPMBUILDARGS) --define="dist %{?undefined}" -ts
$(top_builddir)/$(distdir).tar.gz
+srpm: MonetDB.spec $(top_builddir)/$(distdir).tar.bz2 $(rpmtopdir)/rpmmacros
+ $(RPMBUILD) $(RPMBUILDARGS) --define="dist %{?undefined}" -ts
$(top_builddir)/$(distdir).tar.bz2
diff --git a/tools/mserver/Makefile.ag b/tools/mserver/Makefile.ag
--- a/tools/mserver/Makefile.ag
+++ b/tools/mserver/Makefile.ag
@@ -33,7 +33,6 @@
SOURCES = mserver5.c monet_version.h monet_version.c.in
LIBS = ../../monetdb5/tools/libmonetdb5 @SHARED_LIBS@ \
../../gdk/libbat \
- ../../monetdb5/misc/libsabaoth \
$(SOCKET_LIBS) $(MALLOC_LIBS) $(PTHREAD_LIBS) $(DL_LIBS) \
$(curl_LIBS) $(pcre_LIBS) $(openssl_LIBS) $(PSAPILIB)
}
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
