r120432 - in trunk/mcs/tools: . moon moon/Descriptors moon/masterinfos tuner

0 views

Skip to first unread message

Jb Evain (jbevain@gmail.com)

unread,

Dec 1, 2008, 7:47:17 PM12/1/08

to mono-p...@lists.ximian.com, ximian....@gmail.com, mono-svn-patche...@googlegroups.com

Author: jbevain
Date: 2008-12-01 19:47:17 -0500 (Mon, 01 Dec 2008)
New Revision: 120432

Added:
trunk/mcs/tools/moon/
trunk/mcs/tools/moon/ChangeLog
trunk/mcs/tools/moon/Descriptors/
trunk/mcs/tools/moon/Makefile
trunk/mcs/tools/moon/masterinfos/
trunk/mcs/tools/moon/masterinfos/Mono.CompilerServices.SymbolWriter.info
trunk/mcs/tools/moon/masterinfos/System.Core.info
trunk/mcs/tools/moon/masterinfos/System.Net.info
trunk/mcs/tools/moon/masterinfos/System.Runtime.Serialization.info
trunk/mcs/tools/moon/masterinfos/System.ServiceModel.Web.info
trunk/mcs/tools/moon/masterinfos/System.ServiceModel.info
trunk/mcs/tools/moon/masterinfos/System.Xml.Linq.info
trunk/mcs/tools/moon/masterinfos/System.Xml.info
trunk/mcs/tools/moon/masterinfos/System.info
trunk/mcs/tools/moon/masterinfos/mscorlib.info
trunk/mcs/tools/tuner/Mono.Tuner.dll.sources
Removed:
trunk/mcs/tools/moon/masterinfos/silverlight/
trunk/mcs/tools/tuner/AUTHORS
trunk/mcs/tools/tuner/Descriptors/
trunk/mcs/tools/tuner/README
trunk/mcs/tools/tuner/masterinfos/
Modified:
trunk/mcs/tools/ChangeLog
trunk/mcs/tools/Makefile
trunk/mcs/tools/tuner/ChangeLog
trunk/mcs/tools/tuner/Makefile
Log:
in mcs/tools/tuner:
2008-12-01 Jb Evain <jbe...@novell.com>

* Makefile: move tuning logic inside ../moon. We now simply build
the tuner as a simple library.

in mcs/tools/moon:
2008-12-01 Jb Evain <jbe...@novell.com>

* Makefile: re-use the tuning logic that previously was defined
in mcs/tools/tuner. We're now building the net_2_1 tuned libraries
from here exclusively.

in mcs/tools:
2008-12-01 Jb Evain <jbe...@novell.com>

* Makefile: build the tuner library during the net_1_1 profile. The
tuning of the net_2_1 assemblies now takes place in moon.

Modified: trunk/mcs/tools/ChangeLog
===================================================================
--- trunk/mcs/tools/ChangeLog 2008-12-02 00:42:44 UTC (rev 120431)
+++ trunk/mcs/tools/ChangeLog 2008-12-02 00:47:17 UTC (rev 120432)
@@ -1,3 +1,8 @@
+2008-12-01 Jb Evain <jbe...@novell.com>
+
+ * Makefile: build the tuner library during the net_1_1 profile. The
+ tuning of the net_2_1 assemblies now takes place in moon.
+
2008-11-21 Jb Evain <jbe...@novell.com>

* Makefile: build corcompare only during net_2_0 now.

Modified: trunk/mcs/tools/Makefile
===================================================================
--- trunk/mcs/tools/Makefile 2008-12-02 00:42:44 UTC (rev 120431)
+++ trunk/mcs/tools/Makefile 2008-12-02 00:47:17 UTC (rev 120432)
@@ -56,14 +56,14 @@
csharplib

net_2_1_dirs := \
- compiler-tester
+ compiler-tester \

