Changeset: c05daca1127e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c05daca1127e
Modified Files:
MonetDB.spec
buildtools/Mx/Makefile.ag
buildtools/autogen/autogen/am.py
buildtools/autogen/autogen/msc.py
buildtools/burg/Makefile.ag
buildtools/mel/Makefile.ag
Branch: default
Log Message:
Implemented NOINST option for binaries, don't install Mx, mel, burg.
diffs (164 lines):
diff -r a768a21f2eba -r c05daca1127e MonetDB.spec
--- a/MonetDB.spec Tue Jan 11 10:57:50 2011 +0100
+++ b/MonetDB.spec Wed Jan 12 12:48:45 2011 +0100
@@ -478,9 +478,6 @@
%{_bindir}/Maddlog
%{_bindir}/Mbootstrap
%{_bindir}/Mdebootstrap
-%{_bindir}/Mx
-%{_bindir}/burg
-%{_bindir}/mel
%dir %{_includedir}/MonetDB
%dir %{_includedir}/MonetDB/common
%dir %{_includedir}/MonetDB/gdk
diff -r a768a21f2eba -r c05daca1127e buildtools/Mx/Makefile.ag
--- a/buildtools/Mx/Makefile.ag Tue Jan 11 10:57:50 2011 +0100
+++ b/buildtools/Mx/Makefile.ag Wed Jan 12 12:48:45 2011 +0100
@@ -16,6 +16,7 @@
# All Rights Reserved.
bin_Mx = {
+ NOINST
SOURCES = Code.c Def.c Display.c Form.c Io.c Mx.c Print.c Sys.c Tok.c
disclaimer.c
}
diff -r a768a21f2eba -r c05daca1127e buildtools/autogen/autogen/am.py
--- a/buildtools/autogen/autogen/am.py Tue Jan 11 10:57:50 2011 +0100
+++ b/buildtools/autogen/autogen/am.py Wed Jan 12 12:48:45 2011 +0100
@@ -577,8 +577,10 @@
for condname in binmap['COND']:
fd.write("endif\n")
cname = "$(C_" + name + ")"
+ elif binmap.has_key('NOINST'):
+ am['NBINS'].append(binname)
else:
- fd.write("%s_PROGRAMS =%s\n" % (norm_binname, binname))
+ am['BINS'].append(binname)
am['InstallList'].append("\t%s/%s%s\n" % (bd, binname, cond))
@@ -619,7 +621,7 @@
fd.write(nsrcs + "\n")
fd.write(srcs + "\n")
if len(SCRIPTS) > 0:
- fd.write("%s_scripts = %s\n" % (norm_binname, am_list2string(SCRIPTS,
" ", "")))
+ fd.write("%s_scripts =%s\n" % (norm_binname, am_list2string(SCRIPTS, "
", "")))
am['BUILT_SOURCES'].append("$(" + name + "_scripts)")
fd.write("all-local-%s: $(%s_scripts)\n" % (name, name))
am['ALL'].append(cname)
@@ -649,6 +651,8 @@
if binsmap.has_key("DIR"):
lbins.append(bin)
+ elif binsmap.has_key('NOINST'):
+ am['NBINS'].append(bin)
else:
am['BINS'].append(bin)
@@ -1204,6 +1208,7 @@
am['LIBS'] = [] # all libraries (am_libs and
am_library)
am['NLIBS'] = [] # all libraries which are not installed
am['BINS'] = []
+ am['NBINS'] = []
am['BIN_SCRIPTS'] = []
am['INSTALL'] = []
am['DATA_INSTALL'] = []
@@ -1270,6 +1275,9 @@
for (pref, lib, sep) in am['NLIBS']:
fd.write('install-%sLTLIBRARIES:\n' % lib)
+ if am['NBINS']:
+ fd.write("noinst_PROGRAMS =%s\n" % am_list2string(am['NBINS'], " ",
""))
+
if len(am['BINS']) > 0:
fd.write("bin_PROGRAMS =%s\n" % am_list2string(am['BINS'], " ", ""))
for i in am['BINS']:
@@ -1277,7 +1285,7 @@
if len(am['BIN_SCRIPTS']) > 0:
scripts = am['BIN_SCRIPTS']
- fd.write("bin_SCRIPTS = %s\n" % am_list2string(scripts, " ", ""))
+ fd.write("bin_SCRIPTS =%s\n" % am_list2string(scripts, " ", ""))
fd.write("install-exec-local-SCRIPTS: \n")
fd.write("all-local-SCRIPTS: $(bin_SCRIPTS)\n")
@@ -1307,7 +1315,7 @@
else:
name="top"
fd.write("%sincludedir = $(pkgincludedir)\n" % (name))
- fd.write("nodist_%sinclude_HEADERS = %s %s\n" % (name,
am_list2string(am['HDRS'], " ", ""), incs))
+ fd.write("nodist_%sinclude_HEADERS =%s %s\n" % (name,
am_list2string(am['HDRS'], " ", ""), incs))
fd.write('''
include $(top_srcdir)/buildtools/conf/rules.mk
diff -r a768a21f2eba -r c05daca1127e buildtools/autogen/autogen/msc.py
--- a/buildtools/autogen/autogen/msc.py Tue Jan 11 10:57:50 2011 +0100
+++ b/buildtools/autogen/autogen/msc.py Wed Jan 12 12:48:45 2011 +0100
@@ -614,7 +614,10 @@
msc['BINS'].append((binname, '$(C_%s_exe)' % binname2, condname))
else:
condname = ''
- msc['BINS'].append((binname, binname, condname))
+ if binmap.has_key('NOINST'):
+ msc['NBINS'].append((binname, binname, condname))
+ else:
+ msc['BINS'].append((binname, binname, condname))
if binmap.has_key("DIR"):
bd = binmap["DIR"][0] # use first name given
@@ -701,7 +704,10 @@
else:
fd.write("%sdir = $(bindir)\n" % (bin.replace('-','_')) );
- msc['BINS'].append((bin, bin, ''))
+ if binsmap.has_key('NOINST'):
+ msc['NBINS'].append((bin, bin, ''))
+ else:
+ msc['BINS'].append((bin, bin, ''))
if binsmap.has_key(bin + "_LIBS"):
msc_additional_libs(fd, bin, "", "BIN", binsmap[bin + "_LIBS"],
[], msc, '', '.exe')
@@ -1185,6 +1191,7 @@
msc['NLIBS'] = [] # archives (libraries which are not installed)
msc['SCRIPTS'] = []
msc['BINS'] = []
+ msc['NBINS'] = []
msc['HDRS'] = []
msc['INSTALL'] = {}
msc['LIBDIR'] = 'lib'
@@ -1267,6 +1274,13 @@
else:
fd.write(' "%s"' % v)
+ if msc['NBINS']:
+ for x, v, cond in msc['NBINS']:
+ if v[:1] == '$':
+ fd.write(' %s' % v)
+ else:
+ fd.write(' "%s.exe"' % v)
+
if msc['BINS']:
for x, v, cond in msc['BINS']:
if v[:1] == '$':
diff -r a768a21f2eba -r c05daca1127e buildtools/burg/Makefile.ag
--- a/buildtools/burg/Makefile.ag Tue Jan 11 10:57:50 2011 +0100
+++ b/buildtools/burg/Makefile.ag Wed Jan 12 12:48:45 2011 +0100
@@ -18,6 +18,7 @@
YFLAGS = -d
bin_burg = {
+ NOINST
SCRIPTS = h tab.h
SOURCES = be.c burs.c closure.c delta.c fe.c gram.y item.c lex.c \
list.c main.c map.c nonterminal.c operator.c pattern.c \
diff -r a768a21f2eba -r c05daca1127e buildtools/mel/Makefile.ag
--- a/buildtools/mel/Makefile.ag Tue Jan 11 10:57:50 2011 +0100
+++ b/buildtools/mel/Makefile.ag Wed Jan 12 12:48:45 2011 +0100
@@ -19,6 +19,7 @@
W_CFLAGS = -wd4018
bin_mel = {
+ NOINST
SOURCES = FileInfo.cc ListIterator.cc any_arg.cc atom.cc \
atomops.cc atom_arg.cc bat_arg.cc builtin.cc \
command.cc debug.cc depend.cc dependency.cc \
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
