Related Words

Bld/_init.mak.lnx

@@ -62,24 +62,20 @@ include $(BUILD_ROOT)/Bld/_rule.mak.lnx
 DEBUGPROCS_OBJ = $(OBJ_DIR)/$(BUILD_CONFIG)/$(DEBUGPROCS_NAME)
 GENERIC_OBJ = $(OBJ_DIR)/$(BUILD_CONFIG)/$(GENERIC_NAME)
 KERNEL_OBJ = $(OBJ_DIR)/$(BUILD_CONFIG)/$(KERNEL_NAME)
-LANGUAGE_OBJ= $(OBJ_DIR)/$(BUILD_CONFIG)/$(LANGUAGE_NAME)
 APPCORE_OBJ= $(OBJ_DIR)/$(BUILD_CONFIG)/$(APPCORE_NAME)
 TEXT_OBJ= $(OBJ_DIR)/$(BUILD_CONFIG)/$(TEXT_NAME)
 CELLAR_OBJ= $(OBJ_DIR)/$(BUILD_CONFIG)/$(CELLAR_NAME)
 GRENGINE_OBJ= $(OBJ_DIR)/$(BUILD_CONFIG)/$(GRENGINE_NAME)
 VIEWS_OBJ= $(OBJ_DIR)/$(BUILD_CONFIG)/$(VIEWS_NAME)
-DBACCESS_OBJ= $(OBJ_DIR)/$(BUILD_CONFIG)/$(DBACCESS_NAME)
 
 DEBUGPROCS_SRC = $(SRC)/$(DEBUGPROCS_NAME)
 GENERIC_SRC = $(SRC)/$(GENERIC_NAME)
 KERNEL_SRC = $(SRC)/$(KERNEL_NAME)
-LANGUAGE_SRC = $(SRC)/$(LANGUAGE_NAME)
 APPCORE_SRC = $(SRC)/$(APPCORE_NAME)
 TEXT_SRC = $(SRC)/$(TEXT_NAME)
 CELLAR_SRC = $(SRC)/$(CELLAR_NAME)
 GRENGINE_SRC = $(SRC)/Graphite/$(GRENGINE_NAME)
 VIEWS_SRC = $(SRC)/$(VIEWS_NAME)
-DBACCESS_SRC = $(SRC)/$(DBACCESS_NAME)
 
 # Include user specific settings
 -include $(BUILD_ROOT)/Bld/_user.mak.lnx

Bld/_names.mak

@@ -7,7 +7,6 @@ KERNEL_NAME =Kernel
 GENERIC_NAME =Generic
 GRENGINE_NAME =GrEngine
 FDO_NAME =FDO
-LANGUAGE_NAME =Language
 FWRESOURCES_NAME =FwResources
 TEXT_NAME =Text
 VIEWS_NAME =views

Build/Linux.targets

@@ -8,7 +8,7 @@
 	</PropertyGroup>
 
 	<!-- call preparatory Linux targets -->
-	<Target Name="initLinux" Condition="'$(OS)'=='Unix'" DependsOnTargets="Initialize;unitpp;tlbs-copy;teckit;iculibs;linuxLibs;ensureTLBsUpToDate;setupLinuxRegistry"
+	<Target Name="initLinux" Condition="'$(OS)'=='Unix'" DependsOnTargets="Initialize;unitpp;tlbs-copy;teckit;iculibs;linuxLibs;ensureTLBsUpToDate;setupLinuxRegistry;BuildLinuxXslAssemblies"
 			Inputs="$(dir-fwdistfiles)/strings-en.txt" Outputs="$(dir-outputBase)/strings-en.txt">
 		<Copy SourceFiles="$(dir-fwdistfiles)/strings-en.txt"
 			  DestinationFolder="$(dir-outputBase)"
@@ -121,9 +121,8 @@
 		<IdhFiles Include="$(fwrt)/Src/Kernel/FwKernel.idh"/>
 		<IdhFiles Include="$(fwrt)/Src/Kernel/FwKernelTlb.idl"/>
 		<IdhFiles Include="$(fwrt)/Src/Kernel/TextServ.idh"/>
