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 2014/07/20 17:04:51 UTC
[1/2] git commit: Search all of @INC for library files
Repository: lucy-clownfish
Updated Branches:
refs/heads/windows_fixes_for_0.4 2493f9006 -> e37455efd
Search all of @INC for library files
Needed to make the Lucy build work on Windows if Clownfish is
in a non-standard location.
Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/6ba9f7ff
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/6ba9f7ff
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/6ba9f7ff
Branch: refs/heads/windows_fixes_for_0.4
Commit: 6ba9f7ffc9b2a72a5761c8cdbfc112dda3ebc226
Parents: 2493f90
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Sun Jul 20 16:59:41 2014 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Sun Jul 20 17:01:42 2014 +0200
----------------------------------------------------------------------
compiler/perl/lib/Clownfish/CFC/Perl/Build.pm | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/6ba9f7ff/compiler/perl/lib/Clownfish/CFC/Perl/Build.pm
----------------------------------------------------------------------
diff --git a/compiler/perl/lib/Clownfish/CFC/Perl/Build.pm b/compiler/perl/lib/Clownfish/CFC/Perl/Build.pm
index 1b6c04f..dc1d285 100644
--- a/compiler/perl/lib/Clownfish/CFC/Perl/Build.pm
+++ b/compiler/perl/lib/Clownfish/CFC/Perl/Build.pm
@@ -144,10 +144,9 @@ sub cf_linker_flags {
# Link against import library on MSVC
my $ext = $Config{cc} =~ /^cl\b/ ? 'lib' : $dlext;
- for my $location ( qw( site vendor ) ) {
- my $install_dir = $Config{"install${location}arch"};
+ for my $dir (@INC) {
my $lib_file = catfile(
- $install_dir, 'auto', @module_parts, "$class_name.$ext",
+ $dir, 'auto', @module_parts, "$class_name.$ext",
);
return ( $lib_file ) if -f $lib_file;
}
[2/2] git commit: Windows batch file to setup dev environment
Posted by nw...@apache.org.
Windows batch file to setup dev environment
Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/e37455ef
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/e37455ef
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/e37455ef
Branch: refs/heads/windows_fixes_for_0.4
Commit: e37455efd563ecd238b7b81a96edc769330c709a
Parents: 6ba9f7f
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Sun Jul 20 17:00:51 2014 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Sun Jul 20 17:01:43 2014 +0200
----------------------------------------------------------------------
devel/bin/setup_env.bat | 71 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 71 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/e37455ef/devel/bin/setup_env.bat
----------------------------------------------------------------------
diff --git a/devel/bin/setup_env.bat b/devel/bin/setup_env.bat
new file mode 100644
index 0000000..8357073
--- /dev/null
+++ b/devel/bin/setup_env.bat
@@ -0,0 +1,71 @@
+@echo off
+
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements. See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem the License. You may obtain a copy of the License at
+rem
+rem http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing, software
+rem distributed under the License is distributed on an "AS IS" BASIS,
+rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+rem See the License for the specific language governing permissions and
+rem limitations under the License.
+
+setlocal EnableExtensions EnableDelayedExpansion
+
+set base_dir=%~dp0\..\..
+call :normalize "%base_dir%"
+set base_dir=%retval%
+set runtime_dir=%base_dir%\runtime
+set compiler_dir=%base_dir%\compiler
+
+call :add_to_path "%PATH%" "%compiler_dir%\c"
+set PATH=%retval%
+call :add_to_path "%PATH%" "%runtime_dir%\c"
+set PATH=%retval%
+call :add_to_path "%INCLUDE%" "%runtime_dir%\perl\xs"
+set INCLUDE=%retval%
+call :add_to_path "%LIB%" "%runtime_dir%\c"
+set LIB=%retval%
+call :add_to_path "%CLOWNFISH_INCLUDE%" "%runtime_dir%\core"
+set CLOWNFISH_INCLUDE=%retval%
+call :add_to_path "%PERL5LIB%" "%compiler_dir%\perl\blib\arch"
+set PERL5LIB=%retval%
+call :add_to_path "%PERL5LIB%" "%compiler_dir%\perl\blib\lib"
+set PERL5LIB=%retval%
+call :add_to_path "%PERL5LIB%" "%runtime_dir%\perl\blib\arch"
+set PERL5LIB=%retval%
+call :add_to_path "%PERL5LIB%" "%runtime_dir%\perl\blib\lib"
+set PERL5LIB=%retval%
+
+endlocal & (
+ set "PATH=%PATH%"
+ set "INCLUDE=%INCLUDE%"
+ set "LIB=%LIB%"
+ set "CLOWNFISH_INCLUDE=%CLOWNFISH_INCLUDE%"
+ set "PERL5LIB=%PERL5LIB%"
+)
+
+exit /b
+
+:normalize
+set retval=%~f1
+goto :eof
+
+:add_to_path
+set _path=%~1
+set _dir=%~2
+if "%_path%" == "" (
+ set "retval=%_dir%"
+ goto :eof
+)
+if "!_path:%_dir%=!" == "%_path%" (
+ set "retval=%_path%;%_dir%"
+ goto :eof
+)
+set retval=%_path%
+goto :eof