Update to mono-sil_3.4

* Change environ to /opt/mono-sil. * Needed to upgrade encConverters, Stephen McConnel helped make a new package fieldworks-enc-converters installed in /opt/mono-sil * Add dependency for mono-sil etc. and fieldworks-enc-converters * Deleted old linux encConverters files. * Increased timeout value on xWorksTests, FDOTests, and RootSiteTests Change-Id: I45faa2e3a850713df1d766ad06229e73fd47765e
MaxMood96 · Apr 21, 2015 · 4fd9ca4 · 4fd9ca4
1 parent 29ebd55
commit 4fd9ca4
Show file tree

Hide file tree

Showing 58 changed files with 37 additions and 188 deletions.
diff --git a/Build/Agent/dependencies.config b/Build/Agent/dependencies.config
@@ -20,7 +20,12 @@
 # [email protected]
 
 [common]
-any=build-essential automake uuid-dev libenchant-dev xutils-dev libboost-dev libboost-test-dev graphicsmagick-libmagick-dev-compat libxklavier-dev libgraphite-dev libgtkmm-2.4-dev mono-gmcs mono-devel gtk-sharp2 git-gui unzip gawk tofrodos ttf-mscorefonts-installer fonts-sil-charis xvfb xserver-xephyr metacity ibus bison mono-devel libgif-dev libjpeg-dev libexif-dev libhunspell-dev libtool wget xulrunner-geckofx29 geckofx29
+any=build-essential automake uuid-dev libenchant-dev xutils-dev libboost-dev libboost-test-dev \
+graphicsmagick-libmagick-dev-compat libxklavier-dev libgraphite-dev libgtkmm-2.4-dev mono-gmcs \
+mono-sil mono-basic-sil libgdiplus-sil gtk-sharp2-sil git-gui unzip gawk tofrodos \
+ttf-mscorefonts-installer fonts-sil-charis xvfb xserver-xephyr metacity ibus bison \
+libgif-dev libjpeg-dev libexif-dev libhunspell-dev libtool wget xulrunner-geckofx29 \
+geckofx29 fieldworks-enc-converters
 
 [precise]
 any=libtiff4-dev openjdk-6-jre

diff --git a/Build/FwBuildTasks.dll b/Build/FwBuildTasks.dll
diff --git a/Build/Linux.targets b/Build/Linux.targets
@@ -77,28 +77,41 @@
 		<Exec Command="make externaltargets" WorkingDirectory="$(fwrt)" Condition="'$(action)'!='clean'"/>
 		<Exec Command="make externaltargets-test" WorkingDirectory="$(fwrt)" Condition="'$(action)'=='test'"/>
 		<!-- Always copy from Release -->
+		<CreateProperty Value="" Condition="'$(arch)'!='x86_64'">
+			<Output TaskParameter="Value" PropertyName="encConverters-ext"/>
+		</CreateProperty>
+		<CreateProperty Value="_64" Condition="'$(arch)'=='x86_64'">
+			<Output TaskParameter="Value" PropertyName="encConverters-ext"/>
+		</CreateProperty>
 		<CreateItem Include="$(dir-fwoutputlibPlatform)/Release/*.*">
 			<Output TaskParameter="Include" ItemName="LinuxReleaseLibs"/>
 		</CreateItem>
 		<Copy SourceFiles="@(LinuxReleaseLibs)"
 			  DestinationFolder="$(dir-outputBase)"
 			  SkipUnchangedFiles="true" OverwriteReadOnlyFiles="true"
 			  Condition="'$(action)'!='clean'"/>
-		<CreateItem Include="$(dir-fwoutputlibPlatformBase)/*.*">
+		<CreateItem Include="/opt/mono-sil/lib/encConverters/*.dll">
+			<Output TaskParameter="Include" ItemName="LinuxDebugLibs"/>
+		</CreateItem>
+		<Copy SourceFiles="@(LinuxDebugLibs)"
+			  DestinationFolder="$(dir-outputBase)"
+			  SkipUnchangedFiles="true" OverwriteReadOnlyFiles="true"
+			  Condition="'$(action)'!='clean'"/>
+		<CreateItem Include="/opt/mono-sil/lib/encConverters/*$(encConverters-ext).so">
 			<Output TaskParameter="Include" ItemName="LinuxDebugLibs"/>
 		</CreateItem>
 		<Copy SourceFiles="@(LinuxDebugLibs)"
 			  DestinationFolder="$(dir-outputBase)"
 			  SkipUnchangedFiles="true" OverwriteReadOnlyFiles="true"
 			  Condition="'$(action)'!='clean'"/>
