• R/O
  • R/O (HTTP)
  • R/W (SSH)
  • R/W (HTTPS)

yamy: コミット

source code repository of yamy


コミットメタ情報

リビジョンee50853039a8b4e9342d809ec55e36d42ec838f0 (tree)
日時2014-10-01 18:45:03
作者gimy <gimy@user...>
コミッターgimy

ログメッセージ

use boost_1_56_0 and build by VS2013

変更サマリ

差分

--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
11 *~
22 *.pdb
33 *.sdf
4+*.opensdf
45 functions.h
56 /Debug
67 /Release
--- a/compiler_specific.h
+++ b/compiler_specific.h
@@ -21,7 +21,7 @@
2121 # pragma warning(disable : 4061 4100 4132 4552 4701 4706 4786)
2222
2323 # define setmode _setmode
24-# define for if (false) ; else for
24+//# define for if (false) ; else for
2525
2626 # define stati64_t _stati64
2727
--- a/proj/regex32.vcxproj
+++ b/proj/regex32.vcxproj
@@ -62,7 +62,7 @@
6262 <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
6363 </ClCompile>
6464 <Lib>
65- <OutputFile>ext_lib$(CPUBIT)\$(Configuration)\libboost_regex-mt-sgd-$(BOOST_MAJOR).lib</OutputFile>
65+ <OutputFile>ext_lib$(CPUBIT)\$(Configuration)\lib\libboost_regex-vc120-mt-sgd-$(BOOST_MAJOR).lib</OutputFile>
6666 </Lib>
6767 </ItemDefinitionGroup>
6868 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -83,7 +83,7 @@
8383 <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
8484 </ClCompile>
8585 <Lib>
86- <OutputFile>ext_lib$(CPUBIT)\$(Configuration)\libboost_regex-mt-s-$(BOOST_MAJOR).lib</OutputFile>
86+ <OutputFile>ext_lib$(CPUBIT)\$(Configuration)\lib\libboost_regex-vc120-mt-s-$(BOOST_MAJOR).lib</OutputFile>
8787 </Lib>
8888 </ItemDefinitionGroup>
8989 <ItemGroup>
--- a/proj/regex64.vcxproj
+++ b/proj/regex64.vcxproj
@@ -87,7 +87,7 @@
8787 <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
8888 </ClCompile>
8989 <Lib>
90- <OutputFile>ext_lib$(CPUBIT)\$(Configuration)\libboost_regex-mt-sgd-$(BOOST_MAJOR).lib</OutputFile>
90+ <OutputFile>ext_lib$(CPUBIT)\$(Configuration)\lib\libboost_regex-vc120-mt-sgd-$(BOOST_MAJOR).lib</OutputFile>
9191 </Lib>
9292 </ItemDefinitionGroup>
9393 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -111,7 +111,7 @@
111111 <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
112112 </ClCompile>
113113 <Lib>
114- <OutputFile>ext_lib$(CPUBIT)\$(Configuration)\libboost_regex-mt-s-$(BOOST_MAJOR).lib</OutputFile>
114+ <OutputFile>ext_lib$(CPUBIT)\$(Configuration)\lib\libboost_regex-vc120-mt-s-$(BOOST_MAJOR).lib</OutputFile>
115115 </Lib>
116116 </ItemDefinitionGroup>
117117 <ItemGroup>
@@ -124,12 +124,6 @@
124124 <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)makeregex.bat;%(Outputs)</Outputs>
125125 </CustomBuild>
126126 </ItemGroup>
127- <ItemGroup>
128- <ProjectReference Include="regex32.vcxproj">
129- <Project>{2376fa78-c8b7-4ed0-b4e3-b5ad778a8c0f}</Project>
130- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
131- </ProjectReference>
132- </ItemGroup>
133127 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
134128 <ImportGroup Label="ExtensionTargets">
135129 </ImportGroup>
--- a/proj/yamy.props
+++ b/proj/yamy.props
@@ -4,7 +4,7 @@
44 </ImportGroup>
55 <PropertyGroup Label="UserMacros">
66 <VERSION>0.03</VERSION>
7- <BOOST_MAJOR>1_38</BOOST_MAJOR>
7+ <BOOST_MAJOR>1_56</BOOST_MAJOR>
88 <BOOST_MINOR>0</BOOST_MINOR>
99 </PropertyGroup>
1010 <PropertyGroup>
@@ -12,7 +12,15 @@
1212 <OutDir>..\$(Configuration)\</OutDir>
1313 <IntDir>$(Configuration)\$(ProjectName)\</IntDir>
1414 </PropertyGroup>
15- <ItemDefinitionGroup />
15+ <ItemDefinitionGroup>
16+ <ClCompile>
17+ <AdditionalIncludeDirectories>../../boost_$(BOOST_MAJOR)_$(BOOST_MINOR)</AdditionalIncludeDirectories>
18+ <PreprocessorDefinitions>VERSION="$(VERSION)";LOGNAME="$(USERNAME)";COMPUTERNAME="$(COMPUTERNAME)";_CRT_SECURE_NO_WARNINGS;MAYU64;USE_INI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
19+ </ClCompile>
20+ <Link>
21+ <AdditionalLibraryDirectories>ext_lib$(CPUBIT)\$(ConfigurationName)\lib</AdditionalLibraryDirectories>
22+ </Link>
23+ </ItemDefinitionGroup>
1624 <ItemGroup>
1725 <BuildMacro Include="VERSION">
1826 <Value>$(VERSION)</Value>
--- a/proj/yamydll.props
+++ b/proj/yamydll.props
@@ -10,6 +10,8 @@
1010 <Link>
1111 <AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
1212 <OutputFile>$(OutDir)yamy$(CPUBIT).dll</OutputFile>
13+ <AdditionalLibraryDirectories>
14+ </AdditionalLibraryDirectories>
1315 </Link>
1416 </ItemDefinitionGroup>
1517 <ItemGroup />
--- a/tools/makedistrib.js
+++ b/tools/makedistrib.js
@@ -28,7 +28,7 @@ if (fso == null) {
2828 }
2929
3030 var shell = WScript.CreateObject("Shell.Application");
31-if (fso == null) {
31+if (shell == null) {
3232 throw new Error("can't create Shell Application Object!");
3333 }
3434
@@ -50,7 +50,7 @@ var PackFile = function(dir, name) {
5050 RemoveFile(targetDir, pkgFile);
5151 throw new Error("can't pack " + path + "!");
5252 }
53- var item = shell.NameSpace(fso.GetAbsolutePathName(path) + "\\..\\").ParseName(name);
53+ var item = shell.NameSpace(fso.GetAbsolutePathName(dir)).ParseName(name);
5454 var count = targetZip.Items().Count;
5555 targetZip.CopyHere(item);
5656 while (targetZip.Items().Count != count + 1) {
--- a/tools/makeregex_template.bat
+++ b/tools/makeregex_template.bat
@@ -2,6 +2,8 @@
22 #define VC_VERSION vc9
33 #elif _MSC_VER == 1400
44 #define VC_VERSION vc8
5+#elif _MSC_VER == 1800
6+#define VC_VERSION vc12
57 #endif
68
79 set CONFIG=%1
@@ -10,19 +12,25 @@ set BOOST_MINOR=%3
1012 set CPUBIT=%4
1113 set BOOST_DIR=..\..\boost_%BOOST_MAJOR%_%BOOST_MINOR%
1214 set REGEX_VC=VC_VERSION
15+set STAGE_DIR=%~dp0\..\proj\ext_lib%CPUBIT%\%CONFIG%
1316
14-if "%CONFIG%" == "Debug" set GD=gd
17+if "%CONFIG%" == "Debug" (
18+ set GD=gd
19+ set VARIANT=debug
20+) else (
21+ set GD=
22+ set VARIANT=release
23+)
1524
1625 set REGEX=libboost_regex-%REGEX_VC%0-mt-s%GD%-%BOOST_MAJOR%
1726
18-pushd %BOOST_DIR%\libs\regex\build
27+pushd %BOOST_DIR%
1928
20-if exist %REGEX_VC%0\%REGEX%.lib nmake -f %REGEX_VC%.mak %REGEX%_clean
21-nmake -f %REGEX_VC%.mak XCFLAGS=-D_WCTYPE_INLINE_DEFINED main_dir %REGEX%_dir ./%REGEX_VC%0/%REGEX%.lib
29+b2 --build-dir=build/boost%CPUBIT% --stagedir=%STAGE_DIR% --with-regex address-model=%CPUBIT% variant=%VARIANT% link=static threading=multi runtime-link=static stage
2230
2331 popd
2432
25-copy /Y %BOOST_DIR%\libs\regex\build\%REGEX_VC%0\%REGEX%.lib ..\proj\ext_lib%CPUBIT%\%CONFIG%\%REGEX%.lib
26-copy /Y %BOOST_DIR%\libs\regex\build\%REGEX_VC%0\%REGEX%.lib ..\proj\ext_lib%CPUBIT%\%CONFIG%\libboost_regex-mt-s%GD%-%BOOST_MAJOR%.lib
33+rem copy /Y %BOOST_DIR%\libs\regex\build\%REGEX_VC%0\%REGEX%.lib ..\proj\ext_lib%CPUBIT%\%CONFIG%\%REGEX%.lib
34+rem copy /Y %BOOST_DIR%\libs\regex\build\%REGEX_VC%0\%REGEX%.lib ..\proj\ext_lib%CPUBIT%\%CONFIG%\libboost_regex-mt-s%GD%-%BOOST_MAJOR%.lib
2735
28-if "%CONFIG%" == "Debug" copy /Y %BOOST_DIR%\libs\regex\build\%REGEX_VC%0\%REGEX%.pdb ..\proj\ext_lib%CPUBIT%\%CONFIG%\%REGEX%.pdb
36+rem if "%CONFIG%" == "Debug" copy /Y %BOOST_DIR%\libs\regex\build\%REGEX_VC%0\%REGEX%.pdb ..\proj\ext_lib%CPUBIT%\%CONFIG%\%REGEX%.pdb
旧リポジトリブラウザで表示