From 3ee3f5e3410279bebe571cfafd869f1498e6f9b0 Mon Sep 17 00:00:00 2001 From: Kevin Hahn Date: Mon, 20 May 2024 13:42:51 -0600 Subject: [PATCH 1/2] reference SIL packages in packages.config instead of requiring dlls in the libs folder. --- README.md | 4 ---- src/CssDialog/ConfigurationTool.cs | 3 ++- src/CssDialog/CssDialog.csproj | 10 ++++------ src/CssDialog/frmSplash.cs | 13 +++++++------ src/CssDialog/packages.config | 2 ++ src/PsTool/PsTool.csproj | 19 +++++++------------ src/PsTool/packages.config | 4 ++++ 7 files changed, 26 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index bdaa6f5a9..792a5c674 100644 --- a/README.md +++ b/README.md @@ -47,10 +47,6 @@ Development ----------- Pathway is currently running under .net 4.8.1 -*Before building Pathway* - -Before building Pathway, the developer should install the latest dependencies. All dependencies have been moved to nuGet packages except for the libpalaso packages: `icu.net.dll`, `Spart.dll`, `SIL.Core.dll`, `SIL.Core.Desktop.dll` and `SIL.WritingSystems.dll`. These were installed in the `lib` folder from `libpalaso_palaso-win32-master_Continuous_8.0.0_artifacts` in the net461 folder. The latest icu files: `icudt56.dll`, `icuin56.dll`, and `icuuc56.dll` were also added to that folder. - *Building on Windows* Wix 3.11.x should be installed to build installer packages. A Developer will also need the Visual Studio Wix extension for the version of Visual Studio being used. diff --git a/src/CssDialog/ConfigurationTool.cs b/src/CssDialog/ConfigurationTool.cs index 669373e21..5a8746782 100644 --- a/src/CssDialog/ConfigurationTool.cs +++ b/src/CssDialog/ConfigurationTool.cs @@ -1502,7 +1502,8 @@ private static void SetUpErrorHandling() { if (ErrorReport.EmailAddress == null) { - ExceptionHandler.Init(); + //todo determine the best way to handle this + ExceptionHandler.Init(new ConsoleExceptionHandler()); ErrorReport.EmailAddress = IssuesEmailAddress; ErrorReport.AddStandardProperties(); ExceptionHandler.AddDelegate(ReportError); diff --git a/src/CssDialog/CssDialog.csproj b/src/CssDialog/CssDialog.csproj index fe6a544ee..f25af0b17 100644 --- a/src/CssDialog/CssDialog.csproj +++ b/src/CssDialog/CssDialog.csproj @@ -263,13 +263,11 @@ ..\..\packages\PrinceXMLWrapper.1.2.0\lib\netstandard2.0\PrinceXML.Wrapper.dll - - False - ..\..\lib\SIL.Core.dll + + ..\..\packages\SIL.Core.14.1.0\lib\net461\SIL.Core.dll - - False - ..\..\lib\SIL.Core.Desktop.dll + + ..\..\packages\SIL.Core.Desktop.14.1.0\lib\net461\SIL.Core.Desktop.dll diff --git a/src/CssDialog/frmSplash.cs b/src/CssDialog/frmSplash.cs index f53cde86b..ce4f184b7 100644 --- a/src/CssDialog/frmSplash.cs +++ b/src/CssDialog/frmSplash.cs @@ -1,14 +1,14 @@ // -------------------------------------------------------------------------------------------- // -// Copyright (C) 2014, SIL International. All Rights Reserved. -// +// Copyright (C) 2014, SIL International. All Rights Reserved. +// // Distributable under the terms of either the Common Public License or the // GNU Lesser General Public License, as specified in the LICENSING.txt file. -// +// // Greg Trihus // greg_trihus@sil.org -// Last reviewed: -// +// Last reviewed: +// // // Splash screen with Project Info // @@ -95,7 +95,8 @@ private static void SetUpErrorHandling() { if (ErrorReport.EmailAddress == null) { - ExceptionHandler.Init(); + //todo determine how to handle this + ExceptionHandler.Init(new ConsoleExceptionHandler()); ErrorReport.EmailAddress = IssuesEmailAddress; ErrorReport.AddStandardProperties(); ExceptionHandler.AddDelegate(ReportError); diff --git a/src/CssDialog/packages.config b/src/CssDialog/packages.config index 5dc1acfe9..0ccb74982 100644 --- a/src/CssDialog/packages.config +++ b/src/CssDialog/packages.config @@ -20,4 +20,6 @@ + + \ No newline at end of file diff --git a/src/PsTool/PsTool.csproj b/src/PsTool/PsTool.csproj index 0688455c7..2402e72ed 100644 --- a/src/PsTool/PsTool.csproj +++ b/src/PsTool/PsTool.csproj @@ -235,7 +235,7 @@ False - ..\..\packages\icu.net.2.7.1\lib\net451\icu.net.dll + ..\..\packages\icu.net.2.9.0\lib\net451\icu.net.dll ..\..\packages\ini-parser.2.5.2\lib\net20\INIFileParser.dll @@ -254,7 +254,7 @@ False - ..\..\lib\SIL.WritingSystems.dll + ..\..\packages\SIL.WritingSystems.14.1.0\lib\net461\SIL.WritingSystems.dll @@ -318,13 +318,7 @@ - ..\..\lib\SIL.Core.dll - - - ..\..\packages\System.Security.AccessControl.4.7.0\lib\net461\System.Security.AccessControl.dll - - - ..\..\packages\System.Security.Principal.Windows.4.7.0\lib\net461\System.Security.Principal.Windows.dll + ..\..\packages\SIL.Core.14.1.0\lib\net461\SIL.Core.dll @@ -487,9 +481,10 @@ --> - - - + + + + diff --git a/src/PsTool/packages.config b/src/PsTool/packages.config index d37d41471..f0522decd 100644 --- a/src/PsTool/packages.config +++ b/src/PsTool/packages.config @@ -2,6 +2,8 @@ + + @@ -20,4 +22,6 @@ + + \ No newline at end of file From 988d835e4104d44949139a27a7bda333788ea714 Mon Sep 17 00:00:00 2001 From: Kevin Hahn Date: Fri, 24 May 2024 11:29:33 -0600 Subject: [PATCH 2/2] remove references to getDependencies scripts --- Build/getDependencies Updates.txt | 12 --- Build/getDependencies-linux.sh | 97 ------------------- Build/getDependencies-win.sh | 97 ------------------- Build/make-source-package.sh | 3 - .../Linux build instructions.txt | 1 - 5 files changed, 210 deletions(-) delete mode 100644 Build/getDependencies Updates.txt delete mode 100755 Build/getDependencies-linux.sh delete mode 100644 Build/getDependencies-win.sh diff --git a/Build/getDependencies Updates.txt b/Build/getDependencies Updates.txt deleted file mode 100644 index bf7d3e914..000000000 --- a/Build/getDependencies Updates.txt +++ /dev/null @@ -1,12 +0,0 @@ -The getDependencies scripts were created by installing the BuildUpdate ruby script from: https://github.com/chrisvire/BuildUpdate and following the installation instructions and then using: - -../../BuildUpdate/buildupdate.rb -r .. -t bt75 -f getDependencies.win.sh -and -../../BuildUpdate/buildupdate.rb -r .. -t bt364 -f getDependencies.linux.sh - -To update these two files if the depencies are changed on Team City, simply use: -../../BuildUpdate/buildupdate.rb -f getDependencies.win.sh -and -../../BuildUpdate/buildupdate.rb -f getDependencies.linux.sh - -If that doesn't work it is straightforward to recreate the files. diff --git a/Build/getDependencies-linux.sh b/Build/getDependencies-linux.sh deleted file mode 100755 index 34aadf44b..000000000 --- a/Build/getDependencies-linux.sh +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/bash -# server=build.palaso.org -# build_type=bt362 -# root_dir=.. -# Auto-generated by https://github.com/chrisvire/BuildUpdate. -# Do not edit this file by hand! - -cd "$(dirname "$0")" - -# *** Functions *** -force=0 -clean=0 - -while getopts fc opt; do -case $opt in -f) force=1 ;; -c) clean=1 ;; -esac -done - -shift $((OPTIND - 1)) - -copy_auto() { -if [ "$clean" == "1" ] -then -echo cleaning $2 -rm -f ""$2"" -else -where_curl=$(type -P curl) -where_wget=$(type -P wget) -if [ "$where_curl" != "" ] -then -copy_curl $1 $2 -elif [ "$where_wget" != "" ] -then -copy_wget $1 $2 -else -echo "Missing curl or wget" -exit 1 -fi -fi -} - -copy_curl() { -echo "curl: $2 <= $1" -if [ -e "$2" ] && [ "$force" != "1" ] -then -curl -# -L -z $2 -o $2 $1 -else -curl -# -L -o $2 $1 -fi -} - -copy_wget() { -echo "wget: $2 <= $1" -f1=$(basename $1) -f2=$(basename $2) -cd $(dirname $2) -wget -q -L -N $1 -# wget has no true equivalent of curl's -o option. -# Different versions of wget handle (or not) % escaping differently. -# A URL query is the only reason why $f1 and $f2 should differ. -if [ "$f1" != "$f2" ]; then mv $f2\?* $f2; fi -cd - -} - - -# *** Results *** -# build: pathway-precise-64-continuous (bt362) -# project: Pathway -# URL: http://build.palaso.org/viewType.html?buildTypeId=bt362 -# VCS: https://github.com/sillsdev/pathway.git [develop] -# dependencies: -# [0] build: palaso-linux64-libpalaso-3.1 Continuous (bt322) -# project: libpalaso -# URL: http://build.palaso.org/viewType.html?buildTypeId=bt322 -# clean: false -# revision: pathway.tcbuildtag -# paths: {"L10NSharp.dll"=>"lib", "SIL.Core.dll"=>"lib", "SIL.Core.dll.config"=>"lib", "SIL.Core.dll.mdb"=>"lib", "SIL.WritingSystems.dll"=>"lib", "SIL.WritingSystems.dll.mdb"=>"lib", "icu.net.dll"=>"lib", "icudt54.dll"=>"lib", "icuin54.dll"=>"lib", "icuuc54.dll"=>"lib"} -# VCS: https://github.com/sillsdev/libpalaso.git [libpalaso-3.1] - -# make sure output directories exist -mkdir -p ../lib - -# download artifact dependencies -copy_auto http://build.palaso.org/guestAuth/repository/download/bt322/pathway.tcbuildtag/L10NSharp.dll ../lib/L10NSharp.dll -copy_auto http://build.palaso.org/guestAuth/repository/download/bt322/pathway.tcbuildtag/SIL.Core.dll ../lib/SIL.Core.dll -copy_auto http://build.palaso.org/guestAuth/repository/download/bt322/pathway.tcbuildtag/SIL.Core.dll.config ../lib/SIL.Core.dll.config -copy_auto http://build.palaso.org/guestAuth/repository/download/bt322/pathway.tcbuildtag/SIL.Core.dll.mdb ../lib/SIL.Core.dll.mdb -copy_auto http://build.palaso.org/guestAuth/repository/download/bt322/pathway.tcbuildtag/SIL.WritingSystems.dll ../lib/SIL.WritingSystems.dll -copy_auto http://build.palaso.org/guestAuth/repository/download/bt322/pathway.tcbuildtag/SIL.WritingSystems.dll.mdb ../lib/SIL.WritingSystems.dll.mdb -copy_auto http://build.palaso.org/guestAuth/repository/download/bt322/pathway.tcbuildtag/Spart.dll ../lib/Spart.dll -copy_auto http://build.palaso.org/guestAuth/repository/download/bt322/pathway.tcbuildtag/icu.net.dll ../lib/icu.net.dll -copy_auto http://build.palaso.org/guestAuth/repository/download/bt322/pathway.tcbuildtag/icudt54.dll ../lib/icudt54.dll -copy_auto http://build.palaso.org/guestAuth/repository/download/bt322/pathway.tcbuildtag/icuin54.dll ../lib/icuin54.dll -copy_auto http://build.palaso.org/guestAuth/repository/download/bt322/pathway.tcbuildtag/icuuc54.dll ../lib/icuuc54.dll -# End of script diff --git a/Build/getDependencies-win.sh b/Build/getDependencies-win.sh deleted file mode 100644 index 21b90d01b..000000000 --- a/Build/getDependencies-win.sh +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/bash -# server=build.palaso.org -# build_type=bt50 -# root_dir=.. -# Auto-generated by https://github.com/chrisvire/BuildUpdate. -# Do not edit this file by hand! - -cd "$(dirname "$0")" - -# *** Functions *** -force=0 -clean=0 - -while getopts fc opt; do -case $opt in -f) force=1 ;; -c) clean=1 ;; -esac -done - -shift $((OPTIND - 1)) - -copy_auto() { -if [ "$clean" == "1" ] -then -echo cleaning $2 -rm -f ""$2"" -else -where_curl=$(type -P curl) -where_wget=$(type -P wget) -if [ "$where_curl" != "" ] -then -copy_curl $1 $2 -elif [ "$where_wget" != "" ] -then -copy_wget $1 $2 -else -echo "Missing curl or wget" -exit 1 -fi -fi -} - -copy_curl() { -echo "curl: $2 <= $1" -if [ -e "$2" ] && [ "$force" != "1" ] -then -curl -# -L -z $2 -o $2 $1 -else -curl -# -L -o $2 $1 -fi -} - -copy_wget() { -echo "wget: $2 <= $1" -f1=$(basename $1) -f2=$(basename $2) -cd $(dirname $2) -wget -q -L -N $1 -# wget has no true equivalent of curl's -o option. -# Different versions of wget handle (or not) % escaping differently. -# A URL query is the only reason why $f1 and $f2 should differ. -if [ "$f1" != "$f2" ]; then mv $f2\?* $f2; fi -cd - -} - - -# *** Results *** -# build: pathway-win32-default continuous (bt50) -# project: Pathway -# URL: http://build.palaso.org/viewType.html?buildTypeId=bt50 -# VCS: https://github.com/sillsdev/pathway.git [develop] -# dependencies: -# [0] build: palaso-win32-libpalaso-3.1 Continuous (bt223) -# project: libpalaso -# URL: http://build.palaso.org/viewType.html?buildTypeId=bt223 -# clean: false -# revision: pathway.tcbuildtag -# paths: {"L10NSharp.dll"=>"lib", "L10NSharp.pdb"=>"lib", "SIL.Core.dll"=>"lib", "SIL.Core.pdb"=>"lib", "SIL.WritingSystems.dll"=>"lib", "SIL.WritingSystems.pdb"=>"lib", "icu.net.dll"=>"lib", "icudt54.dll"=>"lib", "icuin54.dll"=>"lib", "icuuc54.dll"=>"lib"} -# VCS: https://github.com/sillsdev/libpalaso.git [libpalaso-3.1] - -# make sure output directories exist -mkdir -p ../lib - -# download artifact dependencies -copy_auto http://build.palaso.org/guestAuth/repository/download/bt223/pathway.tcbuildtag/L10NSharp.dll ../lib/L10NSharp.dll -copy_auto http://build.palaso.org/guestAuth/repository/download/bt223/pathway.tcbuildtag/L10NSharp.pdb ../lib/L10NSharp.pdb -copy_auto http://build.palaso.org/guestAuth/repository/download/bt223/pathway.tcbuildtag/SIL.Core.dll ../lib/SIL.Core.dll -copy_auto http://build.palaso.org/guestAuth/repository/download/bt223/pathway.tcbuildtag/SIL.Core.pdb ../lib/SIL.Core.pdb -copy_auto http://build.palaso.org/guestAuth/repository/download/bt223/pathway.tcbuildtag/SIL.WritingSystems.dll ../lib/SIL.WritingSystems.dll -copy_auto http://build.palaso.org/guestAuth/repository/download/bt223/pathway.tcbuildtag/SIL.WritingSystems.pdb ../lib/SIL.WritingSystems.pdb -copy_auto http://build.palaso.org/guestAuth/repository/download/bt223/pathway.tcbuildtag/Spart.dll ../lib/Spart.dll -copy_auto http://build.palaso.org/guestAuth/repository/download/bt223/pathway.tcbuildtag/icu.net.dll ../lib/icu.net.dll -copy_auto http://build.palaso.org/guestAuth/repository/download/bt223/pathway.tcbuildtag/icudt54.dll ../lib/icudt54.dll -copy_auto http://build.palaso.org/guestAuth/repository/download/bt223/pathway.tcbuildtag/icuin54.dll ../lib/icuin54.dll -copy_auto http://build.palaso.org/guestAuth/repository/download/bt223/pathway.tcbuildtag/icuuc54.dll ../lib/icuuc54.dll -# End of script diff --git a/Build/make-source-package.sh b/Build/make-source-package.sh index d535d752a..5ca31699c 100755 --- a/Build/make-source-package.sh +++ b/Build/make-source-package.sh @@ -38,9 +38,6 @@ git -C "./$(git rev-parse --show-cdup)" archive ${BRANCH} | tar -x -C $PKGDIR cd $PKGDIR -# Download dependencies -Build/getDependencies.sh - # Delete unwanted non-source files find . -type f -iname "*.exe" -delete diff --git a/src/Documentation/Linux build instructions.txt b/src/Documentation/Linux build instructions.txt index e3c1cc1cb..c39ddcf53 100644 --- a/src/Documentation/Linux build instructions.txt +++ b/src/Documentation/Linux build instructions.txt @@ -17,7 +17,6 @@ If you are on xenial, you want to update the build control with: cp Build/xenial-pkg/* debian/. (Please don't check in debian/control and debian/rules for xenial as the originals are used for release.sh) Make sure the dependencies are installed with: -bash Build/getDependencies.sh Let the system know your info for commits git config --global user.name yourname git config --global user.email youremailaddress@yourdomain.xyz