@@ -45,26 +45,31 @@ function set_configuration {
45
45
# run "Content of $FILE" cat config/Makefile
46
46
}
47
47
48
- PREFIX=$( echo $OCAMLROOT | cygpath -f - -m)
49
48
APPVEYOR_BUILD_FOLDER=$( echo $APPVEYOR_BUILD_FOLDER | cygpath -f -)
49
+ # These directory names are specified here, because getting UTF-8 correctly
50
+ # through appveyor.yml -> Command Script -> Bash is quite painful...
51
+ OCAMLROOT=$( echo $PROGRAMFILES /Бактріан🐫| cygpath -f - -m)
52
+
53
+ # This must be kept in sync with appveyor_build.cmd
54
+ BUILD_PREFIX=🐫реализация
50
55
51
56
export PATH=$( echo $OCAMLROOT | cygpath -f -) /bin/flexdll:$PATH
52
57
53
58
case " $1 " in
54
59
install)
55
- mkdir -p " $PREFIX /bin/flexdll"
60
+ mkdir -p " $OCAMLROOT /bin/flexdll"
56
61
cd $APPVEYOR_BUILD_FOLDER /../flexdll
57
62
# msvc64 objects need to be compiled with VS2015, so are copied later from
58
63
# a source build.
59
64
for f in flexdll.h flexlink.exe flexdll* _msvc.obj default* .manifest ; do
60
- cp $f " $PREFIX /bin/flexdll/$f "
65
+ cp $f " $OCAMLROOT /bin/flexdll/"
61
66
done
62
67
echo ' eval $($APPVEYOR_BUILD_FOLDER/tools/msvs-promote-path)' >> ~ /.bash_profile
63
68
;;
64
69
msvc32-only)
65
- cd $APPVEYOR_BUILD_FOLDER /../build -msvc32
70
+ cd $APPVEYOR_BUILD_FOLDER /../$BUILD_PREFIX -msvc32
66
71
67
- set_configuration msvc " C:/Program Files/OCaml-msmvc32 " -WX
72
+ set_configuration msvc " $OCAMLROOT -msvc32 " -WX
68
73
69
74
run " make world" make world
70
75
run " make runtimeopt" make runtimeopt
@@ -74,31 +79,32 @@ case "$1" in
74
79
exit 0
75
80
;;
76
81
test)
77
- run " ocamlc.opt -version" $APPVEYOR_BUILD_FOLDER /ocamlc.opt -version
78
- run " test msvc64" make -C $APPVEYOR_BUILD_FOLDER tests
79
- run " test mingw32" make -C $APPVEYOR_BUILD_FOLDER /../build-mingw32 tests
80
- run " install msvc64" make -C $APPVEYOR_BUILD_FOLDER install
81
- run " install mingw32" make -C $APPVEYOR_BUILD_FOLDER /../build-mingw32 install
82
+ FULL_BUILD_PREFIX=$APPVEYOR_BUILD_FOLDER /../$BUILD_PREFIX
83
+ run " ocamlc.opt -version" $FULL_BUILD_PREFIX -msvc64/ocamlc.opt -version
84
+ run " test msvc64" make -C $FULL_BUILD_PREFIX -msvc64 tests
85
+ run " test mingw32" make -C $FULL_BUILD_PREFIX -mingw32 tests
86
+ run " install msvc64" make -C $FULL_BUILD_PREFIX -msvc64 install
87
+ run " install mingw32" make -C $FULL_BUILD_PREFIX -mingw32 install
82
88
;;
83
89
* )
84
- cd $APPVEYOR_BUILD_FOLDER
90
+ cd $APPVEYOR_BUILD_FOLDER /../ $BUILD_PREFIX -msvc64
85
91
86
92
tar -xzf $APPVEYOR_BUILD_FOLDER /flexdll.tar.gz
87
93
cd flexdll-$FLEXDLL_VERSION
88
94
make MSVC_DETECT=0 CHAINS=msvc64 support
89
- cp flexdll* _msvc64.obj " $PREFIX /bin/flexdll"
95
+ cp flexdll* _msvc64.obj " $OCAMLROOT /bin/flexdll/ "
90
96
cd ..
91
97
92
- set_configuration msvc64 " $PREFIX " -WX
98
+ set_configuration msvc64 " $OCAMLROOT " -WX
93
99
94
- cd ../build -mingw32
100
+ cd ../$BUILD_PREFIX -mingw32
95
101
96
- set_configuration mingw " $( echo $OCAMLROOT2 | cygpath -f - -m ) " -Werror
102
+ set_configuration mingw " $OCAMLROOT -mingw32 " -Werror
97
103
98
- cd $APPVEYOR_BUILD_FOLDER
104
+ cd $APPVEYOR_BUILD_FOLDER /../ $BUILD_PREFIX -msvc64
99
105
100
106
export TERM=ansi
101
- script --quiet --return --command " make -C ../build -mingw32 flexdll world.opt" ../build -mingw32/build.log > /dev/null 2> /dev/null &
107
+ script --quiet --return --command " make -C ../$BUILD_PREFIX -mingw32 flexdll world.opt" ../$BUILD_PREFIX -mingw32/build.log > /dev/null 2> /dev/null &
102
108
BUILD_PID=$!
103
109
104
110
run " make world" make world
@@ -109,7 +115,7 @@ case "$1" in
109
115
set +e
110
116
111
117
# For an explanation of the sed command, see https://github.com/appveyor/ci/issues/1824
112
- tail --pid=$BUILD_PID -n +1 -f ../build -mingw32/build.log | sed -e ' s/\d027\[K//g' -e ' s/\d027\[m/\d027[0m/g' -e ' s/\d027\[01\([m;]\)/\d027[1\1/g' &
118
+ tail --pid=$BUILD_PID -n +1 -f ../$BUILD_PREFIX -mingw32/build.log | sed -e ' s/\d027\[K//g' -e ' s/\d027\[m/\d027[0m/g' -e ' s/\d027\[01\([m;]\)/\d027[1\1/g' &
113
119
TAIL_PID=$!
114
120
wait $BUILD_PID
115
121
STATUS=$?
0 commit comments