Kouhei Sutou
null+****@clear*****
Wed Jan 31 09:45:08 JST 2018
Kouhei Sutou 2018-01-31 09:45:08 +0900 (Wed, 31 Jan 2018) New Revision: 6a3cc0d793f6e0c6949d2257fa14ccf38e3d4014 https://github.com/groonga/groonga/commit/6a3cc0d793f6e0c6949d2257fa14ccf38e3d4014 Message: package windows: follow changes for Debian stretch Modified files: packages/windows/Dockerfile packages/windows/Rakefile Modified: packages/windows/Dockerfile (+6 -4) =================================================================== --- packages/windows/Dockerfile 2018-01-30 12:30:58 +0900 (d505a469b) +++ packages/windows/Dockerfile 2018-01-31 09:45:08 +0900 (884672b04) @@ -1,8 +1,8 @@ FROM debian RUN dpkg --add-architecture i386 -RUN apt update -RUN apt install -V -y \ +RUN apt update && \ + apt install -V -y \ build-essential \ devscripts \ autoconf \ @@ -10,10 +10,12 @@ RUN apt install -V -y \ cmake \ pkg-config \ mingw-w64 \ - wine \ wine-binfmt \ + wine32 \ + wine64 \ rsync \ - ruby + ruby && \ + apt clean RUN gem install rake Modified: packages/windows/Rakefile (+2 -6) =================================================================== --- packages/windows/Rakefile 2018-01-30 12:30:58 +0900 (c28bc2694) +++ packages/windows/Rakefile 2018-01-31 09:45:08 +0900 (2abe5de7d) @@ -1,6 +1,6 @@ # -*- coding: utf-8; mode: ruby -*- # -# Copyright (C) 2011-2017 Kouhei Sutou <kou �� clear-code.com> +# Copyright (C) 2011-2018 Kouhei Sutou <kou �� clear-code.com> # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -277,11 +277,7 @@ namespace :build do mecab_dict_index_bin = binary_dir + "bin" + "mecab-dict-index.exe" cp(mecab_dict_index_original, mecab_dict_index_bin) - if groonga_win32_x86_p - mecab_dict_index = "wine32 #{mecab_dict_index_bin}" - else - mecab_dict_index = "wine64 #{mecab_dict_index_bin}" - end + mecab_dict_index = "wine #{mecab_dict_index_bin}" rm_rf(File.expand_path("~/.wine")) sh("make", "mecab_dict_index=#{mecab_dict_index}") or exit(false) rm(mecab_dict_index_bin) -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20180131/d40c42ea/attachment-0001.htm