net_1_1_bootstrap_SUBDIRS = gacutil security resgen culevel
net_1_1_SUBDIRS := $(net_1_1_dirs)
net_2_0_bootstrap_SUBDIRS = resgen
net_2_0_SUBDIRS := $(net_2_0_dirs)
net_2_1_raw_SUBDIRS := $(net_2_1_dirs)
-net_2_1_SUBDIRS := $(net_2_1_dirs) tuner
+net_2_1_SUBDIRS := $(net_2_1_dirs) moon

SUBDIRS = $(net_1_1_dirs) $(net_2_0_dirs) $(net_2_1_dirs)

Property changes on: trunk/mcs/tools/moon
___________________________________________________________________
Name: svn:ignore
+ tune.stamp

Added: trunk/mcs/tools/moon/ChangeLog
===================================================================
--- trunk/mcs/tools/moon/ChangeLog 2008-12-02 00:42:44 UTC (rev 120431)
+++ trunk/mcs/tools/moon/ChangeLog 2008-12-02 00:47:17 UTC (rev 120432)
@@ -0,0 +1,5 @@
+2008-12-01 Jb Evain <jbe...@novell.com>
+
+ * Makefile: re-use the tuning logic that previously was defined
+ in mcs/tools/tuner. We're now building the net_2_1 tuned libraries
+ from here exclusively.

Copied: trunk/mcs/tools/moon/Descriptors (from rev 120417, trunk/mcs/tools/tuner/Descriptors)

Property changes on: trunk/mcs/tools/moon/Descriptors
___________________________________________________________________
Name: svn:mergeinfo
+