-		<IdhFiles Include="$(fwrt)/Src/Language/Language.idh"/>
-		<IdhFiles Include="$(fwrt)/Src/Language/LanguageTlb.idl"/>
-		<IdhFiles Include="$(fwrt)/Src/Language/Render.idh"/>
+		<IdhFiles Include="$(fwrt)/Src/Kernel/Language.idh"/>
+		<IdhFiles Include="$(fwrt)/Src/Kernel/Render.idh"/>
 		<IdhFiles Include="$(fwrt)/Src/SharpViews/FwComponents/FwComponents.idh"/>
 		<IdhFiles Include="$(fwrt)/Src/views/Views.idh"/>
 		<IdhFiles Include="$(fwrt)/Src/views/ViewsTlb.idl"/>
@@ -161,7 +160,6 @@
 		<!--We also need to extract the interface GUIDs for Linux -->
 		<Message Text="Extracting iids for use on Linux..."/>
 		<ExtractIIDs Input="$(dir-fwoutputCommon)/FwKernelTlb.h" Output="$(fwrt)/Src/Kernel/FwKernel_GUIDs.cpp"/>
-		<ExtractIIDs Input="$(dir-fwoutputCommon)/LanguageTlb.h" Output="$(fwrt)/Src/Language/Language_GUIDs.cpp"/>
 		<ExtractIIDs Input="$(dir-fwoutputCommon)/ViewsTlb.h" Output="$(fwrt)/Src/views/Views_GUIDs.cpp"
 			LinesToInsertAtTop='#include "FwKernelTlb.h"'/>
 		<Copy SourceFiles="$(dir-fwoutput)/idhfiles.MD5" DestinationFolder="$(fwrt)/Lib/linux/Common"/>
@@ -233,4 +231,16 @@
 			SecondLine="8856396c-63a9-4bc7-ad47-87ec8b6ef5a4 libManagedComBridge.so"/>
 	</Target>
 
+	<!-- Mono doesn't have an XSL compiler so we just put the XSLs in a resource assembly -->
+	<Target Name="BuildLinuxXslAssemblies" Condition="'$(OS)'=='Unix'">
+		<CreateItem Include="$(fwrt)/Src/Transforms/Presentation/*.xsl">
+			<Output TaskParameter="Include" ItemName="PresentationXslFiles"/>
+		</CreateItem>
+		<Csc TargetType="library" OutputAssembly="$(dir-outputBase)/PresentationTransforms.dll" Optimize="true" Platform="AnyCPU" Resources="@(PresentationXslFiles)" />
+
+		<CreateItem Include="$(fwrt)/Src/Transforms/Application/*.xsl">
+			<Output TaskParameter="Include" ItemName="ApplicationXslFiles"/>
+		</CreateItem>
+		<Csc TargetType="library" OutputAssembly="$(dir-outputBase)/ApplicationTransforms.dll" Optimize="true" Platform="AnyCPU" Resources="@(ApplicationXslFiles)" />
+	</Target>
 </Project>

Build/RegFree.targets

@@ -7,17 +7,15 @@
 	This allows our programs to run without registering our COM DLLs, which in turn allows different
 	versions of FieldWorks to coexist on the same computer. This is only relevant for Windows.-->
 	<ItemGroup>
-		<Dlls Include="$(OutDir)FwKernel.dll"/>
-		<Dlls Include="$(OutDir)Views.dll"/>
-		<Dlls Include="$(OutDir)Language.dll"/>
-		<Dlls Include="$(OutDir)Graphite.dll"/>
+		<DependentAssemblies Include="$(OutDir)FwKernel.manifest"/>
+		<DependentAssemblies Include="$(OutDir)Views.manifest"/>
+		<DependentAssemblies Include="$(OutDir)Graphite.manifest"/>
 	</ItemGroup>
 	<ItemGroup>
 		<Fragments Include="$(OutDir)/../../DistFiles/*.fragment.manifest"/>
 	</ItemGroup>
