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/30 03:26:02 UTC
[lucy-commits] svn commit: r1141357 - in /incubator/lucy/trunk: charmonizer/Makefile.MSVC
charmonizer/Makefile.MinGW charmonizer/Makefile.win
devel/bin/gen_charmonizer_makefiles.pl perl/buildlib/Lucy/Build.pm
Author: marvin
Date: Thu Jun 30 01:26:02 2011
New Revision: 1141357
URL: http://svn.apache.org/viewvc?rev=1141357&view=rev
Log:
Support MinGW (as used by Strawberry Perl) in addition to MSVC from within the
Windows cmd.exe environment.
Added:
incubator/lucy/trunk/charmonizer/Makefile.MSVC (with props)
incubator/lucy/trunk/charmonizer/Makefile.MinGW (with props)
Modified:
incubator/lucy/trunk/charmonizer/Makefile.win
incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl
incubator/lucy/trunk/perl/buildlib/Lucy/Build.pm
Added: incubator/lucy/trunk/charmonizer/Makefile.MSVC
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/Makefile.MSVC?rev=1141357&view=auto
==============================================================================
--- incubator/lucy/trunk/charmonizer/Makefile.MSVC (added)
+++ incubator/lucy/trunk/charmonizer/Makefile.MSVC Thu Jun 30 01:26:02 2011
@@ -0,0 +1,31 @@
+# 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.
+# 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.
+
+CC= cl
+DEFS=
+CFLAGS= -Isrc -nologo $(DEFS)
+OBJEXT= .obj
+EXEEXT= .exe
+LINKER= link
+LINKFLAGS= -nologo
+LINKOUT= /OUT:
+
+.c.obj:
+ $(CC) $(CFLAGS) -c $< -Fo$@
+
+include Makefile.win
+
Propchange: incubator/lucy/trunk/charmonizer/Makefile.MSVC
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/lucy/trunk/charmonizer/Makefile.MinGW
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/Makefile.MinGW?rev=1141357&view=auto
==============================================================================
--- incubator/lucy/trunk/charmonizer/Makefile.MinGW (added)
+++ incubator/lucy/trunk/charmonizer/Makefile.MinGW Thu Jun 30 01:26:02 2011
@@ -0,0 +1,31 @@
+# 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.
+# 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.
+
+CC= gcc
+DEFS=
+CFLAGS= -Isrc $(DEFS)
+OBJEXT= .o
+EXEEXT= .exe
+LINKER= $(CC)
+LINKFLAGS= $(CFLAGS)
+LINKOUT= -o
+
+.c.o:
+ $(CC) $(CFLAGS) -c $*.c -o $@
+
+include Makefile.win
+
Propchange: incubator/lucy/trunk/charmonizer/Makefile.MinGW
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/lucy/trunk/charmonizer/Makefile.win
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/Makefile.win?rev=1141357&r1=1141356&r2=1141357&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/Makefile.win (original)
+++ incubator/lucy/trunk/charmonizer/Makefile.win Thu Jun 30 01:26:02 2011
@@ -15,15 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-CC= cl
-DEFS=
-CFLAGS= -Isrc -nologo $(DEFS)
-EXEEXT= .exe
-OBJEXT= .obj
PROGNAME= charmonize$(EXEEXT)
-LINKER= link
-LINKFLAGS = -nologo
-LINKOUT= /OUT:
CLEANABLE= $(OBJS) $(PROGNAME) $(TEST_OBJS) $(TESTS) core *.pdb
TESTS= TestDirManip$(EXEEXT) TestFuncMacro$(EXEEXT) TestHeaders$(EXEEXT) TestIntegers$(EXEEXT) TestLargeFiles$(EXEEXT) TestUnusedVars$(EXEEXT) TestVariadicMacros$(EXEEXT)
@@ -34,9 +26,6 @@ TEST_OBJS= src\Charmonizer\Test$(OBJEXT)
HEADERS= src\Charmonizer\Core\Compiler.h src\Charmonizer\Core\ConfWriter.h src\Charmonizer\Core\Defines.h src\Charmonizer\Core\Dir.h src\Charmonizer\Core\HeaderChecker.h src\Charmonizer\Core\OperatingSystem.h src\Charmonizer\Core\Stat.h src\Charmonizer\Core\Util.h src\Charmonizer\Probe.h src\Charmonizer\Probe\AtomicOps.h src\Charmonizer\Probe\DirManip.h src\Charmonizer\Probe\Floats.h src\Charmonizer\Probe\FuncMacro.h src\Charmonizer\Probe\Headers.h src\Charmonizer\Probe\Integers.h src\Charmonizer\Probe\LargeFiles.h src\Charmonizer\Probe\Memory.h src\Charmonizer\Probe\UnusedVars.h src\Charmonizer\Probe\VariadicMacros.h src\Charmonizer\Test.h
-.c.obj:
- $(CC) $(CFLAGS) -c $< -Fo$@
-
all: $(PROGNAME)
$(PROGNAME): $(OBJS)
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=1141357&r1=1141356&r2=1141357&view=diff
==============================================================================
--- incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl (original)
+++ incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl Thu Jun 30 01:26:02 2011
@@ -134,15 +134,7 @@ sub gen_makefile_win {
# GENERATED BY $FindBin::Script: do not hand-edit!!!
#
$license
-CC= cl
-DEFS=
-CFLAGS= -Isrc -nologo \$(DEFS)
-EXEEXT= .exe
-OBJEXT= .obj
PROGNAME= charmonize\$(EXEEXT)
-LINKER= link
-LINKFLAGS = -nologo
-LINKOUT= /OUT:
CLEANABLE= \$(OBJS) \$(PROGNAME) \$(TEST_OBJS) \$(TESTS) core *.pdb
TESTS= $args{test_execs}
@@ -153,9 +145,6 @@ TEST_OBJS= $args{test_objs}
HEADERS= $args{headers}
-.c.obj:
- \$(CC) \$(CFLAGS) -c \$< -Fo\$@
-
all: \$(PROGNAME)
\$(PROGNAME): \$(OBJS)
Modified: incubator/lucy/trunk/perl/buildlib/Lucy/Build.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/buildlib/Lucy/Build.pm?rev=1141357&r1=1141356&r2=1141357&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/buildlib/Lucy/Build.pm (original)
+++ incubator/lucy/trunk/perl/buildlib/Lucy/Build.pm Thu Jun 30 01:26:02 2011
@@ -138,9 +138,10 @@ sub _run_make {
chdir $dir if $dir;
unshift @command, 'CC=' . $self->config('cc');
if ( $self->config('cc') =~ /^cl\b/ ) {
- if ( -f "Makefile.win" ) {
- unshift @command, "-f", "Makefile.win";
- }
+ unshift @command, "-f", "Makefile.MSVC";
+ }
+ elsif ( $^O =~ /mswin/i ) {
+ unshift @command, "-f", "Makefile.MinGW";
}
unshift @command, "$Config{make}";
system(@command) and confess("$Config{make} failed");