Added: trunk/mcs/tools/moon/Makefile
===================================================================
--- trunk/mcs/tools/moon/Makefile 2008-12-02 00:42:44 UTC (rev 120431)
+++ trunk/mcs/tools/moon/Makefile 2008-12-02 00:47:17 UTC (rev 120432)
@@ -0,0 +1,107 @@
+thisdir = tools/moon
+SUBDIRS =
+include ../../build/rules.make
+
+sn = $(topdir)/class/lib/net_1_1_bootstrap/sn.exe
+SN = MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(sn)
+SNFLAGS = -q -R
+
+LINKER = ../linker/monolinker.exe
+
+TUNER_DESCS = \
+ Descriptors/mscorlib.xml \
+ Descriptors/smcs.xml \
+ Descriptors/System.xml
+
+TUNER_LIBRARIES = \
+ mscorlib \
+ System \
+ System.Net \
+ System.Core \
+ System.Xml \
+ System.Xml.Linq \
+ System.Runtime.Serialization \
+ System.ServiceModel \
+ System.ServiceModel.Web \
+ Mono.CompilerServices.SymbolWriter
+
+TUNER_MASTERS = $(TUNER_LIBRARIES:%=masterinfos/%.info)
+
+LOCAL_MCS_FLAGS = -r:$(LINKER) -r:Mono.Cecil.dll
+
+DISTFILES = $(TUNER_SOURCES) $(TUNER_DESCS) $(TUNER_MASTERS)
+
+WORKING_DIR = $(topdir)/class/lib/net_2_1_raw
+OUTPUT_DIR = $(topdir)/class/lib/net_2_1
+
+DLLFILES = $(TUNER_LIBRARIES:%=%.dll)
+
+FILES = smcs.exe $(DLLFILES)
+WORKING_FILES = $(FILES:%=$(WORKING_DIR)/%)
+OUTPUT_FILES = $(FILES:%=$(OUTPUT_DIR)/%)
+
+all-local: $(OUTPUT_FILES)
+
+install-local: end-install
+
+clean-local:
+ rm -f $(OUTPUT_FILES) tune.stamp tune.stampt
+
+TUNER_FLAGS = -d $(WORKING_DIR) -o $(OUTPUT_DIR) \
+ -l none \
+ -c link \
+ -a smcs \
+ -b true \
+ -g true \
+ -m display_internalized false
+
+TUNER_STEPS = \
+ Mono.Tuner.InjectAttributes,Mono.Tuner:OutputStep \
+ Mono.Tuner.AdjustVisibility,Mono.Tuner:OutputStep \
+ Mono.Tuner.PrintStatus,Mono.Tuner:OutputStep \
+ Mono.Tuner.RemoveSerialization,Mono.Tuner:OutputStep
+
+ifdef CHECK_VISIBILITY
+TUNER_STEPS += Mono.Tuner.CheckVisibility,Mono.Tuner
+endif
+
+$(OUTPUT_FILES): tune.stamp
+ test -f $@ || { rm -f $<; $(MAKE) $<; }
+
+tune.stamp: $(WORKING_FILES) $(OUTPUT_DIR)/.stamp
+ touch $@t
+ MONO_PATH=".$(PLATFORM_PATH_SEPARATOR)$(topdir)/class/lib/net_1_1$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) --debug $(LINKER) $(TUNER_FLAGS) $(TUNER_DESCS:%=-x %) $(TUNER_STEPS:%=-s %) $(TUNER_MASTERS:%=-i %)
+ for i in $(DLLFILES); do $(SN) $(SNFLAGS) $(OUTPUT_DIR)/$$i $(topdir)/class/mono.snk; done
+ mv $@t $@
+
+gacutil = $(topdir)/class/lib/net_1_1_bootstrap/gacutil.exe
+GACUTIL = MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(gacutil) -bootstrap
+
+TUNER_INSTALL_DIR = $(DESTDIR)$(mono_libdir)/mono/2.1
+
+end-install: \
+ inst-mscorlib.dll \
+ inst-smcs.exe \
+ gac-System \
+ gac-System.Net \
+ gac-System.Xml \
+ gac-System.Xml.Linq \
+ gac-System.Core \
+ gac-System.Runtime.Serialization \
+ gac-System.ServiceModel \
+ gac-System.ServiceModel.Web \
+ gac-Mono.CompilerServices.SymbolWriter
+
+inst-%: $(OUTPUT_DIR)/%
+ $(MKINSTALLDIRS) $(TUNER_INSTALL_DIR)
+ $(INSTALL_LIB) $(OUTPUT_DIR)/$* $(TUNER_INSTALL_DIR)/$*
+ test ! -f $(OUTPUT_DIR)/$*.mdb || $(INSTALL_LIB) $(OUTPUT_DIR)/$*.mdb $(TUNER_INSTALL_DIR)/$*.mdb
+
+gac-%: $(OUTPUT_DIR)/%.dll
+ $(GACUTIL) /i $(OUTPUT_DIR)/$*.dll /f /root $(DESTDIR)$(mono_libdir) /package 2.1
+
+Mono.Tuner.dll: $(TUNER_SOURCES)
+ $(CSCOMPILE) /out:Mono.Tuner.dll /t:library $(TUNER_SOURCES)
+
+retune:
+ rm -f tune.stamp && $(MAKE) tune.stamp

Copied: trunk/mcs/tools/moon/masterinfos (from rev 120417, trunk/mcs/tools/tuner/masterinfos)

Property changes on: trunk/mcs/tools/moon/masterinfos
___________________________________________________________________
Name: svn:mergeinfo
+

Copied: trunk/mcs/tools/moon/masterinfos/Mono.CompilerServices.SymbolWriter.info (from rev 120417, trunk/mcs/tools/tuner/masterinfos/silverlight/Mono.CompilerServices.SymbolWriter.info)

Property changes on: trunk/mcs/tools/moon/masterinfos/Mono.CompilerServices.SymbolWriter.info
___________________________________________________________________
Name: svn:mergeinfo
+

Copied: trunk/mcs/tools/moon/masterinfos/System.Core.info (from rev 120417, trunk/mcs/tools/tuner/masterinfos/silverlight/System.Core.info)

