Parcourir la source

* net_1_1_java_System.Drawing.dll.sources,
net_1_1_java_System.Drawing.dll.exclude.sources: added java profile
sources lists
* Makefile: add java profile section

svn path=/trunk/mcs/; revision=53017

Andrew Skiba il y a 20 ans
Parent
commit
0cd6bb7536

+ 7 - 0
mcs/class/System.Drawing/ChangeLog

@@ -1,3 +1,10 @@
+2005-11-14  Andrew Skiba  <[email protected]>
+
+	* net_1_1_java_System.Drawing.dll.sources,
+	net_1_1_java_System.Drawing.dll.exclude.sources: added java profile
+	sources lists
+	* Makefile: add java profile section
+
 2005-11-13 Konstantin Triger <[email protected]>
 
 	* System.Drawing.vmwcsproj: Added System.Drawing.Text/LineLayout.jvm.cs,

+ 7 - 0
mcs/class/System.Drawing/Makefile

@@ -9,6 +9,13 @@ LIB_MCS_FLAGS = /unsafe /r:$(corlib) /r:System.dll /nowarn:649 /nowarn:169
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -resource:Test/resources/indexed.png,indexed.png \
 	 /r:System.Drawing.dll -nowarn:0618 -nowarn:219 -nowarn:169 -nowarn:1595
 
+ifeq (net_1_1_java, $(PROFILE))
+LIB_MCS_FLAGS +=				\
+	-r:System.Xml.dll			\
+	-r:rt.dll				\
+	-r:J2SE.Helpers.dll
+endif
+
 include ../../build/library.make
 
 EXTRA_DISTFILES = Test/resources/indexed.png

+ 81 - 0
mcs/class/System.Drawing/net_1_1_java_System.Drawing.dll.exclude.sources

@@ -0,0 +1,81 @@
+##files existing in both profiles
+System.Drawing.Drawing2D/AdjustableArrowCap.cs
+System.Drawing.Drawing2D/CustomLineCap.cs
+System.Drawing.Drawing2D/GraphicsContainer.cs
+System.Drawing.Drawing2D/GraphicsPath.cs
+System.Drawing.Drawing2D/GraphicsPathIterator.cs
+System.Drawing.Drawing2D/GraphicsState.cs
+System.Drawing.Drawing2D/HatchBrush.cs
+System.Drawing.Drawing2D/LinearGradientBrush.cs
+System.Drawing.Drawing2D/Matrix.cs
+System.Drawing.Drawing2D/PathGradientBrush.cs
+System.Drawing.Imaging/EncoderParameter.cs
+System.Drawing.Imaging/ImageAttributes.cs
+System.Drawing.Imaging/ImageCodecInfo.cs
+System.Drawing.Imaging/Metafile.cs
+System.Drawing.Text/FontCollection.cs
+System.Drawing.Text/InstalledFontCollection.cs
+System.Drawing.Text/PrivateFontCollection.cs
+System.Drawing/Bitmap.cs
+System.Drawing/Brush.cs
+System.Drawing/Font.cs
+System.Drawing/FontFamily.cs
+System.Drawing/Graphics.cs
+System.Drawing/Icon.cs
+System.Drawing/Image.cs
+System.Drawing/Pen.cs
+System.Drawing/Region.cs
+System.Drawing/SolidBrush.cs
+System.Drawing/StringFormat.cs
+System.Drawing/SystemColors.cs
+System.Drawing/TextureBrush.cs
+
+##completely different files
+System.Drawing.Design/CategoryNameCollection.cs
+System.Drawing.Design/IPropertyValueUIService.cs
+System.Drawing.Design/IToolboxService.cs
+System.Drawing.Design/IToolboxUser.cs
+System.Drawing.Design/PaintValueEventArgs.cs
+System.Drawing.Design/PropertyValueItem.cs
+System.Drawing.Design/PropertyValueUIHandler.cs
+System.Drawing.Design/PropertyValueUIItemInvokeHandler.cs
+System.Drawing.Design/ToolboxItemCollection.cs
+System.Drawing.Design/ToolboxItemCreatorCallback.cs
+System.Drawing.Imaging/PlayRecordCallback.cs
+System.Drawing.Printing/Duplex.cs
+System.Drawing.Printing/InvalidPrinterException.cs
+System.Drawing.Printing/Margins.cs
+System.Drawing.Printing/MarginsConverter.cs
+System.Drawing.Printing/PageSettings.cs
+System.Drawing.Printing/PaperKind.cs
+System.Drawing.Printing/PaperSize.cs
+System.Drawing.Printing/PaperSource.cs
+System.Drawing.Printing/PaperSourceKind.cs
+System.Drawing.Printing/PreviewPageInfo.cs
+System.Drawing.Printing/PreviewPrintController.cs
+System.Drawing.Printing/PrintController.cs
+System.Drawing.Printing/PrintDocument.cs
+System.Drawing.Printing/PrintEventArgs.cs
+System.Drawing.Printing/PrintEventHandler.cs
+System.Drawing.Printing/PrintPageEventArgs.cs
+System.Drawing.Printing/PrintPageEventHandler.cs
+System.Drawing.Printing/PrintRange.cs
+System.Drawing.Printing/PrinterResolution.cs
+System.Drawing.Printing/PrinterResolutionKind.cs
+System.Drawing.Printing/PrinterSettings.cs
+System.Drawing.Printing/PrinterUnit.cs
+System.Drawing.Printing/PrinterUnitConvert.cs
+System.Drawing.Printing/PrintingPermission.cs
+System.Drawing.Printing/PrintingPermissionAttribute.cs
+System.Drawing.Printing/PrintingPermissionLevel.cs
+System.Drawing.Printing/QueryPageSettingsEventArgs.cs
+System.Drawing.Printing/QueryPageSettingsEventHandler.cs
+System.Drawing.Printing/StandardPrintController.cs
+System.Drawing/ComIStreamMarshaler.cs
+System.Drawing/ComIStreamWrapper.cs
+System.Drawing/SRDescriptionAttribute.cs
+System.Drawing/gdipEnums.cs
+System.Drawing/gdipFunctions.cs
+System.Drawing/gdipStructs.cs
+System.Drawing/carbonFunctions.cs
+

