Minor fixes related to build and special setting for Official build i…

…n Wix
Autodesk · May 2, 2019 · 27e6362 · 27e6362
1 parent ea3ce17
commit 27e6362
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 27 deletions.
diff --git a/Install/Program Files to Install/bundle/Contents/Resources/ADSKIFCExporterHelp.htm b/Install/Program Files to Install/bundle/Contents/Resources/ADSKIFCExporterHelp.htm
@@ -113,7 +113,7 @@ <h3>Usage</h3>
 
 <p><strong>Export only elements visible in view</strong>: Checked to export only the visible elements of the current view (based on filtering and/or element and category hiding), unchecked to export the entire model.  
 <p><strong>Export rooms in 3D views</strong>: If the "export only elements visible in view" is checked, checking this option will export all of the rooms that are contained inside the section box of the selected 3D view.  If there is no active section box, all rooms will be exported.
-<p><strong>Export Bounding Box</strong>: Checked to export bounding box representations, Unchecked to exclude them.  This is the the default for GSA export.</p>
+<p><strong>Export Bounding Box</strong>: Checked to export bounding box representations, Unchecked to exclude them.  This is the default for GSA export.</p>
 <p><strong>Export Linked Files as Separate IFCs</strong>: Checked to export any Revit links in the project as separate IFCs, unchecked to exclude them.  Each linked instance in the file will export as a separate IFC file with the right positioning relative to the host file.  Multiple instances of the same linked document will export as separate files, identical except for their position and orientation.  Note that linked IFC files will be re-exported, so may suffer data loss on roundtrip.
 
 <p><strong>Split walls and columns by Level</strong>: Whether or not to split walls and columns by building stories.</p>
@@ -231,7 +231,7 @@ <h2 id="VersionHistory" name="VersionHistory">Version History</h2>
             <li>Enable site and project property creation
             <li>Utilize Site GlobalId method
             <li>Add multilanguage support files for German language (DE)
-            <li>Provide a complete list of all Shared Parameters used by Revit on export including ALL properties defined in IFC PropertySet Definition for both Instances and Types. The lists are included in the installer and will be placed in the instal folder: IFC Shared Parameters-RevitIFCBuiltIn_ALL.txt (for the Instace parameters) and IFC Shared Parameters-RevitIFCBuiltIn-Type_ALL.txt (for the Type parameters).
+            <li>Provide a complete list of all Shared Parameters used by Revit on export including ALL properties defined in IFC PropertySet Definition for both Instances and Types. The lists are included in the installer and will be placed in the install folder: IFC Shared Parameters-RevitIFCBuiltIn_ALL.txt (for the Instance parameters) and IFC Shared Parameters-RevitIFCBuiltIn-Type_ALL.txt (for the Type parameters).
             <li>Improve consistency for setting the object direct attributes, support IfcObjectType[Type] special parameter to drive instance ObjectType parameter from the Type, update the shared parameter definition files (now for [Type] parameters we will also maintain the GUID as long as it remains)
             <li>Incremental work towards IFC4RV 1.2 MVD
 </ul>
@@ -247,8 +247,8 @@ <h2 id="VersionHistory" name="VersionHistory">Version History</h2>
 			<li>Fixed performance issue in IFC2x3 export due to error in creating types
 			<li>Fixed issue with slanted Pile
 			<li>Fixed issue related to element that is split into parts