Property changes on: trunk/mcs/tools/moon/masterinfos/System.Core.info
___________________________________________________________________
Name: svn:mergeinfo
+

Copied: trunk/mcs/tools/moon/masterinfos/System.Net.info (from rev 120417, trunk/mcs/tools/tuner/masterinfos/silverlight/System.Net.info)

Property changes on: trunk/mcs/tools/moon/masterinfos/System.Net.info
___________________________________________________________________
Name: svn:mergeinfo
+

Copied: trunk/mcs/tools/moon/masterinfos/System.Runtime.Serialization.info (from rev 120417, trunk/mcs/tools/tuner/masterinfos/silverlight/System.Runtime.Serialization.info)

Property changes on: trunk/mcs/tools/moon/masterinfos/System.Runtime.Serialization.info
___________________________________________________________________
Name: svn:mergeinfo
+

Copied: trunk/mcs/tools/moon/masterinfos/System.ServiceModel.Web.info (from rev 120417, trunk/mcs/tools/tuner/masterinfos/silverlight/System.ServiceModel.Web.info)

Property changes on: trunk/mcs/tools/moon/masterinfos/System.ServiceModel.Web.info
___________________________________________________________________
Name: svn:mergeinfo
+

Copied: trunk/mcs/tools/moon/masterinfos/System.ServiceModel.info (from rev 120417, trunk/mcs/tools/tuner/masterinfos/silverlight/System.ServiceModel.info)

Property changes on: trunk/mcs/tools/moon/masterinfos/System.ServiceModel.info
___________________________________________________________________
Name: svn:mergeinfo
+

Copied: trunk/mcs/tools/moon/masterinfos/System.Xml.Linq.info (from rev 120417, trunk/mcs/tools/tuner/masterinfos/silverlight/System.Xml.Linq.info)

Property changes on: trunk/mcs/tools/moon/masterinfos/System.Xml.Linq.info
___________________________________________________________________
Name: svn:mergeinfo
+

Copied: trunk/mcs/tools/moon/masterinfos/System.Xml.info (from rev 120417, trunk/mcs/tools/tuner/masterinfos/silverlight/System.Xml.info)

Property changes on: trunk/mcs/tools/moon/masterinfos/System.Xml.info
___________________________________________________________________
Name: svn:mergeinfo
+

Copied: trunk/mcs/tools/moon/masterinfos/System.info (from rev 120417, trunk/mcs/tools/tuner/masterinfos/silverlight/System.info)

Property changes on: trunk/mcs/tools/moon/masterinfos/System.info
___________________________________________________________________
Name: svn:mergeinfo
+

Copied: trunk/mcs/tools/moon/masterinfos/mscorlib.info (from rev 120417, trunk/mcs/tools/tuner/masterinfos/silverlight/mscorlib.info)

Property changes on: trunk/mcs/tools/moon/masterinfos/mscorlib.info
___________________________________________________________________
Name: svn:mergeinfo
+

Deleted: trunk/mcs/tools/tuner/AUTHORS
===================================================================
--- trunk/mcs/tools/tuner/AUTHORS 2008-12-02 00:42:44 UTC (rev 120431)
+++ trunk/mcs/tools/tuner/AUTHORS 2008-12-02 00:47:17 UTC (rev 120432)
@@ -1 +0,0 @@
-Jb Evain <jbe...@novell.com>

Modified: trunk/mcs/tools/tuner/ChangeLog
===================================================================
--- trunk/mcs/tools/tuner/ChangeLog 2008-12-02 00:42:44 UTC (rev 120431)
+++ trunk/mcs/tools/tuner/ChangeLog 2008-12-02 00:47:17 UTC (rev 120432)
@@ -1,3 +1,8 @@
+2008-12-01 Jb Evain <jbe...@novell.com>
+
+ * Makefile: move tuning logic inside ../moon. We now simply build
+ the tuner as a simple library.
+
2008-11-20 Jb Evain <jbe...@novell.com>

