In mono/tests:

2005-06-14  Ben Maurer  <bmaurer@ximian.com>

	* Makefile.am (testbundle): Test case that bundling works with a
	hello world.

In .:
2005-06-14  Ben Maurer  <bmaurer@ximian.com>

	* mono-uninstalled.pc.in: pc file that handles mono when it is not
	installed. This lets us have mkbundle work inside the tree.

	* configure.in: Create the .pc file above.

svn path=/trunk/mono/; revision=45977

diff --git a/ChangeLog b/ChangeLog
index f7caeed80be51e46cec58cd7046cc097f25397c5..04bf6ce3d36293763a7c478c2c50861e7cd5914c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-06-14  Ben Maurer  <bmaurer@ximian.com>
+
+       * mono-uninstalled.pc.in: pc file that handles mono when it is not
+       installed. This lets us have mkbundle work inside the tree.
+
+       * configure.in: Create the .pc file above.
+
 2005-06-13  Jonathan Pryor <jonpryor@vt.edu>
 
        * man/mono-shlib-cop.1: Add man page for mono-shlib-cop program.

diff --git a/configure.in b/configure.in
index 9c71c2a20ff4746f6b78622cc87cb9c6beb039d9..abb2a667677bac80e5db885381bd96ef8b4a3647 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1715,6 +1715,7 @@ AC_OUTPUT([
 Makefile
 mint.pc
 mono.pc
+mono-uninstalled.pc
 scripts/mono-nunit.pc
 scripts/mono-find-provides
 scripts/mono-find-requires

diff --git a/mono-uninstalled.pc.in b/mono-uninstalled.pc.in
new file mode 100644 (file)
index 0000000..ec70839
--- /dev/null
+++ b/mono-uninstalled.pc.in
@@ -0,0 +1,6 @@
+Name: Mono
+Description: Mono Runtime
+Version: @VERSION@
+Requires: glib-2.0 gmodule-2.0 gthread-2.0
+Libs: -L${pc_top_builddir}/mono/mini/.libs -lmono @libmono_ldflags@ -lm
+Cflags: -I${pc_top_builddir}/@srcdir@ -I${pc_top_builddir}/@srcdir@/mono @libmono_cflags@

diff --git a/mono/tests/ChangeLog b/mono/tests/ChangeLog
index f2d41a3737159a895faa75725e3a2a5f19b0f6a1..52a85c3be006670e87e5f777c3a8bd2b7f14fa82 100644 (file)
--- a/mono/tests/ChangeLog
+++ b/mono/tests/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-14  Ben Maurer  <bmaurer@ximian.com>
+
+       * Makefile.am (testbundle): Test case that bundling works with a
+       hello world.
+
 2005-05-26  Zoltan Varga  <vargaz@freemail.hu>
 
        * Makefile.am (TestDriver.dll): Fix a warning.

diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am
index 7b3f5b4e54c009d3b5c4a405f3ab20ce46d13999..49bf1c745ef2fcc35c9cda536f177847a421e699 100644 (file)
--- a/mono/tests/Makefile.am
+++ b/mono/tests/Makefile.am
@@ -10,6 +10,11 @@ RUNTIME_ARGS=--config tests-config --optimize=all
 
 RUNTIME = MONO_PATH=$(mcs_topdir)/class/lib/default $(top_builddir)/runtime/mono-wrapper
 
+MKBUNDLE = \
+       PKG_CONFIG_TOP_BUILD_DIR=$(top_builddir) \
+       PKG_CONFIG_PATH=$(top_builddir):$(PKG_CONFIG_PATH) \
+       $(RUNTIME) $(mcs_topdir)/tools/mkbundle/mkbundle.exe
+
 CSC = $(RUNTIME) $(mcs_topdir)/class/lib/default/mcs.exe -unsafe -nowarn:0162 -nowarn:0168 -nowarn:0219
 ILASM = $(RUNTIME) $(mcs_topdir)/ilasm/ilasm.exe
 
@@ -251,7 +256,7 @@ EXTRA_DIST=test-driver $(TEST_CS_SRC) $(TEST_IL_SRC) $(BENCHSRC) $(STRESS_TESTS_
 %.exe: %.cs TestDriver.dll
        $(CSC) -r:TestDriver.dll -out:$@ $<
 
-test:  testjit
+test:  testjit testbundle
 
 TestDriver.dll:
        $(CSC) -target:library -out:$@ $(srcdir)/../mini/TestDriver.cs
@@ -377,6 +382,11 @@ stresstest: $(STRESS_TESTS)
        if [ $${failed} != 0 ]; then echo -e "\nFailed tests:\n"; \
          for i in $${failed_tests}; do echo $${i}; done; exit 1; fi
 
+testbundle: console.exe
+       $(MKBUNDLE) --static console.exe
+       ./a.out
+       - rm -rf a.out
+
 noinst_LTLIBRARIES = libtest.la
 
 INCLUDES = $(GLIB_CFLAGS)