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 03:54:08 UTC
[lucy-commits] svn commit: r1142359 - in /incubator/lucy/trunk: charmonizer/Makefile
charmonizer/Makefile.MSVC charmonizer/Makefile.MinGW
devel/bin/gen_charmonizer_makefiles.pl
Author: marvin
Date: Sun Jul 3 01:54:08 2011
New Revision: 1142359
URL: http://svn.apache.org/viewvc?rev=1142359&view=rev
Log:
Go back to using hard-coded exe extensions instead of $(EXEEXT) Makefile
variable.
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=1142359&r1=1142358&r2=1142359&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/Makefile (original)
+++ incubator/lucy/trunk/charmonizer/Makefile Sun Jul 3 01:54:08 2011
@@ -18,7 +18,6 @@
CC= cc
DEFS=
CFLAGS= -Isrc $(DEFS)
-EXEEXT=
LINKER= $(CC)
LINKFLAGS= $(CFLAGS)
LINKOUT= -o
@@ -26,9 +25,9 @@ LINKOUT= -o
.c.o:
$(CC) $(CFLAGS) -c $*.c -o $@
-PROGNAME= charmonize$(EXEEXT)
+PROGNAME= charmonize
-TESTS= TestDirManip$(EXEEXT) TestFuncMacro$(EXEEXT) TestHeaders$(EXEEXT) TestIntegers$(EXEEXT) TestLargeFiles$(EXEEXT) TestUnusedVars$(EXEEXT) TestVariadicMacros$(EXEEXT)
+TESTS= TestDirManip TestFuncMacro TestHeaders TestIntegers TestLargeFiles TestUnusedVars TestVariadicMacros
OBJS= charmonize.o src/Charmonizer/Core/Compiler.o src/Charmonizer/Core/ConfWriter.o src/Charmonizer/Core/Dir.o src/Charmonizer/Core/HeaderChecker.o src/Charmonizer/Core/OperatingSystem.o src/Charmonizer/Core/Stat.o src/Charmonizer/Core/Util.o src/Charmonizer/Probe.o src/Charmonizer/Probe/AtomicOps.o src/Charmonizer/Probe/DirManip.o src/Charmonizer/Probe/Floats.o src/Charmonizer/Probe/FuncMacro.o src/Charmonizer/Probe/Headers.o src/Charmonizer/Probe/Integers.o src/Charmonizer/Probe/LargeFiles.o src/Charmonizer/Probe/Memory.o src/Charmonizer/Probe/UnusedVars.o src/Charmonizer/Probe/VariadicMacros.o
@@ -47,25 +46,25 @@ $(OBJS) $(TEST_OBJS): $(HEADERS)
tests: $(TESTS)
-TestDirManip$(EXEEXT): src/Charmonizer/Test.o src/Charmonizer/Test/TestDirManip.o
+TestDirManip: src/Charmonizer/Test.o src/Charmonizer/Test/TestDirManip.o
$(LINKER) $(LINKFLAGS) src/Charmonizer/Test.o src/Charmonizer/Test/TestDirManip.o $(LINKOUT)"$@"
-TestFuncMacro$(EXEEXT): src/Charmonizer/Test.o src/Charmonizer/Test/TestFuncMacro.o
+TestFuncMacro: src/Charmonizer/Test.o src/Charmonizer/Test/TestFuncMacro.o
$(LINKER) $(LINKFLAGS) src/Charmonizer/Test.o src/Charmonizer/Test/TestFuncMacro.o $(LINKOUT)"$@"
-TestHeaders$(EXEEXT): src/Charmonizer/Test.o src/Charmonizer/Test/TestHeaders.o
+TestHeaders: src/Charmonizer/Test.o src/Charmonizer/Test/TestHeaders.o
$(LINKER) $(LINKFLAGS) src/Charmonizer/Test.o src/Charmonizer/Test/TestHeaders.o $(LINKOUT)"$@"
-TestIntegers$(EXEEXT): src/Charmonizer/Test.o src/Charmonizer/Test/TestIntegers.o
+TestIntegers: src/Charmonizer/Test.o src/Charmonizer/Test/TestIntegers.o
$(LINKER) $(LINKFLAGS) src/Charmonizer/Test.o src/Charmonizer/Test/TestIntegers.o $(LINKOUT)"$@"
-TestLargeFiles$(EXEEXT): src/Charmonizer/Test.o src/Charmonizer/Test/TestLargeFiles.o
+TestLargeFiles: src/Charmonizer/Test.o src/Charmonizer/Test/TestLargeFiles.o
$(LINKER) $(LINKFLAGS) src/Charmonizer/Test.o src/Charmonizer/Test/TestLargeFiles.o $(LINKOUT)"$@"
-TestUnusedVars$(EXEEXT): src/Charmonizer/Test.o src/Charmonizer/Test/TestUnusedVars.o
+TestUnusedVars: src/Charmonizer/Test.o src/Charmonizer/Test/TestUnusedVars.o
$(LINKER) $(LINKFLAGS) src/Charmonizer/Test.o src/Charmonizer/Test/TestUnusedVars.o $(LINKOUT)"$@"
-TestVariadicMacros$(EXEEXT): src/Charmonizer/Test.o src/Charmonizer/Test/TestVariadicMacros.o
+TestVariadicMacros: src/Charmonizer/Test.o src/Charmonizer/Test/TestVariadicMacros.o
$(LINKER) $(LINKFLAGS) src/Charmonizer/Test.o src/Charmonizer/Test/TestVariadicMacros.o $(LINKOUT)"$@"
clean:
Modified: incubator/lucy/trunk/charmonizer/Makefile.MSVC
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/Makefile.MSVC?rev=1142359&r1=1142358&r2=1142359&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/Makefile.MSVC (original)
+++ incubator/lucy/trunk/charmonizer/Makefile.MSVC Sun Jul 3 01:54:08 2011
@@ -18,7 +18,6 @@
CC= cl
DEFS=
CFLAGS= -Isrc -nologo -D_CRT_SECURE_NO_WARNINGS $(DEFS)
-EXEEXT= .exe
LINKER= link
LINKFLAGS= -nologo
LINKOUT= /OUT:
@@ -26,9 +25,9 @@ LINKOUT= /OUT:
.c.obj:
$(CC) $(CFLAGS) -c $< -Fo$@
-PROGNAME= charmonize$(EXEEXT)
+PROGNAME= charmonize.exe
-TESTS= TestDirManip$(EXEEXT) TestFuncMacro$(EXEEXT) TestHeaders$(EXEEXT) TestIntegers$(EXEEXT) TestLargeFiles$(EXEEXT) TestUnusedVars$(EXEEXT) TestVariadicMacros$(EXEEXT)
+TESTS= TestDirManip.exe TestFuncMacro.exe TestHeaders.exe TestIntegers.exe TestLargeFiles.exe TestUnusedVars.exe TestVariadicMacros.exe
OBJS= charmonize.obj src\Charmonizer\Core\Compiler.obj src\Charmonizer\Core\ConfWriter.obj src\Charmonizer\Core\Dir.obj src\Charmonizer\Core\HeaderChecker.obj src\Charmonizer\Core\OperatingSystem.obj src\Charmonizer\Core\Stat.obj src\Charmonizer\Core\Util.obj src\Charmonizer\Probe.obj src\Charmonizer\Probe\AtomicOps.obj src\Charmonizer\Probe\DirManip.obj src\Charmonizer\Probe\Floats.obj src\Charmonizer\Probe\FuncMacro.obj src\Charmonizer\Probe\Headers.obj src\Charmonizer\Probe\Integers.obj src\Charmonizer\Probe\LargeFiles.obj src\Charmonizer\Probe\Memory.obj src\Charmonizer\Probe\UnusedVars.obj src\Charmonizer\Probe\VariadicMacros.obj
@@ -47,25 +46,25 @@ $(OBJS) $(TEST_OBJS): $(HEADERS)
tests: $(TESTS)
-TestDirManip$(EXEEXT): src\Charmonizer\Test.obj src\Charmonizer\Test\TestDirManip.obj
+TestDirManip.exe: src\Charmonizer\Test.obj src\Charmonizer\Test\TestDirManip.obj
$(LINKER) $(LINKFLAGS) src\Charmonizer\Test.obj src\Charmonizer\Test\TestDirManip.obj $(LINKOUT)"$@"
-TestFuncMacro$(EXEEXT): src\Charmonizer\Test.obj src\Charmonizer\Test\TestFuncMacro.obj
+TestFuncMacro.exe: src\Charmonizer\Test.obj src\Charmonizer\Test\TestFuncMacro.obj
$(LINKER) $(LINKFLAGS) src\Charmonizer\Test.obj src\Charmonizer\Test\TestFuncMacro.obj $(LINKOUT)"$@"
-TestHeaders$(EXEEXT): src\Charmonizer\Test.obj src\Charmonizer\Test\TestHeaders.obj
+TestHeaders.exe: src\Charmonizer\Test.obj src\Charmonizer\Test\TestHeaders.obj
$(LINKER) $(LINKFLAGS) src\Charmonizer\Test.obj src\Charmonizer\Test\TestHeaders.obj $(LINKOUT)"$@"
-TestIntegers$(EXEEXT): src\Charmonizer\Test.obj src\Charmonizer\Test\TestIntegers.obj
+TestIntegers.exe: src\Charmonizer\Test.obj src\Charmonizer\Test\TestIntegers.obj
$(LINKER) $(LINKFLAGS) src\Charmonizer\Test.obj src\Charmonizer\Test\TestIntegers.obj $(LINKOUT)"$@"
-TestLargeFiles$(EXEEXT): src\Charmonizer\Test.obj src\Charmonizer\Test\TestLargeFiles.obj
+TestLargeFiles.exe: src\Charmonizer\Test.obj src\Charmonizer\Test\TestLargeFiles.obj
$(LINKER) $(LINKFLAGS) src\Charmonizer\Test.obj src\Charmonizer\Test\TestLargeFiles.obj $(LINKOUT)"$@"
-TestUnusedVars$(EXEEXT): src\Charmonizer\Test.obj src\Charmonizer\Test\TestUnusedVars.obj
+TestUnusedVars.exe: src\Charmonizer\Test.obj src\Charmonizer\Test\TestUnusedVars.obj
$(LINKER) $(LINKFLAGS) src\Charmonizer\Test.obj src\Charmonizer\Test\TestUnusedVars.obj $(LINKOUT)"$@"
-TestVariadicMacros$(EXEEXT): src\Charmonizer\Test.obj src\Charmonizer\Test\TestVariadicMacros.obj
+TestVariadicMacros.exe: src\Charmonizer\Test.obj src\Charmonizer\Test\TestVariadicMacros.obj
$(LINKER) $(LINKFLAGS) src\Charmonizer\Test.obj src\Charmonizer\Test\TestVariadicMacros.obj $(LINKOUT)"$@"
clean:
Modified: incubator/lucy/trunk/charmonizer/Makefile.MinGW
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/Makefile.MinGW?rev=1142359&r1=1142358&r2=1142359&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/Makefile.MinGW (original)
+++ incubator/lucy/trunk/charmonizer/Makefile.MinGW Sun Jul 3 01:54:08 2011
@@ -18,7 +18,6 @@
CC= gcc
DEFS=
CFLAGS= -Isrc $(DEFS)
-EXEEXT= .exe
LINKER= $(CC)
LINKFLAGS= $(CFLAGS)
LINKOUT= -o
@@ -26,9 +25,9 @@ LINKOUT= -o
.c.o:
$(CC) $(CFLAGS) -c $*.c -o $@
-PROGNAME= charmonize$(EXEEXT)
+PROGNAME= charmonize.exe
-TESTS= TestDirManip$(EXEEXT) TestFuncMacro$(EXEEXT) TestHeaders$(EXEEXT) TestIntegers$(EXEEXT) TestLargeFiles$(EXEEXT) TestUnusedVars$(EXEEXT) TestVariadicMacros$(EXEEXT)
+TESTS= TestDirManip.exe TestFuncMacro.exe TestHeaders.exe TestIntegers.exe TestLargeFiles.exe TestUnusedVars.exe TestVariadicMacros.exe
OBJS= charmonize.o src\Charmonizer\Core\Compiler.o src\Charmonizer\Core\ConfWriter.o src\Charmonizer\Core\Dir.o src\Charmonizer\Core\HeaderChecker.o src\Charmonizer\Core\OperatingSystem.o src\Charmonizer\Core\Stat.o src\Charmonizer\Core\Util.o src\Charmonizer\Probe.o src\Charmonizer\Probe\AtomicOps.o src\Charmonizer\Probe\DirManip.o src\Charmonizer\Probe\Floats.o src\Charmonizer\Probe\FuncMacro.o src\Charmonizer\Probe\Headers.o src\Charmonizer\Probe\Integers.o src\Charmonizer\Probe\LargeFiles.o src\Charmonizer\Probe\Memory.o src\Charmonizer\Probe\UnusedVars.o src\Charmonizer\Probe\VariadicMacros.o
@@ -47,25 +46,25 @@ $(OBJS) $(TEST_OBJS): $(HEADERS)
tests: $(TESTS)
-TestDirManip$(EXEEXT): src\Charmonizer\Test.o src\Charmonizer\Test\TestDirManip.o
+TestDirManip.exe: src\Charmonizer\Test.o src\Charmonizer\Test\TestDirManip.o
$(LINKER) $(LINKFLAGS) src\Charmonizer\Test.o src\Charmonizer\Test\TestDirManip.o $(LINKOUT)"$@"
-TestFuncMacro$(EXEEXT): src\Charmonizer\Test.o src\Charmonizer\Test\TestFuncMacro.o
+TestFuncMacro.exe: src\Charmonizer\Test.o src\Charmonizer\Test\TestFuncMacro.o
$(LINKER) $(LINKFLAGS) src\Charmonizer\Test.o src\Charmonizer\Test\TestFuncMacro.o $(LINKOUT)"$@"
-TestHeaders$(EXEEXT): src\Charmonizer\Test.o src\Charmonizer\Test\TestHeaders.o
+TestHeaders.exe: src\Charmonizer\Test.o src\Charmonizer\Test\TestHeaders.o
$(LINKER) $(LINKFLAGS) src\Charmonizer\Test.o src\Charmonizer\Test\TestHeaders.o $(LINKOUT)"$@"
-TestIntegers$(EXEEXT): src\Charmonizer\Test.o src\Charmonizer\Test\TestIntegers.o
+TestIntegers.exe: src\Charmonizer\Test.o src\Charmonizer\Test\TestIntegers.o
$(LINKER) $(LINKFLAGS) src\Charmonizer\Test.o src\Charmonizer\Test\TestIntegers.o $(LINKOUT)"$@"
-TestLargeFiles$(EXEEXT): src\Charmonizer\Test.o src\Charmonizer\Test\TestLargeFiles.o
+TestLargeFiles.exe: src\Charmonizer\Test.o src\Charmonizer\Test\TestLargeFiles.o
$(LINKER) $(LINKFLAGS) src\Charmonizer\Test.o src\Charmonizer\Test\TestLargeFiles.o $(LINKOUT)"$@"
-TestUnusedVars$(EXEEXT): src\Charmonizer\Test.o src\Charmonizer\Test\TestUnusedVars.o
+TestUnusedVars.exe: src\Charmonizer\Test.o src\Charmonizer\Test\TestUnusedVars.o
$(LINKER) $(LINKFLAGS) src\Charmonizer\Test.o src\Charmonizer\Test\TestUnusedVars.o $(LINKOUT)"$@"
-TestVariadicMacros$(EXEEXT): src\Charmonizer\Test.o src\Charmonizer\Test\TestVariadicMacros.o
+TestVariadicMacros.exe: src\Charmonizer\Test.o src\Charmonizer\Test\TestVariadicMacros.o
$(LINKER) $(LINKFLAGS) src\Charmonizer\Test.o src\Charmonizer\Test\TestVariadicMacros.o $(LINKOUT)"$@"
clean:
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=1142359&r1=1142358&r2=1142359&view=diff
==============================================================================
--- incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl (original)
+++ incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl Sun Jul 3 01:54:08 2011
@@ -28,14 +28,15 @@ sub new {
my ( $class, %args ) = @_;
# Validate args, create object.
- for (qw( dir filename obj_ext )) {
- $args{$_} or confess("Missing required param '$_'");
+ for (qw( dir filename obj_ext exe_ext )) {
+ defined $args{$_} or confess("Missing required param '$_'");
}
my $dir = $args{dir};
my $self = bless {
dir => $dir,
filename => $args{filename},
obj_ext => $args{obj_ext},
+ exe_ext => $args{exe_ext},
}, $class;
# Gather source paths, normalized for the target OS.
@@ -91,7 +92,7 @@ sub test_execs {
my $self = shift;
my @test_execs = grep { $_ !~ /Test\.c/ } @_; # skip Test.c entry
for (@test_execs) {
- s/.*(Test\w+)\.c$/$1\$(EXEEXT)/ or die "no match: $_";
+ s/.*(Test\w+)\.c$/$1$self->{exe_ext}/ or die "no match: $_";
}
return @test_execs;
}
@@ -102,7 +103,7 @@ sub test_blocks {
my @blocks;
for my $c_file (@c_files) {
my $exe = $c_file;
- $exe =~ s/.*(Test\w+)\.c$/$1\$(EXEEXT)/ or die "no match $exe";
+ $exe =~ s/.*(Test\w+)\.c$/$1$self->{exe_ext}/ or die "no match $exe";
my ($obj) = $self->objectify($c_file);
push @blocks, <<END_BLOCK;
$exe: src/Charmonizer/Test$self->{obj_ext} $obj
@@ -131,7 +132,7 @@ sub gen_makefile {
#
$license
$args{top}
-PROGNAME= charmonize\$(EXEEXT)
+PROGNAME= charmonize$self->{exe_ext}
TESTS= $args{test_execs}
@@ -205,6 +206,7 @@ sub new {
return $class->SUPER::new(
filename => 'Makefile',
obj_ext => '.o',
+ exe_ext => '',
@_
);
}
@@ -214,7 +216,6 @@ sub top {
CC= cc
DEFS=
CFLAGS= -Isrc \$(DEFS)
-EXEEXT=
LINKER= \$(CC)
LINKFLAGS= \$(CFLAGS)
LINKOUT= -o
@@ -235,6 +236,7 @@ sub new {
return $class->SUPER::new(
filename => 'Makefile.MSVC',
obj_ext => '.obj',
+ exe_ext => '.exe',
@_
);
}
@@ -245,7 +247,6 @@ sub top {
CC= cl
DEFS=
CFLAGS= -Isrc -nologo -D_CRT_SECURE_NO_WARNINGS \$(DEFS)
-EXEEXT= .exe
LINKER= link
LINKFLAGS= -nologo
LINKOUT= /OUT:
@@ -266,6 +267,7 @@ sub new {
return $class->SUPER::new(
filename => 'Makefile.MinGW',
obj_ext => '.o',
+ exe_ext => '.exe',
@_
);
}
@@ -275,7 +277,6 @@ sub top {
CC= gcc
DEFS=
CFLAGS= -Isrc \$(DEFS)
-EXEEXT= .exe
LINKER= \$(CC)
LINKFLAGS= \$(CFLAGS)
LINKOUT= -o