[svn] r6669: vs-plugin/trunk/Setup: Integration.wxs Product.wxs
Variables.wxi buildSetup.bat
Nuald
svnadmin at nemerle.org
Wed Sep 20 08:22:20 CEST 2006
Log:
Fixed setup project to compile (builded setup project works only with installed VS SDK).
Author: Nuald
Date: Wed Sep 20 08:21:57 2006
New Revision: 6669
Modified:
vs-plugin/trunk/Setup/Integration.wxs
vs-plugin/trunk/Setup/Product.wxs
vs-plugin/trunk/Setup/Variables.wxi
vs-plugin/trunk/Setup/buildSetup.bat
Modified: vs-plugin/trunk/Setup/Integration.wxs
==============================================================================
--- vs-plugin/trunk/Setup/Integration.wxs (original)
+++ vs-plugin/trunk/Setup/Integration.wxs Wed Sep 20 08:21:57 2006
@@ -18,49 +18,61 @@
<Fragment>
<ComponentGroup Id="CompGroup_Integration">
- <ComponentRef Id="Comp_Interfaces" />
+ <ComponentRef Id="Comp_01" />
+ <ComponentRef Id="Comp_02" />
+ <ComponentRef Id="Comp_03" />
<ComponentRef Id="Comp_LanguageService" />
<ComponentRef Id="Comp_Project" />
<ComponentRef Id="Comp_SnippetsIndex" />
<ComponentRef Id="Comp_Snippets" />
- <ComponentRef Id="Comp_MSBuild" />
- <ComponentRef Id="Comp_ProjectTemplates" />
- <ComponentRef Id="Comp_ItemTemplates" />
</ComponentGroup>
<DirectoryRef Id="INSTALLDIR">
- <Component Id="Comp_Interfaces" DiskId="1" Guid="$(var.Comp_Interfaces_Guid)">
- <File Id="File_NemerleInterfaces" Name="IPIFACES.DLL"
- LongName="NemerleInterfaces.dll" Source="$(var.IntegrationBinPath)\" />
+ <Component Id="Comp_01" DiskId="1" Guid="$(var.Comp_01_Guid)">
+ <File Id="File_01.dll" Name="FILE01.DLL"
+ LongName="Nemerle.Compiler.dll" Source="$(var.IntegrationBinPath)\" />
+ </Component>
+
+ <Component Id="Comp_02" DiskId="1" Guid="$(var.Comp_02_Guid)">
+ <File Id="File_02.dll" Name="FILE02.DLL"
+ LongName="Nemerle.dll" Source="$(var.IntegrationBinPath)\" />
+ </Component>
+
+ <Component Id="Comp_03" DiskId="1" Guid="$(var.Comp_03_Guid)">
+ <File Id="File_03.dll" Name="FILE03.DLL"
+ LongName="Nemerle.Macros.dll" Source="$(var.IntegrationBinPath)\" />
</Component>
<Component Id="Comp_LanguageService" DiskId="1" Guid="$(var.Comp_LanguageService_Guid)">
<File Id="File_LanguageService" Name="LANGSVC.DLL"
- LongName="Nemerle.LanguageService.dll" Source="$(var.IntegrationBinPath)\" />
+ LongName="Nemerle.Compiler.Utils.dll" Source="$(var.IntegrationBinPath)\" />
+ </Component>
- <Registry Root="HKLM" Key="Software\Microsoft\VisualStudio\8.0\Packages\{CF7296F1-47E5-4915-83A0-8C44961F098D}"
- Value="Microsoft.Samples.VisualStudio.NemerleLanguageService.NemerlePackage, Nemerle.LanguageService, Version=1.0.2255.34670, Culture=neutral, PublicKeyToken=$(var.PublicKeyToken)"
- Type="string"
- >
- <Registry Name="InprocServer32" Value="[SystemFolder]mscoree.dll" Type="string" />
- <Registry Name="Class"
- Value="Microsoft.Samples.VisualStudio.NemerleLanguageService.NemerlePackage"
- Type="string" />
- <Registry Name="CodeBase" Value="[#File_LanguageService]" Type="string" />
+ <Component Id="Comp_Project" DiskId="1" Guid="$(var.Comp_Project_Guid)">
+ <File Id="File_Project" Name="PROJECT.DLL" LongName="Nemerle.VsIntegration.dll"
+ Source="$(var.IntegrationBinPath)\" />
+
+ <Registry Root="HKLM" Key="Software\Microsoft\VisualStudio\8.0Exp\Languages\CodeExpansions\Nemerle" Value="{edcc3b79-0bad-11db-bc1a-00112fde8b61}" Type="string">
+ <Registry Name="DisplayName" Value="100" Type="string" />
+ <Registry Name="IndexPath" Value="D:\\Work\\Nemerle\\vs-plugin\\bin\\Release\\[$ComponentPath]\\CodeSnippets\\SnippetsIndex.xml" Type="string" />
+ <Registry Name="LangStringId" Value="nemerle" Type="string" />
+ <Registry Name="Package" Value="{cf7296f1-47e5-4915-83a0-8c44961f098d}" Type="string" />
+ <Registry Name="ShowRoots" Value="0" Type="integer" />
</Registry>
- <Registry Root="HKLM"
- Key="Software\Microsoft\VisualStudio\8.0\Languages\File Extensions\.n"
- Value="{DB1997E2-0364-4344-8E0C-F18C2FEF6CAA}" Type="string" />
+ <Registry Root="HKLM" Key="Software\Microsoft\VisualStudio\8.0Exp\Languages\CodeExpansions\Nemerle\ForceCreateDirs">
+ <Registry Name="Nemerle" Value="D:\\Work\\Nemerle\\vs-plugin\\bin\\Release\\[$ComponentPath]\\CodeSnippets\\Snippets\\;%MyDocs%\Code Snippets\Nemerle\My Code Snippets\" Type="string" />
+ </Registry>
- <Registry Root="HKLM"
- Key="Software\Microsoft\VisualStudio\8.0\Languages\Language Services\Nemerle"
- Value="{DB1997E2-0364-4344-8E0C-F18C2FEF6CAA}"
- Type="string"
- >
- <Registry Name="Package" Value="{CF7296F1-47E5-4915-83A0-8C44961F098D}"
- Type="string" />
+ <Registry Root="HKLM" Key="Software\Microsoft\VisualStudio\8.0Exp\Languages\CodeExpansions\Nemerle\Paths">
+ <Registry Name="Nemerle" Value="D:\\Work\\Nemerle\\vs-plugin\\bin\\Release\\[$ComponentPath]\\CodeSnippets\\Snippets\\;%MyDocs%\Code Snippets\Nemerle\My Code Snippets\" Type="string" />
+ </Registry>
+
+ <Registry Root="HKLM" Key="Software\Microsoft\VisualStudio\8.0Exp\Languages\File Extensions\.n" Value="{edcc3b79-0bad-11db-bc1a-00112fde8b61}" Type="string" />
+
+ <Registry Root="HKLM" Key="Software\Microsoft\VisualStudio\8.0Exp\Languages\Language Services\Nemerle" Value="{edcc3b79-0bad-11db-bc1a-00112fde8b61}" Type="string">
+ <Registry Name="Package" Value="{cf7296f1-47e5-4915-83a0-8c44961f098d}" Type="string" />
<Registry Name="LangResID" Value="100" Type="integer" />
<Registry Name="ShowMatchingBrace" Value="1" Type="integer" />
<Registry Name="CodeSense" Value="1" Type="integer" />
@@ -69,98 +81,77 @@
<Registry Name="ShowCompletion" Value="1" Type="integer" />
</Registry>
- <Registry Root="HKLM"
- Key="Software\Microsoft\VisualStudio\8.0\Services\{E6A9189C-43BB-4482-ACF2-F285F432EFF2}"
- Value="{CF7296F1-47E5-4915-83A0-8C44961F098D}" Type="string">
- <Registry Name="Name" Value="INemerleLibraryManager" Type="string" />
+ <Registry Root="HKLM" Key="Software\Microsoft\VisualStudio\8.0Exp\InstalledProducts\NemerlePackage">
+ <Registry Name="Package" Value="{cf7296f1-47e5-4915-83a0-8c44961f098d}" Type="string" />
+ <Registry Name="UseInterface" Value="1" Type="integer" />
</Registry>
- <Registry Root="HKLM"
- Key="Software\Microsoft\VisualStudio\8.0\Services\{DB1997E2-0364-4344-8E0C-F18C2FEF6CAA}"
- Value="{CF7296F1-47E5-4915-83A0-8C44961F098D}" Type="string">
- <Registry Name="Name" Value="Nemerle" Type="string" />
+ <Registry Root="HKLM" Key="Software\Microsoft\VisualStudio\8.0Exp\Packages\{cf7296f1-47e5-4915-83a0-8c44961f098d}" Value="Microsoft.Samples.VisualStudio.NemerleLanguageService.NemerlePackage, Nemerle.VsIntegration, Version=1.0.0.0, Culture=neutral, PublicKeyToken=c4c0f22444bf4088" Type="string">
+ <Registry Name="InprocServer32" Value="[SystemFolder]mscoree.dll" Type="string" />
+ <Registry Name="Class" Value="Microsoft.Samples.VisualStudio.NemerleLanguageService.NemerlePackage" Type="string" />
+ <Registry Name="Assembly" Value="Nemerle.VsIntegration, Version=1.0.0.0, Culture=neutral, PublicKeyToken=c4c0f22444bf4088" Type="string" />
+ <Registry Name="ID" Value="104" Type="integer" />
+ <Registry Name="MinEdition" Value="standard" Type="string" />
+ <Registry Name="ProductVersion" Value="1.0" Type="string" />
+ <Registry Name="ProductName" Value="Nemerle VS Integration" Type="string" />
+ <Registry Name="CompanyName" />
</Registry>
- </Component>
- <Component Id="Comp_Project" DiskId="1" Guid="$(var.Comp_Project_Guid)">
- <File Id="File_Project" Name="PROJECT.DLL" LongName="NemerleProject.dll"
- Source="$(var.IntegrationBinPath)\" />
+ <Registry Root="HKLM" Key="Software\Microsoft\VisualStudio\8.0Exp\Editors\{edcc3b7f-0bad-11db-bc1a-00112fde8b61}">
+ <Registry Name="Package" Value="{cf7296f1-47e5-4915-83a0-8c44961f098d}" Type="string" />
+ </Registry>
- <Registry Root="HKLM"
- Key="Software\Microsoft\VisualStudio\8.0\Packages\{FBA89739-12DE-4598-9374-DF0082489563}"
- Value="Nemerle.VsIntegration.Project.NemerleProjectPackage, NemerleProject, Version=8.0.2255.34716, Culture=neutral, PublicKeyToken=$(var.PublicKeyToken)" Type="string">
- <Registry Name="InprocServer32" Value="[SystemFolder]mscoree.dll" Type="string" />
- <Registry Name="Class"
- Value="Nemerle.VsIntegration.Project.NemerleProjectPackage"
- Type="string" />
- <Registry Name="CodeBase" Value="[#File_Project]" Type="string" />
+ <Registry Root="HKLM" Key="Software\Microsoft\VisualStudio\8.0Exp\Editors\{edcc3b7f-0bad-11db-bc1a-00112fde8b61}\Extensions">
+ <Registry Name="n" Value="32" Type="integer" />
</Registry>
- <Registry Root="HKLM"
- Key="Software\Microsoft\VisualStudio\8.0\Editors\{f26a6ee9-3ce6-4885-b62d-382f4dd3a50e}"
- Name="Package"
- Value="{FBA89739-12DE-4598-9374-DF0082489563}"
- Type="string">
- <Registry Key="Extensions" Name="py" Value="32" Type="integer" />
- <Registry Key="LogicalViews" Name="{7651a701-06e5-11d1-8ebd-00a0c90f26ea}" Type="string" />
+ <Registry Root="HKLM" Key="Software\Microsoft\VisualStudio\8.0Exp\Editors\{edcc3b7f-0bad-11db-bc1a-00112fde8b61}\LogicalViews">
+ <Registry Name="{edcc3b84-0bad-11db-bc1a-00112fde8b61}" />
</Registry>
- <Registry Root="HKLM"
- Key="Software\Microsoft\VisualStudio\8.0\Menus"
- Name="{FBA89739-12DE-4598-9374-DF0082489563}"
- Value=", 1000, 1"
- Type="string" />
+ <Registry Root="HKLM" Key="Software\Microsoft\VisualStudio\8.0Exp\Menus">
+ <Registry Name="{cf7296f1-47e5-4915-83a0-8c44961f098d}" Value=", 1000, 1" Type="string" />
+ </Registry>
- <Registry Root="HKLM"
- Key="Software\Microsoft\VisualStudio\8.0\CLSID\{b7406511-3c20-407a-abf8-03965e5025eb}"
- Value="Nemerle.VsIntegration.Project.GeneralPropertyPage" Type="string">
+ <Registry Root="HKLM" Key="Software\Microsoft\VisualStudio\8.0Exp\CLSID\{edcc3b88-0bad-11db-bc1a-00112fde8b61}" Value="Nemerle.VsIntegration.Project.GeneralPropertyPage" Type="string">
<Registry Name="InprocServer32" Value="[SystemFolder]mscoree.dll" Type="string" />
- <Registry Name="Class"
- Value="Nemerle.VsIntegration.Project.GeneralPropertyPage"
- Type="string" />
- <Registry Name="CodeBase" Value="[#File_Project]" Type="string" />
+ <Registry Name="Class" Value="Nemerle.VsIntegration.Project.GeneralPropertyPage" Type="string" />
+ <Registry Name="Assembly" Value="Nemerle.VsIntegration, Version=1.0.0.0, Culture=neutral, PublicKeyToken=c4c0f22444bf4088" Type="string" />
<Registry Name="ThreadingModel" Value="Both" Type="string" />
</Registry>
- <Registry Root="HKLM"
- Key="Software\Microsoft\VisualStudio\8.0\CLSID\{87ec20f2-2c4b-488c-91ae-76826e660cf0}"
- Value="Nemerle.VsIntegration.Project.NemerleBuildPropertyPage"
- Type="string"
- >
-
+ <Registry Root="HKLM" Key="Software\Microsoft\VisualStudio\8.0Exp\CLSID\{edcc3b7e-0bad-11db-bc1a-00112fde8b61}" Value="Nemerle.VsIntegration.Project.NemerleBuildPropertyPage" Type="string">
<Registry Name="InprocServer32" Value="[SystemFolder]mscoree.dll" Type="string" />
- <Registry Name="Class"
- Value="Nemerle.VsIntegration.Project.NemerleBuildPropertyPage"
- Type="string" />
-
- <Registry Name="CodeBase" Value="[#File_Project]" Type="string" />
+ <Registry Name="Class" Value="Nemerle.VsIntegration.Project.NemerleBuildPropertyPage" Type="string" />
+ <Registry Name="Assembly" Value="Nemerle.VsIntegration, Version=1.0.0.0, Culture=neutral, PublicKeyToken=c4c0f22444bf4088" Type="string" />
<Registry Name="ThreadingModel" Value="Both" Type="string" />
</Registry>
- <Registry Root="HKLM"
- Key="Software\Microsoft\VisualStudio\8.0\Projects\{af48b115-53db-4e4f-a04c-cf2b83c29ee3}"
- Value="NemerleProjectFactory" Type="string">
- <Registry Name="DisplayName" Value="NemerleProject" Type="string" />
- <Registry Name="DisplayProjectFileExtensions"
- Value="Nemerle Project Project Files (*.nproj);*.nproj"
- Type="string" />
- <Registry Name="Package"
- Value="{FBA89739-12DE-4598-9374-DF0082489563}"
- Type="string" />
+ <Registry Root="HKLM" Key="Software\Microsoft\VisualStudio\8.0Exp\Projects\{edcc3b85-0bad-11db-bc1a-00112fde8b61}" Value="NemerleProjectFactory" Type="string">
+ <Registry Name="DisplayName" Value="Nemerle" Type="string" />
+ <Registry Name="DisplayProjectFileExtensions" Value="Nemerle Project Project Files (*.nproj);*.nproj" Type="string" />
+ <Registry Name="Package" Value="{cf7296f1-47e5-4915-83a0-8c44961f098d}" Type="string" />
<Registry Name="DefaultProjectExtension" Value="nproj" Type="string" />
<Registry Name="PossibleProjectExtensions" Value="nproj" Type="string" />
- <Registry Name="ProjectTemplatesDir" Value="\NullPath" Type="string" />
+ <Registry Name="ProjectTemplatesDir" Value="[$ComponentPath]\.\NullPath" Type="string" />
<Registry Name="Language(VsTemplate)" Value="Nemerle" Type="string" />
</Registry>
- <Registry Root="HKLM"
- Key="Software\Microsoft\VisualStudio\8.0\NewProjectTemplates\TemplateDirs\{FBA89739-12DE-4598-9374-DF0082489563}\/1"
- Value="NemerleProject"
- Type="string">
+ <Registry Root="HKLM" Key="Software\Microsoft\VisualStudio\8.0Exp\NewProjectTemplates\TemplateDirs\{cf7296f1-47e5-4915-83a0-8c44961f098d}\/1" Value="Nemerle" Type="string">
<Registry Name="SortPriority" Value="100" Type="integer" />
- <Registry Name="TemplatesDir" Value="\NullPath" Type="string" />
+ <Registry Name="TemplatesDir" Value="[$ComponentPath]\.\NullPath" Type="string" />
+ </Registry>
+
+ <Registry Root="HKLM" Key="Software\Microsoft\VisualStudio\8.0Exp\Services\{edcc3b7b-0bad-11db-bc1a-00112fde8b61}" Value="{cf7296f1-47e5-4915-83a0-8c44961f098d}" Type="string">
+ <Registry Name="Name" Value="INemerleLibraryManager" Type="string" />
+ </Registry>
+
+ <Registry Root="HKLM" Key="Software\Microsoft\VisualStudio\8.0Exp\Services\{edcc3b79-0bad-11db-bc1a-00112fde8b61}" Value="{cf7296f1-47e5-4915-83a0-8c44961f098d}" Type="string">
+ <Registry Name="Name" Value="Nemerle" Type="string" />
</Registry>
</Component>
+
+
</DirectoryRef>
<DirectoryRef Id="Dir_SnippetsIndex">
@@ -199,65 +190,11 @@
<Component Id="Comp_Snippets" DiskId="1" Guid="$(var.Comp_Snippets_Guid)">
<File Id="File_SnippetClass" Name="CLASS.SNP" LongName="class.snippet" />
<File Id="File_SnippetCtor" Name="CTOR.SNP" LongName="ctor.snippet" />
- <File Id="File_SnippetElse" Name="ELSE.SNP" LongName="else.snippet" />
<File Id="File_SnippetFor" Name="FOR.SNP" LongName="for.snippet" />
<File Id="File_SnippetIf" Name="IF.SNP" LongName="if.snippet" />
<File Id="File_SnippetWhile" Name="WHILE.SNP" LongName="while.snippet" />
</Component>
</DirectoryRef>
- <DirectoryRef Id="Dir_ProjectTemplatesRoot">
- <Directory Id="Dir_ProjectTemplates"
- Name="NEMERLE"
- LongName="Nemerle"
- src="$(var.ProjectTemplatesZipPath)"
- >
- <Component Id="Comp_ProjectTemplates"
- DiskId="1"
- Guid="$(var.Comp_ProjectTemplates_Guid)"
- >
- <File Id="File_ClassLibrary.zip"
- Name="CLASSLIB.ZIP"
- LongName="ClassLibrary.zip" />
- <File Id="File_WinformApp.zip"
- Name="WINFORM.ZIP"
- LongName="WinformApp.zip" />
- </Component>
- </Directory>
- </DirectoryRef>
-
- <DirectoryRef Id="Dir_ItemTemplatesRoot">
- <Directory Id="Dir_ItemTemplates"
- Name="NEMERLE"
- LongName="Nemerle"
- src="$(var.ItemTemplatesZipPath)"
- >
- <Component Id="Comp_ItemTemplates"
- DiskId="1"
- Guid="$(var.Comp_ItemTemplates_Guid)">
- <File Id="File_Class.zip" Name="Class.zip" />
- <File Id="File_Form.zip" Name="Form.zip" />
- <File Id="File_ResX.zip" Name="ResX.zip" />
- <File Id="File_Text.zip" Name="Text.zip" />
- </Component>
- </Directory>
- </DirectoryRef>
-
- <DirectoryRef Id="ProgramFilesFolder">
- <Directory Id="Dir_MSBuild" Name="MSBuild">
- <Directory Id="Dir_MSBuildMS" Name="MSFT" LongName="Microsoft">
- <Directory Id="Dir_MSBuildMSNemerle" Name="NEMERLE" LongName="Nemerle">
- <Directory Id="Dir_MSBuildMSNemerle10" Name="1.0">
- <Component Id="Comp_MSBuild" DiskId="1" Guid="$(var.Comp_MSBuild_Guid)">
- <File Id="File_Targets" Name="TARGETS" LongName="Nemerle.MSBuild.targets" src="..\Project\MSBuild\" />
- <File Id="File_Tasks" Name="TASKS"
- LongName="Nemerle.MSBuild.Tasks.dll"
- src="..\Project\MSBuild\" />
- </Component>
- </Directory>
- </Directory>
- </Directory>
- </Directory>
- </DirectoryRef>
</Fragment>
</Wix>
\ No newline at end of file
Modified: vs-plugin/trunk/Setup/Product.wxs
==============================================================================
--- vs-plugin/trunk/Setup/Product.wxs (original)
+++ vs-plugin/trunk/Setup/Product.wxs Wed Sep 20 08:21:57 2006
@@ -55,7 +55,6 @@
<!-- Root feature -->
<Feature Id="Feature_VSIIP" ConfigurableDirectory="INSTALLDIR" Absent="disallow" AllowAdvertise="no" Display="hidden" Level="1" Title="Nemerle Integration">
- <ComponentGroupRef Id="CompGroup_NemerleBinaries" />
<ComponentGroupRef Id="CompGroup_Integration" />
</Feature>
@@ -75,6 +74,6 @@
</InstallUISequence>
<!-- User interface -->
- <UIRef Id="WixUI" />
+ <UIRef Id="WixUI_Minimal" />
</Product>
</Wix>
\ No newline at end of file
Modified: vs-plugin/trunk/Setup/Variables.wxi
==============================================================================
--- vs-plugin/trunk/Setup/Variables.wxi (original)
+++ vs-plugin/trunk/Setup/Variables.wxi Wed Sep 20 08:21:57 2006
@@ -12,6 +12,9 @@
<!-- GUIDs for the components -->
<?define Comp_ConsoleWindow_Guid=8C08835C-16DC-4E7B-9409-E1A477988E0A?>
+ <?define Comp_01_Guid=8C08835C-16DC-4E7B-9409-E1A477988E01?>
+ <?define Comp_02_Guid=8C08835C-16DC-4E7B-9409-E1A477988E02?>
+ <?define Comp_03_Guid=8C08835C-16DC-4E7B-9409-E1A477988E03?>
<?define Comp_Interfaces_Guid=AA312924-12D5-4609-A133-D4C705084723?>
<?define Comp_LanguageService_Guid=ABC61C91-40C2-4678-8EDD-DF1B0C2C310D?>
<?define Comp_Project_Guid=273F3FB6-A1FE-4C6E-BEA4-F1311C3DE0A9?>
@@ -26,7 +29,7 @@
<!-- Relative path of the folder with the binaries -->
<?define IntegrationBinPath=..\Bin\Release?>
- <?define SnippetsSources=..\LanguageService\CodeSnippets?>
+ <?define SnippetsSources=..\Bin\Release\CodeSnippets?>
<?define ProjectTemplatesZipPath=..\Project\obj\Release?>
<?define ItemTemplatesZipPath=..\Project\obj\Release?>
</Include>
Modified: vs-plugin/trunk/Setup/buildSetup.bat
==============================================================================
--- vs-plugin/trunk/Setup/buildSetup.bat (original)
+++ vs-plugin/trunk/Setup/buildSetup.bat Wed Sep 20 08:21:57 2006
@@ -9,4 +9,4 @@
Set VariablesFile=%~dp0Variables.wxi
%WIXDIR%\candle.exe -dVariablesFile="%VariablesFile%" Integration.wxs NemerleBinaries.wxs Product.wxs
-%WIXDIR%\light.exe Integration.wixobj NemerleBinaries.wixobj Product.wixobj %WIXDIR%\lib\wixui_minimal.wixlib -out VSIIP.msi -loc %WIXDIR%\lib\WixUI_en-us.wxl
+%WIXDIR%\light.exe Integration.wixobj Product.wixobj %WIXDIR%\wixui.wixlib -out VSIIP.msi -loc %WIXDIR%\WixUI_en-us.wxl
More information about the svn
mailing list