Skip to content

Commit

Permalink
Don't use ActivePerl's msi
Browse files Browse the repository at this point in the history
  • Loading branch information
@k-takata
k-takata committed Dec 27, 2015
1 parent 634c539 commit a992872
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 19 deletions.
1 change: 0 additions & 1 deletion appveyor.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ after_build:
- 7z a ..\gvim_%ARCH%.zip ..\runtime\*

test_script:
- path %path%;C:\Lua;C:\Perl522\bin;C:\Tcl\bin
- cd testdir
- nmake -f Make_dos.mak VIMPROG=..\gvim
- nmake -f Make_dos.mak VIMPROG=..\vim
Expand Down
44 changes: 26 additions & 18 deletions src/appveyor.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,16 @@ exit 1
reg copy HKLM\SOFTWARE\Python\PythonCore\2.7 HKLM\SOFTWARE\Python\PythonCore\2.7-32 /s /reg:32
:: Lua
curl -L "http://downloads.sourceforge.net/project/luabinaries/5.3.2/Windows%%20Libraries/Dynamic/lua-5.3.2_Win32_dllw4_lib.zip" -o lua.zip
7z x lua.zip -oC:\Lua
7z x lua.zip -oC:\Lua > nul
:: Perl
appveyor DownloadFile http://downloads.activestate.com/ActivePerl/releases/5.22.0.2200/ActivePerl-5.22.0.2200-MSWin32-x86-64int-299195.msi -F perl.msi
msiexec /i /quiet perl.msi TARGETDIR=C:\Perl522
appveyor DownloadFile http://downloads.activestate.com/ActivePerl/releases/5.22.0.2200/ActivePerl-5.22.0.2200-MSWin32-x86-64int-299195.zip -FileName perl.zip
7z x perl.zip -oC:\ > nul
for /d %%i in (C:\ActivePerl*) do move %%i C:\Perl522
:: Tcl
appveyor DownloadFile http://downloads.activestate.com/ActiveTcl/releases/8.6.4.1/ActiveTcl8.6.4.1.299124-win32-ix86-threaded.exe -F tcl.exe
appveyor DownloadFile http://downloads.activestate.com/ActiveTcl/releases/8.6.4.1/ActiveTcl8.6.4.1.299124-win32-ix86-threaded.exe -FileName tcl.exe
start /wait tcl.exe --directory C:\Tcl

path C:\Perl522\perl\bin;%path%;C:\Lua;C:\Tcl\bin
@echo off
goto :eof

Expand All @@ -36,14 +38,16 @@ goto :eof
reg copy HKLM\SOFTWARE\Python\PythonCore\2.7 HKLM\SOFTWARE\Python\PythonCore\2.7-32 /s /reg:64
:: Lua
curl -L "http://downloads.sourceforge.net/project/luabinaries/5.3.2/Windows%%20Libraries/Dynamic/lua-5.3.2_Win64_dllw4_lib.zip" -o lua.zip
7z x lua.zip -oC:\Lua
7z x lua.zip -oC:\Lua > nul
:: Perl
appveyor DownloadFile http://downloads.activestate.com/ActivePerl/releases/5.22.0.2200/ActivePerl-5.22.0.2200-MSWin32-x64-299195.msi -F perl.msi
msiexec /i /quiet perl.msi TARGETDIR=C:\Perl522
appveyor DownloadFile http://downloads.activestate.com/ActivePerl/releases/5.22.0.2200/ActivePerl-5.22.0.2200-MSWin32-x64-299195.zip -FileName perl.zip
7z x perl.zip -oC:\ > nul
for /d %%i in (C:\ActivePerl*) do move %%i C:\Perl522
:: Tcl
appveyor DownloadFile http://downloads.activestate.com/ActiveTcl/releases/8.6.4.1/ActiveTcl8.6.4.1.299124-win32-x86_64-threaded.exe -F tcl.exe
appveyor DownloadFile http://downloads.activestate.com/ActiveTcl/releases/8.6.4.1/ActiveTcl8.6.4.1.299124-win32-x86_64-threaded.exe -FileName tcl.exe
start /wait tcl.exe --directory C:\Tcl

path C:\Perl522\perl\bin;%path%;C:\Lua;C:\Tcl\bin
@echo off
goto :eof

