null+****@clear*****
null+****@clear*****
2011年 11月 27日 (日) 20:47:41 JST
Kouhei Sutou 2011-11-27 11:47:41 +0000 (Sun, 27 Nov 2011)
New Revision: 7449a4be4f175126aa879ebb2568482723941be9
Log:
[windows] support x86.
Modified files:
.gitignore
configure.ac
doc/source/news.txt
packages/windows/Makefile.am
packages/windows/Rakefile
Renamed files:
packages/windows/setup-x64.nsi.in
(from packages/windows/setup.nsi.in)
Modified: .gitignore (+4 -2)
===================================================================
--- .gitignore 2011-11-27 11:25:43 +0000 (d0f2ccc)
+++ .gitignore 2011-11-27 11:47:41 +0000 (c277218)
@@ -92,10 +92,12 @@ version.sh
/packages/yum/centos/
/packages/source/files/
/packages/windows/tmp/
-/packages/windows/dist/
+/packages/windows/dist-x86/
+/packages/windows/dist-x64/
/packages/windows/files/
/packages/windows/LICENSE
-/packages/windows/setup.nsi
+/packages/windows/setup-x86.nsi
+/packages/windows/setup-x64.nsi
/packages/*.tar.gz
/examples/dictionary/db/
/examples/dictionary/*.gz
Modified: configure.ac (+1 -1)
===================================================================
--- configure.ac 2011-11-27 11:25:43 +0000 (ae9435b)
+++ configure.ac 2011-11-27 11:47:41 +0000 (1d9d6db)
@@ -191,7 +191,7 @@ AC_CONFIG_FILES([
packages/windows/Makefile
packages/windows/patches/Makefile
packages/windows/language-files/Makefile
- packages/windows/setup.nsi
+ packages/windows/setup-x64.nsi
data/Makefile
data/html/Makefile
data/munin/Makefile
Modified: doc/source/news.txt (+1 -1)
===================================================================
--- doc/source/news.txt 2011-11-27 11:25:43 +0000 (719f778)
+++ doc/source/news.txt 2011-11-27 11:47:41 +0000 (d71a8cd)
@@ -43,7 +43,7 @@ Improvements
* Removed associated path on remove. [#1180]
* [deb] Supported i386.
* [rpm] Supported i386.
-* [windows] Supported i386.
+* [windows] Supported x86.
Fixes
^^^^^
Modified: packages/windows/Makefile.am (+32 -11)
===================================================================
--- packages/windows/Makefile.am 2011-11-27 11:25:43 +0000 (a2778b5)
+++ packages/windows/Makefile.am 2011-11-27 11:47:41 +0000 (8dc7a9d)
@@ -2,7 +2,8 @@ SUBDIRS = \
patches \
language-files
EXTRA_DIST = Rakefile
-LICENSE_DIR = dist/share/license
+LICENSE_DIR = dist-x64/share/license
+ARCHITECTURES = x86 x64
all:
@@ -26,13 +27,19 @@ build_options = \
DEBUG_BUILD=$(DEBUG_BUILD)
build: source
- $(RUBY) -S rake build $(build_options)
+ for architecture in $(ARCHITECTURES); do \
+ $(RUBY) -S rake build $(build_options) \
+ ARCHITECTURE=$${arcitecture}; \
+ done
build-groonga: source
- $(RUBY) -S rake build:groonga $(build_options)
+ for architecture in $(ARCHITECTURES); do \
+ $(RUBY) -S rake build:groonga $(build_options) \
+ ARCHITECTURE=$${arcitecture}; \
+ done
-installer: setup.nsi
- (echo "groonga"; \
+LICENSE:
+ @(echo "groonga"; \
echo "======="; \
echo; \
echo "AUTHORS"; \
@@ -88,14 +95,28 @@ installer: setup.nsi
echo; \
cat $(LICENSE_DIR)/naist-jdic/COPYING; \
) > LICENSE
- makensis setup.nsi
+
+installer: installer-x86 installer-x64
+
+setup-x86.nsi: setup-x64.nsi
+ sed -e 's/64/86/g' setup-x64.nsi > setup-x86.nsi
+
+installer-x86: LICENSE setup-x86.nsi
+ makensis setup-x86.nsi
+
+installer-x64: LICENSE setup-x64.nsi
+ makensis setup-x64.nsi
package:
- mkdir -p files
- rm -rf files/$(PACKAGE)-$(VERSION)
- cp -a dist files/$(PACKAGE)-$(VERSION)
- (cd files && zip -r $(PACKAGE)-$(VERSION).zip $(PACKAGE)-$(VERSION))
- rm -rf files/$(PACKAGE)-$(VERSION)
+ for architecture in $(ARCHITECTURES); do \
+ mkdir -p files; \
+ rm -rf files/$(PACKAGE)-$(VERSION); \
+ cp -a dist-$${architecture} files/$(PACKAGE)-$(VERSION); \
+ (cd files && \
+ zip -r $(PACKAGE)-$(VERSION)-$${architecture}.zip \
+ $(PACKAGE)-$(VERSION)-$${architecture}); \
+ rm -rf files/$(PACKAGE)-$(VERSION)-$${architecture}; \
+ done
SOURCE=../$(PACKAGE)-$(VERSION).tar.gz
Modified: packages/windows/Rakefile (+7 -3)
===================================================================
--- packages/windows/Rakefile 2011-11-27 11:25:43 +0000 (8620b1b)
+++ packages/windows/Rakefile 2011-11-27 11:47:41 +0000 (eb6ac18)
@@ -19,18 +19,22 @@ require 'pathname'
base_dir = Pathname.new(__FILE__).dirname
-groonga_win32_i386_p = ENV["GROONGA32"] == "yes"
+groonga_win32_x86_p = ENV["ARCHITECTURE"] == "x86"
groonga_version = ENV["VERSION"]
groonga_source = Pathname.new(ENV["SOURCE"]).expand_path
debug_build_p = ENV["DEBUG_BUILD"] == "yes"
debug_flags = ["CFLAGS=-ggdb3 -O0", "CXXFLAGS=-ggdb3 -O0"]
-dist_dir = Pathname.new("dist").expand_path
+if groonga_win32_x86_p
+ dist_dir = Pathname.new("dist-x86").expand_path
+else
+ dist_dir = Pathname.new("dist-x64").expand_path
+end
license_dir = dist_dir + "share" + "license"
binary_dir = base_dir + dist_dir
patches_dir = (base_dir + "patches").expand_path
-if groonga_win32_i386_p
+if groonga_win32_x86_p
host = "i686-w64-mingw32"
mecab_patches = []
else
Renamed: packages/windows/setup-x64.nsi.in (+0 -0) 100%
===================================================================