diff --git a/.gitignore b/.gitignore index a4c7c89ff4..fb3a29176c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,6 @@ GeneratedAssemblyInfo.cs Collection.cpp .vs/ Build/GlobalInclude.properties -Build/LibraryDevelopment.properties Build/NuGet.exe Build/nunit.framework.dll Build/nunit.framework.xml diff --git a/Build/DownloadLibraryDependencies.pl b/Build/DownloadLibraryDependencies.pl deleted file mode 100644 index 344d423f7f..0000000000 --- a/Build/DownloadLibraryDependencies.pl +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/perl - -# This script is used to download the dependencies to build libpalaso, liblcm and chorus -# libraries locally for debugging FLEx. It find the locations to these local repos by parsing -# the LibraryDevelopment.properties file. - -# Run: perl DownloadLibraryDependencies.pl -# Note: you will need to install XML::Simple to run this script. -# XML::Simple is included in Strawberry Perl on windows (http://strawberryperl.com/) -# XML::Simple installation can be done on linux using the CPAN shell: -# shell> perl -MCPAN -e shell -# cpan> install XML::Simple - -# After this script terminates, do the following to build libraries locally -# Windows: build /t:LocalLibrary /p:Platform= -# Linux: msbuild /t:LocalLibrary -use XML::Simple; - -my $osName = "$^O"; -my $extension = "win.sh"; -if ($osName eq "linux") { - $extension = "mono.sh"; -} -my $xml = new XML::Simple; -my $data = $xml->XMLin("LibraryDevelopment.properties"); -my $palasoArtifactsDir = "$data->{PropertyGroup}->{'PalasoArtifactsDir'}->{content}"; -my $chorusArtifactsDir = "$data->{PropertyGroup}->{'ChorusArtifactsDir'}->{content}"; -my $useLocal = "$data->{PropertyGroup}->{'UseLocalLibraries'}"; -print "Downloading libpalaso dependencies...\n"; - -# Look for "output" in the path and take everything before it -if (not $palasoArtifactsDir =~ m/output/) { - die "Error: Expected to find 'output' in the libpalaso artifacts path. Check the LibraryDevelopment.properties file.\n"; -} -my $palasoBase = "$`"; -# Replace backslashes with forward slashes -$palasoBase =~ s/\\/\//g; -system($palasoBase . "build/buildupdate.$extension"); -print "Finished downloading libpalaso dependencies.\n"; -print "Downloading chorus dependencies...\n"; -if (not $chorusArtifactsDir =~ m/output/) { - die "Error: Expected to find 'output' in the chorus artifacts path. Check the LibraryDevelopment.properties file.\n"; -} -my $chorusBase = "$`"; -$chorusBase =~ s/\\/\//g; -system($chorusBase . "build/buildupdate.$extension"); -print "Finished downloading chorus dependencies.\n"; -if ($useLocal ne "Y") { - print "\nWARNING: FieldWorks is not set to build using local libraries. Edit the LibraryDevelopment.properties file to change this.\n"; -} \ No newline at end of file diff --git a/Build/InstallerBuild.proj b/Build/InstallerBuild.proj index 2ae3e091bc..d7df9bb384 100644 --- a/Build/InstallerBuild.proj +++ b/Build/InstallerBuild.proj @@ -28,7 +28,6 @@ - diff --git a/Build/LibraryDevelopment.targets b/Build/LibraryDevelopment.targets deleted file mode 100644 index a694d238dd..0000000000 --- a/Build/LibraryDevelopment.targets +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - $(LcmLocalArtifactsDir) - $([System.IO.Path]::GetFullPath("$(LcmLocalArtifactsDir)/../..")) - - UNSPECIFIED - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - N - - - - - - - \ No newline at end of file diff --git a/Build/LocalLibrary.targets b/Build/LocalLibrary.targets deleted file mode 100644 index 033673b619..0000000000 --- a/Build/LocalLibrary.targets +++ /dev/null @@ -1,68 +0,0 @@ - - - - - x64 - x86 - Any CPU - Debug - DebugMono - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Build/Localize.targets b/Build/Localize.targets index d4e29dab4d..2682152a50 100644 --- a/Build/Localize.targets +++ b/Build/Localize.targets @@ -105,8 +105,8 @@ diff --git a/Build/PackageRestore.targets b/Build/PackageRestore.targets index e58d0f0448..0f70e2ac64 100644 --- a/Build/PackageRestore.targets +++ b/Build/PackageRestore.targets @@ -250,7 +250,6 @@ - -