You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by ma...@apache.org on 2011/06/25 19:25:56 UTC
[lucy-commits] svn commit: r1139574 - in /incubator/lucy/trunk: charmonizer/Makefile
charmonizer/Makefile.win devel/bin/gen_charmonizer_makefiles.pl
Author: marvin
Date: Sat Jun 25 17:25:56 2011
New Revision: 1139574
URL: http://svn.apache.org/viewvc?rev=1139574&view=rev
Log:
Use $FindBin::Script instead of $0 so that different path separators under
Unix and Windows do not cause a change in output.
Modified:
incubator/lucy/trunk/charmonizer/Makefile
incubator/lucy/trunk/charmonizer/Makefile.win
incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl
Modified: incubator/lucy/trunk/charmonizer/Makefile
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/Makefile?rev=1139574&r1=1139573&r2=1139574&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/Makefile (original)
+++ incubator/lucy/trunk/charmonizer/Makefile Sat Jun 25 17:25:56 2011
@@ -1,4 +1,4 @@
-# GENERATED BY ../devel/bin/gen_charmonizer_makefiles.pl: do not hand-edit!!!
+# GENERATED BY gen_charmonizer_makefiles.pl: do not hand-edit!!!
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
Modified: incubator/lucy/trunk/charmonizer/Makefile.win
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/Makefile.win?rev=1139574&r1=1139573&r2=1139574&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/Makefile.win (original)
+++ incubator/lucy/trunk/charmonizer/Makefile.win Sat Jun 25 17:25:56 2011
@@ -1,4 +1,4 @@
-# GENERATED BY ../devel/bin/gen_charmonizer_makefiles.pl: do not hand-edit!!!
+# GENERATED BY gen_charmonizer_makefiles.pl: do not hand-edit!!!
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
Modified: incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl?rev=1139574&r1=1139573&r2=1139574&view=diff
==============================================================================
--- incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl (original)
+++ incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl Sat Jun 25 17:25:56 2011
@@ -18,6 +18,7 @@
use strict;
use warnings;
use File::Find qw( find );
+use FindBin;
-d "src" or die "Switch to the directory containg the charmonizer src/.\n";
@@ -83,7 +84,7 @@ sub gen_makefile {
my %args = @_;
open my $fh, ">Makefile" or die "open Makefile failed: $!\n";
my $content = <<EOT;
-# GENERATED BY $0: do not hand-edit!!!
+# GENERATED BY $FindBin::Script: do not hand-edit!!!
#
$license
CC= cc
@@ -122,11 +123,12 @@ EOT
print $fh $content;
}
+use FindBin;
sub gen_makefile_win {
my %args = @_;
open my $fh, ">Makefile.win" or die "open Makefile.win failed: $!\n";
my $content = <<EOT;
-# GENERATED BY $0: do not hand-edit!!!
+# GENERATED BY $FindBin::Script: do not hand-edit!!!
#
$license
CC= cl