|
From: <ac...@us...> - 2010-03-29 22:16:24
|
Revision: 17
http://clibinutils.svn.sourceforge.net/clibinutils/?rev=17&view=rev
Author: aco
Date: 2010-03-29 22:16:13 +0000 (Mon, 29 Mar 2010)
Log Message:
-----------
remove ilasm.pnet as choice for assembler and add gmcs as possible C# compiler
Modified Paths:
--------------
mono-based-binutils/branches/aco-dev/configure
mono-based-binutils/branches/aco-dev/configure.ac
Modified: mono-based-binutils/branches/aco-dev/configure
===================================================================
--- mono-based-binutils/branches/aco-dev/configure 2010-03-24 13:31:51 UTC (rev 16)
+++ mono-based-binutils/branches/aco-dev/configure 2010-03-29 22:16:13 UTC (rev 17)
@@ -2495,7 +2495,7 @@
withval=$with_ilasm; CIL_AS=$withval
fi
-for ac_prog in ilasm.pnet ilasm ilasm1
+for ac_prog in ilasm ilasm1
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -2548,8 +2548,10 @@
withval=$with_mcs; MCS=$withval
fi
-# Extract the first word of "mcs", so it can be a program name with args.
-set dummy mcs; ac_word=$2
+for ac_prog in mcs gmcs
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_MCS+set}" = set; then :
@@ -2565,7 +2567,7 @@
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_MCS="mcs"
+ ac_cv_prog_MCS="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -2573,7 +2575,6 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_prog_MCS" && ac_cv_prog_MCS="mcs-not-found"
fi
fi
MCS=$ac_cv_prog_MCS
@@ -2586,7 +2587,11 @@
fi
+ test -n "$MCS" && break
+done
+test -n "$MCS" || MCS="mcs-not-found"
+
ac_config_files="$ac_config_files Makefile scripts/Makefile tools/Makefile doc/Makefile"
Modified: mono-based-binutils/branches/aco-dev/configure.ac
===================================================================
--- mono-based-binutils/branches/aco-dev/configure.ac 2010-03-24 13:31:51 UTC (rev 16)
+++ mono-based-binutils/branches/aco-dev/configure.ac 2010-03-29 22:16:13 UTC (rev 17)
@@ -29,12 +29,12 @@
AC_ARG_WITH(ilasm,
AS_HELP_STRING([--with-ilasm=as_binary_path], [use this ilasm]),
CIL_AS=$withval)
-AC_PATH_PROGS(CIL_AS, [ ilasm.pnet ilasm ilasm1 ], ilasm-pnet-not-found)
+AC_PATH_PROGS(CIL_AS, [ ilasm ilasm1 ], ilasm-pnet-not-found)
AC_ARG_WITH(mcs,
AS_HELP_STRING([--with-mcs=mcs_binary_path], [use this mcs]),
MCS=$withval)
-AC_CHECK_PROG(MCS, mcs, mcs, mcs-not-found)
+AC_CHECK_PROGS(MCS, [ mcs gmcs ], mcs-not-found)
AC_CONFIG_FILES([Makefile scripts/Makefile tools/Makefile doc/Makefile])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ac...@us...> - 2010-03-30 21:54:57
|
Revision: 24
http://clibinutils.svn.sourceforge.net/clibinutils/?rev=24&view=rev
Author: aco
Date: 2010-03-30 21:54:44 +0000 (Tue, 30 Mar 2010)
Log Message:
-----------
merge from trunk
Modified Paths:
--------------
mono-based-binutils/branches/aco-dev/ChangeLog
mono-based-binutils/branches/aco-dev/INSTALL
mono-based-binutils/branches/aco-dev/scripts/as.in
mono-based-binutils/branches/aco-dev/tools/gcc4cli/ld/Driver.cs
mono-based-binutils/branches/aco-dev/tools/gcc4cli/utils/CFile.cs
mono-based-binutils/branches/aco-dev/tools/gcc4cli/utils/CObject.cs
Property Changed:
----------------
mono-based-binutils/branches/aco-dev/
Property changes on: mono-based-binutils/branches/aco-dev
___________________________________________________________________
Modified: svn:mergeinfo
- /mono-based-binutils/trunk:5-12
+ /mono-based-binutils/trunk:5-23
Modified: mono-based-binutils/branches/aco-dev/ChangeLog
===================================================================
--- mono-based-binutils/branches/aco-dev/ChangeLog 2010-03-30 21:26:37 UTC (rev 23)
+++ mono-based-binutils/branches/aco-dev/ChangeLog 2010-03-30 21:54:44 UTC (rev 24)
@@ -1,3 +1,16 @@
+2010-03-24 Thierry LAFAGE <thi...@in...>
+
+ * tools/gcc4cli/utils/CObject.cs: remove code concerning Pnet ilasm.
+ * scripts/as.in: remove code concerning Pnet ilasm.
+
+2010-03-23 Thierry LAFAGE <thi...@in...>
+
+ * tools/gcc4cli/ld/Driver.cs: add "--runtime <rtversion>"
+ command-line option to specify one of 1.0, 1.1 or 2.0 (default)
+ runtime version.
+ * tools/gcc4cli/utils/CFile.cs: use the specified runtime
+ version (2.0 by default).
+
2010-03-22 Andrea C. Ornstein <and...@st...>
* tools/gcc4cli/utils/CodeFixer.cs (FixReferences): optimize code stream,
Modified: mono-based-binutils/branches/aco-dev/INSTALL
===================================================================
--- mono-based-binutils/branches/aco-dev/INSTALL 2010-03-30 21:26:37 UTC (rev 23)
+++ mono-based-binutils/branches/aco-dev/INSTALL 2010-03-30 21:54:44 UTC (rev 24)
@@ -1,4 +1,3 @@
-
First of all download from Mono subversion repository Mono.Cecil
(http://anonsvn.mono-project.com/viewcvs/trunk/mcs/class/Mono.Cecil.tar.gz?view=tar)
and uncompress it in the directory tools
Modified: mono-based-binutils/branches/aco-dev/scripts/as.in
===================================================================
--- mono-based-binutils/branches/aco-dev/scripts/as.in 2010-03-30 21:26:37 UTC (rev 23)
+++ mono-based-binutils/branches/aco-dev/scripts/as.in 2010-03-30 21:54:44 UTC (rev 24)
@@ -23,7 +23,7 @@
shift
;;
-o)
- PARAM="$PARAM $1$2";
+ PARAM="$PARAM -output:$2";
shift
shift
;;
@@ -34,13 +34,7 @@
esac
done
-if test "x`$ILASM --version | grep Mono | wc -l`" = "x0"; then
- #needed by Pnet ilasm
- PARAM=`echo "--format dll $PARAM" | sed 's? -o? -o ?'`;
-else
- #needed by Mono ilasm
- PARAM=`echo "-dll -quiet $PARAM" | sed 's? -o? -output:?'`;
-fi
+PARAM="-dll -quiet $PARAM"
CMD="$ILASM $PARAM"
if test -n "$VERBOSE"; then
Modified: mono-based-binutils/branches/aco-dev/tools/gcc4cli/ld/Driver.cs
===================================================================
--- mono-based-binutils/branches/aco-dev/tools/gcc4cli/ld/Driver.cs 2010-03-30 21:26:37 UTC (rev 23)
+++ mono-based-binutils/branches/aco-dev/tools/gcc4cli/ld/Driver.cs 2010-03-30 21:54:44 UTC (rev 24)
@@ -49,6 +49,24 @@
set { multithreaded = value; }
}
+ public string RTVersion {
+ set {
+ switch (value) {
+ case "1.0":
+ CFile.RT = TargetRuntime.NET_1_0;
+ break;
+ case "1.1":
+ CFile.RT = TargetRuntime.NET_1_1;
+ break;
+ case "2.0":
+ CFile.RT = TargetRuntime.NET_2_0;
+ break;
+ default:
+ throw new System.ArgumentException("Bad value for runtime version", "RTversion");
+ }
+ }
+ }
+
Driver ()
{
}
@@ -112,6 +130,9 @@
case "-r":
IncrementalLink = true;
break;
+ case "--runtime":
+ RTVersion = (string) q.Dequeue ();
+ break;
case "-v":
Tracer.IncreaseVerbosity();
break;
@@ -193,14 +214,15 @@
Console.WriteLine (prog_name);
Console.WriteLine ("ld [options] <obj_files>");
- Console.WriteLine (" -o <filename> Specify the output file");
- Console.WriteLine (" -e | -exe output is an executable");
- Console.WriteLine (" -d | -dll | --shared output is a dll");
- Console.WriteLine (" -L <searchdir> search for Libraries also in searchdir");
- Console.WriteLine (" -l <libname> link with libname");
- Console.WriteLine (" -r Perform an incremental link");
- Console.WriteLine (" -v increase verbosity");
- Console.WriteLine (" -h this message");
+ Console.WriteLine (" -o <filename> Specify the output file");
+ Console.WriteLine (" -e | -exe output is an executable");
+ Console.WriteLine (" -d | -dll | --shared output is a dll");
+ Console.WriteLine (" -L <searchdir> search for Libraries also in searchdir");
+ Console.WriteLine (" -l <libname> link with libname");
+ Console.WriteLine (" -r Perform an incremental link");
+ Console.WriteLine (" --runtime <rtversion> Use runtime version <rtversion>: 1.0, 1.1 or 2.0 (default)");
+ Console.WriteLine (" -v increase verbosity");
+ Console.WriteLine (" -h this message");
Console.WriteLine ("");
Console.WriteLine (" Sample: ld -o a.out input.dll");
}
Modified: mono-based-binutils/branches/aco-dev/tools/gcc4cli/utils/CFile.cs
===================================================================
--- mono-based-binutils/branches/aco-dev/tools/gcc4cli/utils/CFile.cs 2010-03-30 21:26:37 UTC (rev 23)
+++ mono-based-binutils/branches/aco-dev/tools/gcc4cli/utils/CFile.cs 2010-03-30 21:54:44 UTC (rev 24)
@@ -12,6 +12,8 @@
public static readonly string ExternalAssemblyName = "ExternalAssembly";
public static readonly string ExternalTypeName = "ExternalAssembly";
+ public static TargetRuntime RT = TargetRuntime.NET_2_0;
+
string name;
AssemblyDefinition assembly;
ModuleDefinition module;
@@ -41,7 +43,7 @@
{
Name = name;
Assembly = AssemblyFactory.DefineAssembly (name, name,
- TargetRuntime.NET_1_0,
+ RT,
kind);
Assembly.Resolver = asm_resolver;
Modified: mono-based-binutils/branches/aco-dev/tools/gcc4cli/utils/CObject.cs
===================================================================
--- mono-based-binutils/branches/aco-dev/tools/gcc4cli/utils/CObject.cs 2010-03-30 21:26:37 UTC (rev 23)
+++ mono-based-binutils/branches/aco-dev/tools/gcc4cli/utils/CObject.cs 2010-03-30 21:54:44 UTC (rev 24)
@@ -15,8 +15,6 @@
{
MainType = Module.Types["<Module>"];
FillTables ();
- if (ref_types.Contains ("<ModuleExtern>"))
- fix_DOTGNU_Errors ();
}
internal CObject (string name, AssemblyResolver asm_resolver)
@@ -30,30 +28,6 @@
Module.Types.Add (MainType);
}
- void fix_DOTGNU_Errors ()
- {
- foreach (MethodDefinition method in MainType.Methods) {
- foreach (Instruction instr in method.Body.Instructions) {
- if ( instr.OpCode.OperandType == OperandType.InlineMethod
- || (instr.OpCode.OperandType == OperandType.InlineTok && instr.Operand is MethodReference)) {
- MethodReference mref = instr.Operand as MethodReference;
- if (mref.DeclaringType.Name == "<ModuleExtern>") {
- string m_name = mref.Name;
- if (def_symbols.Contains (m_name)) {
- mref.DeclaringType = ((MethodReference)def_symbols[m_name]).DeclaringType;
- }
- else if (private_symbols.Contains (m_name)) {
- mref.DeclaringType = ((MethodReference)private_symbols[m_name]).DeclaringType;
- }
- else
- throw new Exception ("Error in hack for DOTGNU");
- }
- }
- }
- }
- ref_types.Remove ("<ModuleExtern>");
- }
-
static int renamer_id = 0;
bool MethodIsVarArg(MethodReference method)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ac...@us...> - 2010-04-06 20:03:33
|
Revision: 35
http://clibinutils.svn.sourceforge.net/clibinutils/?rev=35&view=rev
Author: aco
Date: 2010-04-06 20:03:26 +0000 (Tue, 06 Apr 2010)
Log Message:
-----------
merge from trunk
Modified Paths:
--------------
mono-based-binutils/branches/aco-dev/ChangeLog
mono-based-binutils/branches/aco-dev/Makefile.am
mono-based-binutils/branches/aco-dev/Makefile.in
mono-based-binutils/branches/aco-dev/configure
mono-based-binutils/branches/aco-dev/configure.ac
mono-based-binutils/branches/aco-dev/doc/Makefile.am
mono-based-binutils/branches/aco-dev/doc/Makefile.in
mono-based-binutils/branches/aco-dev/scripts/ld.in
mono-based-binutils/branches/aco-dev/tools/Makefile.am
mono-based-binutils/branches/aco-dev/tools/Makefile.in
mono-based-binutils/branches/aco-dev/tools/gcc4cli/ld/Driver.cs
mono-based-binutils/branches/aco-dev/tools/gcc4cli/utils/CObject.cs
Added Paths:
-----------
mono-based-binutils/branches/aco-dev/tools/AssemblyInfo.cs.in
Removed Paths:
-------------
mono-based-binutils/branches/aco-dev/doc/Doxyfile.Mono.Cecil.in
Property Changed:
----------------
mono-based-binutils/branches/aco-dev/
Property changes on: mono-based-binutils/branches/aco-dev
___________________________________________________________________
Modified: svn:mergeinfo
- /mono-based-binutils/trunk:5-23
+ /mono-based-binutils/trunk:5-34
Modified: mono-based-binutils/branches/aco-dev/ChangeLog
===================================================================
--- mono-based-binutils/branches/aco-dev/ChangeLog 2010-04-06 19:38:02 UTC (rev 34)
+++ mono-based-binutils/branches/aco-dev/ChangeLog 2010-04-06 20:03:26 UTC (rev 35)
@@ -1,3 +1,23 @@
+2010-04-06 Andrea C. Ornstein <and...@st...>
+
+ * configure.ac: fix project name,
+ remove last dependencies to DotGnu tools,
+ add configure options for documentation and debug,
+ generate C# version file.
+ * Makefile.am: add SUBDIR doc only if required by configure.
+ * doc/Makefile.am: use autotools to generate documentation.
+ * tools/Makefile.am: use lbin_DATA instead of lbin_SCRIPTS,
+ add debug build, add version info to assemblies.
+ * tools/AssemblyInfo.cs.in: Newfile with version information.
+ * configure: Regenerated.
+ * Makefile.in: Likewise.
+ * doc/Makefile.in: Likewise.
+ * tools/Makefile.in: Likewise.
+ * tools/gcc4cli/ld/Driver.cs: ignore option -lm.
+ * scripts/ld.in: pass -lm option to ld.exe.
+ * scripts/as.in: add option to generate debug information.
+ * tools/gcc4cli/utils/CObject.cs: When linking rename also private Types.
+
2010-03-24 Thierry LAFAGE <thi...@in...>
* tools/gcc4cli/utils/CObject.cs: remove code concerning Pnet ilasm.
Modified: mono-based-binutils/branches/aco-dev/Makefile.am
===================================================================
--- mono-based-binutils/branches/aco-dev/Makefile.am 2010-04-06 19:38:02 UTC (rev 34)
+++ mono-based-binutils/branches/aco-dev/Makefile.am 2010-04-06 20:03:26 UTC (rev 35)
@@ -1,5 +1,6 @@
-SUBDIRS = tools scripts doc
+SUBDIRS = tools scripts
-all-doc:
- $(MAKE) -C doc all-doc
+if DOXYGEN_ENABLED
+SUBDIRS += doc
+endif
Modified: mono-based-binutils/branches/aco-dev/Makefile.in
===================================================================
--- mono-based-binutils/branches/aco-dev/Makefile.in 2010-04-06 19:38:02 UTC (rev 34)
+++ mono-based-binutils/branches/aco-dev/Makefile.in 2010-04-06 20:03:26 UTC (rev 35)
@@ -34,6 +34,7 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
+@DOXYGEN_ENABLED_TRUE@am__append_1 = doc
subdir = .
DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \
@@ -64,7 +65,7 @@
distdir dist dist-all distcheck
ETAGS = etags
CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
+DIST_SUBDIRS = tools scripts doc
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -193,7 +194,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = tools scripts doc
+SUBDIRS = tools scripts $(am__append_1)
all: all-recursive
.SUFFIXES:
@@ -660,9 +661,6 @@
pdf-am ps ps-am tags tags-recursive uninstall uninstall-am
-all-doc:
- $(MAKE) -C doc all-doc
-
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Modified: mono-based-binutils/branches/aco-dev/configure
===================================================================
--- mono-based-binutils/branches/aco-dev/configure 2010-04-06 19:38:02 UTC (rev 34)
+++ mono-based-binutils/branches/aco-dev/configure 2010-04-06 20:03:26 UTC (rev 35)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for cil-binutils 0.1.
+# Generated by GNU Autoconf 2.65 for cli-binutils 0.1.1.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -546,16 +546,20 @@
MAKEFLAGS=
# Identity of this package.
-PACKAGE_NAME='cil-binutils'
-PACKAGE_TARNAME='cil-binutils'
-PACKAGE_VERSION='0.1'
-PACKAGE_STRING='cil-binutils 0.1'
+PACKAGE_NAME='cli-binutils'
+PACKAGE_TARNAME='cli-binutils'
+PACKAGE_VERSION='0.1.1'
+PACKAGE_STRING='cli-binutils 0.1.1'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
ac_unique_file="scripts/as.in"
ac_subst_vars='LTLIBOBJS
LIBOBJS
+DOXYGEN_ENABLED_FALSE
+DOXYGEN_ENABLED_TRUE
+ENABLE_DEBUG_FALSE
+ENABLE_DEBUG_TRUE
MCS
CIL_AS
DOXYGEN
@@ -645,6 +649,8 @@
enable_maintainer_mode
with_ilasm
with_mcs
+enable_debug
+enable_doxygen
'
ac_precious_vars='build_alias
host_alias
@@ -1190,7 +1196,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures cil-binutils 0.1 to adapt to many kinds of systems.
+\`configure' configures cli-binutils 0.1.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1238,7 +1244,7 @@
--infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
- --docdir=DIR documentation root [DATAROOTDIR/doc/cil-binutils]
+ --docdir=DIR documentation root [DATAROOTDIR/doc/cli-binutils]
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
@@ -1261,7 +1267,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of cil-binutils 0.1:";;
+ short | recursive ) echo "Configuration of cli-binutils 0.1.1:";;
esac
cat <<\_ACEOF
@@ -1271,6 +1277,8 @@
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-maintainer-mode enable make rules and dependencies not useful
(and sometimes confusing) to the casual installer
+ --enable-debug enable debug (default no)
+ --enable-doxygen enable doxygen documentation generation (default no)
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -1343,7 +1351,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-cil-binutils configure 0.1
+cli-binutils configure 0.1.1
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1360,7 +1368,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by cil-binutils $as_me 0.1, which was
+It was created by cli-binutils $as_me 0.1.1, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -2283,8 +2291,8 @@
# Define the identity of the package.
- PACKAGE='cil-binutils'
- VERSION='0.1'
+ PACKAGE='cli-binutils'
+ VERSION='0.1.1'
cat >>confdefs.h <<_ACEOF
@@ -2539,7 +2547,7 @@
test -n "$CIL_AS" && break
done
-test -n "$CIL_AS" || CIL_AS="ilasm-pnet-not-found"
+test -n "$CIL_AS" || CIL_AS="ilasm-not-found"
@@ -2592,12 +2600,59 @@
test -n "$MCS" || MCS="mcs-not-found"
-ac_config_files="$ac_config_files Makefile scripts/Makefile tools/Makefile doc/Makefile"
+# Check whether debug is enabled
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether debug is enabled" >&5
+$as_echo_n "checking whether debug is enabled... " >&6; }
+# Check whether --enable-debug was given.
+if test "${enable_debug+set}" = set; then :
+ enableval=$enable_debug;
+else
+ enable_debug=no
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_debug" >&5
+$as_echo "$enable_debug" >&6; }
+ if test x$enable_debug = xyes; then
+ ENABLE_DEBUG_TRUE=
+ ENABLE_DEBUG_FALSE='#'
+else
+ ENABLE_DEBUG_TRUE='#'
+ ENABLE_DEBUG_FALSE=
+fi
-ac_config_files="$ac_config_files doc/Doxyfile.gcc4cli doc/Doxyfile.Mono.Cecil"
+# Check whether doxygen documentationgeneration is enabled
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether doxygen api is enabled" >&5
+$as_echo_n "checking whether doxygen api is enabled... " >&6; }
+# Check whether --enable-doxygen was given.
+if test "${enable_doxygen+set}" = set; then :
+ enableval=$enable_doxygen; if test "x$DOXYGEN" = x""doxygen-not-found; then :
+ if test "x$enable_doxygen" = x""yes; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: doxygen not present cannot enable documentation" >&5
+$as_echo "$as_me: WARNING: doxygen not present cannot enable documentation" >&2;} ; enable_doxygen=no
+fi
+fi
+else
+ enable_doxygen=no
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_doxygen" >&5
+$as_echo "$enable_doxygen" >&6; }
+ if test x$enable_doxygen = xyes; then
+ DOXYGEN_ENABLED_TRUE=
+ DOXYGEN_ENABLED_FALSE='#'
+else
+ DOXYGEN_ENABLED_TRUE='#'
+ DOXYGEN_ENABLED_FALSE=
+fi
+
+
+ac_config_files="$ac_config_files Makefile scripts/Makefile tools/Makefile tools/AssemblyInfo.cs"
+
+
+ac_config_files="$ac_config_files doc/Makefile doc/Doxyfile.gcc4cli"
+
+
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -2736,6 +2791,14 @@
as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${ENABLE_DEBUG_TRUE}" && test -z "${ENABLE_DEBUG_FALSE}"; then
+ as_fn_error "conditional \"ENABLE_DEBUG\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${DOXYGEN_ENABLED_TRUE}" && test -z "${DOXYGEN_ENABLED_FALSE}"; then
+ as_fn_error "conditional \"DOXYGEN_ENABLED\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
: ${CONFIG_STATUS=./config.status}
ac_write_fail=0
@@ -3144,7 +3207,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by cil-binutils $as_me 0.1, which was
+This file was extended by cli-binutils $as_me 0.1.1, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3197,7 +3260,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-cil-binutils config.status 0.1
+cli-binutils config.status 0.1.1
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
@@ -3307,9 +3370,9 @@
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
"tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
+ "tools/AssemblyInfo.cs") CONFIG_FILES="$CONFIG_FILES tools/AssemblyInfo.cs" ;;
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
"doc/Doxyfile.gcc4cli") CONFIG_FILES="$CONFIG_FILES doc/Doxyfile.gcc4cli" ;;
- "doc/Doxyfile.Mono.Cecil") CONFIG_FILES="$CONFIG_FILES doc/Doxyfile.Mono.Cecil" ;;
*) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
Modified: mono-based-binutils/branches/aco-dev/configure.ac
===================================================================
--- mono-based-binutils/branches/aco-dev/configure.ac 2010-04-06 19:38:02 UTC (rev 34)
+++ mono-based-binutils/branches/aco-dev/configure.ac 2010-04-06 20:03:26 UTC (rev 35)
@@ -1,6 +1,6 @@
-AC_PREREQ(2.59)
-AC_INIT(cil-binutils, 0.1)
+AC_PREREQ(2.64)
+AC_INIT(cli-binutils, 0.1.1)
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([ac_scripts])
@@ -28,16 +28,35 @@
AC_ARG_WITH(ilasm,
AS_HELP_STRING([--with-ilasm=as_binary_path], [use this ilasm]),
- CIL_AS=$withval)
-AC_PATH_PROGS(CIL_AS, [ ilasm ilasm1 ], ilasm-pnet-not-found)
+ [CIL_AS=$withval])
+AC_PATH_PROGS(CIL_AS, [ ilasm ilasm1 ], ilasm-not-found)
AC_ARG_WITH(mcs,
AS_HELP_STRING([--with-mcs=mcs_binary_path], [use this mcs]),
- MCS=$withval)
-AC_CHECK_PROGS(MCS, [ mcs gmcs ], mcs-not-found)
+ [MCS=$withval])
+AC_CHECK_PROGS(MCS, [ mcs gmcs ], mcs-not-found)
-AC_CONFIG_FILES([Makefile scripts/Makefile tools/Makefile doc/Makefile])
+# Check whether debug is enabled
+AC_MSG_CHECKING(whether debug is enabled)
+AC_ARG_ENABLE(debug,
+ AS_HELP_STRING([--enable-debug], [enable debug (default no)]),
+ [],[enable_debug=no] )
+AC_MSG_RESULT($enable_debug)
+AM_CONDITIONAL(ENABLE_DEBUG, test x$enable_debug = xyes)
-AC_CONFIG_FILES([doc/Doxyfile.gcc4cli doc/Doxyfile.Mono.Cecil])
+# Check whether doxygen documentationgeneration is enabled
+AC_MSG_CHECKING(whether doxygen api is enabled)
+AC_ARG_ENABLE(doxygen,
+ AS_HELP_STRING([--enable-doxygen], [enable doxygen documentation generation (default no)]),
+ AS_VAR_IF([DOXYGEN],[doxygen-not-found],
+ [AS_VAR_IF([enable_doxygen],[yes],
+ [ AC_MSG_WARN([doxygen not present cannot enable documentation]) ; enable_doxygen=no ]) ]),
+ [enable_doxygen=no] )
+AC_MSG_RESULT($enable_doxygen)
+AM_CONDITIONAL(DOXYGEN_ENABLED, test x$enable_doxygen = xyes)
+AC_CONFIG_FILES([Makefile scripts/Makefile tools/Makefile tools/AssemblyInfo.cs])
+
+AC_CONFIG_FILES([doc/Makefile doc/Doxyfile.gcc4cli])
+
AC_OUTPUT
Deleted: mono-based-binutils/branches/aco-dev/doc/Doxyfile.Mono.Cecil.in
===================================================================
--- mono-based-binutils/branches/aco-dev/doc/Doxyfile.Mono.Cecil.in 2010-04-06 19:38:02 UTC (rev 34)
+++ mono-based-binutils/branches/aco-dev/doc/Doxyfile.Mono.Cecil.in 2010-04-06 20:03:26 UTC (rev 35)
@@ -1,1521 +0,0 @@
-# Doxyfile 1.5.8
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
-#
-# All text after a hash (#) is considered a comment and will be ignored
-# The format is:
-# TAG = value [value, ...]
-# For lists items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the
-# iconv built into libc) for the transcoding. See
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
-
-DOXYFILE_ENCODING = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
-# by quotes) that should identify the project.
-
-PROJECT_NAME = "Mono.Cecil"
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
-# if some version control system is used.
-
-PROJECT_NUMBER =
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
-# where doxygen was started. If left blank the current directory will be used.
-
-OUTPUT_DIRECTORY = @builddir@/Mono.Cecil
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of
-# source files, where putting all generated files in the same directory would
-# otherwise cause performance problems for the file system.
-
-CREATE_SUBDIRS = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
-# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek,
-# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages),
-# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish,
-# Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, Slovene,
-# Spanish, Swedish, and Ukrainian.
-
-OUTPUT_LANGUAGE = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
-# Set to NO to disable this.
-
-BRIEF_MEMBER_DESC = YES
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-
-REPEAT_BRIEF = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is
-# used as the annotated text. Otherwise, the brief description is used as-is.
-# If left blank, the following values are used ("$name" is automatically
-# replaced with the name of the entity): "The $name class" "The $name widget"
-# "The $name file" "is" "provides" "specifies" "contains"
-# "represents" "a" "an" "the"
-
-ABBREVIATE_BRIEF = "The $name class" \
- "The $name widget" \
- "The $name file" \
- is \
- provides \
- specifies \
- contains \
- represents \
- a \
- an \
- the
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
-# description.
-
-ALWAYS_DETAILED_SEC = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-
-INLINE_INHERITED_MEMB = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
-# to NO the shortest path that makes the file name unique will be used.
-
-FULL_PATH_NAMES = YES
-
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user-defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the
-# path to strip.
-
-STRIP_FROM_PATH = @top_srcdir@/tools/Mono.Cecil
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-# the path mentioned in the documentation of a class, which tells
-# the reader which header file to include in order to use a class.
-# If left blank only the name of the header file containing the class
-# definition is used. Otherwise one should specify the include paths that
-# are normally passed to the compiler using the -I flag.
-
-STRIP_FROM_INC_PATH = @top_srcdir@/tools/Mono.Cecil
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful is your file systems
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
-SHORT_NAMES = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like regular Qt-style comments
-# (thus requiring an explicit @brief command for a brief description.)
-
-JAVADOC_AUTOBRIEF = NO
-
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
-# interpret the first line (until the first dot) of a Qt-style
-# comment as the brief description. If set to NO, the comments
-# will behave just like regular Qt-style comments (thus requiring
-# an explicit \brief command for a brief description.)
-
-QT_AUTOBRIEF = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
-# description. Set this tag to YES if you prefer the old behaviour instead.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
-# re-implements.
-
-INHERIT_DOCS = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
-# a new page for each member. If set to NO, the documentation of a member will
-# be part of the file/class/namespace that contains it.
-
-SEPARATE_MEMBER_PAGES = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
-# Doxygen uses this value to replace tabs by spaces in code fragments.
-
-TAB_SIZE = 8
-
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
-# You can put \n's in the value part of an alias to insert newlines.
-
-ALIASES =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
-# sources only. Doxygen will then generate output that is more tailored for C.
-# For instance, some of the names that are used will be different. The list
-# of all members will be omitted, etc.
-
-OPTIMIZE_OUTPUT_FOR_C = NO
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
-# sources only. Doxygen will then generate output that is more tailored for
-# Java. For instance, namespaces will be presented as packages, qualified
-# scopes will look different, etc.
-
-OPTIMIZE_OUTPUT_JAVA = YES
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources only. Doxygen will then generate output that is more tailored for
-# Fortran.
-
-OPTIMIZE_FOR_FORTRAN = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for
-# VHDL.
-
-OPTIMIZE_OUTPUT_VHDL = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it parses.
-# With this tag you can assign which parser to use for a given extension.
-# Doxygen has a built-in mapping, but you can override or extend it using this tag.
-# The format is ext=language, where ext is a file extension, and language is one of
-# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP,
-# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran),
-# use: inc=Fortran f=C
-
-EXTENSION_MAPPING =
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should
-# set this tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
-# func(std::string) {}). This also make the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-
-BUILTIN_STL_SUPPORT = NO
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-
-CPP_CLI_SUPPORT = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
-# Doxygen will parse them like normal C++ but will assume all classes use public
-# instead of private inheritance when no explicit protection keyword is present.
-
-SIP_SUPPORT = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate getter
-# and setter methods for a property. Setting this option to YES (the default)
-# will make doxygen to replace the get and set methods by a property in the
-# documentation. This will only work if the methods are indeed getting or
-# setting a simple type. If this is not the case, or you want to show the
-# methods anyway, you should set this option to NO.
-
-IDL_PROPERTY_SUPPORT = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC = NO
-
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a
-# subgroup of that type (e.g. under the Public Functions section). Set it to
-# NO to prevent subgrouping. Alternatively, this can be done per class using
-# the \nosubgrouping command.
-
-SUBGROUPING = YES
-
-# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
-# is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically
-# be useful for C code in case the coding convention dictates that all compound
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-
-TYPEDEF_HIDES_STRUCT = NO
-
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
-# determine which symbols to keep in memory and which to flush to disk.
-# When the cache is full, less often used symbols will be written to disk.
-# For small to medium size projects (<1000 input files) the default value is
-# probably good enough. For larger projects a too small cache size can cause
-# doxygen to be busy swapping symbols to and from disk most of the time
-# causing a significant performance penality.
-# If the system has enough physical memory increasing the cache will improve the
-# performance by keeping more symbols in memory. Note that the value works on
-# a logarithmic scale so increasing the size by one will rougly double the
-# memory usage. The cache size is given by this formula:
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols
-
-SYMBOL_CACHE_SIZE = 0
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
-EXTRACT_ALL = YES
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
-# will be included in the documentation.
-
-EXTRACT_PRIVATE = YES
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
-# will be included in the documentation.
-
-EXTRACT_STATIC = YES
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
-# If set to NO only classes defined in header files are included.
-
-EXTRACT_LOCAL_CLASSES = YES
-
-# This flag is only useful for Objective-C code. When set to YES local
-# methods, which are defined in the implementation section but not in
-# the interface are included in the documentation.
-# If set to NO (the default) only methods in the interface are included.
-
-EXTRACT_LOCAL_METHODS = NO
-
-# If this flag is set to YES, the members of anonymo...
[truncated message content] |
|
From: <ac...@us...> - 2010-04-07 05:35:02
|
Revision: 39
http://clibinutils.svn.sourceforge.net/clibinutils/?rev=39&view=rev
Author: aco
Date: 2010-04-07 05:34:56 +0000 (Wed, 07 Apr 2010)
Log Message:
-----------
merge from trunk
Modified Paths:
--------------
mono-based-binutils/branches/aco-dev/ChangeLog
mono-based-binutils/branches/aco-dev/configure.ac
mono-based-binutils/branches/aco-dev/scripts/Makefile.am
mono-based-binutils/branches/aco-dev/scripts/Makefile.in
Added Paths:
-----------
mono-based-binutils/branches/aco-dev/scripts/base-tool-script.in
mono-based-binutils/branches/aco-dev/scripts/nothing-to-do.in
Removed Paths:
-------------
mono-based-binutils/branches/aco-dev/scripts/ar.in
mono-based-binutils/branches/aco-dev/scripts/ld.in
mono-based-binutils/branches/aco-dev/scripts/nm.in
mono-based-binutils/branches/aco-dev/scripts/objcopy.in
mono-based-binutils/branches/aco-dev/scripts/objdump.in
mono-based-binutils/branches/aco-dev/scripts/ranlib.in
mono-based-binutils/branches/aco-dev/scripts/size.in
mono-based-binutils/branches/aco-dev/scripts/strip.in
Property Changed:
----------------
mono-based-binutils/branches/aco-dev/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ac...@us...> - 2010-04-25 18:50:40
|
Revision: 42
http://clibinutils.svn.sourceforge.net/clibinutils/?rev=42&view=rev
Author: aco
Date: 2010-04-25 18:50:34 +0000 (Sun, 25 Apr 2010)
Log Message:
-----------
Merged from trunk
Modified Paths:
--------------
mono-based-binutils/branches/aco-dev/ChangeLog
Property Changed:
----------------
mono-based-binutils/branches/aco-dev/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|