# # # delete "visualc/botan.vcproj" # # delete "visualc/lua.vcproj" # # delete "visualc/monotone.vcproj" # # delete "visualc/netxx.vcproj" # # delete "visualc/pcre.vcproj" # # delete "visualc/sqlite3.vcproj" # # delete "visualc/stringprep.vcproj" # # delete "visualc/tester.vcproj" # # delete "visualc/txt2c.vcproj" # # delete "visualc/unit_tester.vcproj" # # rename "README.visualc8" # to "README.visualc" # # add_file "visualc/libplatform.vcxproj" # content [b1bac948407ed3fbd9229d084fac214bc117521c] # # add_file "visualc/libplatform.vcxproj.filters" # content [9b5abd4540f3a400bc51676c9f8defb21b63316d] # # add_file "visualc/monotone.vcxproj" # content [f9d1e4bf621e4b0d5e18ed2d8b9600acda4be59b] # # add_file "visualc/monotone.vcxproj.filters" # content [544555e9471f5532e850e81ca3ec570302d1e6a7] # # add_file "visualc/netxx.vcxproj" # content [a0d5efdf2710681608cd36619da9f48618826987] # # add_file "visualc/netxx.vcxproj.filters" # content [9b1354f38821d1d8041529e09fa161cadb8837a6] # # add_file "visualc/tester.vcxproj" # content [43f9909203296b283fd92906b95f01f54dfaad11] # # add_file "visualc/tester.vcxproj.filters" # content [f8eabbbacf9274019dae2323ef30dcc7d04b9a50] # # add_file "visualc/txt2c.vcxproj" # content [eb14bd92654adb25fe9348d0ad4eb34145212418] # # add_file "visualc/txt2c.vcxproj.filters" # content [98d469b55f1e5b6daeca1a1ba5c96d024b71bab6] # # add_file "visualc/unit_tester.vcxproj" # content [00bd20f67a5f10c2641caa6d9f585fe6ee89e8a1] # # add_file "visualc/unit_tester.vcxproj.filters" # content [c464f84de8860acccd7cdd48eaa4169a98b9cbd0] # # patch ".mtn-ignore" # from [af5e150ca99ed11f75f73928d7258eabbe08a111] # to [c2be58b176d52e7c1a5506b7f2f388ef049db55a] # # patch "README.visualc" # from [d6f503886a735b74ac6401b6532f10dd2b43aac6] # to [09d779af11eca39e2409c2801eb72eb9e63ddbc4] # # patch "automate_ostream.hh" # from [d4ff673e1080a7b081d79a1876a6bb203d05640d] # to [3771687ded1949e75511d177e7f600e30d93054f] # # patch "cmd_automate.cc" # from [adcb13a39667247f022a9a84ec7717fce33e3e2c] # to [9ca3dc8cb127d6d4e20768fd007f1dd94a10119c] # # patch "key_store.cc" # from [6ea38c00f7da18dd8136f0a4080b2fb7a8cbedba] # to [a49d0412a6f7df61114a8db644b599070799dc37] # # patch "keys.hh" # from [f48a9a4a28dd60cc8b89cb4f0fc9ecf0dd8613c9] # to [6626961a663b81dc8d1fe3748cde74a44f24885d] # # patch "monotone.cc" # from [93efe8898e46a4888eff29a34a77bfedbe7172ce] # to [4abde4b4c7b81306f61b997b915211108a897da3] # # patch "netcmd.hh" # from [f6c60950810184737024220f58f806db5ec1ee2a] # to [cdea1bcd99e0770ffb878227032c02aa1c89449a] # # patch "netxx/osutil.h" # from [74df9538ae587f638afa95772b582ad5d173c70a] # to [4aa82962bf4e3636a1c6962f85b2ee6c6dd4c511] # # patch "option.hh" # from [a120f75cc822a8ff7a0e0602d2385f3d730f2588] # to [d572a50411ed5e4769ed37536216408e9e7786d7] # # patch "pch.hh" # from [4831fa5a656735b98e48a8e34cb3377526f87bab] # to [224190ead406ea57f47f4547da980b0541b5ec3c] # # patch "platform.hh" # from [648608271dd6559ba89bc0bb816a3de306c3355f] # to [36e49168714b08892b1c222a1af797d280fec80b] # # patch "project.hh" # from [072a2c57396fafe3102d3c1478f2914ade2fa08e] # to [b26d01f963594f3449b084682784143a7e0c3e14] # # patch "selectors.hh" # from [8f23c72c0901a492c75f483b8c2c4316251b31ed] # to [e8f92e6ff129f9261cd7106fadb565b7549ff873] # # patch "tester.cc" # from [adb12440ea0b944027ea7f8eb35e06acbce2bcce] # to [25c80b80fabdf6cc9c28d3cfd152fd8ea934380a] # # patch "transforms.cc" # from [5ddd45879695306827570bd595789564990540fd] # to [d1576ac79245777811e13b8813595fd982b86a56] # # patch "txt2c.cc" # from [ce9a9030cd612c9b12dd2b415a2c04197b2b1614] # to [70cd7f295935fb18c8181cf004c2bb9857412e1a] # # patch "unix/process.cc" # from [a4fbbe13d86d9ef8427ed44416737385e3616968] # to [c2f91b2afc1c5db49261f0638040e5b8b8f751fd] # # patch "visualc/config.h" # from [923f821fff59c63fa06a8554f32f8557aaf378c9] # to [55e6e1525fb06d1a0e6cefe6be2ebe05991b1fc3] # # patch "visualc/monotone.sln" # from [4cc9dff446e2748daca6e0adb3028aa11b7a8d0d] # to [312fa84b29e077861e6963bf120ee590a933c072] # # patch "visualc/unistd.h" # from [470e076aa451f7e9b5de640025a322afd1ac8b5d] # to [a38a6819a8feb51aa67e7e1d44265dd5193ec089] # # patch "vocab.cc" # from [1a4f7c3ab144ead8f4698c7c225c2fac6b161cc3] # to [8c5bb15cd5d94be236545517123419254dd60d99] # # patch "win32/fs.cc" # from [4c87e1d1a39ab6ff39479086db3e67e66cddaffa] # to [c91fc830b427cc735004f2843e1382dde23c4ed5] # # patch "win32/process.cc" # from [e95879b8147e9cd0de0a9f907deefa14e6093266] # to [8e17a9b84bbd696555f77d96a9bb1f81c10bce9d] # # patch "work.hh" # from [12a0cb4870fdb76affdfed725039d7407be701b8] # to [1cf7bcb0a51ca78ea3183102a61aa6ec14d2483a] # ============================================================ --- visualc/libplatform.vcxproj b1bac948407ed3fbd9229d084fac214bc117521c +++ visualc/libplatform.vcxproj b1bac948407ed3fbd9229d084fac214bc117521c @@ -0,0 +1,81 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {309B9A4E-2572-4A68-876D-E02639F84510} + libplatform + + + + StaticLibrary + true + MultiByte + + + Application + false + true + MultiByte + + + + + + + + + + + + + + + Level3 + Disabled + $(ProjectDir);$(ProjectDir)\..;%(AdditionalIncludeDirectories) + MultiThreadedDLL + + + true + + + + + Level3 + MaxSpeed + true + true + + + true + true + true + + + + + + + + + + + + + + + + + + + + \ No newline at end of file ============================================================ --- visualc/libplatform.vcxproj.filters 9b5abd4540f3a400bc51676c9f8defb21b63316d +++ visualc/libplatform.vcxproj.filters 9b5abd4540f3a400bc51676c9f8defb21b63316d @@ -0,0 +1,55 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file ============================================================ --- visualc/monotone.vcxproj f9d1e4bf621e4b0d5e18ed2d8b9600acda4be59b +++ visualc/monotone.vcxproj f9d1e4bf621e4b0d5e18ed2d8b9600acda4be59b @@ -0,0 +1,288 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {83E1EB91-ABA9-4DC5-9423-87B3D977F015} + monotone + + + + Application + MultiByte + false + + + Application + MultiByte + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + Debug\ + monotoneDebug\ + true + Release\ + monotoneRelease\ + false + mtn + + + + /Zm200 %(AdditionalOptions) + Disabled + $(ProjectDir);$(ProjectDir)\..;%(AdditionalIncludeDirectories) + WIN32;_CONSOLE;BOOST_MSVC_STD_ITERATOR;_CRT_SECURE_NO_DEPRECATE;min=min;max=max;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDLL + + + pch.hh + Level3 + EditAndContinue + 4231;4800;4267;4996;4355;4661;4996;%(DisableSpecificWarnings) + pch.hh;%(ForcedIncludeFiles) + + + /NODEFAULTLIB:LIBCMTD.lib %(AdditionalOptions) + botan.lib;sqlite3.lib;netxx.lib;libidn.lib;lua51.lib;pcre.lib;ws2_32.lib;shell32.lib;advapi32.lib;zlib.lib;libplatform.lib;%(AdditionalDependencies) + $(OutDir)mtn.exe + $(OutDir);%(AdditionalLibraryDirectories) + %(IgnoreSpecificDefaultLibraries) + true + $(TargetDir)$(TargetName).pdb + Console + MachineX86 + + + + + MaxSpeed + AnySuitable + true + Speed + true + false + $(ProjectDir);$(ProjectDir)\..\lua;$(ProjectDir)\..\pcre;$(ProjectDir)\..;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_MBCS;_CONSOLE;BOOST_MSVC_STD_ITERATOR;_CRT_SECURE_NO_DEPRECATE;min=min;max=max;%(PreprocessorDefinitions) + true + true + MultiThreadedDLL + false + Create + pch.hh + Level3 + ProgramDatabase + 4231;4800;4267;4996;4355;4661;4996;%(DisableSpecificWarnings) + pch.hh;%(ForcedIncludeFiles) + + + /NODEFAULTLIB:LIBCMT.lib %(AdditionalOptions) + botan.lib;sqlite3.lib;netxx.lib;stringprep.lib;lua.lib;pcre.lib;iconv.lib;ws2_32.lib;shell32.lib;advapi32.lib;zlib.lib;%(AdditionalDependencies) + $(OutDir)mtn.exe + $(OutDir);%(AdditionalLibraryDirectories) + true + false + Console + true + true + + + MachineX86 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CompileAsCpp + CompileAsCpp + + + + + + + + CompileAsCpp + CompileAsCpp + + + + + + + + + + + + + txt2c schema.sql + "$(TargetDir)\txt2c.exe" --strip-trailing schema "$(ProjectDir)\..\schema.sql" "$(ProjectDir)\..\schema.cc" + + $(TargetDir)\txt2c.exe;%(AdditionalInputs) + schema.cc;%(Outputs) + Generating $(ProjectDir)\..\schema.c from $(ProjectDir)\..\schema.sql + "$(TargetDir)\txt2c.exe" --strip-trailing --no-static "$(ProjectDir)\..\schema.sql" schema >"$(ProjectDir)\..\schema.c" + + $(TargetDir)\txt2c.exe;%(AdditionalInputs) + schema.c;%(Outputs) + + + txt2c std_hooks.lua + "$(TargetDir)\txt2c.exe" --strip-trailing std_hooks "$(ProjectDir)\..\std_hooks.lua" "$(ProjectDir)\..\std_hooks.cc" + + $(TargetDir)\txt2c.exe;%(AdditionalInputs) + std_hooks.cc;%(Outputs) + Generating $(ProjectDir)\..\std_hooks.c from $(ProjectDir)\..\std_hooks.lua + "$(TargetDir)\txt2c.exe" --strip-trailing --no-static "$(ProjectDir)\..\std_hooks.lua" std_hooks >"$(ProjectDir)\..\std_hooks.c" + + $(TargetDir)\txt2c.exe;%(AdditionalInputs) + std_hooks.c;%(Outputs) + + + Writing package_full_revision.cc + copy "$(ProjectDir)\..\_MTN\revision" "$(ProjectDir)\..\package_revision.txt" +"$(TargetDir)\txt2c.exe" --strip-trailing package_full_revision "$(ProjectDir)\unknown_package.txt" $(ProjectDir)\..\package_full_revision.cc" +"$(TargetDir)\txt2c.exe" --strip-trailing package_revision "$(ProjectDir)\..\package_revision.txt" $(ProjectDir)\..\package_revision.cc" + + $(TargetDir)\txt2c.exe;%(AdditionalInputs) + package_full_revision.cc;package_revision.cc;%(Outputs) + Writing package_full_revision.cc + copy "$(ProjectDir)\..\_MTN\revision" "$(ProjectDir)\..\package_revision.txt" +"$(TargetDir)\txt2c.exe" --strip-trailing --no-static "$(ProjectDir)\unknown_package.txt" package_full_revision >"$(ProjectDir)\..\package_full_revision.cc" +"$(TargetDir)\txt2c.exe" --strip-trailing --no-static "$(ProjectDir)\..\package_revision.txt" package_revision >"$(ProjectDir)\..\package_revision.cc" + + $(TargetDir)\txt2c.exe;%(AdditionalInputs) + package_full_revision.cc;package_revision.cc;%(Outputs) + + + + + {a075e27b-893b-4426-9b52-d6a795f699de} + false + + + {efc02287-836f-470d-9955-44a8f81fb764} + false + + + + + + \ No newline at end of file ============================================================ --- visualc/monotone.vcxproj.filters 544555e9471f5532e850e81ca3ec570302d1e6a7 +++ visualc/monotone.vcxproj.filters 544555e9471f5532e850e81ca3ec570302d1e6a7 @@ -0,0 +1,357 @@ + + + + + {ec34f421-acd2-434f-9e06-853b72205ff9} + cpp;c;cxx;rc;def;odl;idl;hpj;bat;asm + + + {96f1db2d-b0c1-4d52-ac9a-915315f66de8} + h;hpp;hxx;hm;inl;inc + + + {27738d0d-086f-43d9-b5e9-20d9c2f7ca1e} + ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + + + + \ No newline at end of file ============================================================ --- visualc/netxx.vcxproj a0d5efdf2710681608cd36619da9f48618826987 +++ visualc/netxx.vcxproj a0d5efdf2710681608cd36619da9f48618826987 @@ -0,0 +1,134 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {A075E27B-893B-4426-9B52-D6A795F699DE} + + + + StaticLibrary + MultiByte + + + StaticLibrary + MultiByte + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + Debug\ + netxxDebug\ + Release\ + netxxRelease\ + + + + Disabled + $(ProjectDir)\..\visualc;$(ProjectDir)\..;%(AdditionalIncludeDirectories) + WIN32;_CONSOLE;NETXX_NO_INET6;NETXX_NO_PTON;NETXX_NO_NTOP;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDLL + + + Level3 + EditAndContinue + + + $(OutDir)$(ProjectName).lib + + + + + MaxSpeed + AnySuitable + true + Speed + true + false + $(ProjectDir)\..\visualc;$(ProjectDir)\..;%(AdditionalIncludeDirectories) + WIN32;_CONSOLE;NETXX_NO_INET6;NETXX_NO_PTON;NETXX_NO_NTOP;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + + + Level3 + ProgramDatabase + 4996;%(DisableSpecificWarnings) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file ============================================================ --- visualc/netxx.vcxproj.filters 9b1354f38821d1d8041529e09fa161cadb8837a6 +++ visualc/netxx.vcxproj.filters 9b1354f38821d1d8041529e09fa161cadb8837a6 @@ -0,0 +1,159 @@ + + + + + {83fa1137-d294-4134-8f34-95c38856434c} + cpp;c;cxx;rc;def;odl;idl;hpj;bat;asm + + + {9a0275fa-739a-4e58-b43c-341e98a7ea1d} + h;hpp;hxx;hm;inl;inc + + + {38e6a103-3c3b-42e1-91ff-69a622898de8} + ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file ============================================================ --- visualc/tester.vcxproj 43f9909203296b283fd92906b95f01f54dfaad11 +++ visualc/tester.vcxproj 43f9909203296b283fd92906b95f01f54dfaad11 @@ -0,0 +1,171 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {56C03BD7-0CFA-404B-B666-58020593A071} + tester + Win32Proj + + + + Application + MultiByte + false + + + Application + MultiByte + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + true + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + + + + Disabled + $(ProjectDir);$(ProjectDir)\..\lua;$(ProjectDir)\..\pcre;$(ProjectDir)\..;%(AdditionalIncludeDirectories) + WIN32;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDLL + + + Level3 + EditAndContinue + + + botan.lib;lua51.lib;pcre.lib;libidn.lib;zlib.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) + %(IgnoreSpecificDefaultLibraries) + true + Console + MachineX86 + + + + + Default + false + Neither + false + $(ProjectDir);$(ProjectDir)\..\lua;$(ProjectDir)\..\pcre;$(ProjectDir)\..;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + true + MultiThreadedDLL + + + Level3 + ProgramDatabase + 4661;%(DisableSpecificWarnings) + + + /NODEFAULTLIB:LIBCMTD.lib %(AdditionalOptions) + botan.lib;lua.lib;pcre.lib;stringprep.lib;iconv.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) + true + Console + true + true + MachineX86 + + + + + + + + + + + + + + + + + + + + + + + + + + + + CompileAsCpp + CompileAsCpp + + + + + + + + + + + + + + + + + + + + + + + + txt2c testlib.lua + "$(TargetDir)\txt2c.exe" --strip-trailing testlib "$(ProjectDir)\..\testlib.lua" "$(ProjectDir)\..\testlib.cc" + + $(TargetDir)\txt2c.exe;%(AdditionalInputs) + testlib.c;%(Outputs) + txt2c testlib.lua + "$(TargetDir)\txt2c.exe" --strip-trailing --no-static "$(ProjectDir)\..\testlib.lua" testlib >"$(ProjectDir)\..\testlib.c" + + $(TargetDir)\txt2c.exe;%(AdditionalInputs) + testlib.c;%(Outputs) + + + + + + + + {efc02287-836f-470d-9955-44a8f81fb764} + false + + + + + + \ No newline at end of file ============================================================ --- visualc/tester.vcxproj.filters f8eabbbacf9274019dae2323ef30dcc7d04b9a50 +++ visualc/tester.vcxproj.filters f8eabbbacf9274019dae2323ef30dcc7d04b9a50 @@ -0,0 +1,158 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Header Files + + + + + + \ No newline at end of file ============================================================ --- visualc/txt2c.vcxproj eb14bd92654adb25fe9348d0ad4eb34145212418 +++ visualc/txt2c.vcxproj eb14bd92654adb25fe9348d0ad4eb34145212418 @@ -0,0 +1,110 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {EFC02287-836F-470D-9955-44A8F81FB764} + txt2c + + + + Application + MultiByte + + + Application + MultiByte + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + Debug\ + txt2cDebug\ + true + Release\ + Release\ + false + + + + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + $(OutDir)txt2c.exe + true + $(TargetDir)$(TargetName).pdb + Console + MachineX86 + + + + + + + + + %(Outputs) + + + MaxSpeed + OnlyExplicitInline + true + WIN32;NDEBUG;_MBCS;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + $(OutDir)txt2c.exe + true + Console + true + true + MachineX86 + + + + + + + + + + + + + + + + \ No newline at end of file ============================================================ --- visualc/txt2c.vcxproj.filters 98d469b55f1e5b6daeca1a1ba5c96d024b71bab6 +++ visualc/txt2c.vcxproj.filters 98d469b55f1e5b6daeca1a1ba5c96d024b71bab6 @@ -0,0 +1,27 @@ + + + + + {5e2c2ea3-d288-4cfa-95bb-1f18d2107cc1} + cpp;c;cxx;rc;def;odl;idl;hpj;bat;asm + + + {e58aeddc-f4e5-4fa9-a44e-06883b054dc1} + h;hpp;hxx;hm;inl;inc + + + {9f09a171-9f28-48d3-ba85-4f59bd400d32} + ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + + + + Source Files + + + + + Header Files + + + \ No newline at end of file ============================================================ --- visualc/unit_tester.vcxproj 00bd20f67a5f10c2641caa6d9f585fe6ee89e8a1 +++ visualc/unit_tester.vcxproj 00bd20f67a5f10c2641caa6d9f585fe6ee89e8a1 @@ -0,0 +1,235 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {8F951705-66C4-4B67-A585-C8CF75EA2644} + monotone + + + + Application + MultiByte + false + + + Application + MultiByte + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + Debug\ + unit-testerDebug\ + true + Release\ + unit-testerRelease\ + false + + + + /Zm200 %(AdditionalOptions) + Disabled + $(ProjectDir);$(ProjectDir)\..;%(AdditionalIncludeDirectories) + WIN32;_CONSOLE;BOOST_MSVC_STD_ITERATOR;_CRT_SECURE_NO_DEPRECATE;min=min;max=max;BUILD_UNIT_TESTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDLL + + + pch.hh + Level3 + EditAndContinue + 4231;4800;4267;4996;4355;4661;4996;%(DisableSpecificWarnings) + pch.hh;%(ForcedIncludeFiles) + + + /NODEFAULTLIB:LIBCMTD.lib /VERBOSE:lib %(AdditionalOptions) + botan.lib;netxx.lib;libidn.lib;pcre.lib;ws2_32.lib;shell32.lib;advapi32.lib;zlib.lib;libplatform.lib;%(AdditionalDependencies) + $(OutDir)unit_tester.exe + $(OutDir);%(AdditionalLibraryDirectories) + %(IgnoreSpecificDefaultLibraries) + true + $(TargetDir)$(TargetName).pdb + Console + MachineX86 + + + $(IntDir)$(TargetFileName).embed.manifest + /outputresource:".\Debug\unit_tester.exe%3b#1" %(AdditionalOptions) + false + + + $(IntDir)$(TargetFileName).embed.manifest.res + + + + + MaxSpeed + AnySuitable + true + Speed + true + false + $(ProjectDir);$(ProjectDir)\..\lua;$(ProjectDir)\..\pcre;$(ProjectDir)\..;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_MBCS;_CONSOLE;BOOST_MSVC_STD_ITERATOR;_CRT_SECURE_NO_DEPRECATE;min=min;max=max;BUILD_UNIT_TESTS;%(PreprocessorDefinitions) + true + true + MultiThreadedDLL + false + Create + pch.hh + Level3 + ProgramDatabase + 4231;4800;4267;4996;4355;4661;4996;%(DisableSpecificWarnings) + pch.hh;%(ForcedIncludeFiles) + + + /NODEFAULTLIB:LIBCMT.lib %(AdditionalOptions) + botan.lib;sqlite3.lib;netxx.lib;stringprep.lib;lua.lib;pcre.lib;iconv.lib;ws2_32.lib;shell32.lib;advapi32.lib;zlib.lib;%(AdditionalDependencies) + $(OutDir)unit_tester.exe + $(OutDir);%(AdditionalLibraryDirectories) + true + false + Console + true + true + + + MachineX86 + + + + + + $(IntDir) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(IntDir)unit_basic_io.obj + + + $(IntDir)unit_charset.obj + + + $(IntDir)unit_commands.obj + + + $(IntDir)unit_cset.obj + + + + $(IntDir)unit_git_change.obj + + + $(IntDir)unit_globish.obj + + + $(IntDir)unit_graph.obj + + + $(IntDir)unit_merge_3way.obj + + + $(IntDir)unit_merge_roster.obj + + + $(IntDir)unit_mkstemp.obj + + + $(IntDir)unit_netcmd.obj + + + $(IntDir)unit_netxx_pipe.obj + + + + $(IntDir)unit_option.obj + + + $(IntDir)unit_oudated_indicator.obj + + + + + $(IntDir)unit_refiner.cc + + + $(IntDir)unit_restrictions.obj + + + $(IntDir)unit_revision.obj + + + + + + $(IntDir)unit_simplestring_xform.obj + + + + $(IntDir)unit_transforms.obj + + + $(IntDir)unit_uri.obj + + + $(IntDir)unit_vocab.obj + + + $(IntDir)unit_xdelta.obj + + + + + + + + + + \ No newline at end of file ============================================================ --- visualc/unit_tester.vcxproj.filters c464f84de8860acccd7cdd48eaa4169a98b9cbd0 +++ visualc/unit_tester.vcxproj.filters c464f84de8860acccd7cdd48eaa4169a98b9cbd0 @@ -0,0 +1,208 @@ + + + + + {b63c054f-0160-4372-b0aa-ec28091c235c} + cpp;c;cxx;rc;def;odl;idl;hpj;bat;asm + + + {ac1592f8-ee23-4fb5-8bfe-7e782b36564e} + h;hpp;hxx;hm;inl;inc + + + {c09abf60-a71c-432f-9ef1-bc93be0e23a4} + ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file ============================================================ --- .mtn-ignore af5e150ca99ed11f75f73928d7258eabbe08a111 +++ .mtn-ignore c2be58b176d52e7c1a5506b7f2f388ef049db55a @@ -61,3 +61,6 @@ ^unit_tests\.status$ ^version\.texi$ ^monotone\.html$ +^visualc/[a-z_0-9]+\.vcxproj\.user$ +^visualc/[-a-z_0-9]*(Debug|Release)$ +^visualc/monotone.suo$ ============================================================ --- README.visualc8 d6f503886a735b74ac6401b6532f10dd2b43aac6 +++ README.visualc 09d779af11eca39e2409c2801eb72eb9e63ddbc4 @@ -1,3 +1,69 @@ +Visual Studio Express 2010 + + +pcre - from http://gnuwin32.sourceforge.net/packages/pcre.htm , http://sourceforge.net/projects/gnuwin32/files/ , http://sourceforge.net/projects/gnuwin32/files/pcre/7.0/pcre-7.0.exe/download + C:\Program Files\GnuWin32 + installer + add include directory to include path and lib directory to library path + +botan + install Python http://www.python.org/download/releases/ + http://www.python.org/ftp/python/2.6.5/python-2.6.5.msi + or + http://www.python.org/ftp/python/2.6.5/python-2.6.5.amd64.msi + + http://botan.randombit.net/files/Botan-1.9.7.tgz + unpack + run c:\...\python.exe config.py + run "nmake" (I think this might require you to be running from "visual studio command prompt" to have you %PATH% set right) + run "nmake check" + add the top directories to your library path, and build/include to your include path + +lua http://luaforge.net/frs/download.php/4002/lua5_1_4_Win32_dll8_lib.zip http://luabinaries.luaforge.net/download.html + zip file + download, unpack, add include and library directories + +zlib http://sourceforge.net/projects/gnuwin32/files/zlib/1.2.3/zlib-1.2.3.exe/download + C:\Program Files\GnuWin32 + installer + install, make sure directories are added + +sqlite + http://www.sqlite.org/sqlitedll-3_6_23_1.zip + http://www.sqlite.org/sqlite-amalgamation-3_6_23_1.zip + extract, add include/lib directories + open "visual studio command prompt", go to the sqlite lib directory, run "lib /def:sqlite3.def /out:sqlite3.lib" + +idn + http://ftp.gnu.org/gnu/libidn/libidn-1.19.tar.gz + unpack somewhere + go to win32 directory, open libidn.sln + add LIBIDN_BUILDING to the preprocessor definitions + (Configuration Properties->C/C++->Preprocessor) + build the sln + add win32\lib to your library path and lib\ and win32\include to your include path + +boost (headers) + http://sourceforge.net/projects/boost/files/boost/1.43.0/boost_1_43_0.zip/download + unpack somewhere, add to include path + +gettext? libiconv? + + +Include path + Go to "Property Manager" window (View->Other Windows) + expand a project and one of the Debug | Win32 or Release | Win32 nodes under it + right-click "Microsoft.Cpp.Win32.user", click "Properties" + go to Common Properties->C/C++->General + edit "Additional Include Directories" +Libraries + Common Properties->VC++ Directories + edit "Library Directories" + + + + + Visual Studio 2005 Install libiconv: ============================================================ --- automate_ostream.hh d4ff673e1080a7b081d79a1876a6bb203d05640d +++ automate_ostream.hh 3771687ded1949e75511d177e7f600e30d93054f @@ -120,7 +120,9 @@ protected: { /* this->init(&_M_autobuf); */ } protected: - basic_automate_ostream() { } + basic_automate_ostream() + : std::basic_ostream<_CharT, _Traits>(&_M_autobuf) + { } public: virtual ~basic_automate_ostream() ============================================================ --- cmd_automate.cc adcb13a39667247f022a9a84ec7717fce33e3e2c +++ cmd_automate.cc 9ca3dc8cb127d6d4e20768fd007f1dd94a10119c @@ -11,7 +11,7 @@ #include #include #include -#include +//#include #include "cmd.hh" #include "app_state.hh" @@ -21,6 +21,7 @@ #include "lua.hh" #include "lua_hooks.hh" #include "database.hh" +#include "platform.hh" #include "work.hh" using std::istream; @@ -151,7 +152,7 @@ CMD_AUTOMATE_HIDDEN(bandtest, "{ info | { first+=3; ++second; - usleep(100000); // 100ms + process_sleep(0.1); // 100ms } } else ============================================================ --- key_store.cc 6ea38c00f7da18dd8136f0a4080b2fb7a8cbedba +++ key_store.cc a49d0412a6f7df61114a8db644b599070799dc37 @@ -539,7 +539,7 @@ key_store_state::decrypt_private_key(key pkcs8_key.reset(Botan::PKCS8::load_key(ds, "")); #endif } - catch (Botan::Exception & e) + catch (std::exception & e) { L(FL("failed to load key with no passphrase: %s") % e.what()); @@ -572,7 +572,7 @@ key_store_state::decrypt_private_key(key #endif break; } - catch (Botan::Exception & e) + catch (std::exception & e) { cycles++; L(FL("decrypt_private_key: failure %d to load encrypted key: %s") @@ -783,7 +783,7 @@ key_store::decrypt_rsa(key_id const & id plaintext = string(reinterpret_cast(plain.begin()), plain.size()); } - catch (Botan::Exception & ex) + catch (std::exception & ex) { E(false, ciphertext.made_from, F("Botan error decrypting data: '%s'") % ex.what()); @@ -1012,7 +1012,7 @@ key_store_state::migrate_old_key_pair #endif break; } - catch (Botan::Exception & e) + catch (std::exception & e) { L(FL("migrate_old_key_pair: failure %d to load old private key: %s") % cycles % e.what()); ============================================================ --- keys.hh f48a9a4a28dd60cc8b89cb4f0fc9ecf0dd8613c9 +++ keys.hh 6626961a663b81dc8d1fe3748cde74a44f24885d @@ -18,7 +18,7 @@ struct keypair; class key_store; class database; struct keypair; -class globish; +struct globish; // keys.{hh,cc} does all the "delicate" crypto (meaning: that which needs // to read passphrases and manipulate raw, decrypted private keys). it ============================================================ --- monotone.cc 93efe8898e46a4888eff29a34a77bfedbe7172ce +++ monotone.cc 4abde4b4c7b81306f61b997b915211108a897da3 @@ -209,8 +209,8 @@ cpp_main(int argc, char ** argv) #else E(linked_botan_version > BOTAN_VERSION_CODE_FOR(1,7,22), origin::system, F("This monotone binary requires Botan 1.7.22 or newer.")); - E(linked_botan_version < BOTAN_VERSION_CODE_FOR(1,9,0), origin::system, - F("This monotone binary does not work with Botan 1.9.x.")); + //E(linked_botan_version < BOTAN_VERSION_CODE_FOR(1,9,0), origin::system, + // F("This monotone binary does not work with Botan 1.9.x.")); #endif app_state app; ============================================================ --- netcmd.hh f6c60950810184737024220f58f806db5ec1ee2a +++ netcmd.hh cdea1bcd99e0770ffb878227032c02aa1c89449a @@ -28,7 +28,7 @@ class lua_hooks; class project_t; class key_store; class lua_hooks; -class options; +struct options; class app_state; ============================================================ --- netxx/osutil.h 74df9538ae587f638afa95772b582ad5d173c70a +++ netxx/osutil.h 4aa82962bf4e3636a1c6962f85b2ee6c6dd4c511 @@ -54,8 +54,8 @@ # undef EAFNOSUPPORT # define EAFNOSUPPORT WSAEAFNOSUPPORT -# undef ENOSPC -# define ENOSPC WSAENOSPC +//# undef ENOSPC +//# define ENOSPC WSAENOSPC # undef ECONNRESET # define ECONNRESET WSAECONNRESET ============================================================ --- option.hh a120f75cc822a8ff7a0e0602d2385f3d730f2588 +++ option.hh d572a50411ed5e4769ed37536216408e9e7786d7 @@ -233,13 +233,15 @@ namespace option { bool arg, void(T::*set)(std::string), void(T::*reset)()) + // VS2010 is finding std::tr1::mem_fn by argument-dependent lookup + : setter(boost::mem_fn(set)), resetter(boost::mem_fn(reset)) { I((name && name[0]) || (desc && desc[0])); description = desc; names = name; has_arg = arg; - setter = set; - resetter = reset; + //setter = set; + //resetter = reset; } concrete_option instantiate(T * obj) const ============================================================ --- pch.hh 4831fa5a656735b98e48a8e34cb3377526f87bab +++ pch.hh 224190ead406ea57f47f4547da980b0541b5ec3c @@ -11,10 +11,6 @@ #include #include #include -#include -#include -#include -#include // We have a local version of this to work around a bug in the MSVC debug checking. #include #include "lexical_cast.hh" ============================================================ --- platform.hh 648608271dd6559ba89bc0bb816a3de306c3355f +++ platform.hh 36e49168714b08892b1c222a1af797d280fec80b @@ -32,7 +32,7 @@ int process_kill(pid_t pid, int signal); pid_t process_spawn_pipe(char const * const argv[], FILE** in, FILE** out); int process_wait(pid_t pid, int *res, int timeout = -1);// default infinite int process_kill(pid_t pid, int signal); -int process_sleep(unsigned int seconds); +int process_sleep(float seconds); // stop "\n"->"\r\n" from breaking automate on Windows void make_io_binary(); ============================================================ --- project.hh 072a2c57396fafe3102d3c1478f2914ade2fa08e +++ project.hh b26d01f963594f3449b084682784143a7e0c3e14 @@ -20,7 +20,7 @@ class key_store; class arg_type; class database; class key_store; -class options; +struct options; class lua_hooks; struct globish; struct date_t; ============================================================ --- selectors.hh 8f23c72c0901a492c75f483b8c2c4316251b31ed +++ selectors.hh e8f92e6ff129f9261cd7106fadb565b7549ff873 @@ -13,7 +13,7 @@ #include "vocab.hh" #include -class options; +struct options; class lua_hooks; class project_t; ============================================================ --- tester.cc adb12440ea0b944027ea7f8eb35e06acbce2bcce +++ tester.cc 25c80b80fabdf6cc9c28d3cfd152fd8ea934380a @@ -57,7 +57,7 @@ string basename(string const & s) string basename(string const & s) { - string::size_type sep = s.rfind('/'); + string::size_type sep = s.find_last_of("/\\"); if (sep == string::npos) return s; // force use of short circuit if (sep == s.size()) @@ -67,7 +67,7 @@ string dirname(string const & s) string dirname(string const & s) { - string::size_type sep = s.rfind('/'); + string::size_type sep = s.find_last_of("/\\"); if (sep == string::npos) return "."; if (sep == s.size() - 1) // dirname() of the root directory is itself ============================================================ --- transforms.cc 5ddd45879695306827570bd595789564990540fd +++ transforms.cc d1576ac79245777811e13b8813595fd982b86a56 @@ -53,10 +53,10 @@ using Botan::Hash_Filter; // paradigm "must" be used. this program is intended for source code // control and I make no bones about it. -NORETURN(static inline void error_in_transform(Botan::Exception & e)); +NORETURN(static inline void error_in_transform(std::exception & e)); static inline void -error_in_transform(Botan::Exception & e, origin::type caused_by) +error_in_transform(std::exception & e, origin::type caused_by) { // these classes can all indicate data corruption if (typeid(e) == typeid(Botan::Encoding_Error) @@ -107,7 +107,7 @@ error_in_transform(Botan::Exception & e, pipe->process_msg(in); \ out = pipe->read_all_as_string(Pipe::LAST_MESSAGE); \ } \ - catch (Botan::Exception & e) \ + catch (std::exception & e) \ { \ pipe.reset(new Pipe(new T(carg))); \ error_in_transform(e, made_from); \ @@ -173,7 +173,7 @@ template<> string xform tmp = pipe->read_all_as_string(Pipe::LAST_MESSAGE); out = base64< gzip >(tmp, in.made_from); } - catch (Botan::Exception & e) + catch (std::exception & e) { pipe.reset(new Pipe(new Gzip_Compression, new Base64_Encoder)); @@ -237,7 +237,7 @@ void unpack(base64< gzip > const & in pipe->process_msg(in()); out = T(pipe->read_all_as_string(Pipe::LAST_MESSAGE), in.made_from); } - catch (Botan::Exception & e) + catch (std::exception & e) { pipe.reset(new Pipe(new Base64_Decoder, new Gzip_Decompression)); @@ -264,7 +264,7 @@ calculate_ident(data const & dat, p->process_msg(dat()); ident = id(p->read_all_as_string(Pipe::LAST_MESSAGE), dat.made_from); } - catch (Botan::Exception & e) + catch (std::exception & e) { p.reset(new Pipe(new Hash_Filter("SHA-160"))); error_in_transform(e, dat.made_from); ============================================================ --- txt2c.cc ce9a9030cd612c9b12dd2b415a2c04197b2b1614 +++ txt2c.cc 70cd7f295935fb18c8181cf004c2bb9857412e1a @@ -11,6 +11,7 @@ #include #include #include +#include #include // for strerror #include // for rename ============================================================ --- unix/process.cc a4fbbe13d86d9ef8427ed44416737385e3616968 +++ unix/process.cc c2f91b2afc1c5db49261f0638040e5b8b8f751fd @@ -310,9 +310,9 @@ int process_kill(pid_t pid, int signal) return kill(pid, signal); } -int process_sleep(unsigned int seconds) +int process_sleep(float seconds) { - return sleep(seconds); + return usleep((unsigned int)(seconds*1e6)); } pid_t get_process_id() ============================================================ --- visualc/config.h 923f821fff59c63fa06a8554f32f8557aaf378c9 +++ visualc/config.h 55e6e1525fb06d1a0e6cefe6be2ebe05991b1fc3 @@ -8,14 +8,17 @@ #define VERSION "0.47" #ifdef _MSC_VER -typedef unsigned long pid_t; +// If this is unsigned, then we can't use -1 for invalid. +// Because, when that's passed to Lua it's turned into a double and +// (double)(ulong)(-1) is not equal to (double)(-1). +typedef /*unsigned*/ long pid_t; typedef unsigned int os_err_t; // #define HAVE_EXTERN_TEMPLATE #define LOCALEDIR "" #endif /* Define if using bundled pcre */ -#define PCRE_STATIC 1 +//#define PCRE_STATIC 1 /* Type to use for `s16'. */ #define TYPE_S16 short @@ -79,5 +82,11 @@ typedef unsigned int os_err_t; */ #pragma warning( disable : 4250 ) +/* + * Disable MS specific warning C4275 + * non dll-interface class '<...>' used as base for dll-interface struct '<...>' + * This happens every time botan subclasses std::exception. + */ +#pragma warning( disable : 4275 ) #endif /* CONFIG_H */ ============================================================ --- visualc/monotone.sln 4cc9dff446e2748daca6e0adb3028aa11b7a8d0d +++ visualc/monotone.sln 312fa84b29e077861e6963bf120ee590a933c072 @@ -1,46 +1,23 @@  -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "monotone", "monotone.vcproj", "{83E1EB91-ABA9-4DC5-9423-87B3D977F015}" +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual C++ Express 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "monotone", "monotone.vcxproj", "{83E1EB91-ABA9-4DC5-9423-87B3D977F015}" ProjectSection(ProjectDependencies) = postProject - {36249158-B5C6-46BD-9FAF-15454CBE722F} = {36249158-B5C6-46BD-9FAF-15454CBE722F} - {CA00DD78-49F0-43BD-B5BB-D649C796FA95} = {CA00DD78-49F0-43BD-B5BB-D649C796FA95} - {A075E27B-893B-4426-9B52-D6A795F699DE} = {A075E27B-893B-4426-9B52-D6A795F699DE} - {EFC02287-836F-470D-9955-44A8F81FB764} = {EFC02287-836F-470D-9955-44A8F81FB764} - {FF042D9E-E5DC-4C89-AB5B-6CD03990A595} = {FF042D9E-E5DC-4C89-AB5B-6CD03990A595} - {4B57DCC2-608A-42E3-B54F-89DAA495D7BA} = {4B57DCC2-608A-42E3-B54F-89DAA495D7BA} - {84286BE1-7522-4A9E-853C-27CD329B96D1} = {84286BE1-7522-4A9E-853C-27CD329B96D1} + {309B9A4E-2572-4A68-876D-E02639F84510} = {309B9A4E-2572-4A68-876D-E02639F84510} EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{36B323F6-E1FE-4B73-846C-21F62E28CC90}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "netxx", "netxx.vcxproj", "{A075E27B-893B-4426-9B52-D6A795F699DE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "botan", "botan.vcproj", "{4B57DCC2-608A-42E3-B54F-89DAA495D7BA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "txt2c", "txt2c.vcxproj", "{EFC02287-836F-470D-9955-44A8F81FB764}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua", "lua.vcproj", "{84286BE1-7522-4A9E-853C-27CD329B96D1}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tester", "tester.vcxproj", "{56C03BD7-0CFA-404B-B666-58020593A071}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "netxx", "netxx.vcproj", "{A075E27B-893B-4426-9B52-D6A795F699DE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcre", "pcre.vcproj", "{36249158-B5C6-46BD-9FAF-15454CBE722F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj", "{CA00DD78-49F0-43BD-B5BB-D649C796FA95}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stringprep", "stringprep.vcproj", "{FF042D9E-E5DC-4C89-AB5B-6CD03990A595}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "txt2c", "txt2c.vcproj", "{EFC02287-836F-470D-9955-44A8F81FB764}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tester", "tester.vcproj", "{56C03BD7-0CFA-404B-B666-58020593A071}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unit_tester", "unit_tester.vcxproj", "{8F951705-66C4-4B67-A585-C8CF75EA2644}" ProjectSection(ProjectDependencies) = postProject - {EFC02287-836F-470D-9955-44A8F81FB764} = {EFC02287-836F-470D-9955-44A8F81FB764} - {FF042D9E-E5DC-4C89-AB5B-6CD03990A595} = {FF042D9E-E5DC-4C89-AB5B-6CD03990A595} - {84286BE1-7522-4A9E-853C-27CD329B96D1} = {84286BE1-7522-4A9E-853C-27CD329B96D1} - {4B57DCC2-608A-42E3-B54F-89DAA495D7BA} = {4B57DCC2-608A-42E3-B54F-89DAA495D7BA} - {36249158-B5C6-46BD-9FAF-15454CBE722F} = {36249158-B5C6-46BD-9FAF-15454CBE722F} + {309B9A4E-2572-4A68-876D-E02639F84510} = {309B9A4E-2572-4A68-876D-E02639F84510} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unit_tester", "unit_tester.vcproj", "{8F951705-66C4-4B67-A585-C8CF75EA2644}" - ProjectSection(ProjectDependencies) = postProject - {83E1EB91-ABA9-4DC5-9423-87B3D977F015} = {83E1EB91-ABA9-4DC5-9423-87B3D977F015} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libplatform", "libplatform.vcxproj", "{309B9A4E-2572-4A68-876D-E02639F84510}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -52,30 +29,10 @@ Global {83E1EB91-ABA9-4DC5-9423-87B3D977F015}.Debug|Win32.Build.0 = Debug|Win32 {83E1EB91-ABA9-4DC5-9423-87B3D977F015}.Release|Win32.ActiveCfg = Release|Win32 {83E1EB91-ABA9-4DC5-9423-87B3D977F015}.Release|Win32.Build.0 = Release|Win32 - {4B57DCC2-608A-42E3-B54F-89DAA495D7BA}.Debug|Win32.ActiveCfg = Debug|Win32 - {4B57DCC2-608A-42E3-B54F-89DAA495D7BA}.Debug|Win32.Build.0 = Debug|Win32 - {4B57DCC2-608A-42E3-B54F-89DAA495D7BA}.Release|Win32.ActiveCfg = Release|Win32 - {4B57DCC2-608A-42E3-B54F-89DAA495D7BA}.Release|Win32.Build.0 = Release|Win32 - {84286BE1-7522-4A9E-853C-27CD329B96D1}.Debug|Win32.ActiveCfg = Debug|Win32 - {84286BE1-7522-4A9E-853C-27CD329B96D1}.Debug|Win32.Build.0 = Debug|Win32 - {84286BE1-7522-4A9E-853C-27CD329B96D1}.Release|Win32.ActiveCfg = Release|Win32 - {84286BE1-7522-4A9E-853C-27CD329B96D1}.Release|Win32.Build.0 = Release|Win32 {A075E27B-893B-4426-9B52-D6A795F699DE}.Debug|Win32.ActiveCfg = Debug|Win32 {A075E27B-893B-4426-9B52-D6A795F699DE}.Debug|Win32.Build.0 = Debug|Win32 {A075E27B-893B-4426-9B52-D6A795F699DE}.Release|Win32.ActiveCfg = Release|Win32 {A075E27B-893B-4426-9B52-D6A795F699DE}.Release|Win32.Build.0 = Release|Win32 - {36249158-B5C6-46BD-9FAF-15454CBE722F}.Debug|Win32.ActiveCfg = Debug|Win32 - {36249158-B5C6-46BD-9FAF-15454CBE722F}.Debug|Win32.Build.0 = Debug|Win32 - {36249158-B5C6-46BD-9FAF-15454CBE722F}.Release|Win32.ActiveCfg = Release|Win32 - {36249158-B5C6-46BD-9FAF-15454CBE722F}.Release|Win32.Build.0 = Release|Win32 - {CA00DD78-49F0-43BD-B5BB-D649C796FA95}.Debug|Win32.ActiveCfg = Debug|Win32 - {CA00DD78-49F0-43BD-B5BB-D649C796FA95}.Debug|Win32.Build.0 = Debug|Win32 - {CA00DD78-49F0-43BD-B5BB-D649C796FA95}.Release|Win32.ActiveCfg = Release|Win32 - {CA00DD78-49F0-43BD-B5BB-D649C796FA95}.Release|Win32.Build.0 = Release|Win32 - {FF042D9E-E5DC-4C89-AB5B-6CD03990A595}.Debug|Win32.ActiveCfg = Debug|Win32 - {FF042D9E-E5DC-4C89-AB5B-6CD03990A595}.Debug|Win32.Build.0 = Debug|Win32 - {FF042D9E-E5DC-4C89-AB5B-6CD03990A595}.Release|Win32.ActiveCfg = Release|Win32 - {FF042D9E-E5DC-4C89-AB5B-6CD03990A595}.Release|Win32.Build.0 = Release|Win32 {EFC02287-836F-470D-9955-44A8F81FB764}.Debug|Win32.ActiveCfg = Debug|Win32 {EFC02287-836F-470D-9955-44A8F81FB764}.Debug|Win32.Build.0 = Debug|Win32 {EFC02287-836F-470D-9955-44A8F81FB764}.Release|Win32.ActiveCfg = Release|Win32 @@ -88,17 +45,12 @@ Global {8F951705-66C4-4B67-A585-C8CF75EA2644}.Debug|Win32.Build.0 = Debug|Win32 {8F951705-66C4-4B67-A585-C8CF75EA2644}.Release|Win32.ActiveCfg = Release|Win32 {8F951705-66C4-4B67-A585-C8CF75EA2644}.Release|Win32.Build.0 = Release|Win32 + {309B9A4E-2572-4A68-876D-E02639F84510}.Debug|Win32.ActiveCfg = Debug|Win32 + {309B9A4E-2572-4A68-876D-E02639F84510}.Debug|Win32.Build.0 = Debug|Win32 + {309B9A4E-2572-4A68-876D-E02639F84510}.Release|Win32.ActiveCfg = Release|Win32 + {309B9A4E-2572-4A68-876D-E02639F84510}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {4B57DCC2-608A-42E3-B54F-89DAA495D7BA} = {36B323F6-E1FE-4B73-846C-21F62E28CC90} - {84286BE1-7522-4A9E-853C-27CD329B96D1} = {36B323F6-E1FE-4B73-846C-21F62E28CC90} - {A075E27B-893B-4426-9B52-D6A795F699DE} = {36B323F6-E1FE-4B73-846C-21F62E28CC90} - {36249158-B5C6-46BD-9FAF-15454CBE722F} = {36B323F6-E1FE-4B73-846C-21F62E28CC90} - {CA00DD78-49F0-43BD-B5BB-D649C796FA95} = {36B323F6-E1FE-4B73-846C-21F62E28CC90} - {FF042D9E-E5DC-4C89-AB5B-6CD03990A595} = {36B323F6-E1FE-4B73-846C-21F62E28CC90} - {EFC02287-836F-470D-9955-44A8F81FB764} = {36B323F6-E1FE-4B73-846C-21F62E28CC90} - EndGlobalSection EndGlobal ============================================================ --- visualc/unistd.h 470e076aa451f7e9b5de640025a322afd1ac8b5d +++ visualc/unistd.h a38a6819a8feb51aa67e7e1d44265dd5193ec089 @@ -10,7 +10,7 @@ #ifdef _MSC_VER #include #include -typedef size_t ssize_t; +//typedef size_t ssize_t; #endif #endif /* _UNISTD_H */ ============================================================ --- vocab.cc 1a4f7c3ab144ead8f4698c7c225c2fac6b161cc3 +++ vocab.cc 8c5bb15cd5d94be236545517123419254dd60d99 @@ -190,7 +190,7 @@ template void dump(key_id const & r, str template void dump(file_id const & r, string &); template void dump(hexenc const & r, string &); template void dump(key_id const & r, string &); -template void dump(rsa_pub_key const&, string &); +//template void dump(rsa_pub_key const&, string &); template void dump(roster_data const & d, string &); template void dump(roster_delta const & d, string &); template void dump(manifest_data const & d, string &); ============================================================ --- win32/fs.cc 4c87e1d1a39ab6ff39479086db3e67e66cddaffa +++ win32/fs.cc c91fc830b427cc735004f2843e1382dde23c4ed5 @@ -12,6 +12,7 @@ #include #include #include +#include #include #include @@ -287,7 +288,11 @@ do_remove_recursive(std::string const & // 0x402 is "unknown error"; it occurs for a non-existing path, which is // not an error in this function. It also occurs for other problems, like // '/' as a directory separator. Sigh. - E(rc == 0 || rc == 0x402, origin::system, + // + // But some return codes are the normal Win32 codes, including 0x02 for + // file not found on Win7. (Probably also Vista, since that's when it + // stopped returning 0x402.) + E(rc == 0 || rc == 0x402 || rc == 2, origin::system, F("could not remove '%s' and contents: SHFileOperation error code 0x%x") % path % rc); E(!op.fAnyOperationsAborted, origin::system, ============================================================ --- win32/process.cc e95879b8147e9cd0de0a9f907deefa14e6093266 +++ win32/process.cc 8e17a9b84bbd696555f77d96a9bb1f81c10bce9d @@ -243,9 +243,9 @@ int process_kill(pid_t pid, int signal) return 0; } -int process_sleep(unsigned int seconds) +int process_sleep(float seconds) { - Sleep(seconds*1000); + Sleep((unsigned int)(seconds*1000)); return 0; } ============================================================ --- work.hh 12a0cb4870fdb76affdfed725039d7407be701b8 +++ work.hh 1cf7bcb0a51ca78ea3183102a61aa6ec14d2483a @@ -18,7 +18,7 @@ class lua_hooks; class node_restriction; struct content_merge_adaptor; class lua_hooks; -class i18n_format; +struct i18n_format; struct options; class app_state;