[svn] r7533: nemerle/trunk: Reg.cmd lib tools/msbuild-task/Nemerle.MSBuild.targets

VladD2 svnadmin at nemerle.org
Fri Mar 16 22:02:35 CET 2007


Log:
Change Nemerle.MSBuild.targets

Author: VladD2
Date: Fri Mar 16 22:02:32 2007
New Revision: 7533

Modified:
   nemerle/trunk/Reg.cmd
   nemerle/trunk/lib/   (props changed)
   nemerle/trunk/tools/msbuild-task/Nemerle.MSBuild.targets

Modified: nemerle/trunk/Reg.cmd
==============================================================================
--- nemerle/trunk/Reg.cmd	(original)
+++ nemerle/trunk/Reg.cmd	Fri Mar 16 22:02:32 2007
@@ -3,10 +3,12 @@
 IF "%Type%"=="" set Type=Debug
 
 set NemerleBin=%~dp0bin\%Type%
+set NemerleRoot=%~dp0.
 set GacUtil="%VS80COMNTOOLS%..\..\SDK\v2.0\Bin\gacutil.exe"
 set NemerleInstall=%ProgramFiles%\Nemerle
 set NGen="%SystemRoot%\Microsoft.NET\Framework\v2.0.50727\ngen.exe"
 
+
 @echo NemerleInstall=%NemerleInstall%
 @echo VS80COMNTOOLS=%VS80COMNTOOLS%
 @echo GacUtil=%GacUtil%
@@ -47,15 +49,10 @@
 exit /b 1
 )
 
+copy /Y "%NemerleRoot%\tools\msbuild-task\Nemerle.MSBuild.targets" "%NemerleInstall%\*.*"
 copy /Y "%NemerleBin%\*.pdb" "%NemerleInstall%\*.pdb"
 copy /Y "%NemerleBin%\*.xml" "%NemerleInstall%\*.xml"
 
-%NGen% install "%NemerleInstall%\Nemerle.dll"
-%NGen% install "%NemerleInstall%\Nemerle.Compiler.dll"
-%NGen% install "%NemerleInstall%\Nemerle.Macros.dll"
-%NGen% install "%NemerleInstall%\Nemerle.MSBuild.Tasks.dll"
-%NGen% install "%NemerleInstall%\ncc.exe"
-
 cd "%~dp0"
 
 pause 

Modified: nemerle/trunk/tools/msbuild-task/Nemerle.MSBuild.targets
==============================================================================
--- nemerle/trunk/tools/msbuild-task/Nemerle.MSBuild.targets	(original)
+++ nemerle/trunk/tools/msbuild-task/Nemerle.MSBuild.targets	Fri Mar 16 22:02:32 2007
@@ -1,152 +1,14 @@
-
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-    <UsingTask
-      TaskName="Nemerle.Tools.MSBuildTask.Ncc" 
-      AssemblyFile="Nemerle.MSBuild.Tasks.dll"/>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+  <UsingTask TaskName="Nemerle.Tools.MSBuildTask.Ncc"
+             AssemblyFile="$(Nemerle)\Nemerle.MSBuild.Tasks.dll" />
 
     <PropertyGroup>
-        <MSBuildAllProjects>$(MSBuildAllProjects);Nemerle.MSBuild.targets</MSBuildAllProjects>
         <DefaultLanguageSourceExtension>.n</DefaultLanguageSourceExtension>
         <Language>Nemerle</Language>
     </PropertyGroup>
 
