From 20f1298fe6ea9f35264ee5a7bc6beac7a274d2d9 Mon Sep 17 00:00:00 2001 From: Bill Zissimopoulos Date: Fri, 8 Apr 2016 15:45:45 -0700 Subject: [PATCH] build: rename mirror to memfs --- .../testing/{mirror.vcxproj => memfs.vcxproj} | 5 ++-- ....vcxproj.filters => memfs.vcxproj.filters} | 2 +- build/VStudio/winfsp.sln | 26 ++++++++----------- tools/deploy.bat | 2 +- tst/{mirror/mirror.c => memfs/memfs-main.c} | 2 +- 5 files changed, 17 insertions(+), 20 deletions(-) rename build/VStudio/testing/{mirror.vcxproj => memfs.vcxproj} (96%) rename build/VStudio/testing/{mirror.vcxproj.filters => memfs.vcxproj.filters} (86%) rename tst/{mirror/mirror.c => memfs/memfs-main.c} (86%) diff --git a/build/VStudio/testing/mirror.vcxproj b/build/VStudio/testing/memfs.vcxproj similarity index 96% rename from build/VStudio/testing/mirror.vcxproj rename to build/VStudio/testing/memfs.vcxproj index 6cf44f80..e8faed8b 100644 --- a/build/VStudio/testing/mirror.vcxproj +++ b/build/VStudio/testing/memfs.vcxproj @@ -21,8 +21,9 @@ {AA7190E8-877F-4827-8CDD-E0D85F83C8C1} Win32Proj - mirror + memfs 8.1 + memfs @@ -171,7 +172,7 @@ - + diff --git a/build/VStudio/testing/mirror.vcxproj.filters b/build/VStudio/testing/memfs.vcxproj.filters similarity index 86% rename from build/VStudio/testing/mirror.vcxproj.filters rename to build/VStudio/testing/memfs.vcxproj.filters index 80ecc54c..3420cb4f 100644 --- a/build/VStudio/testing/mirror.vcxproj.filters +++ b/build/VStudio/testing/memfs.vcxproj.filters @@ -7,7 +7,7 @@ - + Source diff --git a/build/VStudio/winfsp.sln b/build/VStudio/winfsp.sln index 323f8695..55b7d574 100644 --- a/build/VStudio/winfsp.sln +++ b/build/VStudio/winfsp.sln @@ -12,18 +12,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winfsp.sys", "winfsp_sys.vc EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testing", "testing", "{69439FD1-C07D-4BF1-98DC-3CCFECE53A49}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mirror", "testing\mirror.vcxproj", "{AA7190E8-877F-4827-8CDD-E0D85F83C8C1}" - ProjectSection(ProjectDependencies) = postProject - {4A7C0B21-9E10-4C81-92DE-1493EFCF24EB} = {4A7C0B21-9E10-4C81-92DE-1493EFCF24EB} - {C85C26BA-8C22-4D30-83DA-46C3548E6332} = {C85C26BA-8C22-4D30-83DA-46C3548E6332} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winfsp-tests", "testing\winfsp-tests.vcxproj", "{262DF8CC-E7A8-4460-A22C-683CBA322C32}" ProjectSection(ProjectDependencies) = postProject {4A7C0B21-9E10-4C81-92DE-1493EFCF24EB} = {4A7C0B21-9E10-4C81-92DE-1493EFCF24EB} {C85C26BA-8C22-4D30-83DA-46C3548E6332} = {C85C26BA-8C22-4D30-83DA-46C3548E6332} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "memfs", "testing\memfs.vcxproj", "{AA7190E8-877F-4827-8CDD-E0D85F83C8C1}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -48,14 +44,6 @@ Global {C85C26BA-8C22-4D30-83DA-46C3548E6332}.Release|x64.Build.0 = Release|x64 {C85C26BA-8C22-4D30-83DA-46C3548E6332}.Release|x86.ActiveCfg = Release|Win32 {C85C26BA-8C22-4D30-83DA-46C3548E6332}.Release|x86.Build.0 = Release|Win32 - {AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Debug|x64.ActiveCfg = Debug|x64 - {AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Debug|x64.Build.0 = Debug|x64 - {AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Debug|x86.ActiveCfg = Debug|Win32 - {AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Debug|x86.Build.0 = Debug|Win32 - {AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Release|x64.ActiveCfg = Release|x64 - {AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Release|x64.Build.0 = Release|x64 - {AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Release|x86.ActiveCfg = Release|Win32 - {AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Release|x86.Build.0 = Release|Win32 {262DF8CC-E7A8-4460-A22C-683CBA322C32}.Debug|x64.ActiveCfg = Debug|x64 {262DF8CC-E7A8-4460-A22C-683CBA322C32}.Debug|x64.Build.0 = Debug|x64 {262DF8CC-E7A8-4460-A22C-683CBA322C32}.Debug|x86.ActiveCfg = Debug|Win32 @@ -64,12 +52,20 @@ Global {262DF8CC-E7A8-4460-A22C-683CBA322C32}.Release|x64.Build.0 = Release|x64 {262DF8CC-E7A8-4460-A22C-683CBA322C32}.Release|x86.ActiveCfg = Release|Win32 {262DF8CC-E7A8-4460-A22C-683CBA322C32}.Release|x86.Build.0 = Release|Win32 + {AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Debug|x64.ActiveCfg = Debug|x64 + {AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Debug|x64.Build.0 = Debug|x64 + {AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Debug|x86.ActiveCfg = Debug|Win32 + {AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Debug|x86.Build.0 = Debug|Win32 + {AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Release|x64.ActiveCfg = Release|x64 + {AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Release|x64.Build.0 = Release|x64 + {AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Release|x86.ActiveCfg = Release|Win32 + {AA7190E8-877F-4827-8CDD-E0D85F83C8C1}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {AA7190E8-877F-4827-8CDD-E0D85F83C8C1} = {69439FD1-C07D-4BF1-98DC-3CCFECE53A49} {262DF8CC-E7A8-4460-A22C-683CBA322C32} = {69439FD1-C07D-4BF1-98DC-3CCFECE53A49} + {AA7190E8-877F-4827-8CDD-E0D85F83C8C1} = {69439FD1-C07D-4BF1-98DC-3CCFECE53A49} EndGlobalSection EndGlobal diff --git a/tools/deploy.bat b/tools/deploy.bat index 8b0f5f97..0b021b00 100644 --- a/tools/deploy.bat +++ b/tools/deploy.bat @@ -8,7 +8,7 @@ set TARGET=\\%TARGET_MACHINE%%TARGET_ACCOUNT% cd %~dp0.. mkdir %TARGET% 2>nul -for %%f in (winfsp-%SUFFIX%.sys winfsp-%SUFFIX%.dll winfsp-tests-%SUFFIX%.exe mirror-%SUFFIX%.exe) do ( +for %%f in (winfsp-%SUFFIX%.sys winfsp-%SUFFIX%.dll winfsp-tests-%SUFFIX%.exe memfs-%SUFFIX%.exe) do ( copy build\VStudio\build\%CONFIG%\%%f %TARGET% >nul ) echo sc create WinFsp type=filesys binPath=%%~dp0%DRIVER% >%TARGET%sc-create.bat diff --git a/tst/mirror/mirror.c b/tst/memfs/memfs-main.c similarity index 86% rename from tst/mirror/mirror.c rename to tst/memfs/memfs-main.c index a09dd150..c5a49cdb 100644 --- a/tst/mirror/mirror.c +++ b/tst/memfs/memfs-main.c @@ -1,5 +1,5 @@ /** - * @file mirror.c + * @file memfs-main.c * * @copyright 2015-2016 Bill Zissimopoulos */