+			<li>Improvement in handling level of Part Override
 			<li>Some improvements on classification (issue #31)
-			<li>Improve voiding of IfcMappedItem representation (issue #9)
 			<li>Fixed issue on Composite curve tolerance (issue #5)
 			<li>Fixed issue where element is still exported even though it is set to not-exported in the mapping table
 			<li>Bugfix for incorrect cylindrical hollow core Beam export in IFC4RV
@@ -279,6 +279,11 @@ <h2 id="VersionHistory" name="VersionHistory">Version History</h2>
 			<li>Fixed for orphaned entities and wrong footprint information due to incorrect projection direction for IFC4RV requirements. IFC4RV Beam (Arch) is now without error in the automated test
 			<li>1st fixed for issue related to runaway parts in "export only elements visible in view" (there are still situations that may cause a wrong rotation, but the test case reported in issue #86 so far looks good)
          </ul>
+			<p>
+         Import Bug Fixes:
+
+         <ul>
+            <li>Improve voiding of IfcMappedItem representation (#9)
 
    </div>
 
@@ -347,7 +352,7 @@ <h2 id="VersionHistory" name="VersionHistory">Version History</h2>
             <li>Restore calculations for "concealed" and "is external" properties.
             <li>Restore proper mapping of Revit Grids to IfcGrids.
             <li>Restore proper GUID for some door, windows, and property sets.
-            <li>Restore remapping of some deprecated IFC2x3 and IFC4 entitites.
+            <li>Restore remapping of some deprecated IFC2x3 and IFC4 entities.
             <li>Restore support for parameter mapping files.
             <li>Restore support for provisions for voids in IFC2x3.
             <li>Restore support for IfcSpace "ElevationWithFlooring" attribute.

diff --git a/Install/RevitIFCSetupWix/Product.wxs b/Install/RevitIFCSetupWix/Product.wxs
@@ -57,27 +57,45 @@
 
    <Fragment>
       <ComponentGroup Id="ProductComponents" Directory="INSTALLDIR">
-         <Component Id = "COMP_IFC_Export_DLL" Guid="D59E44AA-89A3-4CD7-AD9C-8D4D7AC6026B">
-            <File Id ="FILE_Ifc_Export_DLL" Name="Revit.IFC.Export.dll" Source="$(var.ProjectDir)..\Program Files to Install\Revit.IFC.Export.dll" KeyPath="yes" />
-         </Component>
-         <Component Id = "COMP_IFC_Export_Sig" Guid="2EE671F2-165C-4DD6-A216-672FB7567FE1">
-            <File Id ="FILE_Ifc_Export_Sig" Name="Revit.IFC.Export.sig" Source="$(var.ProjectDir)..\Program Files to Install\Revit.IFC.Export.sig" KeyPath="yes" />
-         </Component>
-         <Component Id = "COMP_IFC_Import_DLL" Guid="E2F0633B-F323-430C-A368-76DBF939FD0D">
-            <File Id ="FILE_Ifc_Import_DLL" Name="Revit.IFC.Import.dll" Source="$(var.ProjectDir)..\Program Files to Install\Revit.IFC.Import.dll" KeyPath="yes" />
-         </Component>
-         <Component Id = "COMP_IFC_Import_Sig" Guid="48EE6912-FCF6-4AE5-9A63-F5A98DFEE811">
-            <File Id ="FILE_Ifc_Import_Sig" Name="Revit.IFC.Import.sig" Source="$(var.ProjectDir)..\Program Files to Install\Revit.IFC.Import.sig" KeyPath="yes" />
-         </Component>
-         <Component Id = "COMP_IFC_Common_DLL" Guid="C7ED4A2C-DCB1-457E-968F-2DDE9993C1B6">
-            <File Id ="FILE_Ifc_Common_DLL" Name="Revit.IFC.Common.dll" Source="$(var.ProjectDir)..\Program Files to Install\Revit.IFC.Common.dll" KeyPath="yes" />
-         </Component>
-         <Component Id = "COMP_IFC_ExternalUI_Sig" Guid="3159B919-CD50-469D-8DDE-FE339CEBBC1C">
-            <File Id ="FILE_Ifc_ExternalUI_Sig" Name="IFCExportUIOverride.sig" Source="$(var.ProjectDir)..\Program Files to Install\IFCExportUIOverride.sig" KeyPath="yes" />
-         </Component>
-         <Component Id = "COMP_IFC_ExternalUI_DLL" Guid="D7F89B58-029F-4062-B226-6F3D2EB7FE5D">
-            <File Id ="FILE_Ifc_ExternalUI_DLL" Name="IFCExportUIOverride.dll" Source="$(var.ProjectDir)..\Program Files to Install\IFCExportUIOverride.dll" KeyPath="yes" />
-         </Component>
+
+         <?ifdef OfficialBuild ?>
+            <Component Id = "COMP_IFC_Export_DLL" Guid="D59E44AA-89A3-4CD7-AD9C-8D4D7AC6026B">
+               <File Id ="FILE_Ifc_Export_DLL" Name="Revit.IFC.Export.dll" Source="$(var.ProjectDir)..\Program Files to Install\Revit.IFC.Export.dll" KeyPath="yes" />
+            </Component>
+            <Component Id = "COMP_IFC_Export_Sig" Guid="2EE671F2-165C-4DD6-A216-672FB7567FE1">
+               <File Id ="FILE_Ifc_Export_Sig" Name="Revit.IFC.Export.sig" Source="$(var.ProjectDir)..\Program Files to Install\Revit.IFC.Export.sig" KeyPath="yes" />
+            </Component>
+            <Component Id = "COMP_IFC_Import_DLL" Guid="E2F0633B-F323-430C-A368-76DBF939FD0D">
+               <File Id ="FILE_Ifc_Import_DLL" Name="Revit.IFC.Import.dll" Source="$(var.ProjectDir)..\Program Files to Install\Revit.IFC.Import.dll" KeyPath="yes" />
+            </Component>
+            <Component Id = "COMP_IFC_Import_Sig" Guid="48EE6912-FCF6-4AE5-9A63-F5A98DFEE811">
+               <File Id ="FILE_Ifc_Import_Sig" Name="Revit.IFC.Import.sig" Source="$(var.ProjectDir)..\Program Files to Install\Revit.IFC.Import.sig" KeyPath="yes" />
+            </Component>
+            <Component Id = "COMP_IFC_ExternalUI_Sig" Guid="3159B919-CD50-469D-8DDE-FE339CEBBC1C">
+               <File Id ="FILE_Ifc_ExternalUI_Sig" Name="IFCExportUIOverride.sig" Source="$(var.ProjectDir)..\Program Files to Install\IFCExportUIOverride.sig" KeyPath="yes" />
+            </Component>
+            <Component Id = "COMP_IFC_ExternalUI_DLL" Guid="D7F89B58-029F-4062-B226-6F3D2EB7FE5D">
+               <File Id ="FILE_Ifc_ExternalUI_DLL" Name="IFCExportUIOverride.dll" Source="$(var.ProjectDir)..\Program Files to Install\IFCExportUIOverride.dll" KeyPath="yes" />
+            </Component>
+            <Component Id = "COMP_IFC_Common_DLL" Guid="C7ED4A2C-DCB1-457E-968F-2DDE9993C1B6">
+               <File Id ="FILE_Ifc_Common_DLL" Name="Revit.IFC.Common.dll" Source="$(var.ProjectDir)..\Program Files to Install\Revit.IFC.Common.dll" KeyPath="yes" />
+            </Component>
+         <?else?>
+            <Component Id = "COMP_IFC_Export_DLL" Guid="D59E44AA-89A3-4CD7-AD9C-8D4D7AC6026B">
+               <File Id ="FILE_Ifc_Export_DLL" Name="Revit.IFC.Export.dll" Source="$(var.Revit.IFC.Export.TargetDir)Revit.IFC.Export.dll" KeyPath="yes" />
+            </Component>
+            <Component Id = "COMP_IFC_Import_DLL" Guid="E2F0633B-F323-430C-A368-76DBF939FD0D">
+               <File Id ="FILE_Ifc_Import_DLL" Name="Revit.IFC.Import.dll" Source="$(var.Revit.IFC.Import.TargetDir)Revit.IFC.Import.dll" KeyPath="yes" />
+            </Component>
+            <Component Id = "COMP_IFC_ExternalUI_DLL" Guid="D7F89B58-029F-4062-B226-6F3D2EB7FE5D">
+               <File Id ="FILE_Ifc_ExternalUI_DLL" Name="IFCExportUIOverride.dll" Source="$(var.IFCExporterUIOverride.TargetDir)IFCExportUIOverride.dll" KeyPath="yes" />
+            </Component>
+            <Component Id = "COMP_IFC_Common_DLL" Guid="C7ED4A2C-DCB1-457E-968F-2DDE9993C1B6">
+               <File Id ="FILE_Ifc_Common_DLL" Name="Revit.IFC.Common.dll" Source="$(var.Revit.IFC.Common.TargetDir)Revit.IFC.Common.dll" KeyPath="yes" />
+            </Component>
+         <?endif?>
+
+
          <Component Id = "COMP_LICENSE_RTF" Guid="9F0851DD-3A43-4D49-AC8C-8B8D2F394A91">
             <File Id ="FILE_LICENSE_RTF" Name="LICENSE.rtf" Source="$(var.ProjectDir)..\Program Files to Install\LICENSE.rtf" KeyPath="yes" />
          </Component>

diff --git a/Install/RevitIFCSetupWix/RevitIFCSetupWix.wixproj b/Install/RevitIFCSetupWix/RevitIFCSetupWix.wixproj
@@ -25,8 +25,9 @@
     <SuppressPdbOutput>True</SuppressPdbOutput>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>$(SolutionDir)..\$(Configuration)$(PlatformName)\</OutputPath>
+    <OutputPath>$(SolutionDir)$(Configuration)$(PlatformName)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <DefineConstants>_OfficialBuild=true</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Product.wxs" />
@@ -96,4 +97,4 @@
 	<Target Name="AfterBuild">
 	</Target>
 	-->
-</Project>
+</Project>