diff options
author | Soumith Chintala <soumith@gmail.com> | 2016-11-21 13:37:28 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-21 13:37:28 +0300 |
commit | 249c93e1703666e80f1ed50685121dc5e22462d5 (patch) | |
tree | 2065251a95793f045f1ad7fbecf9cfcc49828061 | |
parent | c440b66fff270ad0b39b9191ab8dbcf7235a3bc3 (diff) | |
parent | 901d2304c6e99b782aa1510004285a2c1bc97f3c (diff) |
Merge pull request #180 from BTNC/master
explicitly download wineditline.zip since wget is now getting tar.bz2
-rw-r--r-- | install-deps.bat | 18 | ||||
-rw-r--r-- | install.bat | 2 | ||||
-rw-r--r-- | win-files/README.md | 2 | ||||
-rw-r--r-- | win-files/patch/trepl.patch | 15 |
4 files changed, 25 insertions, 12 deletions
diff --git a/install-deps.bat b/install-deps.bat index 244272a..bd59227 100644 --- a/install-deps.bat +++ b/install-deps.bat @@ -88,29 +88,29 @@ if "%TORCH_VS_TARGET%" == "" set TORCH_VS_TARGET= :: luajit-rocks is ready for windows if "%TORCH_LUA_VERSION%" == "" set TORCH_LUA_VERSION=LUAJIT21 -if "%TORCH_LUA_VERSION%" == "LUAJIT21" ( +if /i "%TORCH_LUA_VERSION%" == "LUAJIT21" ( set TORCH_LUAJIT_BRANCH=v2.1 set TORCH_LUA_SOURCE=luajit-2.1 set TORCH_LUAROCKS_LUA=5.1 ) -if "%TORCH_LUA_VERSION%" == "LUAJIT20" ( +if /i "%TORCH_LUA_VERSION%" == "LUAJIT20" ( set TORCH_LUAJIT_BRANCH=master set TORCH_LUA_SOURCE=luajit-2.0 set TORCH_LUAROCKS_LUA=5.1 ) -if "%TORCH_LUA_VERSION%" == "LUA53" ( +if /i "%TORCH_LUA_VERSION%" == "LUA53" ( set TORCH_LUA_SOURCE=lua-5.3.3 set TORCH_LUAROCKS_LUA=5.3 ) -if "%TORCH_LUA_VERSION%" == "LUA52" ( +if /i "%TORCH_LUA_VERSION%" == "LUA52" ( set TORCH_LUA_SOURCE=lua-5.2.4 set TORCH_LUAROCKS_LUA=5.2 ) -if "%TORCH_LUA_VERSION%" == "LUA51" ( +if /i "%TORCH_LUA_VERSION%" == "LUA51" ( set TORCH_LUA_SOURCE=lua-5.1.5 set TORCH_LUAROCKS_LUA=5.1 ) -if "%TORCH_LUA_SOURCE%" == "" ( +if /i "%TORCH_LUA_SOURCE%" == "" ( echo %ECHO_PREFIX% Bad lua version: %TORCH_LUA_VERSION%, only support LUAJIT21, LUAJIT20, LUA53, LUA52, LUA51 goto :FAIL ) @@ -126,7 +126,7 @@ set TORCH_INSTALL_ROC=%TORCH_INSTALL_DIR%\luarocks if not exist %TORCH_INSTALL_BIN% md %TORCH_INSTALL_BIN% if not exist %TORCH_INSTALL_LIB% md %TORCH_INSTALL_LIB% if not exist %TORCH_INSTALL_INC% md %TORCH_INSTALL_INC% -if not %TORCH_LUAJIT_BRANCH% == "" if not exist %TORCH_INSTALL_BIN%\lua\jit md %TORCH_INSTALL_BIN%\lua\jit +if not "%TORCH_LUAJIT_BRANCH%" == "" if not exist %TORCH_INSTALL_BIN%\lua\jit md %TORCH_INSTALL_BIN%\lua\jit if not exist %TORCH_DISTRO%\win-files\3rd md %TORCH_DISTRO%\win-files\3rd echo %ECHO_PREFIX% Torch7 will be installed under %TORCH_INSTALL_DIR% with %TORCH_LUA_SOURCE%, vs%TORCH_VS_VERSION% %TORCH_VS_PLATFORM% @@ -265,7 +265,7 @@ set PATH=%TORCH_DISTRO%\exe\luarocks\win32\tools\;%PATH%; echo %ECHO_PREFIX% Installing %TORCH_LUA_SOURCE% cd %TORCH_DISTRO%\exe\ if not "%TORCH_LUAJIT_BRANCH%" == "" ( -if not exist %TORCH_LUA_SOURCE%\.git git clone -b %TORCH_LUAJIT_BRANCH% http://luajit.org/git/luajit-2.0.git %TORCH_LUA_SOURCE% || goto :Fail + if not exist %TORCH_LUA_SOURCE%\.git git clone -b %TORCH_LUAJIT_BRANCH% http://luajit.org/git/luajit-2.0.git %TORCH_LUA_SOURCE% || goto :Fail cd %TORCH_LUA_SOURCE% && ( if "%TORCH_UPDATE_DEPS%" == "1" git pull ) & cd src ) else ( wget -nc https://www.lua.org/ftp/%TORCH_LUA_SOURCE%.tar.gz --no-check-certificate || goto :Fail @@ -313,7 +313,7 @@ set LUAROCKS_CMD=%TORCH_INSTALL_DIR%\luarocks.cmd echo %ECHO_PREFIX% Installing wineditline for trepl package cd %TORCH_DISTRO%\win-files\3rd\ -wget -nc https://sourceforge.net/projects/mingweditline/files/latest --no-check-certificate -O wineditline.zip +wget -nc https://sourceforge.net/projects/mingweditline/files/wineditline-2.201.zip/download --no-check-certificate -O wineditline.zip 7z x wineditline.zip -y >NUL cd wineditline* cmake -E make_directory build && cd build && cmake .. -G "NMake Makefiles" -DLIB_SUFFIX="64" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=..\ && nmake install diff --git a/install.bat b/install.bat index 9575f53..0defc27 100644 --- a/install.bat +++ b/install.bat @@ -30,7 +30,7 @@ if "%TORCH_SETUP_HAS_MKL%" == "1" ( cd %TORCH_DISTRO%\pkg\torch && git apply %PATCH_DIR%\torch.patch --whitespace=fix & ( call %LUAROCKS_CMD% make rocks\torch-scm-1.rockspec BLAS_LIBRARIES="%BLAS_LIBRARIES%" LAPACK_LIBRARIES="%LAPACK_LIBRARIES%" LAPACK_FOUND=TRUE || goto :FAIL ) & git apply %PATCH_DIR%\torch.patch --reverse --whitespace=fix ) cd %TORCH_DISTRO%\pkg\dok && call %LUAROCKS_CMD% make rocks\dok-scm-1.rockspec || goto :FAIL -cd %TORCH_DISTRO%\exe\trepl && call %LUAROCKS_CMD% make trepl-scm-1.rockspec || goto :FAIL +cd %TORCH_DISTRO%\exe\trepl && git apply %PATCH_DIR%\trepl.patch --whitespace=fix & ( call %LUAROCKS_CMD% make trepl-scm-1.rockspec || goto :FAIL ) & git apply %PATCH_DIR%\trepl.patch --reverse --whitespace=fix cd %TORCH_DISTRO%\pkg\sys && call %LUAROCKS_CMD% make sys-1.1-0.rockspec || goto :FAIL cd %TORCH_DISTRO%\pkg\xlua && call %LUAROCKS_CMD% make xlua-1.0-0.rockspec || goto :FAIL cd %TORCH_DISTRO%\extra\nn && call %LUAROCKS_CMD% make rocks\nn-scm-1.rockspec || goto :FAIL diff --git a/win-files/README.md b/win-files/README.md index fd46a2c..423e6f9 100644 --- a/win-files/README.md +++ b/win-files/README.md @@ -65,8 +65,6 @@ qlua ``` Trepl on windows should work similarly as on linux or macos. qlua should be used to run qt related lua codes. -#### Packages - ## Clean or Uninstall To remove all the temporary compilation files: ```bat diff --git a/win-files/patch/trepl.patch b/win-files/patch/trepl.patch new file mode 100644 index 0000000..14cc036 --- /dev/null +++ b/win-files/patch/trepl.patch @@ -0,0 +1,15 @@ +diff --git a/trepl-scm-1.rockspec b/trepl-scm-1.rockspec +index 76fdb60..e0dae03 100644 +--- a/trepl-scm-1.rockspec ++++ b/trepl-scm-1.rockspec +@@ -49,8 +49,8 @@ build = { + sources = {'readline.c'}, + libraries = {'readline'}, + defines = {"WinEditLine"}, +- incdirs = {"..\\..\\win-files\\3rd\\wineditline-2.101\\include"}, +- libdirs = {"..\\..\\win-files\\3rd\\wineditline-2.101\\lib64"}, ++ incdirs = {"..\\..\\win-files\\3rd\\wineditline-2.201\\include"}, ++ libdirs = {"..\\..\\win-files\\3rd\\wineditline-2.201\\lib64"}, + libraries = {'edit_static', 'user32'} + } + } |