Author: benm
Date: 2005-06-14 11:55:43 -0400 (Tue, 14 Jun 2005)
New Revision: 45977
Added:
trunk/mono/mono-uninstalled.pc.in
Modified:
trunk/mono/
trunk/mono/ChangeLog
trunk/mono/configure.in
trunk/mono/mono/tests/ChangeLog
trunk/mono/mono/tests/Makefile.am
Log:
In mono/tests:
2005-06-14 Ben Maurer <[EMAIL PROTECTED]>
* Makefile.am (testbundle): Test case that bundling works with a
hello world.
In .:
2005-06-14 Ben Maurer <[EMAIL PROTECTED]>
* 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.
Property changes on: trunk/mono
___________________________________________________________________
Name: svn:ignore
- Makefile
Makefile.in
_tmpinst
aclocal.m4
autom4te.cache
config.cache
config.guess
config.h
config.h.in
config.h.in
config.log
config.status
config.sub
configure
libtool
ltconfig
ltmain.sh
mint.pc
mono-*.tar.gz
mono.pc
mono.spec
semantic.cache
stamp-h
stamp-h.in
stamp-h1
tmpinst-dir.stamp
missing
compile
depcomp
install-sh
+ Makefile
Makefile.in
_tmpinst
aclocal.m4
autom4te.cache
config.cache
config.guess
config.h
config.h.in
config.h.in
config.log
config.status
config.sub
configure
libtool
ltconfig
ltmain.sh
mono-*.tar.gz
*.pc
mono.spec
semantic.cache
stamp-h
stamp-h.in
stamp-h1
tmpinst-dir.stamp
missing
compile
depcomp
install-sh
Modified: trunk/mono/ChangeLog
===================================================================
--- trunk/mono/ChangeLog 2005-06-14 15:45:06 UTC (rev 45976)
+++ trunk/mono/ChangeLog 2005-06-14 15:55:43 UTC (rev 45977)
@@ -1,3 +1,10 @@
+2005-06-14 Ben Maurer <[EMAIL PROTECTED]>
+
+ * 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 <[EMAIL PROTECTED]>
* man/mono-shlib-cop.1: Add man page for mono-shlib-cop program.
Modified: trunk/mono/configure.in
===================================================================
--- trunk/mono/configure.in 2005-06-14 15:45:06 UTC (rev 45976)
+++ trunk/mono/configure.in 2005-06-14 15:55:43 UTC (rev 45977)
@@ -1715,6 +1715,7 @@
Makefile
mint.pc
mono.pc
+mono-uninstalled.pc
scripts/mono-nunit.pc
scripts/mono-find-provides
scripts/mono-find-requires
Modified: trunk/mono/mono/tests/ChangeLog
===================================================================
--- trunk/mono/mono/tests/ChangeLog 2005-06-14 15:45:06 UTC (rev 45976)
+++ trunk/mono/mono/tests/ChangeLog 2005-06-14 15:55:43 UTC (rev 45977)
@@ -1,3 +1,8 @@
+2005-06-14 Ben Maurer <[EMAIL PROTECTED]>
+
+ * Makefile.am (testbundle): Test case that bundling works with a
+ hello world.
+
2005-05-26 Zoltan Varga <[EMAIL PROTECTED]>
* Makefile.am (TestDriver.dll): Fix a warning.
Modified: trunk/mono/mono/tests/Makefile.am
===================================================================
--- trunk/mono/mono/tests/Makefile.am 2005-06-14 15:45:06 UTC (rev 45976)
+++ trunk/mono/mono/tests/Makefile.am 2005-06-14 15:55:43 UTC (rev 45977)
@@ -10,6 +10,11 @@
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 @@
%.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 @@
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)
Added: trunk/mono/mono-uninstalled.pc.in
===================================================================
--- trunk/mono/mono-uninstalled.pc.in 2005-06-14 15:45:06 UTC (rev 45976)
+++ trunk/mono/mono-uninstalled.pc.in 2005-06-14 15:55:43 UTC (rev 45977)
@@ -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@
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