-		<CreateItem Include="$(dir-fwoutputlibPlatform)/*.config">
+		<CreateItem Include="/opt/mono-sil/lib/encConverters/*.config">
 			<Output TaskParameter="Include" ItemName="LinuxLibConfigFiles"/>
 		</CreateItem>
 		<Copy SourceFiles="@(LinuxLibConfigFiles)"
 			  DestinationFolder="$(dir-outputBase)"
 			  SkipUnchangedFiles="true" OverwriteReadOnlyFiles="true"
 			  Condition="'$(action)'!='clean'"/>
-		<CreateItem Include="$(dir-fwoutputlibPlatform)/ECPlugins/*.xml">
+		<CreateItem Include="/opt/mono-sil/lib/encConverters/EC/Plugins/*.xml">
 			<Output TaskParameter="Include" ItemName="LinuxLibECPlugins"/>
 		</CreateItem>
 		<MakeDir Directories="$(dir-outputBase)/EC/Plugins" Condition="'$(action)'!='clean'"/>
@@ -245,6 +258,7 @@
 		<Graphite2Sources Include="$(fwrt)/Lib/src/graphite2/src/*.*" Condition="'$(OS)'=='Unix'"/>
 	</ItemGroup>
 	<Target Name="graphite2Linux" Inputs="@(Graphite2Sources)" Outputs="$(fwrt)/Lib/linux/$(config-capital)/libgraphite2.a" Condition="'$(OS)'=='Unix'">
+		<MakeDir Directories="$(fwrt)/Lib/linux/$(config-capital)" />
 		<Make ToolPath="/usr/bin"
 				Makefile="$(fwrt)/Lib/src/graphite2/Makefile"
 				Configuration="$(config-capital)" Target="$(make-target)"

