You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by nw...@apache.org on 2015/07/11 17:58:18 UTC
[1/3] lucy git commit: Allow --disable-threads Charmonizer option
Repository: lucy
Updated Branches:
refs/heads/master a57374a2b -> 739bc635d
Allow --disable-threads Charmonizer option
This option isn't used by Lucy but it's passed on non-threaded Perls.
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/021dcb5a
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/021dcb5a
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/021dcb5a
Branch: refs/heads/master
Commit: 021dcb5ae44d47a400cddc6bb3fd2aa440497a5d
Parents: a57374a
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Sat Jul 11 17:51:07 2015 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Sat Jul 11 17:51:07 2015 +0200
----------------------------------------------------------------------
common/charmonizer.c | 2 ++
common/charmonizer.main | 2 ++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/021dcb5a/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/common/charmonizer.c b/common/charmonizer.c
index 46bfc44..8c121a0 100644
--- a/common/charmonizer.c
+++ b/common/charmonizer.c
@@ -7993,6 +7993,8 @@ int main(int argc, const char **argv) {
= chaz_CLI_new(argv[0], "charmonizer: Probe C build environment");
chaz_CLI_register(cli, "host", "specify host binding language",
CHAZ_CLI_ARG_REQUIRED);
+ chaz_CLI_register(cli, "disable-threads", "whether to disable threads",
+ CHAZ_CLI_NO_ARG);
chaz_CLI_register(cli, "clownfish-prefix",
"prefix of Clownfish installation",
CHAZ_CLI_ARG_OPTIONAL);
http://git-wip-us.apache.org/repos/asf/lucy/blob/021dcb5a/common/charmonizer.main
----------------------------------------------------------------------
diff --git a/common/charmonizer.main b/common/charmonizer.main
index 2ae0fb1..1d00610 100644
--- a/common/charmonizer.main
+++ b/common/charmonizer.main
@@ -111,6 +111,8 @@ int main(int argc, const char **argv) {
= chaz_CLI_new(argv[0], "charmonizer: Probe C build environment");
chaz_CLI_register(cli, "host", "specify host binding language",
CHAZ_CLI_ARG_REQUIRED);
+ chaz_CLI_register(cli, "disable-threads", "whether to disable threads",
+ CHAZ_CLI_NO_ARG);
chaz_CLI_register(cli, "clownfish-prefix",
"prefix of Clownfish installation",
CHAZ_CLI_ARG_OPTIONAL);
[2/3] lucy git commit: Fix Travis build
Posted by nw...@apache.org.
Fix Travis build
Make Travis fetch and build Clownfish before building Lucy.
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/2c58db89
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/2c58db89
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/2c58db89
Branch: refs/heads/master
Commit: 2c58db89172b73950093d2f404829597901fdf79
Parents: 021dcb5
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Sat Jul 11 17:53:51 2015 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Sat Jul 11 17:54:55 2015 +0200
----------------------------------------------------------------------
.travis.yml | 24 ++++++++------
devel/bin/travis-test.sh | 74 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 88 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/2c58db89/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index dd676de..a84cc40 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,16 +14,20 @@
# limitations under the License.
language: perl
-perl:
- - "5.19"
- - "5.18"
- - "5.16"
- - "5.14"
- - "5.12"
- - "5.10"
- - "5.8"
+sudo: required
+# Override Travis' default Perl installation script.
+install: 'true'
+script: devel/bin/travis-test.sh
+env:
+ - LUCY_DEBUG=1 CLOWNFISH_HOST=c
+# - LUCY_DEBUG=1 CLOWNFISH_HOST=go
+ - LUCY_DEBUG=1 CLOWNFISH_HOST=perl PERL_VERSION=5.20
+ - LUCY_DEBUG=1 CLOWNFISH_HOST=perl PERL_VERSION=5.18
+ - LUCY_DEBUG=1 CLOWNFISH_HOST=perl PERL_VERSION=5.16
+ - LUCY_DEBUG=1 CLOWNFISH_HOST=perl PERL_VERSION=5.14
+ - LUCY_DEBUG=1 CLOWNFISH_HOST=perl PERL_VERSION=5.12
+ - LUCY_DEBUG=1 CLOWNFISH_HOST=perl PERL_VERSION=5.10
+ - LUCY_DEBUG=1 CLOWNFISH_HOST=perl PERL_VERSION=5.8
git:
depth: 10
-before_install:
- - cd perl
http://git-wip-us.apache.org/repos/asf/lucy/blob/2c58db89/devel/bin/travis-test.sh
----------------------------------------------------------------------
diff --git a/devel/bin/travis-test.sh b/devel/bin/travis-test.sh
new file mode 100755
index 0000000..624bb86
--- /dev/null
+++ b/devel/bin/travis-test.sh
@@ -0,0 +1,74 @@
+#!/bin/bash
+
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Exit if any command returns non-zero.
+set -e
+
+# Print all commands before executing.
+set -x
+
+test_c() {
+ # Install Clownfish.
+ git clone -q https://git-wip-us.apache.org/repos/asf/lucy-clownfish.git
+ cd lucy-clownfish/runtime/c
+ ./configure
+ make
+ sudo ./install.sh --prefix /usr/local
+ sudo ldconfig
+
+ cd ../../../c
+ ./configure
+ make -j test
+}
+
+test_perl() {
+ perlbrew switch $PERL_VERSION
+
+ # Install Clownfish.
+ git clone -q https://git-wip-us.apache.org/repos/asf/lucy-clownfish.git
+ cd lucy-clownfish/runtime/perl
+ perl Build.PL
+ ./Build
+ sudo ./Build install
+ cd ../../compiler/perl
+ sudo ./Build install
+
+ cd ../../../perl
+ perl Build.PL
+ ./Build test
+}
+
+test_go() {
+ # TODO
+ exit 1
+}
+
+case $CLOWNFISH_HOST in
+ perl)
+ test_perl
+ ;;
+ c)
+ test_c
+ ;;
+ go)
+ test_go
+ ;;
+ *)
+ echo "unknown CLOWNFISH_HOST: $CLOWNFISH_HOST"
+ exit 1
+esac
+
[3/3] lucy git commit: Fix C installation script
Posted by nw...@apache.org.
Fix C installation script
Support symbolic links in man page destination directory.
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/739bc635
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/739bc635
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/739bc635
Branch: refs/heads/master
Commit: 739bc635dd08f7290396d9accc3f2ee792b2eea3
Parents: 2c58db8
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Sat Jul 11 17:56:27 2015 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Sat Jul 11 17:56:27 2015 +0200
----------------------------------------------------------------------
c/install.sh | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/739bc635/c/install.sh
----------------------------------------------------------------------
diff --git a/c/install.sh b/c/install.sh
index 5909d33..44f5345 100755
--- a/c/install.sh
+++ b/c/install.sh
@@ -99,7 +99,14 @@ for src in `find ../core -name '*.cf[hp]'`; do
done
# Install man pages.
-cp -R autogen/man "$prefix"
+mkdir -p "$prefix/man"
+# Resolve symbolic links.
+man_dir=$(cd "$prefix/man" && pwd -P)
+if [ -n "$man_dir" ]; then
+ cp -R autogen/man "$man_dir"
+else
+ echo "Warning: Invalid directory $prefix/man"
+fi
# Create pkg-config file.
mkdir -p "$prefix/lib/pkgconfig"