diff options
| author | Noam Lampert <noaml@mono-cvs.ximian.com> | 2007-12-17 18:47:18 +0300 |
|---|---|---|
| committer | Noam Lampert <noaml@mono-cvs.ximian.com> | 2007-12-17 18:47:18 +0300 |
| commit | 2b91a16f4ae129127857d8730243566bd5a07e6f (patch) | |
| tree | 341183cff860326141ddf4cf6c79c36590e81d17 /mcs/class/Accessibility | |
| parent | 9c265f8909ebf6ffde8dc617707e85bb07381b30 (diff) | |
Allow build in java
svn path=/trunk/mcs/; revision=91456
Diffstat (limited to 'mcs/class/Accessibility')
| -rw-r--r-- | mcs/class/Accessibility/Accessibility.csproj | 14 | ||||
| -rw-r--r-- | mcs/class/Accessibility/Assembly/AssemblyInfo.cs | 2 | ||||
| -rwxr-xr-x | mcs/class/Accessibility/makefile.build | 42 |
3 files changed, 52 insertions, 6 deletions
diff --git a/mcs/class/Accessibility/Accessibility.csproj b/mcs/class/Accessibility/Accessibility.csproj index 765ac2bd565..cc6dc88dbca 100644 --- a/mcs/class/Accessibility/Accessibility.csproj +++ b/mcs/class/Accessibility/Accessibility.csproj @@ -21,8 +21,8 @@ <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>bin\Debug_Java\</OutputPath>
- <DefineConstants>TRACE;DEBUG;JAVA;NET_1_1;NET_2_0;</DefineConstants>
+ <OutputPath>bin\Debug_Java20\</OutputPath>
+ <DefineConstants>TRACE;DEBUG;JAVA;NET_1_1;NET_2_0;TARGET_JVM</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<BaseAddress>285212672</BaseAddress>
@@ -33,8 +33,8 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Java20|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>bin\Release_Java\</OutputPath>
- <DefineConstants>TRACE;JAVA;NET_1_1;NET_2_0;</DefineConstants>
+ <OutputPath>bin\Release_Java20\</OutputPath>
+ <DefineConstants>TRACE;JAVA;NET_1_1;NET_2_0;TARGET_JVM</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<BaseAddress>285212672</BaseAddress>
@@ -46,7 +46,9 @@ <Compile Include="Accessibility\IAccessible.cs" />
<Compile Include="Accessibility\IAccessibleHandler.cs" />
<Compile Include="Assembly\AssemblyInfo.cs" />
- <Compile Include="Consts.cs" />
+ <Compile Include="..\..\build\common\Consts.cs.in">
+ <Link>Consts.cs.in</Link>
+ </Compile>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
@@ -65,4 +67,4 @@ <UserProperties REFS-JarPath-system="" REFS-RefInfo-system="repository:vmw:framework:2.0" REFS-JarPath-system-data="" REFS-RefInfo-system-data="repository:vmw:framework:2.0" REFS-JarPath-system-xml="" REFS-RefInfo-system-xml="repository:vmw:framework:2.0" REFS-JarPath-rt="" REFS-RefInfo-rt="repository:jre:sun:1.6.0" />
</VisualStudio>
</ProjectExtensions>
-</Project>
\ No newline at end of file +</Project>
diff --git a/mcs/class/Accessibility/Assembly/AssemblyInfo.cs b/mcs/class/Accessibility/Assembly/AssemblyInfo.cs index f79c8bce94c..9fce8d86140 100644 --- a/mcs/class/Accessibility/Assembly/AssemblyInfo.cs +++ b/mcs/class/Accessibility/Assembly/AssemblyInfo.cs @@ -63,4 +63,6 @@ using System.Runtime.InteropServices; [assembly: Guid("1ea4dbf0-3c3b-11cf-810c-00aa00389b71")] [assembly: AssemblyDelaySign(true)] +#if !TARGET_JVM [assembly: AssemblyKeyFile("../msfinal.pub")] +#endif diff --git a/mcs/class/Accessibility/makefile.build b/mcs/class/Accessibility/makefile.build new file mode 100755 index 00000000000..2744aa3b5ce --- /dev/null +++ b/mcs/class/Accessibility/makefile.build @@ -0,0 +1,42 @@ +<!--Minimalistic buildfile -->
+<project name="Accessibility" default="all">
+<property name="ghroot" value="${project::get-base-directory()}\..\..\..\.."/>
+ <!--Allways at the beginning-->
+ <include buildfile="${ghroot}\vsbuild\properties.xml" />
+
+ <!--MANDATORY SECTION-->
+
+ <!--Could be GH ANT .NET-->
+ <property name="projecttype" value=".NET2005"/>
+ <!--Could be RUNTIME TOOLS ... -->
+ <property name="rules" value="RUNTIME"/>
+
+ <property name="msbuild_file" value="Accessibility.csproj"/>
+ <property name="override_config" value="${ghconfiguration_ver}"/>
+
+ <!--Fileset describing project output files. Uset by copy/delete rules in framework-->
+ <fileset id="output" basedir="${project::get-base-directory()}\bin" failonempty="true">
+ <include name="${ghconfiguration_ver}\Accessibility.jar"/>
+ <include name="${ghconfiguration_ver}\Accessibility.dll"/>
+ </fileset>
+
+ <!--END MANDATORY SECTION-->
+
+ <!--OPTIONAL SECTION-->
+<!--
+ <target name="postbuild">
+
+ </target>
+-->
+ <!--
+ <property name="cvnsrc" value="svn://svn.myrealbox.com/source/trunk/mcs/<cvn_folder>"/>
+ <target name="prebuild">
+ Put something there if you need
+ </target>
+ -->
+ <!--END OPTIONAL SECTION-->
+
+
+ <!--Allways at the end-->
+ <include buildfile="${ghroot}\vsbuild\framework.xml" />
+</project>
|