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/07/03 05:15:20 UTC
[lucy-commits] svn commit: r1142369 - in /incubator/lucy/trunk: charmonizer/Makefile
charmonizer/Makefile.MSVC charmonizer/Makefile.MinGW
devel/bin/gen_charmonizer_makefiles.pl
Author: marvin
Date: Sun Jul 3 03:15:20 2011
New Revision: 1142369
URL: http://svn.apache.org/viewvc?rev=1142369&view=rev
Log:
Inline the text of the ALv2 within the code generation template.
Modified:
incubator/lucy/trunk/charmonizer/Makefile
incubator/lucy/trunk/charmonizer/Makefile.MSVC
incubator/lucy/trunk/charmonizer/Makefile.MinGW
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=1142369&r1=1142368&r2=1142369&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/Makefile (original)
+++ incubator/lucy/trunk/charmonizer/Makefile Sun Jul 3 03:15:20 2011
@@ -1,5 +1,5 @@
# 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
# this work for additional information regarding copyright ownership.
Modified: incubator/lucy/trunk/charmonizer/Makefile.MSVC
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/Makefile.MSVC?rev=1142369&r1=1142368&r2=1142369&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/Makefile.MSVC (original)
+++ incubator/lucy/trunk/charmonizer/Makefile.MSVC Sun Jul 3 03:15:20 2011
@@ -1,5 +1,5 @@
# 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
# this work for additional information regarding copyright ownership.
Modified: incubator/lucy/trunk/charmonizer/Makefile.MinGW
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/Makefile.MinGW?rev=1142369&r1=1142368&r2=1142369&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/Makefile.MinGW (original)
+++ incubator/lucy/trunk/charmonizer/Makefile.MinGW Sun Jul 3 03:15:20 2011
@@ -1,5 +1,5 @@
# 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
# this work for additional information regarding copyright ownership.
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=1142369&r1=1142368&r2=1142369&view=diff
==============================================================================
--- incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl (original)
+++ incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl Sun Jul 3 03:15:20 2011
@@ -128,15 +128,28 @@ sub clean_target_win {
sub gen_makefile {
my ( $self, %args ) = @_;
open my $fh, ">", $args{file} or die "open '$args{file}' failed: $!\n";
- my $license = $self->license;
my $progname_link_command = $self->build_link_command(
objects => ['$(OBJS)'],
target => '$(PROGNAME)',
);
my $content = <<EOT;
# GENERATED BY $FindBin::Script: do not hand-edit!!!
+
+# 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
#
-$license
+# 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.
+
$args{top}
PROGNAME= charmonize$self->{exe_ext}
@@ -188,25 +201,6 @@ sub write_makefile {
);
}
-sub license {
- return <<'END_LICENSE';
-# 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.
-END_LICENSE
-}
-
package Charmonizer::Build::Makefile::Posix;
BEGIN { our @ISA = qw( Charmonizer::Build::Makefile ) }