diff --git a/Build/Src/FwBuildTasks/CollectTargets.cs b/Build/Src/FwBuildTasks/CollectTargets.cs
@@ -465,9 +465,10 @@ int TimeoutForProject(string project)
 			{
 				case "xWorksTests":			// ~244 sec (Mono 2/8/2013)
 				case "FDOTests":			// ~143 sec
-					return 420000;
+					return 540000;
 				case "FwCoreDlgsTests":		// ~122 sec
 				case "TeDllTests":			// ~122 sec (Mono 2/8/2013)
+					return 420000;
 				case "TeImportExportTests":	// ~90 sec
 					return 240000;
 				case "DiffViewTests":		// ~55 sec
@@ -482,8 +483,8 @@ int TimeoutForProject(string project)
 				case "FwCoreDlgControlsTests": // ~34 sec (overnight build machine 4/1/2013)
 				case "TeScrInitializerTests":  // ~29 sec  (overnight build machine 4/23/2013)
 				case "LexTextControlsTests":			// ~only 8 sec on dev windows, but took longer than 40 sec on mono build machine
-					return 75000;
 				case "RootSiteTests":			// ~11 sec
+					return 75000;
 				case "TeDialogsTests":			// ~11 sec
 				case "TePrintLayoutTests":				// ~12 sec
 				case "FwPrintLayoutComponentsTests":	// ~13 sec

diff --git a/Lib/linux/CcEC.dll.config b/Lib/linux/CcEC.dll.config
diff --git a/Lib/linux/Debug/AIGuesserEC.dll b/Lib/linux/Debug/AIGuesserEC.dll
diff --git a/Lib/linux/Debug/AIGuesserEC.dll.mdb b/Lib/linux/Debug/AIGuesserEC.dll.mdb
diff --git a/Lib/linux/Debug/CcEC.dll b/Lib/linux/Debug/CcEC.dll
diff --git a/Lib/linux/Debug/CcEC.dll.mdb b/Lib/linux/Debug/CcEC.dll.mdb
diff --git a/Lib/linux/Debug/ECInterfaces.dll b/Lib/linux/Debug/ECInterfaces.dll
diff --git a/Lib/linux/Debug/ECInterfaces.dll.mdb b/Lib/linux/Debug/ECInterfaces.dll.mdb
diff --git a/Lib/linux/Debug/IcuEC.dll b/Lib/linux/Debug/IcuEC.dll
diff --git a/Lib/linux/Debug/IcuEC.dll.mdb b/Lib/linux/Debug/IcuEC.dll.mdb
diff --git a/Lib/linux/Debug/PerlExpressionEC.dll b/Lib/linux/Debug/PerlExpressionEC.dll
diff --git a/Lib/linux/Debug/PerlExpressionEC.dll.mdb b/Lib/linux/Debug/PerlExpressionEC.dll.mdb
diff --git a/Lib/linux/Debug/PyScriptEC.dll b/Lib/linux/Debug/PyScriptEC.dll
diff --git a/Lib/linux/Debug/PyScriptEC.dll.mdb b/Lib/linux/Debug/PyScriptEC.dll.mdb
diff --git a/Lib/linux/Debug/SilEncConverters40.dll b/Lib/linux/Debug/SilEncConverters40.dll
diff --git a/Lib/linux/Debug/SilEncConverters40.dll.mdb b/Lib/linux/Debug/SilEncConverters40.dll.mdb
diff --git a/Lib/linux/Debug/libIcuConvEC.so b/Lib/linux/Debug/libIcuConvEC.so
diff --git a/Lib/linux/Debug/libIcuConvEC_64.so b/Lib/linux/Debug/libIcuConvEC_64.so
diff --git a/Lib/linux/Debug/libIcuRegexEC.so b/Lib/linux/Debug/libIcuRegexEC.so
diff --git a/Lib/linux/Debug/libIcuRegexEC_64.so b/Lib/linux/Debug/libIcuRegexEC_64.so
diff --git a/Lib/linux/Debug/libIcuTranslitEC.so b/Lib/linux/Debug/libIcuTranslitEC.so
diff --git a/Lib/linux/Debug/libIcuTranslitEC_64.so b/Lib/linux/Debug/libIcuTranslitEC_64.so
diff --git a/Lib/linux/Debug/libPyScriptEncConverter.so b/Lib/linux/Debug/libPyScriptEncConverter.so
diff --git a/Lib/linux/Debug/libPyScriptEncConverter_64.so b/Lib/linux/Debug/libPyScriptEncConverter_64.so
diff --git a/Lib/linux/Debug/libecdriver.so b/Lib/linux/Debug/libecdriver.so
diff --git a/Lib/linux/Debug/libecdriver_64.so b/Lib/linux/Debug/libecdriver_64.so
diff --git a/Lib/linux/ECPlugins/AI 4.0.0.0 Plugin Details.xml b/Lib/linux/ECPlugins/AI 4.0.0.0 Plugin Details.xml
diff --git a/Lib/linux/ECPlugins/CC 4.0.0.0 Plugin Details.xml b/Lib/linux/ECPlugins/CC 4.0.0.0 Plugin Details.xml
diff --git a/Lib/linux/ECPlugins/EC 4.0.0.0 Plugin Details.xml b/Lib/linux/ECPlugins/EC 4.0.0.0 Plugin Details.xml
diff --git a/Lib/linux/ECPlugins/IcuEC 4.0.0.0 Plugin Details.xml b/Lib/linux/ECPlugins/IcuEC 4.0.0.0 Plugin Details.xml
diff --git a/Lib/linux/ECPlugins/PerlEC 4.0.0.0 Plugin Details.xml b/Lib/linux/ECPlugins/PerlEC 4.0.0.0 Plugin Details.xml
diff --git a/Lib/linux/ECPlugins/PythonEC 4.0.0.0 Plugin Details.xml b/Lib/linux/ECPlugins/PythonEC 4.0.0.0 Plugin Details.xml
diff --git a/Lib/linux/IcuEC.dll.config b/Lib/linux/IcuEC.dll.config
diff --git a/Lib/linux/PerlExpressionEC.dll.config b/Lib/linux/PerlExpressionEC.dll.config
diff --git a/Lib/linux/PyScriptEC.dll.config b/Lib/linux/PyScriptEC.dll.config
diff --git a/Lib/linux/Release/AIGuesserEC.dll b/Lib/linux/Release/AIGuesserEC.dll
diff --git a/Lib/linux/Release/CcEC.dll b/Lib/linux/Release/CcEC.dll
diff --git a/Lib/linux/Release/ECInterfaces.dll b/Lib/linux/Release/ECInterfaces.dll
diff --git a/Lib/linux/Release/IcuEC.dll b/Lib/linux/Release/IcuEC.dll
diff --git a/Lib/linux/Release/PerlExpressionEC.dll b/Lib/linux/Release/PerlExpressionEC.dll
diff --git a/Lib/linux/Release/PyScriptEC.dll b/Lib/linux/Release/PyScriptEC.dll
diff --git a/Lib/linux/Release/SilEncConverters40.dll b/Lib/linux/Release/SilEncConverters40.dll
diff --git a/Lib/linux/Release/libIcuConvEC.so b/Lib/linux/Release/libIcuConvEC.so
diff --git a/Lib/linux/Release/libIcuConvEC_64.so b/Lib/linux/Release/libIcuConvEC_64.so
diff --git a/Lib/linux/Release/libIcuRegexEC.so b/Lib/linux/Release/libIcuRegexEC.so
diff --git a/Lib/linux/Release/libIcuRegexEC_64.so b/Lib/linux/Release/libIcuRegexEC_64.so
diff --git a/Lib/linux/Release/libIcuTranslitEC.so b/Lib/linux/Release/libIcuTranslitEC.so
diff --git a/Lib/linux/Release/libIcuTranslitEC_64.so b/Lib/linux/Release/libIcuTranslitEC_64.so
diff --git a/Lib/linux/Release/libPyScriptEncConverter.so b/Lib/linux/Release/libPyScriptEncConverter.so
diff --git a/Lib/linux/Release/libPyScriptEncConverter_64.so b/Lib/linux/Release/libPyScriptEncConverter_64.so
diff --git a/Lib/linux/Release/libecdriver.so b/Lib/linux/Release/libecdriver.so
diff --git a/Lib/linux/Release/libecdriver_64.so b/Lib/linux/Release/libecdriver_64.so
diff --git a/Lib/linux/SilEncConverters40.dll.config b/Lib/linux/SilEncConverters40.dll.config
diff --git a/environ b/environ
@@ -8,8 +8,8 @@ BASE=$(pwd)
 COM=$(dirname "${BASE}")/libcom/COM
 ARCH=$(uname -m)
 [ -z "$BUILD" ] && BUILD=Debug
-[ -z "$MONO_PREFIX" ] && MONO_PREFIX=/usr/local
-[ -z "$MONO_SILPKGDIR" ] && MONO_SILPKGDIR=/usr/lib/fieldworks
+[ -z "$MONO_PREFIX" ] && MONO_PREFIX=/opt/mono-sil
+[ -z "$MONO_SILPKGDIR" ] && MONO_SILPKGDIR=/opt/mono-sil
 
 # Dependency locations
 # search for xulrunner and geckofx, select the best, and add its location to LD_LIBRARY_PATH
@@ -32,10 +32,10 @@ ${LD_LIBRARY_PATH}"
 [ -z "$PKG_CONFIG_PATH" ] && PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/share/pkgconfig
 
 # Add packaged mono items to paths
-PATH="${MONO_SILPKGDIR}/mono/bin:${PATH}"
-LD_LIBRARY_PATH="${MONO_SILPKGDIR}/mono/lib:${LD_LIBRARY_PATH}"
-PKG_CONFIG_PATH="${MONO_SILPKGDIR}/mono/lib/pkgconfig:${PKG_CONFIG_PATH}"
-MONO_GAC_PREFIX="${MONO_SILPKGDIR}/mono:/usr:${MONO_PREFIX}"
+PATH="${MONO_SILPKGDIR}/bin:${PATH}"
+LD_LIBRARY_PATH="${MONO_SILPKGDIR}/lib:${LD_LIBRARY_PATH}"
+PKG_CONFIG_PATH="${MONO_SILPKGDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}"
+MONO_GAC_PREFIX="${MONO_SILPKGDIR}:/usr:${MONO_PREFIX}"
 
 if [ "$RUNMODE" != "PACKAGE" ]
 then
@@ -69,6 +69,8 @@ if [ "$RUNMODE" != "PACKAGE" -a "$RUNMODE" != "INSTALLED" ]
 then
 	FW_CommonAppData=${BASE}/Output_${ARCH}/VarLibFieldworks
 	[ ! -d $FW_CommonAppData ] && mkdir -p $FW_CommonAppData
+	[ -d /var/lib/encConverters ] && cp -r /var/lib/encConverters/SIL $FW_CommonAppData \
+		&& cp -r /var/lib/encConverters/registry $FW_CommonAppData
 fi
 
 MONO_PATH="${BASE}/DistFiles:${BASE}/Output_${ARCH}/${BUILD}:${GDK_SHARP}:${GECKOFX}"

diff --git a/environ-other b/environ-other
@@ -4,5 +4,6 @@
 #
 # Source this file in a shell and then run make
 
-export PATH=/usr/lib/fieldworks/mono/bin:$PATH
-export LD_LIBRARY_PATH=/usr/lib/fieldworks/mono/lib:$LD_LIBRARY_PATH
+export PATH=/opt/mono-sil/bin:$PATH
+export LD_LIBRARY_PATH=/opt/mono-sil/lib:$LD_LIBRARY_PATH
+export PKG_CONFIG_PATH=/opt/mono-sil/lib/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig:$PKG_CONFIG_PATH