Skip to content

Commit e1fba02

Browse files
committed
Update khaiii install script
1 parent a608153 commit e1fba02

2 files changed

Lines changed: 17 additions & 13 deletions

File tree

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@ matrix:
1010
- choco install nodejs-lts -y
1111
- choco install yarn -y
1212
- export PATH=$(cmd.exe //c "refreshenv > nul & C:\Progra~1\Git\bin\bash -c 'echo \$PATH' ")
13-
- export JAVA_HOME=$(cmd.exe //c "refreshenv > nul & C:\Progra~1\Git\bin\bash -c 'echo \$JAVA_HOME' ")
1413
- java --version
1514
- node -v
15+
env:
16+
- JAVA_HOME="/c/Progra~1/OpenJDK/jdk-11.0.11_9"
1617
- name: "OSX11.3 with OpenJDK 11 (LTS)"
1718
os: osx
18-
osx_image: xcode12.5
19+
osx_image: xcode12u
1920
language: shell
2021
jdk: openjdk11
2122
before_install:

scripts/khaiii_install.sh

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,25 @@ fi
2424
KHAIII_LATEST=$(git tag -l | tail -n 1)
2525
git checkout -f tags/$KHAIII_LATEST
2626

27-
### Python 3 Pypi install
28-
python3 -m pip install --user -r requirements.txt
29-
echo "\033[34mPython3.6 installation finished\033[0m"
30-
31-
### Note original python version for checking.
32-
PYVER=$(python3.6 --version)
33-
echo $PYVER
34-
3527
### Make build files
3628
if [ ! -d "build" ]
3729
then
3830
mkdir build
39-
cd build
40-
cmake ..
31+
fi
32+
33+
# OS Release check (khaiii/khaiii#103)
34+
if [ $TRAVIS_OS_NAME == 'linux' ]
35+
then
36+
RELEASE=`lsb_release -cs`
37+
else
38+
RELEASE=none
39+
fi
40+
41+
cd build
42+
if [ $RELEASE == 'focal' ]
43+
then
44+
cmake -E env CXXFLAGS="-w" cmake ..
4145
else
42-
cd build
4346
cmake ..
4447
fi
4548

0 commit comments

Comments
 (0)