Author: marvin
Date: Mon Jun 11 23:49:46 2012
New Revision: 1349072
URL: http://svn.apache.org/viewvc?rev=1349072&view=rev
Log:
Add "make meld" build target for Charmonizer.
Modified:
lucy/trunk/charmonizer/Makefile
lucy/trunk/charmonizer/Makefile.MSVC
lucy/trunk/charmonizer/Makefile.MinGW
lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl
Modified: lucy/trunk/charmonizer/Makefile
URL:
http://svn.apache.org/viewvc/lucy/trunk/charmonizer/Makefile?rev=1349072&r1=1349071&r2=1349072&view=diff
==============================================================================
--- lucy/trunk/charmonizer/Makefile (original)
+++ lucy/trunk/charmonizer/Makefile Mon Jun 11 23:49:46 2012
@@ -19,6 +19,10 @@ CC= cc
DEFS=
CFLAGS= -Isrc $(DEFS)
PROGNAME= charmonize
+PROBES=
+FILES=
+OUT=
+PERL=/usr/bin/perl
TESTS= TestDirManip TestFuncMacro TestHeaders TestIntegers TestLargeFiles
TestUnusedVars TestVariadicMacros
@@ -35,6 +39,9 @@ CLEANABLE= $(OBJS) $(PROGNAME) $(TEST_OB
all: $(PROGNAME)
+meld:
+ $(PERL) buildbin/meld.pl --probes=$(PROBES) --files=$(FILES)
--out=$(OUT)
+
$(PROGNAME): $(OBJS)
$(CC) $(CFLAGS) $(OBJS) -o $(PROGNAME)
Modified: lucy/trunk/charmonizer/Makefile.MSVC
URL:
http://svn.apache.org/viewvc/lucy/trunk/charmonizer/Makefile.MSVC?rev=1349072&r1=1349071&r2=1349072&view=diff
==============================================================================
--- lucy/trunk/charmonizer/Makefile.MSVC (original)
+++ lucy/trunk/charmonizer/Makefile.MSVC Mon Jun 11 23:49:46 2012
@@ -19,6 +19,10 @@ CC= cl
DEFS=
CFLAGS= -Isrc $(DEFS) -nologo -D_CRT_SECURE_NO_WARNINGS
-D_SCL_SECURE_NO_WARNINGS
PROGNAME= charmonize.exe
+PROBES=
+FILES=
+OUT=
+PERL=/usr/bin/perl
TESTS= TestDirManip.exe TestFuncMacro.exe TestHeaders.exe TestIntegers.exe
TestLargeFiles.exe TestUnusedVars.exe TestVariadicMacros.exe
@@ -35,6 +39,9 @@ CLEANABLE= $(OBJS) $(PROGNAME) $(TEST_OB
all: $(PROGNAME)
+meld:
+ $(PERL) buildbin\meld.pl --probes=$(PROBES) --files=$(FILES)
--out=$(OUT)
+
$(PROGNAME): $(OBJS)
link -nologo $(OBJS) /OUT:$(PROGNAME)
Modified: lucy/trunk/charmonizer/Makefile.MinGW
URL:
http://svn.apache.org/viewvc/lucy/trunk/charmonizer/Makefile.MinGW?rev=1349072&r1=1349071&r2=1349072&view=diff
==============================================================================
--- lucy/trunk/charmonizer/Makefile.MinGW (original)
+++ lucy/trunk/charmonizer/Makefile.MinGW Mon Jun 11 23:49:46 2012
@@ -19,6 +19,10 @@ CC= gcc
DEFS=
CFLAGS= -Isrc $(DEFS)
PROGNAME= charmonize.exe
+PROBES=
+FILES=
+OUT=
+PERL=/usr/bin/perl
TESTS= TestDirManip.exe TestFuncMacro.exe TestHeaders.exe TestIntegers.exe
TestLargeFiles.exe TestUnusedVars.exe TestVariadicMacros.exe
@@ -35,6 +39,9 @@ CLEANABLE= $(OBJS) $(PROGNAME) $(TEST_OB
all: $(PROGNAME)
+meld:
+ $(PERL) buildbin\meld.pl --probes=$(PROBES) --files=$(FILES)
--out=$(OUT)
+
$(PROGNAME): $(OBJS)
$(CC) $(CFLAGS) $(OBJS) -o $(PROGNAME)
Modified: lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl
URL:
http://svn.apache.org/viewvc/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl?rev=1349072&r1=1349071&r2=1349072&view=diff
==============================================================================
--- lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl (original)
+++ lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl Mon Jun 11 23:49:46 2012
@@ -134,6 +134,18 @@ sub clean_rule_win {
qq|clean:\n\tCMD /c FOR %i IN (\$(CLEANABLE)) DO IF EXIST %i DEL /F %i|;
}
+sub meld_rule { confess "abstract method" }
+
+sub meld_rule_posix {
+ qq|meld:\n\t\$(PERL) buildbin/meld.pl --probes=\$(PROBES) |
+ . qq|--files=\$(FILES) --out=\$(OUT)|;
+}
+
+sub meld_rule_win {
+ qq|meld:\n\t\$(PERL) buildbin\\meld.pl --probes=\$(PROBES) |
+ . qq|--files=\$(FILES) --out=\$(OUT)|;
+}
+
sub gen_makefile {
my ( $self, %args ) = @_;
my ( $h_files, $c_files, $c_tests, $c_test_cases )
@@ -142,6 +154,7 @@ sub gen_makefile {
# Derive chunks of Makefile content.
my $progname = $self->execify('charmonize.c');
my $c2o_rule = $self->c2o_rule;
+ my $meld_rule = $self->meld_rule;
my $progname_link_command = $self->build_link_command(
objects => ['$(OBJS)'],
target => '$(PROGNAME)',
@@ -179,6 +192,10 @@ CC= $self->{cc}
DEFS=
CFLAGS= -Isrc \$(DEFS) $self->{extra_cflags}
PROGNAME= $progname
+PROBES=
+FILES=
+OUT=
+PERL=/usr/bin/perl
TESTS= $test_execs
@@ -194,6 +211,8 @@ $c2o_rule
all: \$(PROGNAME)
+$meld_rule
+
\$(PROGNAME): \$(OBJS)
\t$progname_link_command
@@ -224,6 +243,7 @@ sub new {
}
sub clean_rule { shift->clean_rule_posix }
+sub meld_rule { shift->meld_rule_posix }
sub pathify { shift->unixify(@_) }
package Charmonizer::Build::Makefile::MSVC;
@@ -256,6 +276,7 @@ sub build_link_command {
sub pathify { shift->winnify(@_) }
sub clean_rule { shift->clean_rule_win }
+sub meld_rule { shift->meld_rule_win }
package Charmonizer::Build::Makefile::MinGW;
BEGIN { our @ISA = qw( Charmonizer::Build::Makefile ) }
@@ -273,6 +294,7 @@ sub new {
sub pathify { shift->winnify(@_) }
sub clean_rule { shift->clean_rule_win }
+sub meld_rule { shift->meld_rule_win }
### actual script follows
package main;