* Makefile: simplify Makefile and tune System.Xml.Linq.

Modified: trunk/mcs/tools/tuner/Makefile
===================================================================
--- trunk/mcs/tools/tuner/Makefile 2008-12-02 00:42:44 UTC (rev 120431)
+++ trunk/mcs/tools/tuner/Makefile 2008-12-02 00:47:17 UTC (rev 120432)
@@ -2,131 +2,14 @@
SUBDIRS =
include ../../build/rules.make

-sn = $(topdir)/class/lib/net_1_1_bootstrap/sn.exe
-SN = MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(sn)
-SNFLAGS = -q -R
-
LINKER = ../linker/monolinker.exe

-TUNER_SOURCES = \
- Mono.Tuner/TunerAnnotations.cs \
- Mono.Tuner/PrintStatus.cs \
- Mono.Tuner/RemoveSerialization.cs \
- Mono.Tuner/AdjustVisibility.cs \
- Mono.Tuner/CheckVisibility.cs \
- Mono.Tuner/InjectAttributes.cs
+LOCAL_MCS_FLAGS = -r:System.Xml.dll -r:$(LINKER) -r:Mono.Cecil.dll

-TUNER_DESCS = \
- Descriptors/mscorlib.xml \
- Descriptors/smcs.xml \
- Descriptors/System.xml
+LIBRARY = Mono.Tuner.dll

-TUNER_LIBRARIES = \
- mscorlib \
- System \
- System.Net \
- System.Core \
- System.Xml \
- System.Xml.Linq \
- System.Runtime.Serialization \
- System.ServiceModel \
- System.ServiceModel.Web \
- Mono.CompilerServices.SymbolWriter
+NO_INSTALL = yes
+NO_TEST = yes
+NO_SIGN_ASSEMBLY = yes

