diff options
| author | jfrijters <jfrijters> | 2008-01-03 12:41:12 +0300 |
|---|---|---|
| committer | jfrijters <jfrijters> | 2008-01-03 12:41:12 +0300 |
| commit | 0b98567b0d5761c022f8150ae17eedd9b0f6a52c (patch) | |
| tree | 3827e9c1f398abdb49bcce2f839286e74dda7c22 /openjdk | |
| parent | 098ef07111dcd2e7951a044b100986b3933d7e22 (diff) | |
- Generate proper InternalsVisibleTo annotation based on whether we're doing a signed or unsigned build.
- Added SecurityCritical and AllowPartiallyTrustedCallers annotation to IKVM.OpenJDK.ClassLibrary.dll.
Diffstat (limited to 'openjdk')
| -rw-r--r-- | openjdk/AssemblyInfo.java.in (renamed from openjdk/AssemblyInfo.java) | 10 | ||||
| -rw-r--r-- | openjdk/openjdk.build | 11 |
2 files changed, 17 insertions, 4 deletions
diff --git a/openjdk/AssemblyInfo.java b/openjdk/AssemblyInfo.java.in index 515a5bbd..1bf80aa0 100644 --- a/openjdk/AssemblyInfo.java +++ b/openjdk/AssemblyInfo.java.in @@ -1,5 +1,5 @@ /* - Copyright (C) 2006, 2007 Jeroen Frijters + Copyright (C) 2006, 2007, 2008 Jeroen Frijters This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -33,7 +33,7 @@ "Copyright (C) 2001-2005 freebxml.org\r\n" + "Copyright (C) 1998 FundsXpress, Inc.\r\n" + "Copyright (C) 1993-2005 International Business Machines, Inc.\r\n" + - "Copyright (C) 2002-2007 Jeroen Frijters\r\n" + + "Copyright (C) 2002-2008 Jeroen Frijters\r\n" + "Copyright (C) 2007 Red Hat, Inc.\r\n" + "Copyright (C) 1994-2007 Sun Microsystems, Inc.\r\n" + "Copyright (C) 1996-1998 Taligent, Inc.\r\n" + @@ -49,8 +49,10 @@ @cli.System.Reflection.AssemblyProductAttribute.Annotation("IKVM.NET") @cli.System.Reflection.AssemblyCompanyAttribute.Annotation("Jeroen Frijters") -// TODO use a string literal from another class for the runtime assembly name (to handle strong named builds) -@cli.System.Runtime.CompilerServices.InternalsVisibleToAttribute.Annotation("IKVM.Runtime") +@cli.System.Runtime.CompilerServices.InternalsVisibleToAttribute.Annotation("@RUNTIME@") + +@cli.System.Security.SecurityCriticalAttribute.Annotation +@cli.System.Security.AllowPartiallyTrustedCallersAttribute.Annotation // magic type to collect Assembly attributes interface assembly {} diff --git a/openjdk/openjdk.build b/openjdk/openjdk.build index 2d19f9c9..4f47b8a2 100644 --- a/openjdk/openjdk.build +++ b/openjdk/openjdk.build @@ -30,6 +30,17 @@ <include name="**.class"/> </fileset> </delete> + <property name="IKVM.Runtime" value="IKVM.Runtime" /> + <if test="${signoption != ''}"> + <property name="IKVM.Runtime" value="IKVM.Runtime, PublicKey=0024000004800000940000000602000000240000525341310004000001000100DD6B140E5209CAE3D1C710030021EF589D0F00D05ACA8771101A7E99E10EE063E66040DF96E6F842F717BFC5B62D2EC2B62CEB0282E4649790DACB424DB29B68ADC7EAEAB0356FCE04702379F84400B8427EDBB33DAB8720B9F16A42E2CDB87F885EF413DBC4229F2BD157C9B8DC2CD14866DEC5F31C764BFB9394CC3C60E6C0" /> + </if> + <copy file="AssemblyInfo.java.in" tofile="AssemblyInfo.java"> + <filterchain> + <replacetokens> + <token key="RUNTIME" value="${IKVM.Runtime}" /> + </replacetokens> + </filterchain> + </copy> <exec program="javac" commandline="-J-Xmx1024M -g -nowarn -bootclasspath ../classpath/mscorlib.jar${pathsep}../classpath/System.jar @allsources.lst" useruntimeengine="false" /> </target> |