-    <!--
-    The CreateManifestResourceNames target create the manifest resource names
-	from the .RESX files.
-
-        [IN]
-        @(ResxWithNoCulture) - The names the non-culture .RESX files.
-        @(ResxWithCulture) - The names the culture .RESX files.
-        @(NonResxWithNoCulture) - The names of the non-culture non-RESX
-		                          files (like bitmaps, etc).
-								  
-        @(NonResxWithCulture) - The names of the culture non-RESX
-		                       files (like bitmaps, etc).
-
-        [OUT]
-        @(ManifestResourceWithNoCultureName) - The corresponding manifest
-		                                       resource name (.RESOURCE)
-											   
-        @(ManifestResourceWithCultureName) - The corresponding manifest
-		                                     resource name (.RESOURCE)
-											 
-        @(ManifestNonResxWithNoCulture) - The corresponding manifest
-		                                  resource name.
-										  
-        @(ManifestNonResxWithCulture) - The corresponding manifest
-		                               resource name.
-
-    For Nemerle applications the transformation is like:
-
-        Resources1.resx => RootNamespace.Resources1 => Build into main assembly
-        
-		SubFolder\Resources1.resx =>
-			RootNamespace.SubFolder.Resources1 =>
-				Build into main assembly
-        
-		Resources1.fr.resx =>
-			RootNamespace.Resources1.fr =>
-				Build into satellite assembly
-				
-        Resources1.notaculture.resx =>
-			RootNamespace.Resources1.notaculture =>
-				Build into main assembly
-
-    For other project systems, this transformation may be different.
-    -->
-	
-    <PropertyGroup>
-        <CreateManifestResourceNamesDependsOn>
-		</CreateManifestResourceNamesDependsOn>
-    </PropertyGroup>
-    <Target
-        Name="CreateManifestResourceNames"
-        Condition="'
-			@(ResxWithNoCulture)
-			@(ResxWithCulture)
-			@(NonResxWithNoCulture)
-			@(NonResxWithCulture)'!=''"
-			
-        DependsOnTargets="$(CreateManifestResourceNamesDependsOn)"
-        >
-
-        <!-- Create the target resource names for non-culture resx files.
-        <CreateNemerleManifestResourceName
-			Condition="'@(ResxWithNoCulture)'!=''"
-			ResourceFiles="@(ResxWithNoCulture)"
-			RootNamespace="$(RootNamespace)">
-			
-			<Output
-				TaskParameter="ManifestResourceNames"
-				ItemName="ManifestResourceWithNoCultureName"/>
-
-        </CreateCSharpManifestResourceName>--> 
-
-        <!-- Create the target resource names for culture resx files. 
-        <CreateCSharpManifestResourceName
-			Condition="'@(ResxWithCulture)'!=''"
-			ResourceFiles="@(ResxWithCulture)"
-			RootNamespace="$(RootNamespace)">
-
-            <Output
-				TaskParameter="ManifestResourceNames"
-				ItemName="ManifestResourceWithCultureName"/>
-
-        </CreateCSharpManifestResourceName>-->
-
-        <!--
-		Create the target resource names for non-culture non-resx files.
-	    
-        <CreateCSharpManifestResourceName
-			Condition="'@(NonResxWithNoCulture)'!=''"
-			ResourceFiles="@(NonResxWithNoCulture)"
-			RootNamespace="$(RootNamespace)">
-
-            <Output
-				TaskParameter="ManifestResourceNames"
-				ItemName="ManifestNonResxWithNoCulture"/>
-
-        </CreateCSharpManifestResourceName>-->
-
-        <!-- Create the target resource names for culture non-resx files. 
-        <CreateCSharpManifestResourceName
-			Condition="'@(NonResxWithCulture)'!=''"
-			ResourceFiles="@(NonResxWithCulture)"
-			RootNamespace="$(RootNamespace)">
-
-            <Output
-				TaskParameter="ManifestResourceNames"
-				ItemName="ManifestNonResxWithCulture"/>
-
-        </CreateCSharpManifestResourceName>-->
-    </Target>
-
-    <PropertyGroup>
-
-        <!-- "None" is not technically a valid DebugType, so we can't pass it in as such
-             to the compiler.  So here, we modify the properties so they make sense. -->
-        <DebugSymbols Condition=" '$(DebugType)' == 'none' ">false</DebugSymbols>
-        <DebugType    Condition=" '$(DebugType)' == 'none' "></DebugType>    
-
-        <_DisabledWarnings>$(NoWarn)</_DisabledWarnings>
-        
-        <!-- Provide a facility to override UseHostCompilerIfAvailable-->
-        <UseHostCompilerIfAvailable Condition=" '$(UseHostCompilerIfAvailable)' == ''">true</UseHostCompilerIfAvailable>
-
-    </PropertyGroup>
-
-
-    <ItemGroup>
-        <DocFileItem Include="$(DocumentationFile)" Condition="'$(DocumentationFile)'!=''"/>
-    </ItemGroup>
-
-    <PropertyGroup>
-        <CoreCompileDependsOn>_ComputeNonExistentFileProperty</CoreCompileDependsOn>
-    </PropertyGroup>
-    <Target
-        Name="CoreCompile"
+  <Target Name="CoreCompile"
         Inputs="$(MSBuildAllProjects);
                 @(Compile);
                 @(ManifestResourceWithNoCulture);
@@ -164,6 +26,13 @@
         DependsOnTargets="$(CoreCompileDependsOn)"
     >
        
+          <!--
+          <Message Importance="High" Text="$(Nemerle)" />
+          <Exec 
+            Command = "dir /w"
+          />
+          -->
+        
         <Ncc
               AdditionalLibPaths="$(AdditionalLibPaths)"
               DefineConstants="$(DefineConstants)"
@@ -187,33 +56,14 @@
               WarningLevel="$(WarningLevel)"
               WarningsAsErrors="$(WarningsAsErrors)"
               />
+  </Target>
 
+  <Target 
+    Name="_ComputeNonExistentFileProperty"
+  >
+    <!-- The maniacs from VS team run this task for unconditional build project.
+              I do not understand what for it is done. So I cancel this action. If that comment this ефыл.
+     -->
     </Target>
     
-    <Import Project="$(MSBuildBinPath)\Microsoft.Common.targets" />
 </Project>
-
-<!--
-              AddModules="@(AddModules)"
-              AllowUnsafeBlocks="$(AllowUnsafeBlocks)"
-              BaseAddress="$(BaseAddress)"
-              CheckForOverflowUnderflow="$(CheckForOverflowUnderflow)"
-              CodePage="$(CodePage)"
-              DebugType="$(DebugType)"
-              DelaySign="$(DelaySign)"
-              ErrorReport="$(ErrorReport)"
-              FileAlignment="$(FileAlignment)"
-              GenerateFullPaths="$(GenerateFullPaths)"
-              KeyContainer="$(KeyContainerName)"
-              LangVersion="$(LangVersion)"
-              MainEntryPoint="$(StartupObject)"
-              ModuleAssemblyName="$(ModuleAssemblyName)"
-              NoConfig="true"
-              PdbFile="$(PdbFile)" 
-              Platform="$(PlatformTarget)"
-              UseHostCompilerIfAvailable="$(UseHostCompilerIfAvailable)"
-              Utf8Output="$(Utf8Output)"
-              WarningsNotAsErrors="$(WarningsNotAsErrors)"
-              Win32Icon="$(ApplicationIcon)"
-              Win32Resource="$(Win32Resource)"
--->
\ No newline at end of file



More information about the svn mailing list