Expand All @@ -57,25 +61,27 @@ sed -e "s/\$(LINKARGS2)/\$(LINKARGS2) | sed -e 's#.*\\\\r.*##'/" Make_mvc.mak >
nmake -f Make_mvc2.mak CPU=i386 ^
GUI=yes OLE=no DIRECTX=yes ^
FEATURES=HUGE IME=yes MBYTE=yes ICONV=yes DEBUG=no ^
PERL_VER=522 DYNAMIC_PERL=yes PERL=C:\Perl522 ^
PERL_VER=522 DYNAMIC_PERL=yes PERL=C:\Perl522\perl ^
PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27 ^
PYTHON3_VER=34 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python34 ^
LUA_VER=53 DYNAMIC_LUA=yes LUA=C:\Lua ^
TCL_VER=86 DYNAMIC_TCL=yes TCL=C:\Tcl ^
WINVER=0x500
WINVER=0x500 ^
|| exit 1
:: Build CUI version
nmake -f Make_mvc2.mak CPU=i386 ^
GUI=no OLE=no DIRECTX=no ^
FEATURES=HUGE IME=yes MBYTE=yes ICONV=yes DEBUG=no ^
PERL_VER=522 DYNAMIC_PERL=yes PERL=C:\Perl522 ^
PERL_VER=522 DYNAMIC_PERL=yes PERL=C:\Perl522\perl ^
PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27 ^
PYTHON3_VER=34 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python34 ^
LUA_VER=53 DYNAMIC_LUA=yes LUA=C:\Lua ^
TCL_VER=86 DYNAMIC_TCL=yes TCL=C:\Tcl ^
WINVER=0x500
WINVER=0x500 ^
|| exit 1
:: Build translations
pushd po
nmake -f Make_mvc.mak GETTEXT_PATH=C:\cygwin\bin VIMRUNTIME=..\..\runtime install-all
nmake -f Make_mvc.mak GETTEXT_PATH=C:\cygwin\bin VIMRUNTIME=..\..\runtime install-all || exit 1
popd

@echo off
Expand All @@ -91,25 +97,27 @@ sed -e "s/\$(LINKARGS2)/\$(LINKARGS2) | sed -e 's#.*\\\\r.*##'/" Make_mvc.mak >
nmake -f Make_mvc2.mak CPU=AMD64 ^
GUI=yes OLE=no DIRECTX=yes ^
FEATURES=HUGE IME=yes MBYTE=yes ICONV=yes DEBUG=no ^
PERL_VER=522 DYNAMIC_PERL=yes PERL=C:\Perl522 ^
PERL_VER=522 DYNAMIC_PERL=yes PERL=C:\Perl522\perl ^
PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27-x64 ^
PYTHON3_VER=34 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python34-x64 ^
LUA_VER=53 DYNAMIC_LUA=yes LUA=C:\Lua ^
TCL_VER=86 DYNAMIC_TCL=yes TCL=C:\Tcl ^
WINVER=0x500
WINVER=0x500 ^
|| exit 1
:: Build CUI version
nmake -f Make_mvc2.mak CPU=AMD64 ^
GUI=no OLE=no DIRECTX=no ^
FEATURES=HUGE IME=yes MBYTE=yes ICONV=yes DEBUG=no ^
PERL_VER=522 DYNAMIC_PERL=yes PERL=C:\Perl522 ^
PERL_VER=522 DYNAMIC_PERL=yes PERL=C:\Perl522\perl ^
PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27-x64 ^
PYTHON3_VER=34 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python34-x64 ^
LUA_VER=53 DYNAMIC_LUA=yes LUA=C:\Lua ^
TCL_VER=86 DYNAMIC_TCL=yes TCL=C:\Tcl ^
WINVER=0x500
WINVER=0x500 ^
|| exit 1
:: Build translations
pushd po
nmake -f Make_mvc.mak GETTEXT_PATH=C:\cygwin\bin VIMRUNTIME=..\..\runtime install-all
nmake -f Make_mvc.mak GETTEXT_PATH=C:\cygwin\bin VIMRUNTIME=..\..\runtime install-all || exit 1
popd

@echo off
Expand Down

0 comments on commit a992872

Please sign in to comment.