-	<Target Name="CreateManifest" Condition="'$(OS)'=='Windows_NT'" Inputs="@(Dlls)" Outputs="$(Executable).manifest">
-		<RegFree Executable="$(Executable)" Dlls="@(Dlls)" Fragments="@(Fragments)"
-			NoTypeLib="$(OutDir)Graphite.dll" />
+	<Target Name="CreateManifest" Condition="'$(OS)'=='Windows_NT'" Inputs="@(DependentAssemblies)" Outputs="$(Executable).manifest">
+		<RegFree Executable="$(Executable)" DependentAssemblies="@(DependentAssemblies)" Fragments="@(Fragments)" />
 	</Target>
 	<Target Name="AttachManifest" Condition="'$(OS)'=='Windows_NT'" DependsOnTargets="CreateManifest">
 		<Exec Command="mt.exe -outputresource:$(Executable) -manifest $(Executable).manifest"/>

Build/Src/FwBuildTasks/RegFree.cs

@@ -15,7 +15,8 @@
 // </remarks>
 // ---------------------------------------------------------------------------------------------
 using System;
-using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Security.Principal;
@@ -103,6 +104,12 @@ public RegFree()
 		/// ------------------------------------------------------------------------------------
 		public ITaskItem[] AsIs { get; set; }
 
+		/// <summary>
+		/// Gets or sets the dependent assemblies. Currently, this only accepts paths to assembly
+		/// manifests.
+		/// </summary>
+		public ITaskItem[] DependentAssemblies { get; set; }
+
 		private bool? m_IsAdmin;
 		private bool UserIsAdmin
 		{
@@ -128,7 +135,14 @@ public override bool Execute()
 			Log.LogMessage(MessageImportance.Normal, "RegFree processing {0}",
 				Path.GetFileName(Executable));
 
-			var manifestFile = string.IsNullOrEmpty(Output) ? Executable + ".manifest" : Output;
+			StringCollection dllPaths = IdlImp.GetFilesFrom(Dlls);
+			if (dllPaths.Count == 0)
+			{
+				string ext = Path.GetExtension(Executable);
+				if (ext != null && ext.Equals(".dll", StringComparison.InvariantCultureIgnoreCase))
+					dllPaths.Add(Executable);
+			}
+			string manifestFile = string.IsNullOrEmpty(Output) ? Executable + ".manifest" : Output;
 
 			try
 			{
@@ -145,7 +159,6 @@ public override bool Execute()
 				{
 					regHelper.RedirectRegistry(!UserIsAdmin);
 					var creator = new RegFreeCreator(doc, Log);
-					var dllPaths = IdlImp.GetFilesFrom(Dlls);
 					var filesToRemove = dllPaths.Cast<string>().Where(fileName => !File.Exists(fileName)).ToList();
 					foreach (var file in filesToRemove)
 						dllPaths.Remove(file);
@@ -164,7 +177,23 @@ public override bool Execute()
 						}
 					}
 
-					XmlElement root = creator.CreateExeInfo(Executable);
+					string assemblyName = Path.GetFileNameWithoutExtension(manifestFile);
+					Debug.Assert(assemblyName != null);
+					// The C++ test programs won't run if an assemblyIdentity element exists.
+					//if (assemblyName.StartsWith("test"))
+					//	assemblyName = null;
+					string assemblyVersion = null;
+					try
+					{
+						assemblyVersion = FileVersionInfo.GetVersionInfo(Executable).FileVersion;
+					}
+					catch
+					{
+						// just ignore
+					}
+					if (string.IsNullOrEmpty(assemblyVersion))
+						assemblyVersion = "1.0.0.0";
+					XmlElement root = creator.CreateExeInfo(assemblyName, assemblyVersion);
 					foreach (string fileName in dllPaths)
 					{
 						if (NoTypeLib.Count(f => f.ItemSpec == fileName) != 0)
@@ -187,6 +216,12 @@ public override bool Execute()
 						creator.AddAsIs(root, fragmentName);
 					}
 
+					foreach (string assemblyFileName in IdlImp.GetFilesFrom(DependentAssemblies))
+					{
+						Log.LogMessage(MessageImportance.Low, "\tAdding dependent assembly {0}", Path.GetFileName(assemblyFileName));
+						creator.AddDependentAssembly(root, assemblyFileName);
+					}
+
 					var settings = new XmlWriterSettings
 									{
 										OmitXmlDeclaration = false,