+ 48 - 0
mcs/class/System.Drawing/net_1_1_java_System.Drawing.dll.sources

@@ -0,0 +1,48 @@
+#include System.Drawing.dll.sources
+
+##files existing in both profiles
+System.Drawing.Drawing2D/AdjustableArrowCap.jvm.cs
+System.Drawing.Drawing2D/CustomLineCap.jvm.cs
+System.Drawing.Drawing2D/GraphicsContainer.jvm.cs
+System.Drawing.Drawing2D/GraphicsPath.jvm.cs
+System.Drawing.Drawing2D/GraphicsPathIterator.jvm.cs
+System.Drawing.Drawing2D/GraphicsState.jvm.cs
+System.Drawing.Drawing2D/HatchBrush.jvm.cs
+System.Drawing.Drawing2D/LinearGradientBrush.jvm.cs
+System.Drawing.Drawing2D/Matrix.jvm.cs
+System.Drawing.Drawing2D/PathGradientBrush.jvm.cs
+System.Drawing.Imaging/EncoderParameter.jvm.cs
+System.Drawing.Imaging/ImageAttributes.jvm.cs
+System.Drawing.Imaging/ImageCodecInfo.jvm.cs
+System.Drawing.Imaging/Metafile.jvm.cs
+System.Drawing.Text/FontCollection.jvm.cs
+System.Drawing.Text/InstalledFontCollection.jvm.cs
+System.Drawing.Text/PrivateFontCollection.jvm.cs
+System.Drawing/Bitmap.jvm.cs
+System.Drawing/Brush.jvm.cs
+System.Drawing/Font.jvm.cs
+System.Drawing/FontFamily.jvm.cs
+System.Drawing/Graphics.jvm.cs
+System.Drawing/Icon.jvm.cs
+System.Drawing/Image.jvm.cs
+System.Drawing/Pen.jvm.cs
+System.Drawing/Region.jvm.cs
+System.Drawing/SolidBrush.jvm.cs
+System.Drawing/StringFormat.jvm.cs
+System.Drawing/SystemColors.jvm.cs
+System.Drawing/TextureBrush.jvm.cs
+
+##completely different files
+System.Drawing.Drawing2D/ExtendedGeneralPath.jvm.cs
+System.Drawing.Drawing2D/GeneralPathIterator.jvm.cs
+System.Drawing.Imaging/ImageCodec.jvm.cs
+Mainsoft.Drawing.Configuration.jvm/ResolutionConfiguration.cs
+Mainsoft.Drawing.Configuration.jvm/ResolutionConfigurationCollection.cs
+Mainsoft.Drawing.Configuration.jvm/ResolutionConfigurationHandler.cs
+System.Drawing.Text/LineLayout.jvm.cs
+System.Drawing.Text/TextLineIterator.jvm.cs
+System.Drawing/AdvancedStroke.jvm.cs
+System.Drawing/BasicShape.jvm.cs
+System.Drawing/PlainImage.jvm.cs
+System.Drawing/PlainImageCollection.jvm.cs
+System.Drawing/StrokeFactory.jvm.cs