null+****@clear*****
null+****@clear*****
2010年 10月 13日 (水) 14:26:49 JST
Daijiro MORI 2010-10-13 05:26:49 +0000 (Wed, 13 Oct 2010) New Revision: 7ae56a26bb403e52818af6401a03c50f18c83487 Log: Removed cr code from build_windows.bat Modified files: build_windows.bat Modified: build_windows.bat (+48 -48) =================================================================== --- build_windows.bat 2010-10-12 11:34:22 +0000 (c92cc57) +++ build_windows.bat 2010-10-13 05:26:49 +0000 (234004f) @@ -1,48 +1,48 @@ - @ rem Groonga for Windows build script. - - @ if "%VSINSTALLDIR%"=="" goto error_no_VSINSTALLDIR - @ if "%VCINSTALLDIR%"=="" goto error_no_VCINSTALLDIR - - @ set MECAB_SDK_PATH=C:\Program Files\MeCab\sdk - - @ set OLD_INCLUDE=%INCLUDE% - @ set OLD_LIB=%LIB% - - @ set INCLUDE=%INCLUDE%;.;..;%MECAB_SDK_PATH% - @ set LIB=%LIB%;%MECAB_SDK_PATH% - - @ rem build libgroonga.dll -cd lib -nmake -f Makefile.msvc clean -nmake -f Makefile.msvc -cd .. - - @ rem build groonga.exe -cd src -nmake -f Makefile.msvc clean -nmake -f Makefile.msvc -cd .. - - @ set INCLUDE=%OLD_INCLUDE% - @ set LIB=%OLD_LIB% - - @ goto end - -:error_no_VSINSTALLDIR -:error_no_VCINSTALLDIR - @ echo ERROR: execute vcvarsall.bat first! - @ echo. - @ echo Visual Studio 2005 - @ echo c:\Program Files\Microsoft Visual Studio 8\VC\vcvarsall.bat - @ echo Visual Studio 2008 - @ echo c:\Program Files\Microsoft Visual Studio 9.0\VC\vcvarsall.bat - @ echo. - @ echo if you want to get x86 binary on x86/x64 environment, - @ echo you have to pass "x86" to vcvarsall.bat. - @ echo if you want to get x64 binary on x86 environment, - @ echo you have to pass "x86_amd64" to vcvarsall.bat. - @ echo if you want to get x64 binary on x64 environment, - @ echo you have to pass "amd64" to vcvarsall.bat. - @ goto end - -:end \ No newline at end of file + @ rem Groonga for Windows build script. + + @ if "%VSINSTALLDIR%"=="" goto error_no_VSINSTALLDIR + @ if "%VCINSTALLDIR%"=="" goto error_no_VCINSTALLDIR + + @ set MECAB_SDK_PATH=C:\Program Files\MeCab\sdk + + @ set OLD_INCLUDE=%INCLUDE% + @ set OLD_LIB=%LIB% + + @ set INCLUDE=%INCLUDE%;.;..;%MECAB_SDK_PATH% + @ set LIB=%LIB%;%MECAB_SDK_PATH% + + @ rem build libgroonga.dll +cd lib +nmake -f Makefile.msvc clean +nmake -f Makefile.msvc +cd .. + + @ rem build groonga.exe +cd src +nmake -f Makefile.msvc clean +nmake -f Makefile.msvc +cd .. + + @ set INCLUDE=%OLD_INCLUDE% + @ set LIB=%OLD_LIB% + + @ goto end + +:error_no_VSINSTALLDIR +:error_no_VCINSTALLDIR + @ echo ERROR: execute vcvarsall.bat first! + @ echo. + @ echo Visual Studio 2005 + @ echo c:\Program Files\Microsoft Visual Studio 8\VC\vcvarsall.bat + @ echo Visual Studio 2008 + @ echo c:\Program Files\Microsoft Visual Studio 9.0\VC\vcvarsall.bat + @ echo. + @ echo if you want to get x86 binary on x86/x64 environment, + @ echo you have to pass "x86" to vcvarsall.bat. + @ echo if you want to get x64 binary on x86 environment, + @ echo you have to pass "x86_amd64" to vcvarsall.bat. + @ echo if you want to get x64 binary on x64 environment, + @ echo you have to pass "amd64" to vcvarsall.bat. + @ goto end + +:end