Menu
▾
▴
SF.net SVN: orm: [1155] trunk/Setup
|
From: <mcu...@us...> - 2007-10-15 06:36:27
|
Revision: 1155
http://orm.svn.sourceforge.net/orm/?rev=1155&view=rev
Author: mcurland
Date: 2007-10-14 23:36:31 -0700 (Sun, 14 Oct 2007)
Log Message:
-----------
Added DatabaseImport files to setup. refs #305
Modified Paths:
--------------
trunk/Setup/ComponentGroups.wxs
trunk/Setup/Components.wxs
trunk/Setup/Features.wxs
trunk/Setup/Strings.wxl
Modified: trunk/Setup/ComponentGroups.wxs
===================================================================
--- trunk/Setup/ComponentGroups.wxs 2007-10-15 06:35:07 UTC (rev 1154)
+++ trunk/Setup/ComponentGroups.wxs 2007-10-15 06:36:31 UTC (rev 1155)
@@ -58,6 +58,18 @@
<ComponentRef Id="ORMSchemasLocalCatalogComponent"/>
<ComponentRef Id="ORMTransformsComponent"/>
</ComponentGroup>
+ <ComponentGroup Id="DatabaseImportFeatureComponents">
+ <ComponentRef Id="NORMADBImportComponent"/>
+ <ComponentRef Id="NORMADBImportGACComponent"/>
+ <ComponentRef Id="NORMADBImportProjectItemsGeneralComponent"/>
+ <ComponentRef Id="NORMADBImportProjectItemsVBasicComponent"/>
+ <ComponentRef Id="NORMADBImportProjectItemsVCSharpComponent"/>
+ <ComponentRef Id="NORMADBImportProjectItemsVJSharpComponent"/>
+ <ComponentRef Id="NORMADBImportProjectItemsVCPlusPlusComponent"/>
+ <ComponentRef Id="NORMADBImportProjectItemsVWebDevVBasicComponent"/>
+ <ComponentRef Id="NORMADBImportProjectItemsVWebDevCSharpComponent"/>
+ <ComponentRef Id="NORMADBImportProjectItemsVWebDevJSharpComponent"/>
+ </ComponentGroup>
<ComponentGroup Id="HelpFeatureComponents">
<ComponentRef Id="NORMAVSHelpComponent"/>
</ComponentGroup>
Modified: trunk/Setup/Components.wxs
===================================================================
--- trunk/Setup/Components.wxs 2007-10-15 06:35:07 UTC (rev 1154)
+++ trunk/Setup/Components.wxs 2007-10-15 06:36:31 UTC (rev 1155)
@@ -43,6 +43,10 @@
<File Id="Neumont.Tools.ORMAbstractionToConceptualDatabaseBridge.dll_GAC" ShortName="CDBBr.dll" Name="Neumont.Tools.ORMAbstractionToConceptualDatabaseBridge.dll" Source="..\RelationalModel\OialDcilBridge\bin\$(var.BuildConfiguration)\Neumont.Tools.ORMAbstractionToConceptualDatabaseBridge.dll"
DefaultVersion="$(var.ProductVersion)" DefaultLanguage="0" KeyPath="yes" Assembly=".net" AssemblyManifest="Neumont.Tools.ORMAbstractionToConceptualDatabaseBridge.dll_GAC" ProcessorArchitecture="msil"/>
</Component>
+ <Component Id="NORMADBImportGACComponent" Guid="029817D9-6779-4801-$(var.VersionGuidSuffix)" DiskId="1" Win64="$(var.Win64)">
+ <File Id="Neumont.Tools.ORM.DatabaseImport.dll_GAC" ShortName="DBImport.dll" Name="Neumont.Tools.ORM.DatabaseImport.dll" Source="..\Tools\DatabaseImport\bin\$(var.BuildConfiguration)\Neumont.Tools.ORM.DatabaseImport.dll"
+ DefaultVersion="$(var.ProductVersion)" DefaultLanguage="0" KeyPath="yes" Assembly=".net" AssemblyManifest="Neumont.Tools.ORM.DatabaseImport.dll_GAC" ProcessorArchitecture="msil"/>
+ </Component>
</Directory>
<Directory Id="$(var.ProgramFilesFolder)">
@@ -126,6 +130,10 @@
</RegistryKey>
</RegistryKey>
</Component>
+ <Component Id="NORMADBImportComponent" Guid="0B49C0D1-EB3A-4E6E-$(var.VersionGuidSuffix)" DiskId="1" Win64="$(var.Win64)">
+ <File Id="Neumont.Tools.ORM.DatabaseImport.dll" ShortName="DBImport.dll" Name="Neumont.Tools.ORM.DatabaseImport.dll" Source="..\Tools\DatabaseImport\bin\$(var.BuildConfiguration)\Neumont.Tools.ORM.DatabaseImport.dll"
+ DefaultVersion="$(var.ProductVersion)" DefaultLanguage="0" KeyPath="yes" Assembly=".net" AssemblyManifest="Neumont.Tools.ORM.DatabaseImport.dll" ProcessorArchitecture="msil" AssemblyApplication="Neumont.Tools.ORM.DatabaseImport.dll"/>
+ </Component>
<Component Id="ORMCustomToolVBasicComponent" Guid="0B8DF8D8-7418-47F3-$(var.VersionGuidSuffix)" DiskId="1" Win64="$(var.Win64)">
<CreateFolder/>
<Condition>VBASICPACKAGEGUID OR Installed</Condition>
@@ -930,6 +938,10 @@
<File Id="General.zip" Name="ORMModel.zip" Source="..\ORMModel\Shell\ProjectItems\General.zip"
DefaultLanguage="0" CompanionFile="Neumont.Tools.ORM.dll"/>
</Component>
+ <Component Id="NORMADBImportProjectItemsGeneralComponent" Guid="1890A3E6-8C17-478C-$(var.VersionGuidSuffix)" DiskId="1" Win64="$(var.Win64)" KeyPath="yes">
+ <File Id="DBImportGeneral.zip" Name="ORMModelFromDatabase.zip" ShortName="DBImpGen.zip" Source="..\Tools\DatabaseImport\ProjectItems\General.zip"
+ DefaultLanguage="0" CompanionFile="Neumont.Tools.ORM.DatabaseImport.dll"/>
+ </Component>
</Directory>
<Directory Id="VisualBasic" ShortName="VBasic" Name="VisualBasic">
<Component Id="NORMAVSProjectItemsVBasicComponent" Guid="5D140A94-9C4A-4B60-$(var.VersionGuidSuffix)" DiskId="1" Win64="$(var.Win64)" KeyPath="yes">
@@ -937,6 +949,11 @@
<File Id="VisualBasic.zip" Name="ORMModel.zip" Source="..\ORMModel\Shell\ProjectItems\VisualBasic.zip"
DefaultLanguage="0" CompanionFile="Neumont.Tools.ORM.dll"/>
</Component>
+ <Component Id="NORMADBImportProjectItemsVBasicComponent" Guid="8C45B394-60D1-433C-$(var.VersionGuidSuffix)" DiskId="1" Win64="$(var.Win64)" KeyPath="yes">
+ <Condition>VBASICPACKAGEGUID OR Installed</Condition>
+ <File Id="DBImportVisualBasic.zip" Name="ORMModelFromDatabase.zip" ShortName="DBImpVB.zip" Source="..\Tools\DatabaseImport\ProjectItems\VisualBasic.zip"
+ DefaultLanguage="0" CompanionFile="Neumont.Tools.ORM.DatabaseImport.dll"/>
+ </Component>
</Directory>
<Directory Id="CSharp" Name="CSharp">
<Component Id="NORMAVSProjectItemsVCSharpComponent" Guid="C1AAAF79-FA94-45C0-$(var.VersionGuidSuffix)" DiskId="1" Win64="$(var.Win64)" KeyPath="yes">
@@ -944,6 +961,11 @@
<File Id="CSharp.zip" Name="ORMModel.zip" Source="..\ORMModel\Shell\ProjectItems\CSharp.zip"
DefaultLanguage="0" CompanionFile="Neumont.Tools.ORM.dll"/>
</Component>
+ <Component Id="NORMADBImportProjectItemsVCSharpComponent" Guid="08F0D621-59B8-46D1-$(var.VersionGuidSuffix)" DiskId="1" Win64="$(var.Win64)" KeyPath="yes">
+ <Condition>VCSHARPPACKAGEGUID OR Installed</Condition>
+ <File Id="DBImportCSharp.zip" Name="ORMModelFromDatabase.zip" ShortName="DBImpCS.zip" Source="..\Tools\DatabaseImport\ProjectItems\CSharp.zip"
+ DefaultLanguage="0" CompanionFile="Neumont.Tools.ORM.DatabaseImport.dll"/>
+ </Component>
</Directory>
<Directory Id="JSharp" Name="JSharp">
<Component Id="NORMAVSProjectItemsVJSharpComponent" Guid="B6ACBD38-3FAD-4C24-$(var.VersionGuidSuffix)" DiskId="1" Win64="$(var.Win64)" KeyPath="yes">
@@ -951,6 +973,11 @@
<File Id="JSharp.zip" Name="ORMModel.zip" Source="..\ORMModel\Shell\ProjectItems\JSharp.zip"
DefaultLanguage="0" CompanionFile="Neumont.Tools.ORM.dll"/>
</Component>
+ <Component Id="NORMADBImportProjectItemsVJSharpComponent" Guid="B6711598-65C5-4E23-$(var.VersionGuidSuffix)" DiskId="1" Win64="$(var.Win64)" KeyPath="yes">
+ <Condition>VJSHARPPACKAGEGUID OR Installed</Condition>
+ <File Id="DBImportJSharp.zip" Name="ORMModelFromDatabase.zip" ShortName="DBImpJS.zip" Source="..\Tools\DatabaseImport\ProjectItems\JSharp.zip"
+ DefaultLanguage="0" CompanionFile="Neumont.Tools.ORM.DatabaseImport.dll"/>
+ </Component>
</Directory>
<Directory Id="VisualC" Name="VisualC">
<Component Id="NORMAVSProjectItemsVCPlusPlusComponent" Guid="16B28893-FE72-4BBF-$(var.VersionGuidSuffix)" DiskId="1" Win64="$(var.Win64)" KeyPath="yes">
@@ -958,6 +985,11 @@
<File Id="VisualC.zip" Name="ORMModel.zip" Source="..\ORMModel\Shell\ProjectItems\VisualC.zip"
DefaultLanguage="0" CompanionFile="Neumont.Tools.ORM.dll"/>
</Component>
+ <Component Id="NORMADBImportProjectItemsVCPlusPlusComponent" Guid="5BC18298-68CE-46F2-$(var.VersionGuidSuffix)" DiskId="1" Win64="$(var.Win64)" KeyPath="yes">
+ <Condition>VCPLUSPLUSPACKAGEGUID OR Installed</Condition>
+ <File Id="DBImportVisualC.zip" Name="ORMModelFromDatabase.zip" ShortName="DBImpVC.zip" Source="..\Tools\DatabaseImport\ProjectItems\VisualC.zip"
+ DefaultLanguage="0" CompanionFile="Neumont.Tools.ORM.DatabaseImport.dll"/>
+ </Component>
</Directory>
<Directory Id="Web" Name="Web">
<Directory Id="WebVisualBasic" ShortName="VBasic" Name="VisualBasic">
@@ -966,6 +998,11 @@
<File Id="WebVisualBasic.zip" Name="ORMModel.zip" Source="..\ORMModel\Shell\ProjectItems\Web\VisualBasic.zip"
DefaultLanguage="0" CompanionFile="Neumont.Tools.ORM.dll"/>
</Component>
+ <Component Id="NORMADBImportProjectItemsVWebDevVBasicComponent" Guid="34C69005-11CA-4F9E-$(var.VersionGuidSuffix)" DiskId="1" Win64="$(var.Win64)" KeyPath="yes">
+ <Condition>VWEBDEVPACKAGEGUID OR Installed</Condition>
+ <File Id="DBImportWebVisualBasic.zip" Name="ORMModelFromDatabase.zip" ShortName="DBImpWVB.zip" Source="..\Tools\DatabaseImport\ProjectItems\Web\VisualBasic.zip"
+ DefaultLanguage="0" CompanionFile="Neumont.Tools.ORM.DatabaseImport.dll"/>
+ </Component>
</Directory>
<Directory Id="WebCSharp" Name="CSharp">
<Component Id="NORMAVSProjectItemsVWebDevCSharpComponent" Guid="7E4BA3AB-3831-4520-$(var.VersionGuidSuffix)" DiskId="1" Win64="$(var.Win64)" KeyPath="yes">
@@ -973,6 +1010,11 @@
<File Id="WebCSharp.zip" Name="ORMModel.zip" Source="..\ORMModel\Shell\ProjectItems\Web\CSharp.zip"
DefaultLanguage="0" CompanionFile="Neumont.Tools.ORM.dll"/>
</Component>
+ <Component Id="NORMADBImportProjectItemsVWebDevCSharpComponent" Guid="46832808-DF7F-43B1-$(var.VersionGuidSuffix)" DiskId="1" Win64="$(var.Win64)" KeyPath="yes">
+ <Condition>VWEBDEVPACKAGEGUID OR Installed</Condition>
+ <File Id="DBImportWebCSharp.zip" Name="ORMModelFromDatabase.zip" ShortName="DBImpWCS.zip" Source="..\Tools\DatabaseImport\ProjectItems\Web\CSharp.zip"
+ DefaultLanguage="0" CompanionFile="Neumont.Tools.ORM.DatabaseImport.dll"/>
+ </Component>
</Directory>
<Directory Id="WebJSharp" Name="JSharp">
<Component Id="NORMAVSProjectItemsVWebDevJSharpComponent" Guid="E68504E4-D956-4A87-$(var.VersionGuidSuffix)" DiskId="1" Win64="$(var.Win64)" KeyPath="yes">
@@ -980,6 +1022,11 @@
<File Id="WebJSharp.zip" Name="ORMModel.zip" Source="..\ORMModel\Shell\ProjectItems\Web\JSharp.zip"
DefaultLanguage="0" CompanionFile="Neumont.Tools.ORM.dll"/>
</Component>
+ <Component Id="NORMADBImportProjectItemsVWebDevJSharpComponent" Guid="4AC8EFAD-DCE3-4509-$(var.VersionGuidSuffix)" DiskId="1" Win64="$(var.Win64)" KeyPath="yes">
+ <Condition>VWEBDEVPACKAGEGUID OR Installed</Condition>
+ <File Id="DBImportWebJSharp.zip" Name="ORMModelFromDatabase.zip" ShortName="DBImpWJS.zip" Source="..\Tools\DatabaseImport\ProjectItems\Web\JSharp.zip"
+ DefaultLanguage="0" CompanionFile="Neumont.Tools.ORM.DatabaseImport.dll"/>
+ </Component>
</Directory>
</Directory>
</Directory>
Modified: trunk/Setup/Features.wxs
===================================================================
--- trunk/Setup/Features.wxs 2007-10-15 06:35:07 UTC (rev 1154)
+++ trunk/Setup/Features.wxs 2007-10-15 06:36:31 UTC (rev 1155)
@@ -25,6 +25,11 @@
<ComponentGroupRef Id="HelpFeatureComponents"/>
</Feature>
+ <Feature Id="DatabaseImportFeature" Title="!(loc.DatabaseImportFeatureTitle)" Description="!(loc.DatabaseImportFeatureDescription)"
+ Level="1" TypicalDefault="install" InstallDefault="followParent" AllowAdvertise="no">
+ <ComponentGroupRef Id="DatabaseImportFeatureComponents"/>
+ </Feature>
+
<Feature Id="GenerationFeature" Title="!(loc.GenerationFeatureTitle)" Description="!(loc.GenerationFeatureDescription)"
Level="1" TypicalDefault="install" InstallDefault="followParent" AllowAdvertise="no">
<ComponentGroupRef Id="GenerationFeatureComponents"/>
Modified: trunk/Setup/Strings.wxl
===================================================================
--- trunk/Setup/Strings.wxl 2007-10-15 06:35:07 UTC (rev 1154)
+++ trunk/Setup/Strings.wxl 2007-10-15 06:36:31 UTC (rev 1155)
@@ -21,6 +21,8 @@
<String Id="MainFeatureDescription">Neumont ORM Architect for Visual Studio. Includes the Visual Studio Package.</String>
<String Id="HelpFeatureTitle">Help</String>
<String Id="HelpFeatureDescription">Help</String>
+ <String Id="DatabaseImportFeatureTitle">DatabaseImport</String>
+ <String Id="DatabaseImportFeatureDescription">DatabaseImport</String>
<String Id="GenerationFeatureTitle">Generation</String>
<String Id="GenerationFeatureDescription">Generation</String>
<String Id="ClassModelGenerationFeatureTitle">ClassGeneration</String>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
