[Groonga-commit] groonga/groonga at 3099a85 [master] package windows: fix build error

Back to archive index

Kouhei Sutou null+****@clear*****
Tue May 22 14:31:29 JST 2018


Kouhei Sutou	2018-05-22 14:31:29 +0900 (Tue, 22 May 2018)

  New Revision: 3099a85de928c0d2e853fe6be5799605f9c106bf
  https://github.com/groonga/groonga/commit/3099a85de928c0d2e853fe6be5799605f9c106bf

  Message:
    package windows: fix build error

  Modified files:
    packages/windows/Makefile.am
    packages/windows/Rakefile

  Modified: packages/windows/Makefile.am (+1 -0)
===================================================================
--- packages/windows/Makefile.am    2018-05-22 14:28:41 +0900 (47bcafa2e)
+++ packages/windows/Makefile.am    2018-05-22 14:31:29 +0900 (b29e5531c)
@@ -42,6 +42,7 @@ prepare-build:
 	  echo "MEMORY_DEBUG_BUILD='$(MEMORY_DEBUG_BUILD)'";	\
 	  echo "ARCHITECTURES='$(ARCHITECTURES)'";		\
 	) > tmp/env.sh
+	cp $(top_srcdir)/bundled_message_pack_version tmp/
 	docker build					\
 	  --tag groonga/windows-build			\
 	  --force-rm					\

  Modified: packages/windows/Rakefile (+1 -2)
===================================================================
--- packages/windows/Rakefile    2018-05-22 14:28:41 +0900 (b4ad3b999)
+++ packages/windows/Rakefile    2018-05-22 14:31:29 +0900 (9cec405de)
@@ -171,8 +171,7 @@ namespace :build do
     tmp_dir = base_tmp_dir + "msgpack"
     rm_rf(tmp_dir)
     mkdir_p(tmp_dir)
-    msgpack_version_path =
-      base_dir.parent.parent + "bundled_message_pack_version"
+    msgpack_version_path = base_dir + "tmp" + "bundled_message_pack_version"
     msgpack_version = msgpack_version_path.read.strip
     msgpack_base = "msgpack-#{msgpack_version}"
     msgpack_tar_gz = "#{msgpack_base}.tar.gz"
-------------- next part --------------
HTML����������������������������...
URL: https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20180522/16de368e/attachment-0001.htm 



More information about the Groonga-commit mailing list
Back to archive index