diff --git a/.gitignore b/.gitignore index 87f0e066e..10018640d 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,7 @@ ReleaseHant/ /lib/*.lib /include/glog /ipch +env.bat weasel.props *.log *.user diff --git a/INSTALL.md b/INSTALL.md index 3d90fe0fe..b44a11f91 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -2,11 +2,14 @@ ## Preparation -Assume we already have a default installation of **Visual Studio 2015**. +Assume we already have an installation of **Visual Studio 2015** including the component +"MFC and ATL support". Install dev tools: `git`, `cmake` Download third-party libraries: `boost(>=1.60.0)` +Optional: install `python` for building OpenCC dictionaries + ## Checkout source code Make sure you also checkout submodules `brise` and `librime` under `weasel` directory. @@ -15,97 +18,61 @@ Make sure you also checkout submodules `brise` and `librime` under `weasel` dire git clone --recursive https://github.com/rime/weasel.git ``` -## Fast build - -If you want to build Weasel in minimal steps, jump to [this section] (#build-and-install-weasel). - -## Build librime - -This section guides you to build librime, the core input method library used by Weasel. - -To be verbose, you'll get the following binaries as the build output of librime, as well as its -dependent third-party libraries including boost, glog, marisa-trie, leveldb, opencc, yaml-cpp. - - * `librime\build\lib\Release\rime.dll` / `rime.lib` - * `thirdparty\bin\libglog.dll` - * `thirdparty\bin\opencc.dll` - -### Using prebuilt binaries +## Build and Install Weasel -If you've already got a copy of prebuilt binaries of librime, -you can simply copy `.dll`s / `.lib`s into `weasel\output` / `weasel\lib` directories respectively. -Then go straight to building Weasel. +Locate `weasel` source directory. ### Setup build environment -Edit `librime\env.bat.template`, save your copy as `librime\env.bat`. - -Make sure `BOOST_ROOT` is set to `\path\to\boost_1_57_0` in `librime\env.bat`. - -Then, start VC command line tools from `librime\shell.bat`. +Start a Developer Command Prompt window. -### Build librime and its dependencies +Set `BOOST_ROOT` environment variable: -At the command prompt, enter the following command: ```batch -rem cd librime -rem shell.bat - -build.bat boost thirdparty librime +set BOOST_ROOT=X:\path\to\boost_N_NN_N ``` -With some luck, you now have a copy of the built library in `librime\build\lib\Release`: - * shared library - `rime.dll` / `rime.lib`, these will be used by Weasel - * static library - `librime.lib`, if built with `build.bat static` - -### Play with Rime command line tools +Alternatively, save your build environment settings in `env.bat`. +You can create the file by copying `env.bat.template` and make modifications. +Make sure `BOOST_ROOT` is set to existing `X:\path\to\boost_N_NN_N` in your copy. -Rime comes with a REPL application by which you can test if the library is working. +### Build -Windows command line does not use UTF-8 character encoding, thus we save the output to a file. ```batch -rem cd librime -copy /Y thirdparty\bin\*.dll build\bin\ -copy /Y build\lib\Release\rime.dll build\bin\ -cd build\bin -echo zhongzhouyunshurufa | Release\rime_api_console.exe > output.txt +cd weasel +build.bat all ``` -## Build and Install Weasel - -Back to `weasel` directory. - -### Setup build environment - -Edit `env.bat.template`, save your copy as `env.bat`. - -Edit `weasel.props.template`, save your copy as `weasel.props`. -Forget about Python. It's not used anyway. +Voila. -Then, start VC command line tools from `shell.bat`. +### Alternative: using prebuilt Rime binaries -### Build +If you've already got a copy of prebuilt binaries of librime, +you can simply copy `.dll`s / `.lib`s into `weasel\output` / `weasel\lib` directories respectively. +Then build Weasel without the `all` command line option. ```batch -rem cd \path\to\weasel -rem shell.bat - -build.bat all +build.bat boost data hant ``` -Or, if using prebuilt librime libraries (see "Using prebuilt binaries" section above): +### Install and try it live ```batch -build.bat boost data hant +cd output +install.bat ``` -Voila. +### Optional: play with Rime command line tools -### Install and try it live +Rime comes with a REPL application which can be used to test if the library is working. +Windows command line does not use UTF-8 character encoding, thus we save the output to a file. ```batch -cd output -install.bat +cd librime +copy /Y thirdparty\bin\*.dll build\bin\ +copy /Y build\lib\Release\rime.dll build\bin\ +cd build\bin +echo zhongzhouyunshurufa | Release\rime_api_console.exe > output.txt ``` ### Create installer packages @@ -114,4 +81,4 @@ To create installer packages, you need to download and install [Unicode NSIS] (h Then go to `output` directory, right-click and choose "Compile Unicode NSIS Script" with `install.nsi` and `expansion.nsi`. -Installers will be generated in `archives` directory. +Installers will be generated in `output\archives` directory. diff --git a/PyWeasel/PyWeasel.vcxproj b/PyWeasel/PyWeasel.vcxproj index 35b1730cc..0bac74a88 100644 --- a/PyWeasel/PyWeasel.vcxproj +++ b/PyWeasel/PyWeasel.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -38,160 +38,137 @@ {8C75C43E-E9AD-4D2D-81F2-5608F36CE77B} PyWeasel Win32Proj - 7.0 + StaticLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) StaticLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) StaticLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) StaticLibrary Unicode - v140_xp + $(PLATFORM_TOOLSET) StaticLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) StaticLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) StaticLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) StaticLibrary Unicode - v140_xp + $(PLATFORM_TOOLSET) - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - Disabled - $(SolutionDir)\include;$(BOOST_HOME);$(PYTHON_HOME)\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);$(PYTHON_HOME)\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreadedDebugDLL + MultiThreadedDebug Use Level3 EditAndContinue + /Zc:threadSafeInit- %(AdditionalOptions) MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);$(PYTHON_HOME)\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);$(PYTHON_HOME)\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions) MultiThreaded true Use Level3 ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);$(PYTHON_HOME)\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);$(PYTHON_HOME)\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions) MultiThreaded true Use Level3 ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);$(PYTHON_HOME)\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);$(PYTHON_HOME)\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions) MultiThreaded true Use Level3 ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) @@ -200,14 +177,15 @@ Disabled - $(SolutionDir)\include;$(BOOST_HOME);$(PYTHON_HOME)\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);$(PYTHON_HOME)\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreadedDebugDLL + MultiThreadedDebug Use Level3 ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) @@ -217,13 +195,14 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);$(PYTHON_HOME)\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);$(PYTHON_HOME)\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions) MultiThreaded true Use Level3 ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) @@ -233,7 +212,7 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);$(PYTHON_HOME)\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);$(PYTHON_HOME)\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions) MultiThreaded true @@ -249,7 +228,7 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);$(PYTHON_HOME)\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);$(PYTHON_HOME)\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions) MultiThreaded true diff --git a/RimeWithWeasel/RimeWithWeasel.cpp b/RimeWithWeasel/RimeWithWeasel.cpp index 8f6597148..aa9621fd8 100644 --- a/RimeWithWeasel/RimeWithWeasel.cpp +++ b/RimeWithWeasel/RimeWithWeasel.cpp @@ -9,9 +9,7 @@ #include #include -#pragma warning(disable: 4005) #include -#pragma warning(default: 4005) int expand_ibus_modifier(int m) { @@ -394,7 +392,7 @@ bool RimeWithWeaselHandler::_ShowMessage(weasel::Context& ctx, weasel::Status& s else if (m_message_value == "success") tips = L"部署完成"; else if (m_message_value == "failure") - tips = L"有錯誤，請查看日誌 %TEMP%\rime.weasel.*.INFO"; + tips = L"有錯誤，請查看日誌 %TEMP%\\rime.weasel.*.INFO"; } else if (m_message_type == "schema") { tips = /*L"【" + */status.schema_name/* + L"】"*/; diff --git a/RimeWithWeasel/RimeWithWeasel.vcxproj b/RimeWithWeasel/RimeWithWeasel.vcxproj index 187484b56..04ae9169e 100644 --- a/RimeWithWeasel/RimeWithWeasel.vcxproj +++ b/RimeWithWeasel/RimeWithWeasel.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -30,104 +30,84 @@ {1C497821-BD63-4F02-9094-32B185B62F23} RimeWithWeasel Win32Proj - 7.0 + StaticLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) StaticLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) StaticLibrary Unicode - v140_xp + $(PLATFORM_TOOLSET) StaticLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) StaticLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) StaticLibrary Unicode - v140_xp + $(PLATFORM_TOOLSET) - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - Disabled - $(SolutionDir)\include;$(BOOST_HOME);$(SolutionDir)\librime\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);$(SolutionDir)\librime\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreadedDebugDLL + MultiThreadedDebug Use Level3 EditAndContinue + /Zc:threadSafeInit- %(AdditionalOptions) MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);$(SolutionDir)\librime\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);$(SolutionDir)\librime\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true @@ -144,14 +124,15 @@ Disabled - $(SolutionDir)\include;$(BOOST_HOME);$(SolutionDir)\librime\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);$(SolutionDir)\librime\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreadedDebugDLL + MultiThreadedDebug Use Level3 ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) @@ -161,7 +142,7 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);$(SolutionDir)\librime\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);$(SolutionDir)\librime\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true @@ -175,7 +156,7 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);$(SolutionDir)\librime\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);$(SolutionDir)\librime\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true @@ -192,7 +173,7 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);$(SolutionDir)\librime\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);$(SolutionDir)\librime\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true diff --git a/WeaselDeployer/WeaselDeployer.vcxproj b/WeaselDeployer/WeaselDeployer.vcxproj index 57ff7dba9..0230b38bc 100644 --- a/WeaselDeployer/WeaselDeployer.vcxproj +++ b/WeaselDeployer/WeaselDeployer.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -14,32 +14,30 @@ {F53F3E9C-CC4D-4D1D-9C2E-719FE60A7E6B} Win32Proj WeaselDeployer - 7.0 + Application true Unicode - v140_xp + $(PLATFORM_TOOLSET) Application false true Unicode - v140_xp + $(PLATFORM_TOOLSET) - - @@ -55,12 +53,14 @@ Level3 Disabled WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - $(SolutionDir)\include;$(BOOST_HOME);$(PYTHON_HOME)\include;$(SolutionDir)\librime\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);$(PYTHON_HOME)\include;$(SolutionDir)\librime\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug + /Zc:threadSafeInit- %(AdditionalOptions) Windows true - $(SolutionDir)\lib;$(BOOST_HOME)\stage\lib;$(PYTHON_HOME)\libs;$(SolutionDir)\librime\build\lib\Debug;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;$(BOOST_ROOT)\stage\lib;$(PYTHON_HOME)\libs;$(SolutionDir)\librime\build\lib\Debug;%(AdditionalLibraryDirectories) rime.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -72,7 +72,7 @@ true true WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - $(SolutionDir)\include;$(BOOST_HOME);$(SolutionDir)\librime\include + $(SolutionDir)\include;$(BOOST_ROOT);$(SolutionDir)\librime\include MultiThreaded /Zc:threadSafeInit- %(AdditionalOptions) @@ -82,7 +82,7 @@ true true rime.lib;rime.lib;%(AdditionalDependencies) - $(SolutionDir)\lib;$(BOOST_HOME)\stage\lib;$(SolutionDir)\librime\build\lib\Release;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;$(BOOST_ROOT)\stage\lib;$(SolutionDir)\librime\build\lib\Release;%(AdditionalLibraryDirectories) $(SolutionDir)output\$(ProjectName)$(TargetExt) diff --git a/WeaselIME/WeaselIME.vcxproj b/WeaselIME/WeaselIME.vcxproj index d4338a2cd..09c9676c8 100644 --- a/WeaselIME/WeaselIME.vcxproj +++ b/WeaselIME/WeaselIME.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -38,146 +38,136 @@ {A958FE3D-9F6E-44CB-981E-F2AE181657B3} WeaselIME Win32Proj - 7.0 + DynamicLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) DynamicLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) DynamicLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) DynamicLibrary Unicode - v140_xp + $(PLATFORM_TOOLSET) DynamicLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) DynamicLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) DynamicLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) DynamicLibrary Unicode - v140_xp + $(PLATFORM_TOOLSET) - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - true - $(SolutionDir)output\ - false - $(SolutionDir)output\ - false - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - $(SolutionDir)output\ - false - $(SolutionDir)output\ - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - - - weasel$(Platform) - .ime + + true + $(SolutionDir)output\ + false weasel .ime + + $(SolutionDir)output\ + false + weaselt + .ime + + + false + + + true + + + $(SolutionDir)output\ + false + weasel$(Platform) + .ime + + $(SolutionDir)output\ + false weaselt$(Platform) .ime - - .ime - weaselt + + false Disabled - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;WEASELIME_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreadedDebugDLL + MultiThreadedDebug Use Level3 EditAndContinue + /Zc:threadSafeInit- %(AdditionalOptions) imm32.lib;%(AdditionalDependencies) "$(OutDir)weasel.ime" - $(SolutionDir)\lib;$(BOOST_HOME)\stage\lib;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;$(BOOST_ROOT)\stage\lib;%(AdditionalLibraryDirectories) weasel.def true Windows @@ -191,7 +181,7 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;WEASELIME_EXPORTS;%(PreprocessorDefinitions) MultiThreaded true @@ -203,7 +193,7 @@ imm32.lib;%(AdditionalDependencies) $(SolutionDir)output\weasel$(TargetExt) - $(SolutionDir)\lib;$(BOOST_HOME)\stage\lib;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;$(BOOST_ROOT)\stage\lib;%(AdditionalLibraryDirectories) weasel.def false Windows @@ -223,7 +213,7 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;WEASELIME_EXPORTS;%(PreprocessorDefinitions) MultiThreaded true @@ -239,7 +229,7 @@ imm32.lib;%(AdditionalDependencies) $(SolutionDir)output\weaselt$(TargetExt) - $(SolutionDir)\lib;$(BOOST_HOME)\stage\lib;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;$(BOOST_ROOT)\stage\lib;%(AdditionalLibraryDirectories) weasel.def false Windows @@ -256,13 +246,14 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;WEASELIME_EXPORTS;%(PreprocessorDefinitions) MultiThreaded true Use Level3 ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) _UNICODE;UNICODE;WEASEL_HANS;%(PreprocessorDefinitions) @@ -271,7 +262,7 @@ imm32.lib;%(AdditionalDependencies) $(SolutionDir)\output\weasels.ime - $(SolutionDir)\lib;$(BOOST_HOME)\stage\lib;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;$(BOOST_ROOT)\stage\lib;%(AdditionalLibraryDirectories) weasel.def false Windows @@ -290,19 +281,20 @@ Disabled - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;WEASELIME_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreadedDebugDLL + MultiThreadedDebug Use Level3 ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) imm32.lib;%(AdditionalDependencies) "$(OutDir)weasel.ime" - $(SolutionDir)\lib;$(BOOST_HOME)\stage_x64\lib;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;$(BOOST_ROOT)\stage_x64\lib;%(AdditionalLibraryDirectories) weasel.def true Windows @@ -319,7 +311,7 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;WEASELIME_EXPORTS;%(PreprocessorDefinitions) MultiThreaded true @@ -331,7 +323,7 @@ imm32.lib;%(AdditionalDependencies) $(SolutionDir)output\weasel$(Platform)$(TargetExt) - $(SolutionDir)\lib;$(BOOST_HOME)\stage_x64\lib;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;$(BOOST_ROOT)\stage_x64\lib;%(AdditionalLibraryDirectories) weasel.def false Windows @@ -354,7 +346,7 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;WEASELIME_EXPORTS;%(PreprocessorDefinitions) MultiThreaded true @@ -370,7 +362,7 @@ imm32.lib;%(AdditionalDependencies) $(SolutionDir)output\weaselt$(Platform)$(TargetExt) - $(SolutionDir)\lib;$(BOOST_HOME)\stage_x64\lib;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;$(BOOST_ROOT)\stage_x64\lib;%(AdditionalLibraryDirectories) weasel.def false Windows @@ -390,13 +382,14 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;WEASELIME_EXPORTS;%(PreprocessorDefinitions) MultiThreaded true Use Level3 ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) _UNICODE;UNICODE;WEASEL_HANS;%(PreprocessorDefinitions) @@ -405,7 +398,7 @@ imm32.lib;%(AdditionalDependencies) $(SolutionDir)\output\weaselsx64.ime - $(SolutionDir)\lib;$(BOOST_HOME)\stage_x64\lib;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;$(BOOST_ROOT)\stage_x64\lib;%(AdditionalLibraryDirectories) weasel.def false Windows diff --git a/WeaselIPC/WeaselIPC.vcxproj b/WeaselIPC/WeaselIPC.vcxproj index 13c432c76..cd4f4b8a3 100644 --- a/WeaselIPC/WeaselIPC.vcxproj +++ b/WeaselIPC/WeaselIPC.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -38,128 +38,102 @@ {CE11A2DF-8D20-4B07-A935-4B0D03F0303D} WeaselIPC Win32Proj - 7.0 + StaticLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) StaticLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) StaticLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) StaticLibrary Unicode - v140_xp + $(PLATFORM_TOOLSET) StaticLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) StaticLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) StaticLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) StaticLibrary Unicode - v140_xp + $(PLATFORM_TOOLSET) - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - Disabled - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreadedDebugDLL + MultiThreadedDebug Use Level3 EditAndContinue + /Zc:threadSafeInit- %(AdditionalOptions) MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true @@ -173,7 +147,7 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true @@ -187,13 +161,14 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true Use Level3 ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) @@ -202,14 +177,15 @@ Disabled - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreadedDebugDLL + MultiThreadedDebug Use Level3 ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) @@ -219,7 +195,7 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true @@ -236,7 +212,7 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true @@ -253,13 +229,14 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true Use Level3 ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) diff --git a/WeaselIPCServer/WeaselIPCServer.vcxproj b/WeaselIPCServer/WeaselIPCServer.vcxproj index a340e070e..bb93a706a 100644 --- a/WeaselIPCServer/WeaselIPCServer.vcxproj +++ b/WeaselIPCServer/WeaselIPCServer.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -38,128 +38,102 @@ {26930622-CFA2-43DF-A9F3-4AA4A313B2A4} WeaselIPCServer Win32Proj - 7.0 + StaticLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) StaticLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) StaticLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) StaticLibrary Unicode - v140_xp + $(PLATFORM_TOOLSET) StaticLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) StaticLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) StaticLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) StaticLibrary Unicode - v140_xp + $(PLATFORM_TOOLSET) - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - Disabled - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreadedDebugDLL + MultiThreadedDebug Use Level3 EditAndContinue + /Zc:threadSafeInit- %(AdditionalOptions) MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true @@ -173,7 +147,7 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true @@ -187,13 +161,14 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true Use Level3 ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) @@ -202,14 +177,15 @@ Disabled - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreadedDebugDLL + MultiThreadedDebug Use Level3 ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) @@ -219,7 +195,7 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true @@ -236,7 +212,7 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true @@ -253,13 +229,14 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true Use Level3 ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) diff --git a/WeaselServer/WeaselServer.vcxproj b/WeaselServer/WeaselServer.vcxproj index fd9ab155c..b01c1ecc0 100644 --- a/WeaselServer/WeaselServer.vcxproj +++ b/WeaselServer/WeaselServer.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -36,112 +36,102 @@ {A68C2A5C-D74D-4CB2-9E22-A4D2FC256A2D} + Win32Proj WeaselServer - 7.0 + Application Unicode - v140_xp + $(PLATFORM_TOOLSET) Application Unicode - v140_xp + $(PLATFORM_TOOLSET) Application Unicode - v140_xp + $(PLATFORM_TOOLSET) Application Unicode - v140_xp + $(PLATFORM_TOOLSET) Application Unicode - v140_xp + $(PLATFORM_TOOLSET) Application Unicode - v140_xp + $(PLATFORM_TOOLSET) Application Unicode - v140_xp + $(PLATFORM_TOOLSET) Application Unicode - v140_xp + $(PLATFORM_TOOLSET) - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - $(SolutionDir)output\ - $(Configuration)\ - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false + + true + + + true + + + $(SolutionDir)output\ + + + $(SolutionDir)output\ + + + false + + + false + + + false + + + false @@ -158,14 +148,15 @@ Disabled - $(SolutionDir)\include;$(BOOST_HOME);$(PYTHON_HOME)\include;$(SolutionDir)\librime\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);$(PYTHON_HOME)\include;$(SolutionDir)\librime\include;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;STRICT;_DEBUG;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreadedDebugDLL + MultiThreadedDebug Use Level3 EditAndContinue + /Zc:threadSafeInit- %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -174,7 +165,7 @@ imm32.lib;usp10.lib;rime.lib;%(AdditionalDependencies) - $(SolutionDir)\lib;$(BOOST_HOME)\stage\lib;$(PYTHON_HOME)\libs;$(SolutionDir)\librime\build\lib\Debug;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;$(BOOST_ROOT)\stage\lib;$(PYTHON_HOME)\libs;$(SolutionDir)\librime\build\lib\Debug;%(AdditionalLibraryDirectories) true Windows MachineX86 @@ -199,14 +190,15 @@ Disabled - $(SolutionDir)\include;$(BOOST_HOME);$(PYTHON_HOME)\include;$(SolutionDir)\librime\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);$(PYTHON_HOME)\include;$(SolutionDir)\librime\include;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;STRICT;_DEBUG;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreadedDebugDLL + MultiThreadedDebug Use Level3 ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -215,7 +207,7 @@ imm32.lib;usp10.lib;rime.lib;%(AdditionalDependencies) - $(SolutionDir)\lib;$(BOOST_HOME)\stage_x64\lib;$(PYTHON_HOME)\libs;$(SolutionDir)\librime\build\lib\Debug;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;$(BOOST_ROOT)\stage_x64\lib;$(PYTHON_HOME)\libs;$(SolutionDir)\librime\build\lib\Debug;%(AdditionalLibraryDirectories) true Windows MachineX64 @@ -238,7 +230,7 @@ WeaselServer_p.c - $(SolutionDir)\include;$(BOOST_HOME);$(PYTHON_HOME)\include;$(SolutionDir)\librime\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);$(PYTHON_HOME)\include;$(SolutionDir)\librime\include;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;STRICT;NDEBUG;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions) MultiThreaded Use @@ -254,7 +246,7 @@ imm32.lib;usp10.lib;rime.lib;%(AdditionalDependencies) $(SolutionDir)\output\$(ProjectName).exe - $(SolutionDir)\lib;$(BOOST_HOME)\stage\lib;$(PYTHON_HOME)\libs;$(SolutionDir)\librime\build\lib\Release;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;$(BOOST_ROOT)\stage\lib;$(PYTHON_HOME)\libs;$(SolutionDir)\librime\build\lib\Release;%(AdditionalLibraryDirectories) Windows MachineX86 true @@ -282,7 +274,7 @@ WeaselServer_p.c - $(SolutionDir)\include;$(BOOST_HOME);$(PYTHON_HOME)\include;$(SolutionDir)\librime\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);$(PYTHON_HOME)\include;$(SolutionDir)\librime\include;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;STRICT;NDEBUG;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions) MultiThreaded Use @@ -298,7 +290,7 @@ imm32.lib;usp10.lib;rime.lib;%(AdditionalDependencies) $(SolutionDir)\output\$(ProjectName).exe - $(SolutionDir)\lib;$(BOOST_HOME)\stage\lib;$(PYTHON_HOME)\libs;$(SolutionDir)\librime\build\lib\Release;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;$(BOOST_ROOT)\stage\lib;$(PYTHON_HOME)\libs;$(SolutionDir)\librime\build\lib\Release;%(AdditionalLibraryDirectories) false Windows MachineX64 @@ -322,7 +314,7 @@ WeaselServer_p.c - $(SolutionDir)\include;$(BOOST_HOME);$(PYTHON_HOME)\include;$(SolutionDir)\librime\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);$(PYTHON_HOME)\include;$(SolutionDir)\librime\include;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;STRICT;NDEBUG;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions) MultiThreaded Use @@ -336,7 +328,7 @@ imm32.lib;usp10.lib;rime.lib;%(AdditionalDependencies) - $(SolutionDir)\lib;$(BOOST_HOME)\stage\lib;$(PYTHON_HOME)\libs;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;$(BOOST_ROOT)\stage\lib;$(PYTHON_HOME)\libs;%(AdditionalLibraryDirectories) Windows MachineX86 @@ -359,7 +351,7 @@ WeaselServer_p.c - $(SolutionDir)\include;$(BOOST_HOME);$(PYTHON_HOME)\include;$(SolutionDir)\librime\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);$(PYTHON_HOME)\include;$(SolutionDir)\librime\include;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;STRICT;NDEBUG;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions) MultiThreaded Use @@ -373,7 +365,7 @@ imm32.lib;usp10.lib;rime.lib;%(AdditionalDependencies) - $(SolutionDir)\lib;$(BOOST_HOME)\stage\lib;$(PYTHON_HOME)\libs;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;$(BOOST_ROOT)\stage\lib;$(PYTHON_HOME)\libs;%(AdditionalLibraryDirectories) Windows MachineX64 @@ -396,11 +388,12 @@ WeaselServer_p.c - $(SolutionDir)\include;$(BOOST_HOME);$(PYTHON_HOME)\include;$(SolutionDir)\librime\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);$(PYTHON_HOME)\include;$(SolutionDir)\librime\include;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;STRICT;NDEBUG;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions) MultiThreaded Use Level3 + /Zc:threadSafeInit- %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -409,7 +402,7 @@ imm32.lib;usp10.lib;rime.lib;%(AdditionalDependencies) - $(SolutionDir)\lib;$(BOOST_HOME)\stage\lib;$(PYTHON_HOME)\libs;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;$(BOOST_ROOT)\stage\lib;$(PYTHON_HOME)\libs;%(AdditionalLibraryDirectories) Windows MachineX86 @@ -432,11 +425,12 @@ WeaselServer_p.c - $(SolutionDir)\include;$(BOOST_HOME);$(PYTHON_HOME)\include;$(SolutionDir)\librime\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);$(PYTHON_HOME)\include;$(SolutionDir)\librime\include;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;STRICT;NDEBUG;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions) MultiThreaded Use Level3 + /Zc:threadSafeInit- %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -445,7 +439,7 @@ imm32.lib;usp10.lib;rime.lib;%(AdditionalDependencies) - $(SolutionDir)\lib;$(BOOST_HOME)\stage\lib;$(PYTHON_HOME)\libs;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;$(BOOST_ROOT)\stage\lib;$(PYTHON_HOME)\libs;%(AdditionalLibraryDirectories) Windows MachineX64 diff --git a/WeaselSetup/WeaselSetup.vcxproj b/WeaselSetup/WeaselSetup.vcxproj index e00dd0f1a..8a7db035f 100644 --- a/WeaselSetup/WeaselSetup.vcxproj +++ b/WeaselSetup/WeaselSetup.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,53 +22,49 @@ {04B795DB-A22B-4657-9350-29F04B8FB8F6} Win32Proj WeaselSetup - 7.0 + Application true Unicode - v140_xp + $(PLATFORM_TOOLSET) Application true Unicode - v140_xp + $(PLATFORM_TOOLSET) Application false true Unicode - v140_xp + $(PLATFORM_TOOLSET) Application false true Unicode - v140_xp + $(PLATFORM_TOOLSET) - - - - @@ -92,12 +88,14 @@ Level3 Disabled WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - $(SolutionDir)\include;$(BOOST_HOME) + $(SolutionDir)\include;$(BOOST_ROOT) + MultiThreadedDebug + /Zc:threadSafeInit- %(AdditionalOptions) Windows true - $(SolutionDir)\lib;$(BOOST_HOME)\stage\lib + $(SolutionDir)\lib;$(BOOST_ROOT)\stage\lib RequireAdministrator @@ -107,12 +105,14 @@ Level3 Disabled WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - $(SolutionDir)\include;$(BOOST_HOME) + $(SolutionDir)\include;$(BOOST_ROOT) + MultiThreadedDebug + /Zc:threadSafeInit- %(AdditionalOptions) Windows true - $(SolutionDir)\lib;$(BOOST_HOME)\stage\lib + $(SolutionDir)\lib;$(BOOST_ROOT)\stage\lib RequireAdministrator @@ -124,7 +124,7 @@ true true WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - $(SolutionDir)\include;$(BOOST_HOME) + $(SolutionDir)\include;$(BOOST_ROOT) MultiThreaded /Zc:threadSafeInit- %(AdditionalOptions) @@ -133,7 +133,7 @@ true true true - $(SolutionDir)\lib;$(BOOST_HOME)\stage\lib + $(SolutionDir)\lib;$(BOOST_ROOT)\stage\lib imm32.lib;%(AdditionalDependencies) $(SolutionDir)output\$(ProjectName)$(TargetExt) RequireAdministrator @@ -147,7 +147,7 @@ true true WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - $(SolutionDir)\include;$(BOOST_HOME) + $(SolutionDir)\include;$(BOOST_ROOT) MultiThreaded /Zc:threadSafeInit- %(AdditionalOptions) @@ -156,7 +156,7 @@ true true true - $(SolutionDir)\lib;$(BOOST_HOME)\stage_x64\lib + $(SolutionDir)\lib;$(BOOST_ROOT)\stage_x64\lib imm32.lib;%(AdditionalDependencies) RequireAdministrator $(SolutionDir)output\$(ProjectName)$(Platform)$(TargetExt) diff --git a/WeaselTSF/WeaselTSF.vcxproj b/WeaselTSF/WeaselTSF.vcxproj index c0a148488..4793c95df 100644 --- a/WeaselTSF/WeaselTSF.vcxproj +++ b/WeaselTSF/WeaselTSF.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -36,132 +36,121 @@ {FF9B3625-BBD6-4972-8F23-7BA57F3127E8} - WeaselTSF Win32Proj - 7.0 + WeaselTSF + DynamicLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) DynamicLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) DynamicLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) DynamicLibrary Unicode - v140_xp + $(PLATFORM_TOOLSET) DynamicLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) DynamicLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) DynamicLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) DynamicLibrary Unicode - v140_xp + $(PLATFORM_TOOLSET) - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - true - $(SolutionDir)output\ - false - $(SolutionDir)output\ - false - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - $(SolutionDir)output\ - false - $(SolutionDir)output\ - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false + + true + false + $(SolutionDir)output\ weasel - - weasel$(Platform) - + false + $(SolutionDir)output\ weaselt + + false + + + true + + + false + $(SolutionDir)output\ + weasel$(Platform) + + false + $(SolutionDir)output\ weaselt$(Platform) + + false + Disabled - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;WEASELTSF_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -169,10 +158,11 @@ Use Level3 EditAndContinue + /Zc:threadSafeInit- %(AdditionalOptions) $(OutDir)weaselts.dll - $(SolutionDir)\lib;$(BOOST_HOME)\stage\lib;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;$(BOOST_ROOT)\stage\lib;%(AdditionalLibraryDirectories) true Windows MachineX86 @@ -186,7 +176,7 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;WEASELTSF_EXPORTS;%(PreprocessorDefinitions) MultiThreaded true @@ -197,7 +187,7 @@ $(SolutionDir)output\weasel$(TargetExt) - $(SolutionDir)\lib;$(BOOST_HOME)\stage\lib;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;$(BOOST_ROOT)\stage\lib;%(AdditionalLibraryDirectories) false Windows true @@ -214,7 +204,7 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;WEASELTSF_EXPORTS;WEASEL_HANT;%(PreprocessorDefinitions) MultiThreaded true @@ -225,7 +215,7 @@ $(SolutionDir)output\weaselt$(TargetExt) - $(SolutionDir)\lib;$(BOOST_HOME)\stage\lib;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;$(BOOST_ROOT)\stage\lib;%(AdditionalLibraryDirectories) true Windows true @@ -242,17 +232,18 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;WEASELTSF_EXPORTS;%(PreprocessorDefinitions) MultiThreaded true Use Level3 ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) $(SolutionDir)\output\weasels.dll - $(SolutionDir)\lib;$(BOOST_HOME)\stage\lib;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;$(BOOST_ROOT)\stage\lib;%(AdditionalLibraryDirectories) true Windows true @@ -270,7 +261,7 @@ Disabled - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;WEASELTSF_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -278,10 +269,11 @@ Use Level3 ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) $(OutDir)weaselx64.dll - $(SolutionDir)\lib;$(BOOST_HOME)\stage_x64\lib;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;$(BOOST_ROOT)\stage_x64\lib;%(AdditionalLibraryDirectories) true Windows MachineX64 @@ -299,7 +291,7 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;WEASELTSF_EXPORTS;%(PreprocessorDefinitions) MultiThreaded true @@ -310,7 +302,7 @@ $(SolutionDir)output\weasel$(Platform)$(TargetExt) - $(SolutionDir)\lib;$(BOOST_HOME)\stage_x64\lib;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;$(BOOST_ROOT)\stage_x64\lib;%(AdditionalLibraryDirectories) true Windows true @@ -329,7 +321,7 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;WEASELTSF_EXPORTS;WEASEL_HANT;%(PreprocessorDefinitions) MultiThreaded true @@ -340,7 +332,7 @@ $(SolutionDir)output\weaselt$(Platform)$(TargetExt) - $(SolutionDir)\lib;$(BOOST_HOME)\stage_x64\lib;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;$(BOOST_ROOT)\stage_x64\lib;%(AdditionalLibraryDirectories) true Windows true @@ -360,17 +352,18 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;WEASELTSF_EXPORTS;%(PreprocessorDefinitions) MultiThreaded true Use Level3 ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) $(SolutionDir)\output\weaselsx64.dll - $(SolutionDir)\lib;$(BOOST_HOME)\stage_x64\lib;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;$(BOOST_ROOT)\stage_x64\lib;%(AdditionalLibraryDirectories) true Windows true diff --git a/WeaselUI/WeaselUI.vcxproj b/WeaselUI/WeaselUI.vcxproj index 57561cfde..5ef370f1b 100644 --- a/WeaselUI/WeaselUI.vcxproj +++ b/WeaselUI/WeaselUI.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -36,131 +36,105 @@ {10B3B8BF-7294-4661-9A8A-2FFC920FA2F4} - WeaselUI Win32Proj - 7.0 + WeaselUI + StaticLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) StaticLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) StaticLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) StaticLibrary Unicode - v140_xp + $(PLATFORM_TOOLSET) StaticLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) StaticLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) StaticLibrary Unicode true - v140_xp + $(PLATFORM_TOOLSET) StaticLibrary Unicode - v140_xp + $(PLATFORM_TOOLSET) - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - Disabled - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreadedDebugDLL + MultiThreadedDebug Use stdafx.h Level3 EditAndContinue + /Zc:threadSafeInit- %(AdditionalOptions) MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true @@ -174,7 +148,7 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true @@ -188,13 +162,14 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true Use Level3 ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) @@ -203,15 +178,16 @@ Disabled - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreadedDebugDLL + MultiThreadedDebug Use stdafx.h Level3 ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) @@ -221,7 +197,7 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true @@ -238,7 +214,7 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true @@ -255,13 +231,14 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true Use Level3 ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) diff --git a/appveyor.install.bat b/appveyor.install.bat index b700db68c..c826bed6f 100644 --- a/appveyor.install.bat +++ b/appveyor.install.bat @@ -11,7 +11,6 @@ appveyor DownloadFile https://ci.appveyor.com/api/projects/rime/librime/artifact 7z x rime.zip * -olibrime\ | find "ing archive" copy /Y librime\build\include\rime_*.h include\ copy /Y librime\build\lib\Release\rime.dll output\ -ren weasel-appveyor.props weasel.props if %nocache% == 1 ( pushd C:\Libraries diff --git a/build.bat b/build.bat index d6a1ce82b..cd7cde65a 100644 --- a/build.bat +++ b/build.bat @@ -1,8 +1,30 @@ +@echo off + setlocal if exist env.bat call env.bat -set work=%cd% +if not defined WEASEL_ROOT set WEASEL_ROOT=%CD% +echo WEASEL_ROOT=%WEASEL_ROOT% +echo. + +if defined BOOST_ROOT ( + if exist "%BOOST_ROOT%\boost" goto boost_found +) +echo Error: Boost not found! Please set BOOST_ROOT in env.bat. +exit /b 1 +:boost_found +echo BOOST_ROOT=%BOOST_ROOT% +echo. + +if not defined BJAM_TOOLSET ( + rem the number actually means platform toolset, not %VisualStudioVersion% + set BJAM_TOOLSET=msvc-14.0 +) + +if not defined PLATFORM_TOOLSET ( + set PLATFORM_TOOLSET=v140_xp +) set build_option=/t:Build set build_boost=0 @@ -30,23 +52,24 @@ shift goto parse_cmdline_options :end_parsing_cmdline_options -cd %work% +cd /d %WEASEL_ROOT% if exist output\weaselserver.exe ( output\weaselserver.exe /q ) if %build_boost% == 1 ( call :build_boost - cd %work% + if errorlevel 1 exit /b 1 + cd /d %WEASEL_ROOT% ) if %build_rime% == 1 ( - cd %work%\librime + cd %WEASEL_ROOT%\librime if not exist librime\thirdparty\lib\opencc.lib ( call build.bat thirdparty ) call build.bat - cd %work% + cd %WEASEL_ROOT% rem copy /Y librime\thirdparty\lib\*.lib lib\ copy /Y librime\build\include\rime_*.h include\ copy /Y librime\build\lib\Release\rime.dll output\ @@ -58,6 +81,14 @@ if %build_data% == 1 ( call :build_data ) +cd /d %WEASEL_ROOT% + +set WEASEL_PROJECT_PROPERTIES=BOOST_ROOT PLATFORM_TOOLSET + +if not exist weasel.props ( + cscript.exe render.js weasel.props %WEASEL_PROJECT_PROPERTIES% +) + del msbuild*.log if %build_hant% == 1 ( @@ -78,54 +109,76 @@ if errorlevel 1 goto error goto end :build_boost -set boost_build_flags=toolset=msvc-14.0 variant=release link=static threading=multi runtime-link=static -set boost_libs=--with-date_time --with-filesystem --with-locale --with-regex --with-signals --with-system --with-thread -cd %BOOST_ROOT% + +set BOOST_COMPILED_LIBS=--with-date_time^ + --with-filesystem^ + --with-locale^ + --with-regex^ + --with-signals^ + --with-system^ + --with-thread + +set BJAM_OPTIONS_COMMON=toolset=%BJAM_TOOLSET%^ + variant=release^ + link=static^ + threading=multi^ + runtime-link=static^ + cxxflags="/Zc:threadSafeInit- " + +set BJAM_OPTIONS_X86=%BJAM_OPTIONS_COMMON%^ + define=BOOST_USE_WINAPI_VERSION=0x0501 + +set BJAM_OPTIONS_X64=%BJAM_OPTIONS_COMMON%^ + define=BOOST_USE_WINAPI_VERSION=0x0502^ + address-model=64^ + --stagedir=stage_x64 + +cd /d %BOOST_ROOT% if not exist bjam.exe call bootstrap.bat if %ERRORLEVEL% NEQ 0 goto error -bjam %boost_build_flags% stage %boost_libs% +bjam %BJAM_OPTIONS_X86% stage %BOOST_COMPILED_LIBS% if %ERRORLEVEL% NEQ 0 goto error if %build_x64% == 1 ( - bjam %boost_build_flags% address-model=64 --stagedir=stage_x64 stage %boost_libs% + bjam %BJAM_OPTIONS_X64% stage %BOOST_COMPILED_LIBS% if %ERRORLEVEL% NEQ 0 goto error ) exit /b :build_data rem call :build_essay -copy %work%\LICENSE.txt output\ -copy %work%\README.md output\README.txt -copy %work%\brise\essay.txt output\data\ -copy %work%\brise\default.yaml output\data\ -copy %work%\brise\symbols.yaml output\data\ -copy %work%\brise\preset\*.yaml output\data\ -copy %work%\brise\supplement\*.yaml output\data\ +copy %WEASEL_ROOT%\LICENSE.txt output\ +copy %WEASEL_ROOT%\README.md output\README.txt +copy %WEASEL_ROOT%\brise\essay.txt output\data\ +copy %WEASEL_ROOT%\brise\default.yaml output\data\ +copy %WEASEL_ROOT%\brise\symbols.yaml output\data\ +copy %WEASEL_ROOT%\brise\preset\*.yaml output\data\ +copy %WEASEL_ROOT%\brise\supplement\*.yaml output\data\ if not exist output\expansion mkdir output\expansion -copy %work%\brise\extra\*.yaml output\expansion\ +copy %WEASEL_ROOT%\brise\extra\*.yaml output\expansion\ call :build_opencc_data exit /b :build_essay rem essay.kct is deprecated. -copy %work%\librime\thirdparty\bin\kctreemgr.exe %work%\brise\ -copy %work%\librime\thirdparty\bin\zlib1.dll %work%\brise\ -cd %work%\brise +copy %WEASEL_ROOT%\librime\thirdparty\bin\kctreemgr.exe %WEASEL_ROOT%\brise\ +copy %WEASEL_ROOT%\librime\thirdparty\bin\zlib1.dll %WEASEL_ROOT%\brise\ +cd %WEASEL_ROOT%\brise call make_essay.bat -cd %work% +cd %WEASEL_ROOT% exit /b :build_opencc_data -if not exist %work%\librime\thirdparty\data\opencc\TSCharacters.ocd ( - cd %work%\librime +if not exist %WEASEL_ROOT%\librime\thirdparty\data\opencc\TSCharacters.ocd ( + cd %WEASEL_ROOT%\librime call build.bat thirdparty ) -cd %work% +cd %WEASEL_ROOT% if not exist output\data\opencc mkdir output\data\opencc -copy %work%\librime\thirdparty\data\opencc\*.* output\data\opencc\ +copy %WEASEL_ROOT%\librime\thirdparty\data\opencc\*.* output\data\opencc\ exit /b :error echo error building weasel... :end -cd %work% +cd %WEASEL_ROOT% diff --git a/env.bat.template b/env.bat.template index 4f15e7446..65901aa6a 100644 --- a/env.bat.template +++ b/env.bat.template @@ -1,4 +1,12 @@ -rem environment settings -set DEV_PATH=\opt\cmake-win32\bin -set WEASEL_ROOT=%CD% -set BOOST_ROOT=\code\boost_1_59_0 +rem Customize your build environment and save the modified copy to env.bat + +rem REQUIRED: path to Boost source directory +set BOOST_ROOT=%USERPROFILE%\source\vendor\boost_1_60_0 + +rem OPTIONAL: Visual Studio version and platform toolset +rem set BJAM_TOOLSET=msvc-14.0 +rem set CMAKE_GENERATOR="Visual Studio 14 2015" +rem set PLATFORM_TOOLSET=v140_xp + +rem OPTIONAL: path to additional build tools +rem set DEVTOOLS_PATH=%ProgramFiles%\Git\cmd;%ProgramFiles%\CMake\bin;C:\Python27; diff --git a/render.js b/render.js new file mode 100644 index 000000000..9dbb18b34 --- /dev/null +++ b/render.js @@ -0,0 +1,55 @@ +// nanotemplate +(function() { + var _tregex = /(\$\w+)/g; + + String.prototype.template = String.prototype.t = String.prototype.template || function() { + if (arguments[0] instanceof Array) + return arguments[0].map(this.t, this).join(""); + else { + var args = typeof arguments[0] === "object" ? arguments[0] : arguments; + return this.replace(_tregex, function(match) { return args[match.substr(1)]; }); + } + }; + + if (typeof Element === "function" || typeof Element === "object") + Element.prototype.template = Element.prototype.t = Element.prototype.template || function() { + this._tcache = this._tcache || this.innerHTML; + this.innerHTML = this._tcache.t.apply(this._tcache, arguments); + }; +})(); + +// main +var objStream = WScript.CreateObject("ADODB.Stream"); +var shell = WScript.CreateObject("Wscript.Shell"); +var env = shell.Environment("Process"); + +function Render(filename, params) { + objStream.Charset = "utf-8"; + objStream.Open(); + objStream.LoadFromFile(filename + '.template'); + var input = objStream.ReadText(); + objStream.Close(); + + var output = input.template(params); + objStream.Charset = "utf-8"; + objStream.Open(); + objStream.WriteText(output); + objStream.SaveToFile(filename, 2); + objStream.Close(); +} + +if (WScript.Arguments.length == 0) { + WScript.Echo("Usage: " + WScript.ScriptName + " ENV_VAR ..."); + WScript.Quit(1); +} + +var filename = WScript.Arguments(0); +var params = {}; +var variable; +for (var i = 1; i < WScript.Arguments.length; i++) { + variable = WScript.Arguments(i); + params[variable] = env(variable); + WScript.Echo(variable + "=" + params[variable]); +} +Render(filename, params); +WScript.Echo("Generated " + filename); diff --git a/shell.bat b/shell.bat deleted file mode 100644 index c30e0d7dc..000000000 --- a/shell.bat +++ /dev/null @@ -1,5 +0,0 @@ -@echo off -if exist env.bat call env.bat -set OLD_PATH=%PATH% -if defined DEV_PATH set PATH=%OLD_PATH%;%DEV_PATH% -%comspec% /k ""%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat"" x86 diff --git a/test/TestPyWeasel/TestPyWeasel.vcxproj b/test/TestPyWeasel/TestPyWeasel.vcxproj index 60f4f53c3..d38c5bf54 100644 --- a/test/TestPyWeasel/TestPyWeasel.vcxproj +++ b/test/TestPyWeasel/TestPyWeasel.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -38,132 +38,122 @@ {F75130DA-B785-42A7-B90B-571EAD9EDBE0} TestPyWeasel Win32Proj - 7.0 + Application MultiByte true - v140_xp + $(PLATFORM_TOOLSET) Application MultiByte true - v140_xp + $(PLATFORM_TOOLSET) Application MultiByte true - v140_xp + $(PLATFORM_TOOLSET) Application MultiByte - v140_xp + $(PLATFORM_TOOLSET) Application MultiByte true - v140_xp + $(PLATFORM_TOOLSET) Application MultiByte true - v140_xp + $(PLATFORM_TOOLSET) Application MultiByte true - v140_xp + $(PLATFORM_TOOLSET) Application MultiByte - v140_xp + $(PLATFORM_TOOLSET) - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - true - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - false - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - false - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false + + true + + + false + + + false + + + false + + + true + + + false + + + false + + + false Disabled - $(SolutionDir)\include;$(BOOST_HOME);$(PYTHON_HOME)\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);$(PYTHON_HOME)\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreadedDebugDLL + MultiThreadedDebug Use Level3 EditAndContinue + /Zc:threadSafeInit- %(AdditionalOptions) - $(SolutionDir)\lib;$(BOOST_HOME)\stage\lib;$(PYTHON_HOME)\libs;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;$(BOOST_ROOT)\stage\lib;$(PYTHON_HOME)\libs;%(AdditionalLibraryDirectories) true Console MachineX86 @@ -177,16 +167,17 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);$(PYTHON_HOME)\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);$(PYTHON_HOME)\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions) MultiThreaded true Use Level3 ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) - $(SolutionDir)\lib;$(BOOST_HOME)\stage\lib;$(PYTHON_HOME)\libs;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;$(BOOST_ROOT)\stage\lib;$(PYTHON_HOME)\libs;%(AdditionalLibraryDirectories) true Console true @@ -202,16 +193,17 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);$(PYTHON_HOME)\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);$(PYTHON_HOME)\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions) MultiThreaded true Use Level3 ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) - $(SolutionDir)\lib;$(BOOST_HOME)\stage\lib;$(PYTHON_HOME)\libs;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;$(BOOST_ROOT)\stage\lib;$(PYTHON_HOME)\libs;%(AdditionalLibraryDirectories) true Console true @@ -227,16 +219,17 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);$(PYTHON_HOME)\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);$(PYTHON_HOME)\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions) MultiThreaded true Use Level3 ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) - $(SolutionDir)\lib;$(BOOST_HOME)\stage\lib;$(PYTHON_HOME)\libs;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;$(BOOST_ROOT)\stage\lib;$(PYTHON_HOME)\libs;%(AdditionalLibraryDirectories) true Console true @@ -254,17 +247,18 @@ Disabled - $(SolutionDir)\include;$(BOOST_HOME);$(PYTHON_HOME)\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);$(PYTHON_HOME)\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreadedDebugDLL + MultiThreadedDebug Use Level3 ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) - $(SolutionDir)\lib;$(BOOST_HOME)\stage\lib;$(PYTHON_HOME)\libs;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;$(BOOST_ROOT)\stage\lib;$(PYTHON_HOME)\libs;%(AdditionalLibraryDirectories) true Console MachineX64 @@ -281,16 +275,17 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);$(PYTHON_HOME)\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);$(PYTHON_HOME)\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions) MultiThreaded true Use Level3 ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) - $(SolutionDir)\lib;$(BOOST_HOME)\stage\lib;$(PYTHON_HOME)\libs;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;$(BOOST_ROOT)\stage\lib;$(PYTHON_HOME)\libs;%(AdditionalLibraryDirectories) true Console true @@ -309,16 +304,17 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);$(PYTHON_HOME)\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);$(PYTHON_HOME)\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions) MultiThreaded true Use Level3 ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) - $(SolutionDir)\lib;$(BOOST_HOME)\stage\lib;$(PYTHON_HOME)\libs;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;$(BOOST_ROOT)\stage\lib;$(PYTHON_HOME)\libs;%(AdditionalLibraryDirectories) true Console true @@ -337,16 +333,17 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);$(PYTHON_HOME)\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);$(PYTHON_HOME)\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions) MultiThreaded true Use Level3 ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) - $(SolutionDir)\lib;$(BOOST_HOME)\stage\lib;$(PYTHON_HOME)\libs;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;$(BOOST_ROOT)\stage\lib;$(PYTHON_HOME)\libs;%(AdditionalLibraryDirectories) true Console true diff --git a/test/TestResponseParser/TestResponseParser.vcxproj b/test/TestResponseParser/TestResponseParser.vcxproj index cb6251337..c00131d37 100644 --- a/test/TestResponseParser/TestResponseParser.vcxproj +++ b/test/TestResponseParser/TestResponseParser.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -38,130 +38,120 @@ {CC642427-64D7-44D9-8543-8CBBF981FAE7} TestResponseParser Win32Proj - 7.0 + Application Unicode true - v140_xp + $(PLATFORM_TOOLSET) Application Unicode true - v140_xp + $(PLATFORM_TOOLSET) Application Unicode true - v140_xp + $(PLATFORM_TOOLSET) Application Unicode - v140_xp + $(PLATFORM_TOOLSET) Application Unicode true - v140_xp + $(PLATFORM_TOOLSET) Application Unicode true - v140_xp + $(PLATFORM_TOOLSET) Application Unicode true - v140_xp + $(PLATFORM_TOOLSET) Application Unicode - v140_xp + $(PLATFORM_TOOLSET) - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - true - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - false - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - false - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false + + true + + + false + + + false + + + false + + + true + + + false + + + false + + + false Disabled - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreadedDebugDLL + MultiThreadedDebug Level3 EditAndContinue + /Zc:threadSafeInit- %(AdditionalOptions) true @@ -173,7 +163,7 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded true @@ -189,14 +179,14 @@ true true MachineX86 - $(SolutionDir)\lib;$(BOOST_HOME)\stage\lib;$(SolutionDir)\librime\build\lib\Release;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;$(BOOST_ROOT)\stage\lib;$(SolutionDir)\librime\build\lib\Release;%(AdditionalLibraryDirectories) MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded true @@ -218,7 +208,7 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded true @@ -226,6 +216,7 @@ Level3 ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) true @@ -241,15 +232,16 @@ Disabled - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreadedDebugDLL + MultiThreadedDebug Level3 ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) true @@ -264,7 +256,7 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded true @@ -289,7 +281,7 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded true @@ -314,7 +306,7 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded true @@ -322,6 +314,7 @@ Level3 ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) true diff --git a/test/TestWeaselIPC/TestWeaselIPC.vcxproj b/test/TestWeaselIPC/TestWeaselIPC.vcxproj index 95cc01803..19f2de8d6 100644 --- a/test/TestWeaselIPC/TestWeaselIPC.vcxproj +++ b/test/TestWeaselIPC/TestWeaselIPC.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -38,137 +38,127 @@ {9C1CC4BA-18FF-4890-908E-E545881C5586} TestWeaselIPC Win32Proj - 8.1 + Application Unicode true - v140_xp + $(PLATFORM_TOOLSET) Application Unicode true - v140_xp + $(PLATFORM_TOOLSET) Application Unicode true - v140_xp + $(PLATFORM_TOOLSET) Application false Unicode - v140_xp + $(PLATFORM_TOOLSET) Application Unicode true - v140_xp + $(PLATFORM_TOOLSET) Application Unicode true - v140_xp + $(PLATFORM_TOOLSET) Application Unicode true - v140_xp + $(PLATFORM_TOOLSET) Application false Unicode - v140_xp + $(PLATFORM_TOOLSET) - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - true - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - false - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - false - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false + + true + + + false + + + false + + + false + + + true + + + false + + + false + + + false Disabled - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreadedDebugDLL + MultiThreadedDebug Use Level3 EditAndContinue + /Zc:threadSafeInit- %(AdditionalOptions) true Console MachineX86 - $(SolutionDir)\lib;$(BOOST_HOME)\stage\lib;$(PYTHON_HOME)\libs;$(SolutionDir)\librime\build\lib\Debug;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;$(BOOST_ROOT)\stage\lib;$(PYTHON_HOME)\libs;$(SolutionDir)\librime\build\lib\Debug;%(AdditionalLibraryDirectories) imm32.lib;usp10.lib;rime.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -176,7 +166,7 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded true @@ -191,14 +181,14 @@ true true MachineX86 - $(SolutionDir)\lib;$(BOOST_HOME)\stage\lib;$(SolutionDir)\librime\build\lib\Release;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;$(BOOST_ROOT)\stage\lib;$(SolutionDir)\librime\build\lib\Release;%(AdditionalLibraryDirectories) MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded true @@ -219,13 +209,14 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded true Use Level3 ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) true @@ -241,20 +232,21 @@ Disabled - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreadedDebugDLL + MultiThreadedDebug Use Level3 ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) true Console MachineX64 - $(SolutionDir)\lib;$(BOOST_HOME)\stage_x64\lib;$(PYTHON_HOME)\libs;$(SolutionDir)\librime\build\lib\Debug;%(AdditionalLibraryDirectories) + $(SolutionDir)\lib;$(BOOST_ROOT)\stage_x64\lib;$(PYTHON_HOME)\libs;$(SolutionDir)\librime\build\lib\Debug;%(AdditionalLibraryDirectories) @@ -264,7 +256,7 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded true @@ -288,7 +280,7 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded true @@ -312,13 +304,14 @@ MaxSpeed true - $(SolutionDir)\include;$(BOOST_HOME);%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(BOOST_ROOT);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded true Use Level3 ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) true diff --git a/weasel-appveyor.props b/weasel-appveyor.props deleted file mode 100644 index 4929d3745..000000000 --- a/weasel-appveyor.props +++ /dev/null @@ -1,21 +0,0 @@ - - - - C:\Libraries\libboost - C:\Python27 - - - <_ProjectFileVersion>10.0.40219.1 - <_PropertySheetDisplayName>Weasel Project Properties - - - - $(BOOST_HOME) - true - - - $(PYTHON_HOME) - true - - - diff --git a/weasel.props.template b/weasel.props.template index e01cc84ab..5c9819e73 100644 --- a/weasel.props.template +++ b/weasel.props.template @@ -1,7 +1,8 @@  - D:\code\boost_1_57_0 + $BOOST_ROOT + $PLATFORM_TOOLSET C:\Python27 @@ -9,8 +10,12 @@ <_PropertySheetDisplayName>Weasel Project Properties - - $(BOOST_HOME) + + $(BOOST_ROOT) + true + + + $(PLATFORM_TOOLSET) true diff --git a/weasel.vsprops.template b/weasel.vsprops.template deleted file mode 100644 index 0ee8cd7ed..000000000 --- a/weasel.vsprops.template +++ /dev/null @@ -1,18 +0,0 @@ - - - - -