-TUNER_MASTERS = $(TUNER_LIBRARIES:%=masterinfos/silverlight/%.info)
-
-LOCAL_MCS_FLAGS = -r:$(LINKER) -r:Mono.Cecil.dll
-
-DISTFILES = README $(TUNER_SOURCES) $(TUNER_DESCS) $(TUNER_MASTERS)
-
-WORKING_DIR = $(topdir)/class/lib/net_2_1_raw
-OUTPUT_DIR = $(topdir)/class/lib/net_2_1
-
-DLLFILES = $(TUNER_LIBRARIES:%=%.dll)
-
-FILES = smcs.exe $(DLLFILES)
-WORKING_FILES = $(FILES:%=$(WORKING_DIR)/%)
-OUTPUT_FILES = $(FILES:%=$(OUTPUT_DIR)/%)
-
-ifneq (net_2_1, $(PROFILE))
-all-local: Mono.Tuner.dll
-
-install-local:
-
-clean-local:
- rm -f *.dll *.mdb *.pdb
-
-else
-all-local: $(OUTPUT_FILES)
-
-install-local: end-install
-
-clean-local:
- rm -f $(OUTPUT_FILES) tune.stamp tune.stampt
-
-endif
-
-uninstall-local:
-
-dist-local: dist-default
-
-test-local run-test-local run-test-ondotnet-local:
-
-TUNER_FLAGS = -d $(WORKING_DIR) -o $(OUTPUT_DIR) \
- -l none \
- -c link \
- -a smcs \
- -b true \
- -g true \
- -m display_internalized false
-
-TUNER_STEPS = \
- Mono.Tuner.InjectAttributes,Mono.Tuner:OutputStep \
- Mono.Tuner.AdjustVisibility,Mono.Tuner:OutputStep \
- Mono.Tuner.PrintStatus,Mono.Tuner:OutputStep \
- Mono.Tuner.RemoveSerialization,Mono.Tuner:OutputStep
-
-ifdef CHECK_VISIBILITY
-TUNER_STEPS += Mono.Tuner.CheckVisibility,Mono.Tuner
-endif
-
-$(OUTPUT_FILES): tune.stamp
- test -f $@ || { rm -f $<; $(MAKE) $<; }
-
-tune.stamp: $(WORKING_FILES) $(OUTPUT_DIR)/.stamp
- touch $@t
- MONO_PATH=".$(PLATFORM_PATH_SEPARATOR)$(topdir)/class/lib/net_1_1$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) --debug $(LINKER) $(TUNER_FLAGS) $(TUNER_DESCS:%=-x %) $(TUNER_STEPS:%=-s %) $(TUNER_MASTERS:%=-i %)
- for i in $(DLLFILES); do $(SN) $(SNFLAGS) $(OUTPUT_DIR)/$$i $(topdir)/class/mono.snk; done
- mv $@t $@
-
-gacutil = $(topdir)/class/lib/net_1_1_bootstrap/gacutil.exe
-GACUTIL = MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(gacutil) -bootstrap
-
-TUNER_INSTALL_DIR = $(DESTDIR)$(mono_libdir)/mono/2.1
-
-end-install: \
- inst-mscorlib.dll \
- inst-smcs.exe \
- gac-System \
- gac-System.Net \
- gac-System.Xml \
- gac-System.Xml.Linq \
- gac-System.Core \
- gac-System.Runtime.Serialization \
- gac-System.ServiceModel \
- gac-System.ServiceModel.Web \
- gac-Mono.CompilerServices.SymbolWriter
-
-inst-%: $(OUTPUT_DIR)/%
- $(MKINSTALLDIRS) $(TUNER_INSTALL_DIR)
- $(INSTALL_LIB) $(OUTPUT_DIR)/$* $(TUNER_INSTALL_DIR)/$*
- test ! -f $(OUTPUT_DIR)/$*.mdb || $(INSTALL_LIB) $(OUTPUT_DIR)/$*.mdb $(TUNER_INSTALL_DIR)/$*.mdb
-
-gac-%: $(OUTPUT_DIR)/%.dll
- $(GACUTIL) /i $(OUTPUT_DIR)/$*.dll /f /root $(DESTDIR)$(mono_libdir) /package 2.1
-
-Mono.Tuner.dll: $(TUNER_SOURCES)
- $(CSCOMPILE) /out:Mono.Tuner.dll /t:library $(TUNER_SOURCES)
-
-retune:
- rm -f tune.stamp && $(MAKE) tune.stamp
+include ../../build/library.make

Added: trunk/mcs/tools/tuner/Mono.Tuner.dll.sources
===================================================================
--- trunk/mcs/tools/tuner/Mono.Tuner.dll.sources 2008-12-02 00:42:44 UTC (rev 120431)
+++ trunk/mcs/tools/tuner/Mono.Tuner.dll.sources 2008-12-02 00:47:17 UTC (rev 120432)
@@ -0,0 +1,6 @@
+Mono.Tuner/TunerAnnotations.cs
+Mono.Tuner/PrintStatus.cs
+Mono.Tuner/RemoveSerialization.cs
+Mono.Tuner/AdjustVisibility.cs
+Mono.Tuner/CheckVisibility.cs
+Mono.Tuner/InjectAttributes.cs

Deleted: trunk/mcs/tools/tuner/README
===================================================================
--- trunk/mcs/tools/tuner/README 2008-12-02 00:42:44 UTC (rev 120431)
+++ trunk/mcs/tools/tuner/README 2008-12-02 00:47:17 UTC (rev 120432)
@@ -1,8 +0,0 @@
-monotuner
-===
-
-monotuner is an internal tool to re-shape the Mono assemblies to have
-a 2.1 assembly set compatible with Microsoft's Silverlight.
-
-The tuner uses the monolinker, and augment it with some plugins.
-

Reply all

Reply to author

Forward

0 new messages