appveyor: Adjust Racket directory

k-takata · Jan 13, 2016 · 253c7f5 · 253c7f5
1 parent b56300f
commit 253c7f5
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/src/appveyor.bat b/src/appveyor.bat
@@ -42,16 +42,13 @@ echo on
 nmake .config.h.time
 xcopy /s .ext\include C:\Ruby22\include\ruby-2.2.0
 popd
-:: newer 7Zip
-curl -f -L http://www.7-zip.org/a/7z1514.exe -o 7zip.exe
-7z x 7zip.exe -oc:\7zip
 :: Racket
 :: Need a patch to install gvim with dynamic racket
 :: Patch from Yukihiro Nakadaira https://groups.google.com/d/msg/vim_dev/qg7R7HeGq50/l-R74zATAwAJ
 curl -f -L https://raw.githubusercontent.com/chrisbra/vim-mq-patches/master/fix_mzscheme -o fix_mzscheme.diff
 git apply --check fix_mzscheme.diff && git apply fix_mzscheme.diff || exit 1
 curl -f -L https://mirror.racket-lang.org/releases/6.3/installers/racket-minimal-6.3-i386-win32.exe -o racket.exe
-c:\7zip\7z.exe x racket.exe -aoa -r -oc:\racket63 > nul
+start /wait racket.exe /S
 
 if /i "%appveyor_repo_tag%"=="false" goto skip_install_x86
 
@@ -70,7 +67,11 @@ curl -f -L http://upx.sourceforge.net/download/upx391w.zip -o upx.zip
 :skip_install_x86
 
 :: Update PATH
-path C:\Perl522\perl\bin;%path%;C:\Lua;C:\Tcl\bin;C:\Ruby22\bin;c:\racket63
+path C:\Perl522\perl\bin;%path%;C:\Lua;C:\Tcl\bin;C:\Ruby22\bin;C:\Program Files (x86)\Racket;C:\Program Files (x86)\Racket\lib
+
+:: Install additional packages for Racket
+raco pkg install scheme-lib
+raco pkg install r5rs-lib
 @echo off
 goto :eof
 
@@ -101,16 +102,13 @@ echo on
 nmake .config.h.time
 xcopy /s .ext\include C:\Ruby22-x64\include\ruby-2.2.0
 popd
-:: newer 7Zip
-curl -f -L http://www.7-zip.org/a/7z1514-x64.exe -o 7zip.exe
-7z x 7zip.exe -oc:\7zip-x64
 :: Racket
 :: Need a patch to install gvim with dynamic racket
 :: Patch from Yukihiro Nakadaira https://groups.google.com/d/msg/vim_dev/qg7R7HeGq50/l-R74zATAwAJ
 curl -f -L https://raw.githubusercontent.com/chrisbra/vim-mq-patches/master/fix_mzscheme -o fix_mzscheme.diff
 git apply --check fix_mzscheme.diff && git apply fix_mzscheme.diff || exit 1
 curl -f -L https://mirror.racket-lang.org/releases/6.3/installers/racket-minimal-6.3-x86_64-win32.exe -o racket.exe
-c:\7zip-x64\7z.exe x racket.exe -y -r -oc:\racket63-x64 > nul
+start /wait racket.exe /S
 
 if /i "%appveyor_repo_tag%"=="false" goto skip_install_x64
 
@@ -131,7 +129,11 @@ curl -f -L http://upx.sourceforge.net/download/upx391w.zip -o upx.zip
 :skip_install_x64
 
 :: Update PATH
-path C:\Perl522\perl\bin;%path%;C:\Lua;C:\Tcl\bin;C:\Ruby22-x64\bin;c:\racket63-x64
+path C:\Perl522\perl\bin;%path%;C:\Lua;C:\Tcl\bin;C:\Ruby22-x64\bin;C:\Program Files\Racket;C:\Program Files\Racket\lib
+
+:: Install additional packages for Racket
+raco pkg install scheme-lib
+raco pkg install r5rs-lib
 @echo off
 goto :eof
 
@@ -152,7 +154,7 @@ nmake -f Make_mvc2.mak CPU=i386 ^
 	TCL_VER=86 TCL_VER_LONG=8.6 DYNAMIC_TCL=yes TCL=C:\Tcl ^
 	RUBY=C:\Ruby22 DYNAMIC_RUBY=yes RUBY_VER=22 RUBY_VER_LONG=2.2.0 ^
 	RUBY_MSVCRT_NAME=msvcrt ^
-	MZSCHEME=c:\racket63 DYNAMIC_MZSCHEME=yes MZSCHEME_VER=3m_9z0ds0 ^
+	"MZSCHEME=C:\Program Files (x86)\Racket" DYNAMIC_MZSCHEME=yes MZSCHEME_VER=3m_9z0ds0 ^
 	WINVER=0x500 ^
 	|| exit 1
 @if /i "%appveyor_repo_tag%"=="false" goto check_executable
@@ -167,7 +169,7 @@ nmake -f Make_mvc2.mak CPU=i386 ^
 	TCL_VER=86 TCL_VER_LONG=8.6 DYNAMIC_TCL=yes TCL=C:\Tcl ^
 	RUBY=C:\Ruby22 DYNAMIC_RUBY=yes RUBY_VER=22 RUBY_VER_LONG=2.2.0 ^
 	RUBY_MSVCRT_NAME=msvcrt ^
-	MZSCHEME=c:\racket63 DYNAMIC_MZSCHEME=yes MZSCHEME_VER=3m_9z0ds0 ^
+	"MZSCHEME=C:\Program Files (x86)\Racket" DYNAMIC_MZSCHEME=yes MZSCHEME_VER=3m_9z0ds0 ^
 	WINVER=0x500 ^
 	|| exit 1
 :: Build translations
@@ -196,7 +198,7 @@ nmake -f Make_mvc2.mak CPU=AMD64 ^
 	TCL_VER=86 TCL_VER_LONG=8.6 DYNAMIC_TCL=yes TCL=C:\Tcl ^
 	RUBY=C:\Ruby22-x64 DYNAMIC_RUBY=yes RUBY_VER=22 RUBY_VER_LONG=2.2.0 ^
 	RUBY_MSVCRT_NAME=msvcrt ^
-	MZSCHEME=c:\racket63-x64 DYNAMIC_MZSCHEME=yes MZSCHEME_VER=3m_9z0ds0 ^
+	"MZSCHEME=C:\Program Files\Racket" DYNAMIC_MZSCHEME=yes MZSCHEME_VER=3m_9z0ds0 ^
 	WINVER=0x500 ^
 	|| exit 1
 @if /i "%appveyor_repo_tag%"=="false" goto check_executable
@@ -211,7 +213,7 @@ nmake -f Make_mvc2.mak CPU=AMD64 ^
 	TCL_VER=86 TCL_VER_LONG=8.6 DYNAMIC_TCL=yes TCL=C:\Tcl ^
 	RUBY=C:\Ruby22-x64 DYNAMIC_RUBY=yes RUBY_VER=22 RUBY_VER_LONG=2.2.0 ^
 	RUBY_MSVCRT_NAME=msvcrt ^
-	MZSCHEME=c:\racket63-x64 DYNAMIC_MZSCHEME=yes MZSCHEME_VER=3m_9z0ds0 ^
+	"MZSCHEME=C:\Program Files\Racket" DYNAMIC_MZSCHEME=yes MZSCHEME_VER=3m_9z0ds0 ^
 	WINVER=0x500 ^
 	|| exit 1
 :: Build translations