diff options
author | Raja R Harinath <harinath@hurrynot.org> | 2004-11-23 13:57:35 +0300 |
---|---|---|
committer | Raja R Harinath <harinath@hurrynot.org> | 2004-11-23 13:57:35 +0300 |
commit | 12abd22382a1c2c5a28e8c3e6f5649b19664a7eb (patch) | |
tree | 395f77a0eff9c33b2449c9e5a19b423bedf5d5d2 /runtime | |
parent | a5ecc4ae370ee5cfa383e72682db66a4c8eafc28 (diff) |
Simplify 'make all' build.
* configure.in (mono_build_root, mono_runtime, mono_cfg_dir):
New AC_SUBSTed variables.
(runtime/mono-wrapper): New generated file.
(runtime/etc/mono/1.0/machine.config, runtime/etc/mono/2.0/machine.config):
New symlinks.
(AC_OUTPUT): Don't mention runtime/net_1_1 and runtime/net_2_0.
* Makefile.am (SUBDIRS): Remove '.'.
(tmpinst): Remove.
(get-monolite-latest): Update.
(populate-runtime-subdirs): Remove.
(all-local, check-local): Move rules related to building in the mcs/ tree ...
* runtime/Makefile.am: ... here. Completely re-write file.
(install-exec-local): Transfer ownership of installing .exes and
.dlls to the Makefiles in the mcs/ tree.
(_tmpinst): Use tmpinst tree only during testing.
(SUBDIRS): Remove.
* runtime/mono-wrapper.in: New. Template for generated file.
* runtime/net_1_1/Makefile.am, runtime/net_2_0/Makefile.am: Remove.
* mono/mini/Makefile.am (MCS,ILASM): Don't refer to runtime/ directory.
Refer directly to the mcs/ tree.
* mono/tests/Makefile.am (CSC,ILASM): Likewise.
svn path=/trunk/mono/; revision=36432
Diffstat (limited to 'runtime')
-rw-r--r-- | runtime/Makefile.am | 151 | ||||
-rw-r--r-- | runtime/mono-wrapper.in | 4 | ||||
-rw-r--r-- | runtime/net_1_1/.cvsignore | 4 | ||||
-rw-r--r-- | runtime/net_1_1/Makefile.am | 116 | ||||
-rw-r--r-- | runtime/net_2_0/.cvsignore | 4 | ||||
-rw-r--r-- | runtime/net_2_0/Makefile.am | 122 |
6 files changed, 56 insertions, 345 deletions
diff --git a/runtime/Makefile.am b/runtime/Makefile.am index 0096563a6f7..94ebc1097bc 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -2,108 +2,61 @@ # being compiled on windows. # -SUBDIRS = . net_1_1 net_2_0 - -monobins_DATA = \ - monoresgen.exe \ - monoresgen.exe.mdb \ - secutil.exe \ - secutil.exe.mdb \ - ilasm.exe \ - ilasm.exe.mdb \ - cilc.exe \ - cilc.exe.mdb \ - xsd.exe \ - xsd.exe.mdb \ - wsdl.exe \ - wsdl.exe.mdb \ - wsdl2.exe \ - wsdl2.exe.mdb \ - genxs.exe \ - genxs.exe.mdb \ - al.exe \ - al.exe.mdb \ - disco.exe \ - disco.exe.mdb \ - sqlsharp.exe \ - sqlsharp.exe.mdb \ - signcode.exe \ - signcode.exe.mdb \ - chktrust.exe \ - chktrust.exe.mdb \ - soapsuds.exe \ - soapsuds.exe.mdb \ - monop.exe \ - monop.exe.mdb \ - mono-find-provides.exe \ - mono-find-provides.exe.mdb \ - mono-find-requires.exe \ - mono-find-requires.exe.mdb \ - setreg.exe \ - setreg.exe.mdb \ - cert2spc.exe \ - cert2spc.exe.mdb \ - certmgr.exe \ - certmgr.exe.mdb \ - MakeCert.exe \ - MakeCert.exe.mdb \ - gacutil.exe \ - gacutil.exe.mdb \ - sn.exe \ - sn.exe.mdb - -monoone_DATA = \ - mcs.exe \ - mcs.exe.mdb \ - mcs.exe.config \ - mbas.exe - -if ! PLATFORM_WIN32 -gmcs_exe = gmcs.exe gmcs.exe.config gmcs.exe.mdb -endif -monotwo_DATA = $(gmcs_exe) +tmpinst = _tmpinst -EXTRA_DIST= $(monobins_DATA) $(monoone_DATA) $(monotwo_DATA) +noinst_SCRIPTS = mono-wrapper -MAINTAINERCLEANFILES = $(EXTRA_DIST) +symlinks = etc/mono/1.0/machine.config etc/mono/2.0/machine.config -# -# Keep in sync with mono/mono/metadata/Makefile.am -# -if PLATFORM_WIN32 -monobinsdir = $(libdir) -monoonedir = $(libdir) -monotwodir = $(libdir) +etc/mono/1.0/machine.config: $(top_srcdir)/data/net_1_1/machine.config +etc/mono/2.0/machine.config: $(top_srcdir)/data/net_2_0/machine.config + +$(symlinks): + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + +all-local: $(symlinks) mono-wrapper + d=`pwd`; cd $(mcs_topdir) && $(MAKE) RUNTIME=$$d/mono-wrapper all-profiles + +if INSTALL_2_0 +install_profiles = default net_2_0 else -monobinsdir = $(bindir) -monoonedir = $(libdir)/mono/1.0/ -monotwodir = $(libdir)/mono/2.0/ +install_profiles = default endif -$(monoone_DATA) $(monotwo_DATA) $(monobins_DATA): - @name=`echo "$@" | sed 's,\.exe.*$$,,'`; \ - case $$name in \ - mcs | mbas | monoresgen | gmcs | ilasm) d=$$name ;; \ - cilc | genxs | al | disco | soapsuds | monop | browsercaps-updater | gacutil) d=tools/$$name ;; \ - chktrust | signcode | MakeCert | cert2spc | certmgr | secutil | setreg | sn) d=tools/security ;; \ - mono-find-provides | mono-find-requires) d=tools/mono-rpm-helpers/$$name ;; \ - xsd) d=tools/mono-xsd ;; \ - wsdl*) d=tools/wsdl ;; \ - sqlsharp) d=tools/SqlSharp ;; \ - esac; \ - echo "test -f $(mcs_topdir)/$$d/$@" ; \ - test -f $(mcs_topdir)/$$d/$@ || exit 1 ; \ - echo "rm -f $(srcdir)/$@" ; \ - rm -f $(srcdir)/$@ ; \ - echo "cd $(srcdir) && $(LN_S) $(mcs_topdir_from_srcdir)/$$d/$@ $@" ; \ - cd $(srcdir) && $(LN_S) $(mcs_topdir_from_srcdir)/$$d/$@ $@ - -copy_dlls: - cp /nt/mono/mcs/class/*/*.dll . - -push_dlls: - scp -o "Protocol 1" *.dll *.exe snapshot@mono-cvs.ximian.com:dlls - -cleanassemblies: - find -name \*.dll -exec rm -vf {} \; - find -name \*.exe -exec rm -vf {} \; +install-exec-local: + d=`pwd`; cd $(mcs_topdir) && $(MAKE) RUNTIME=$$d/mono-wrapper prefix=$(exec_prefix) PROFILES='$(install_profiles)' install-profiles + +clean-local: + -rm -fr $(symlinks) + d=`pwd`; cd $(mcs_topdir) && $(MAKE) PROFILES='basic net_1_1_bootstrap default net_2_0_bootstrap net_2_0' clean-profiles + -rm -fr $(tmpinst) + +TEST_SUPPORT_FILES = $(tmpinst)/bin/mcs $(tmpinst)/bin/mbas $(tmpinst)/bin/ilasm $(tmpinst)/bin/gmcs +check-local: + $(mkdir_p) $(tmpinst)/bin + $(MAKE) $(TEST_SUPPORT_FILES) + d=`pwd`; PATH=$$d/$(tmpinst)/bin:$$PATH ; export PATH ; \ + ( cd $(mcs_topdir) && $(MAKE) RUNTIME=$$d/mono-wrapper run-test-profiles ) || ret=false ; \ + rm -f $(tmpinst) ; $$ret + +$(tmpinst)/bin/mcs: + $(MAKE) test-support-file target=$@ file=class/lib/default/mcs.exe + +$(tmpinst)/bin/mbas: + $(MAKE) test-support-file target=$@ file=mbas/mbas.exe + +$(tmpinst)/bin/gmcs: + $(MAKE) test-support-file target=$@ file=gmcs/gmcs.exe + +$(tmpinst)/bin/ilasm: + $(MAKE) test-support-file target=$@ file=ilasm/ilasm.exe + +test-support-file: + echo '#! /bin/sh' > $(target) + r=`pwd`; m=`cd $(mcs_topdir) && pwd`; echo 'exec "'"$$r/mono-wrapper"'" "'"$$m/$(file)"'" "$$@"' >> $(target) + chmod +x $(target) + +$(tmpinst)/bin/pedump: $(srcdir)/Makefile.am + $(mkdir_p) $(@D) + (b=`pwd`; echo '#! /bin/sh'; echo 'exec "'"$$b/libtool"'" --mode=execute "'"$$b/mono/metadata/pedump"'" "$$@"') > $@ + chmod +x $@ diff --git a/runtime/mono-wrapper.in b/runtime/mono-wrapper.in new file mode 100644 index 00000000000..e00f38dcf97 --- /dev/null +++ b/runtime/mono-wrapper.in @@ -0,0 +1,4 @@ +#! /bin/sh +MONO_CFG_DIR='@mono_cfg_dir@'; export MONO_CFG_DIR +r=@mono_build_root@ +exec "$r/libtool" --mode=execute "$r/@mono_runtime@" --config "$r/data/config" "$@" diff --git a/runtime/net_1_1/.cvsignore b/runtime/net_1_1/.cvsignore deleted file mode 100644 index e362b9f8326..00000000000 --- a/runtime/net_1_1/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -*.dll -*.mdb diff --git a/runtime/net_1_1/Makefile.am b/runtime/net_1_1/Makefile.am deleted file mode 100644 index 01175e008e5..00000000000 --- a/runtime/net_1_1/Makefile.am +++ /dev/null @@ -1,116 +0,0 @@ -# This is just used to copy and install the DLL files that are currently -# being compiled on windows. -# - -gacutil=$(srcdir)/../gacutil.exe -framework_version = 1.0 - -if USE_JIT -mono_runtime = $(top_builddir)/mono/mini/mono -else -mono_runtime = $(top_builddir)/mono/interpreter/mint -endif - -MONO_CSHARP_DEBUGGER = Mono.CompilerServices.SymbolWriter -if PLATFORM_WIN32 -GAC_DIR = `cygpath -w $(libdir)` -GAC_ROOT_DIR = `cygpath -w $(DESTDIR)$(libdir)` -else -GAC_DIR = $(libdir) -GAC_ROOT_DIR = $(DESTDIR)$(libdir) -endif - -gac_assemblies_list = \ - Accessibility \ - ByteFX.Data \ - Commons.Xml.Relaxng \ - cscompmgd \ - I18N.CJK \ - I18N \ - I18N.MidEast \ - I18N.Other \ - I18N.Rare \ - I18N.West \ - IBM.Data.DB2 \ - ICSharpCode.SharpZipLib \ - Microsoft.VisualBasic \ - Microsoft.VisualC \ - Microsoft.Vsa \ - Mono.Cairo \ - $(MONO_CSHARP_DEBUGGER) \ - Mono.Data.SybaseClient \ - Mono.Data.SqliteClient \ - Mono.Data.TdsClient \ - Mono.Data.Tds \ - Mono.GetOptions \ - Mono.Http \ - Mono.Posix \ - Mono.Security \ - Mono.Security.Win32 \ - Novell.Directory.Ldap \ - Npgsql \ - nunit.util \ - nunit.core \ - nunit.framework \ - PEAPI \ - System.Configuration.Install \ - System.Data \ - System.Data.OracleClient \ - System \ - System.Design \ - System.DirectoryServices \ - System.Drawing.Design \ - System.Drawing \ - System.EnterpriseServices \ - System.Management \ - System.Messaging \ - System.Runtime.Remoting \ - System.Runtime.Serialization.Formatters.Soap \ - System.Security \ - System.ServiceProcess \ - System.Web \ - System.Web.Services \ - System.Windows.Forms \ - System.Xml - -gac_assemblies = $(gac_assemblies_list:=.dll) -mdb_files = $(gac_assemblies:=.mdb) - -corlibdir = $(libdir)/mono/$(framework_version) -corlib_DATA = mscorlib.dll - -EXTRA_DIST = $(gac_assemblies) $(corlib_DATA) $(mdb_files) -MAINTAINERCLEANFILES = $(EXTRA_DIST) - -mscorlib.dll $(gac_assemblies) $(mdb_files): - test -f $(mcs_topdir)/class/lib/default/$@ - -rm -f $(srcdir)/$@ - cd $(srcdir) && $(LN_S) $(mcs_topdir_from_srcdir)/class/lib/default/$@ $@ - -all-local: $(gac_assemblies) $(mdb_files) - -install-data-local: - @if test -f $(srcdir)/mscorlib.dll.mdb; then \ - echo $(INSTALL_DATA) $(srcdir)/mscorlib.dll.mdb $(DESTDIR)$(corlibdir)/mscorlib.dll.mdb; \ - $(INSTALL_DATA) $(srcdir)/mscorlib.dll.mdb $(DESTDIR)$(corlibdir)/mscorlib.dll.mdb; \ - fi - @if test -n '$(gac_assemblies)'; then \ - for i in ''$(gac_assemblies); do \ - echo "MONO_PATH=$(srcdir) $(mono_runtime) --config ../../data/config $(gacutil) /i $(srcdir)/$$i /f /package $(framework_version) /gacdir $(GAC_DIR) /root $(GAC_ROOT_DIR)" ; \ - MONO_PATH=$(srcdir) \ - $(LIBTOOL) --mode=execute $(mono_runtime) --config ../../data/config $(gacutil) /i $(srcdir)/$$i /f /package $(framework_version) /gacdir $(GAC_DIR) /root $(GAC_ROOT_DIR) || exit 1 ; \ - done; fi - -uninstall-local: - @if test -n '$(gac_assemblies_list)'; then \ - for i in ''$(gac_assemblies_list); do \ - echo "MONO_PATH=$(srcdir) $(mono_runtime) $(gacutil) /u $$i /gacdir $(GAC_DIR) /root $(GAC_ROOT_DIR)" ; \ - MONO_PATH=$(srcdir) \ - $(LIBTOOL) --mode=execute $(mono_runtime) --config ../../data/config $(gacutil) /u $$i /gacdir $(GAC_DIR) /root $(GAC_ROOT_DIR) || true ; \ - done; fi - -copy_dlls: - cp /nt/mono/mcs/class/*/*.dll . - -push_dlls: - scp -o "Protocol 1" *.dll *.exe snapshot@mono-cvs.ximian.com:dlls diff --git a/runtime/net_2_0/.cvsignore b/runtime/net_2_0/.cvsignore deleted file mode 100644 index e362b9f8326..00000000000 --- a/runtime/net_2_0/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -*.dll -*.mdb diff --git a/runtime/net_2_0/Makefile.am b/runtime/net_2_0/Makefile.am deleted file mode 100644 index dd8bacc2e49..00000000000 --- a/runtime/net_2_0/Makefile.am +++ /dev/null @@ -1,122 +0,0 @@ -# This is just used to copy and install the DLL files that are currently -# being compiled on windows. -# - -gacutil=$(srcdir)/../gacutil.exe -framework_version = 2.0 - -if USE_JIT -mono_runtime = $(top_builddir)/mono/mini/mono -else -mono_runtime = $(top_builddir)/mono/interpreter/mint -endif - -if PLATFORM_WIN32 -MONO_CSHARP_DEBUGGER = -else -MONO_CSHARP_DEBUGGER = Mono.CompilerServices.SymbolWriter -endif - -gac_assemblies_list = \ - Accessibility \ - ByteFX.Data \ - Commons.Xml.Relaxng \ - cscompmgd \ - I18N.CJK \ - I18N \ - I18N.MidEast \ - I18N.Other \ - I18N.Rare \ - I18N.West \ - ICSharpCode.SharpZipLib \ - Microsoft.VisualBasic \ - Microsoft.VisualC \ - Microsoft.Vsa \ - Mono.C5 \ - Mono.Cairo \ - $(MONO_CSHARP_DEBUGGER) \ - Mono.Data.SybaseClient \ - Mono.Data.SqliteClient \ - Mono.Data.TdsClient \ - Mono.Data.Tds \ - Mono.GetOptions \ - Mono.Http \ - Mono.Posix \ - Mono.Security \ - Mono.Security.Win32 \ - Novell.Directory.Ldap \ - Npgsql \ - PEAPI \ - System.Configuration.Install \ - System.Data \ - System.Data.OracleClient \ - System \ - System.Design \ - System.DirectoryServices \ - System.Drawing.Design \ - System.Drawing \ - System.EnterpriseServices \ - System.Management \ - System.Messaging \ - System.Runtime.Remoting \ - System.Runtime.Serialization.Formatters.Soap \ - System.Security \ - System.ServiceProcess \ - System.Web \ - System.Web.Services \ - System.Windows.Forms \ - System.Xml - -if PLATFORM_WIN32 -gac_assemblies = -mdb_files = -local_mscorlib = -else -gac_assemblies = $(gac_assemblies_list:=.dll) -mdb_files = $(gac_assemblies:=.mdb) -local_mscorlib = mscorlib.dll -endif - -corlibdir = $(libdir)/mono/$(framework_version) -corlib_DATA = $(local_mscorlib) - -EXTRA_DIST = $(gac_assemblies) $(corlib_DATA) $(mdb_files) -MAINTAINERCLEANFILES = $(EXTRA_DIST) - -mscorlib.dll $(gac_assemblies) $(mdb_files): - test -f $(mcs_topdir)/class/lib/net_2_0/$@ - -rm -f $(srcdir)/$@ - cd $(srcdir) && $(LN_S) $(mcs_topdir_from_srcdir)/class/lib/net_2_0/$@ $@ - -all-local: $(gac_assemblies) $(mdb_files) - -if INSTALL_2_0 -install-data-local: - @if test -f $(srcdir)/mscorlib.dll.mdb; then \ - echo $(INSTALL_DATA) $(srcdir)/mscorlib.dll.mdb $(DESTDIR)$(corlibdir)/mscorlib.dll.mdb; \ - $(INSTALL_DATA) $(srcdir)/mscorlib.dll.mdb $(DESTDIR)$(corlibdir)/mscorlib.dll.mdb; \ - fi - @if test -n '$(gac_assemblies)'; then \ - for i in ''$(gac_assemblies); do \ - echo "MONO_PATH=$(srcdir)/../net_1_1 $(mono_runtime) --config ../../data/config $(gacutil) /i $(srcdir)/$$i /f /package $(framework_version) /root $(DESTDIR)$(libdir)" ; \ - MONO_PATH=$(srcdir)/../net_1_1 \ - $(LIBTOOL) --mode=execute $(mono_runtime) --config ../../data/config $(gacutil) /i $(srcdir)/$$i /f /package $(framework_version) /root $(DESTDIR)$(libdir) || exit 1 ; \ - done; fi - -uninstall-local: - @if test -n '$(gac_assemblies_list)'; then \ - for i in ''$(gac_assemblies_list); do \ - echo "MONO_PATH=$(srcdir)/../net_1_1 $(mono_runtime) $(gacutil) /u $$i /root $(DESTDIR)$(libdir)" ; \ - MONO_PATH=$(srcdir)/../net_1_1 \ - $(LIBTOOL) --mode=execute $(mono_runtime) $(gacutil) /u $$i /root $(DESTDIR)$(libdir) || true ; \ - done; fi -else -install-data-local uninstall-local: - @: -endif - -copy_dlls: - cp /nt/mono/mcs/class/*/*.dll . - -push_dlls: - scp -o "Protocol 1" *.dll *.exe snapshot@mono-cvs.ximian.com:dlls |