lucy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nwelln...@apache.org
Subject [lucy-commits] [8/9] git commit: refs/heads/master - Remove Charmonizer from repo
Date Mon, 10 Mar 2014 20:40:12 GMT
Remove Charmonizer from repo


Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/3dc812ab
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/3dc812ab
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/3dc812ab

Branch: refs/heads/master
Commit: 3dc812ab8c5f0370949d21e9e832b40e833bca76
Parents: b9965bf
Author: Nick Wellnhofer <wellnhofer@aevum.de>
Authored: Mon Mar 10 21:38:25 2014 +0100
Committer: Nick Wellnhofer <wellnhofer@aevum.de>
Committed: Mon Mar 10 21:38:56 2014 +0100

----------------------------------------------------------------------
 charmonizer/.gitignore                          |   8 -
 charmonizer/Makefile                            |  75 --
 charmonizer/Makefile.MSVC                       |  75 --
 charmonizer/Makefile.MinGW                      |  75 --
 charmonizer/README                              | 113 ---
 charmonizer/buildbin/meld.pl                    | 207 -----
 charmonizer/charmonize.c                        | 169 ----
 charmonizer/src/Charmonizer/Core/CFlags.c       | 335 --------
 charmonizer/src/Charmonizer/Core/CFlags.h       | 104 ---
 charmonizer/src/Charmonizer/Core/Compiler.c     | 369 ---------
 charmonizer/src/Charmonizer/Core/Compiler.h     | 117 ---
 charmonizer/src/Charmonizer/Core/ConfWriter.c   | 126 ---
 charmonizer/src/Charmonizer/Core/ConfWriter.h   | 132 ----
 charmonizer/src/Charmonizer/Core/ConfWriterC.c  | 408 ----------
 charmonizer/src/Charmonizer/Core/ConfWriterC.h  |  38 -
 .../src/Charmonizer/Core/ConfWriterPerl.c       | 225 ------
 .../src/Charmonizer/Core/ConfWriterPerl.h       |  37 -
 .../src/Charmonizer/Core/ConfWriterPython.c     | 223 ------
 .../src/Charmonizer/Core/ConfWriterPython.h     |  37 -
 .../src/Charmonizer/Core/ConfWriterRuby.c       | 223 ------
 .../src/Charmonizer/Core/ConfWriterRuby.h       |  37 -
 charmonizer/src/Charmonizer/Core/Defines.h      |  38 -
 .../src/Charmonizer/Core/HeaderChecker.c        | 220 ------
 .../src/Charmonizer/Core/HeaderChecker.h        |  58 --
 charmonizer/src/Charmonizer/Core/Make.c         | 767 -------------------
 charmonizer/src/Charmonizer/Core/Make.h         | 243 ------
 .../src/Charmonizer/Core/OperatingSystem.c      | 243 ------
 .../src/Charmonizer/Core/OperatingSystem.h      | 118 ---
 .../src/Charmonizer/Core/SharedLibrary.c        | 135 ----
 .../src/Charmonizer/Core/SharedLibrary.h        |  66 --
 charmonizer/src/Charmonizer/Core/Util.c         | 213 -----
 charmonizer/src/Charmonizer/Core/Util.h         |  87 ---
 charmonizer/src/Charmonizer/Probe.c             | 184 -----
 charmonizer/src/Charmonizer/Probe.h             | 105 ---
 charmonizer/src/Charmonizer/Probe/AtomicOps.c   |  68 --
 charmonizer/src/Charmonizer/Probe/AtomicOps.h   |  51 --
 charmonizer/src/Charmonizer/Probe/Booleans.c    |  47 --
 charmonizer/src/Charmonizer/Probe/Booleans.h    |  50 --
 charmonizer/src/Charmonizer/Probe/BuildEnv.c    |  35 -
 charmonizer/src/Charmonizer/Probe/BuildEnv.h    |  49 --
 charmonizer/src/Charmonizer/Probe/DirManip.c    | 204 -----
 charmonizer/src/Charmonizer/Probe/DirManip.h    |  68 --
 charmonizer/src/Charmonizer/Probe/Floats.c      | 103 ---
 charmonizer/src/Charmonizer/Probe/Floats.h      |  57 --
 charmonizer/src/Charmonizer/Probe/FuncMacro.c   | 153 ----
 charmonizer/src/Charmonizer/Probe/FuncMacro.h   |  59 --
 charmonizer/src/Charmonizer/Probe/Headers.c     | 231 ------
 charmonizer/src/Charmonizer/Probe/Headers.h     |  98 ---
 charmonizer/src/Charmonizer/Probe/Integers.c    | 495 ------------
 charmonizer/src/Charmonizer/Probe/Integers.h    | 119 ---
 charmonizer/src/Charmonizer/Probe/LargeFiles.c  | 322 --------
 charmonizer/src/Charmonizer/Probe/LargeFiles.h  |  64 --
 charmonizer/src/Charmonizer/Probe/Memory.c      | 123 ---
 charmonizer/src/Charmonizer/Probe/Memory.h      |  52 --
 .../src/Charmonizer/Probe/RegularExpressions.c  |  57 --
 .../src/Charmonizer/Probe/RegularExpressions.h  |  38 -
 charmonizer/src/Charmonizer/Probe/Strings.c     |  93 ---
 charmonizer/src/Charmonizer/Probe/Strings.h     |  39 -
 .../src/Charmonizer/Probe/SymbolVisibility.c    |  77 --
 .../src/Charmonizer/Probe/SymbolVisibility.h    |  36 -
 charmonizer/src/Charmonizer/Probe/UnusedVars.c  |  36 -
 charmonizer/src/Charmonizer/Probe/UnusedVars.h  |  46 --
 .../src/Charmonizer/Probe/VariadicMacros.c      |  80 --
 .../src/Charmonizer/Probe/VariadicMacros.h      |  52 --
 charmonizer/src/Charmonizer/Test.c              | 205 -----
 charmonizer/src/Charmonizer/Test.h              | 140 ----
 charmonizer/src/Charmonizer/Test/TestDirManip.c |  71 --
 .../src/Charmonizer/Test/TestFuncMacro.c        |  63 --
 charmonizer/src/Charmonizer/Test/TestHeaders.c  | 164 ----
 charmonizer/src/Charmonizer/Test/TestIntegers.c | 125 ---
 .../src/Charmonizer/Test/TestLargeFiles.c       | 280 -------
 .../src/Charmonizer/Test/TestUnusedVars.c       |  42 -
 .../src/Charmonizer/Test/TestVariadicMacros.c   |  69 --
 73 files changed, 9771 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy/blob/3dc812ab/charmonizer/.gitignore
----------------------------------------------------------------------
diff --git a/charmonizer/.gitignore b/charmonizer/.gitignore
deleted file mode 100644
index 136ab40..0000000
--- a/charmonizer/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-TestDirManip
-TestFuncMacro
-TestHeaders
-TestIntegers
-TestLargeFiles
-TestUnusedVars
-TestVariadicMacros
-charmonize

http://git-wip-us.apache.org/repos/asf/lucy/blob/3dc812ab/charmonizer/Makefile
----------------------------------------------------------------------
diff --git a/charmonizer/Makefile b/charmonizer/Makefile
deleted file mode 100644
index eafc841..0000000
--- a/charmonizer/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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= cc
-DEFS=
-CFLAGS= -Isrc $(DEFS) 
-PROGNAME= charmonize
-PROBES=
-FILES=
-OUT=
-PERL=/usr/bin/perl
-
-TESTS= TestDirManip TestFuncMacro TestHeaders TestIntegers TestLargeFiles TestUnusedVars TestVariadicMacros
-
-OBJS= charmonize.o src/Charmonizer/Core/Compiler.o src/Charmonizer/Core/ConfWriter.o src/Charmonizer/Core/ConfWriterC.o src/Charmonizer/Core/ConfWriterPerl.o src/Charmonizer/Core/ConfWriterRuby.o src/Charmonizer/Core/HeaderChecker.o src/Charmonizer/Core/OperatingSystem.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/SymbolVisibility.o src/Charmonizer/Probe/UnusedVars.o src/Charmonizer/Probe/VariadicMacros.o
-
-TEST_OBJS= src/Charmonizer/Test.o src/Charmonizer/Test/TestDirManip.o src/Charmonizer/Test/TestFuncMacro.o src/Charmonizer/Test/TestHeaders.o src/Charmonizer/Test/TestIntegers.o src/Charmonizer/Test/TestLargeFiles.o src/Charmonizer/Test/TestUnusedVars.o src/Charmonizer/Test/TestVariadicMacros.o
-
-HEADERS= src/Charmonizer/Core/Compiler.h src/Charmonizer/Core/ConfWriter.h src/Charmonizer/Core/ConfWriterC.h src/Charmonizer/Core/ConfWriterPerl.h src/Charmonizer/Core/ConfWriterRuby.h src/Charmonizer/Core/Defines.h src/Charmonizer/Core/HeaderChecker.h src/Charmonizer/Core/OperatingSystem.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/SymbolVisibility.h src/Charmonizer/Probe/UnusedVars.h src/Charmonizer/Probe/VariadicMacros.h src/Charmonizer/Test.h
-
-CLEANABLE= $(OBJS) $(PROGNAME) $(TEST_OBJS) $(TESTS) 
-
-.c.o:
-	$(CC) $(CFLAGS) -c $*.c -o $@
-
-all: $(PROGNAME)
-
-meld:
-	$(PERL) buildbin/meld.pl --probes=$(PROBES) --files=$(FILES) --out=$(OUT)
-
-$(PROGNAME): $(OBJS)
-	$(CC) $(CFLAGS) $(OBJS) -o $(PROGNAME)
-
-$(OBJS) $(TEST_OBJS): $(HEADERS)
-
-tests: $(TESTS)
-
-TestDirManip: src/Charmonizer/Test.o src/Charmonizer/Test/TestDirManip.o
-	$(CC) $(CFLAGS) src/Charmonizer/Test/TestDirManip.o src/Charmonizer/Test.o -o $@
-
-TestFuncMacro: src/Charmonizer/Test.o src/Charmonizer/Test/TestFuncMacro.o
-	$(CC) $(CFLAGS) src/Charmonizer/Test/TestFuncMacro.o src/Charmonizer/Test.o -o $@
-
-TestHeaders: src/Charmonizer/Test.o src/Charmonizer/Test/TestHeaders.o
-	$(CC) $(CFLAGS) src/Charmonizer/Test/TestHeaders.o src/Charmonizer/Test.o -o $@
-
-TestIntegers: src/Charmonizer/Test.o src/Charmonizer/Test/TestIntegers.o
-	$(CC) $(CFLAGS) src/Charmonizer/Test/TestIntegers.o src/Charmonizer/Test.o -o $@
-
-TestLargeFiles: src/Charmonizer/Test.o src/Charmonizer/Test/TestLargeFiles.o
-	$(CC) $(CFLAGS) src/Charmonizer/Test/TestLargeFiles.o src/Charmonizer/Test.o -o $@
-
-TestUnusedVars: src/Charmonizer/Test.o src/Charmonizer/Test/TestUnusedVars.o
-	$(CC) $(CFLAGS) src/Charmonizer/Test/TestUnusedVars.o src/Charmonizer/Test.o -o $@
-
-TestVariadicMacros: src/Charmonizer/Test.o src/Charmonizer/Test/TestVariadicMacros.o
-	$(CC) $(CFLAGS) src/Charmonizer/Test/TestVariadicMacros.o src/Charmonizer/Test.o -o $@
-
-clean:
-	rm -f $(CLEANABLE)
-

http://git-wip-us.apache.org/repos/asf/lucy/blob/3dc812ab/charmonizer/Makefile.MSVC
----------------------------------------------------------------------
diff --git a/charmonizer/Makefile.MSVC b/charmonizer/Makefile.MSVC
deleted file mode 100644
index 95445d6..0000000
--- a/charmonizer/Makefile.MSVC
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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 $(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
-
-OBJS= charmonize.obj src\Charmonizer\Core\Compiler.obj src\Charmonizer\Core\ConfWriter.obj src\Charmonizer\Core\ConfWriterC.obj src\Charmonizer\Core\ConfWriterPerl.obj src\Charmonizer\Core\ConfWriterRuby.obj src\Charmonizer\Core\HeaderChecker.obj src\Charmonizer\Core\OperatingSystem.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\SymbolVisibility.obj src\Charmonizer\Probe\UnusedVars.obj src\Charmonizer\Probe\VariadicMacros.obj
-
-TEST_OBJS= src\Charmonizer\Test.obj src\Charmonizer\Test\TestDirManip.obj src\Charmonizer\Test\TestFuncMacro.obj src\Charmonizer\Test\TestHeaders.obj src\Charmonizer\Test\TestIntegers.obj src\Charmonizer\Test\TestLargeFiles.obj src\Charmonizer\Test\TestUnusedVars.obj src\Charmonizer\Test\TestVariadicMacros.obj
-
-HEADERS= src\Charmonizer\Core\Compiler.h src\Charmonizer\Core\ConfWriter.h src\Charmonizer\Core\ConfWriterC.h src\Charmonizer\Core\ConfWriterPerl.h src\Charmonizer\Core\ConfWriterRuby.h src\Charmonizer\Core\Defines.h src\Charmonizer\Core\HeaderChecker.h src\Charmonizer\Core\OperatingSystem.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\SymbolVisibility.h src\Charmonizer\Probe\UnusedVars.h src\Charmonizer\Probe\VariadicMacros.h src\Charmonizer\Test.h
-
-CLEANABLE= $(OBJS) $(PROGNAME) $(TEST_OBJS) $(TESTS) *.pdb
-
-.c.obj:
-	$(CC) $(CFLAGS) -c $< -Fo$@
-
-all: $(PROGNAME)
-
-meld:
-	$(PERL) buildbin\meld.pl --probes=$(PROBES) --files=$(FILES) --out=$(OUT)
-
-$(PROGNAME): $(OBJS)
-	link -nologo $(OBJS) /OUT:$(PROGNAME)
-
-$(OBJS) $(TEST_OBJS): $(HEADERS)
-
-tests: $(TESTS)
-
-TestDirManip.exe: src\Charmonizer\Test.obj src\Charmonizer\Test\TestDirManip.obj
-	link -nologo src\Charmonizer\Test\TestDirManip.obj src\Charmonizer\Test.obj /OUT:$@
-
-TestFuncMacro.exe: src\Charmonizer\Test.obj src\Charmonizer\Test\TestFuncMacro.obj
-	link -nologo src\Charmonizer\Test\TestFuncMacro.obj src\Charmonizer\Test.obj /OUT:$@
-
-TestHeaders.exe: src\Charmonizer\Test.obj src\Charmonizer\Test\TestHeaders.obj
-	link -nologo src\Charmonizer\Test\TestHeaders.obj src\Charmonizer\Test.obj /OUT:$@
-
-TestIntegers.exe: src\Charmonizer\Test.obj src\Charmonizer\Test\TestIntegers.obj
-	link -nologo src\Charmonizer\Test\TestIntegers.obj src\Charmonizer\Test.obj /OUT:$@
-
-TestLargeFiles.exe: src\Charmonizer\Test.obj src\Charmonizer\Test\TestLargeFiles.obj
-	link -nologo src\Charmonizer\Test\TestLargeFiles.obj src\Charmonizer\Test.obj /OUT:$@
-
-TestUnusedVars.exe: src\Charmonizer\Test.obj src\Charmonizer\Test\TestUnusedVars.obj
-	link -nologo src\Charmonizer\Test\TestUnusedVars.obj src\Charmonizer\Test.obj /OUT:$@
-
-TestVariadicMacros.exe: src\Charmonizer\Test.obj src\Charmonizer\Test\TestVariadicMacros.obj
-	link -nologo src\Charmonizer\Test\TestVariadicMacros.obj src\Charmonizer\Test.obj /OUT:$@
-
-clean:
-	CMD /c FOR %i IN ($(CLEANABLE)) DO IF EXIST %i DEL /F %i
-

http://git-wip-us.apache.org/repos/asf/lucy/blob/3dc812ab/charmonizer/Makefile.MinGW
----------------------------------------------------------------------
diff --git a/charmonizer/Makefile.MinGW b/charmonizer/Makefile.MinGW
deleted file mode 100644
index 3511043..0000000
--- a/charmonizer/Makefile.MinGW
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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) 
-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
-
-OBJS= charmonize.o src\Charmonizer\Core\Compiler.o src\Charmonizer\Core\ConfWriter.o src\Charmonizer\Core\ConfWriterC.o src\Charmonizer\Core\ConfWriterPerl.o src\Charmonizer\Core\ConfWriterRuby.o src\Charmonizer\Core\HeaderChecker.o src\Charmonizer\Core\OperatingSystem.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\SymbolVisibility.o src\Charmonizer\Probe\UnusedVars.o src\Charmonizer\Probe\VariadicMacros.o
-
-TEST_OBJS= src\Charmonizer\Test.o src\Charmonizer\Test\TestDirManip.o src\Charmonizer\Test\TestFuncMacro.o src\Charmonizer\Test\TestHeaders.o src\Charmonizer\Test\TestIntegers.o src\Charmonizer\Test\TestLargeFiles.o src\Charmonizer\Test\TestUnusedVars.o src\Charmonizer\Test\TestVariadicMacros.o
-
-HEADERS= src\Charmonizer\Core\Compiler.h src\Charmonizer\Core\ConfWriter.h src\Charmonizer\Core\ConfWriterC.h src\Charmonizer\Core\ConfWriterPerl.h src\Charmonizer\Core\ConfWriterRuby.h src\Charmonizer\Core\Defines.h src\Charmonizer\Core\HeaderChecker.h src\Charmonizer\Core\OperatingSystem.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\SymbolVisibility.h src\Charmonizer\Probe\UnusedVars.h src\Charmonizer\Probe\VariadicMacros.h src\Charmonizer\Test.h
-
-CLEANABLE= $(OBJS) $(PROGNAME) $(TEST_OBJS) $(TESTS) 
-
-.c.o:
-	$(CC) $(CFLAGS) -c $*.c -o $@
-
-all: $(PROGNAME)
-
-meld:
-	$(PERL) buildbin\meld.pl --probes=$(PROBES) --files=$(FILES) --out=$(OUT)
-
-$(PROGNAME): $(OBJS)
-	$(CC) $(CFLAGS) $(OBJS) -o $(PROGNAME)
-
-$(OBJS) $(TEST_OBJS): $(HEADERS)
-
-tests: $(TESTS)
-
-TestDirManip.exe: src\Charmonizer\Test.o src\Charmonizer\Test\TestDirManip.o
-	$(CC) $(CFLAGS) src\Charmonizer\Test\TestDirManip.o src\Charmonizer\Test.o -o $@
-
-TestFuncMacro.exe: src\Charmonizer\Test.o src\Charmonizer\Test\TestFuncMacro.o
-	$(CC) $(CFLAGS) src\Charmonizer\Test\TestFuncMacro.o src\Charmonizer\Test.o -o $@
-
-TestHeaders.exe: src\Charmonizer\Test.o src\Charmonizer\Test\TestHeaders.o
-	$(CC) $(CFLAGS) src\Charmonizer\Test\TestHeaders.o src\Charmonizer\Test.o -o $@
-
-TestIntegers.exe: src\Charmonizer\Test.o src\Charmonizer\Test\TestIntegers.o
-	$(CC) $(CFLAGS) src\Charmonizer\Test\TestIntegers.o src\Charmonizer\Test.o -o $@
-
-TestLargeFiles.exe: src\Charmonizer\Test.o src\Charmonizer\Test\TestLargeFiles.o
-	$(CC) $(CFLAGS) src\Charmonizer\Test\TestLargeFiles.o src\Charmonizer\Test.o -o $@
-
-TestUnusedVars.exe: src\Charmonizer\Test.o src\Charmonizer\Test\TestUnusedVars.o
-	$(CC) $(CFLAGS) src\Charmonizer\Test\TestUnusedVars.o src\Charmonizer\Test.o -o $@
-
-TestVariadicMacros.exe: src\Charmonizer\Test.o src\Charmonizer\Test\TestVariadicMacros.o
-	$(CC) $(CFLAGS) src\Charmonizer\Test\TestVariadicMacros.o src\Charmonizer\Test.o -o $@
-
-clean:
-	CMD /c FOR %i IN ($(CLEANABLE)) DO IF EXIST %i DEL /F %i
-

http://git-wip-us.apache.org/repos/asf/lucy/blob/3dc812ab/charmonizer/README
----------------------------------------------------------------------
diff --git a/charmonizer/README b/charmonizer/README
deleted file mode 100644
index 42988bc..0000000
--- a/charmonizer/README
+++ /dev/null
@@ -1,113 +0,0 @@
-NAME
-
-    Charmonizer - Use C to configure C.
-
-OVERVIEW
-
-    Charmonizer is a tool for probing, normalizing, and testing the build
-    environment provided by a C compiler and an operating system.  It works by
-    attempting to compile lots of little programs and analyzing the output
-    from those that build successfully.  `
-    
-    Charmonizer modules are ordinary ANSI C files, and the configuration
-    application that you write is an ordinary C executable.  
-    
-REQUIREMENTS
-
-    Charmonizer's only prerequisite is an ISO C90-compliant compiler which can
-    be invoked from C via the system() command.  The build system assumes you
-    have a corresponding make or nmake executable.  Folks hacking on the Charmonizer
-    source need to be aware of  ../devel/bin/gen_charmonizer_makefiles.pl which
-    generates the makefiles from the src tree.
-    
-PROBING
-
-        #include "Charmonizer/Probe.h"
-        #include "Charmonizer/Probe/Integers.h"
-        #include "Charmonizer/Probe/LargeFiles.h"
-
-        int main() 
-        {
-            /* Tell Charmonizer about your OS and compiler. */
-            chaz_Probe_init("cc", "-I/usr/local/include", NULL);
-            
-            /* Run desired Charmonizer modules. */
-            chaz_Integers_run();
-            chaz_LargeFiles_run();
-
-            /* Tear down. */
-            chaz_Probe_clean_up();
-
-            return 0;
-        }
-
-    The purpose of Charmonizer's probing toolset is to generate a single C
-    header file called "charmony.h", gathering together information that is
-    ordinarily only available at runtime and assigning predictable names to
-    functionality which may go by many different aliases on different systems.
-
-    One header file, "Charmonizer/Probe.h", provides the primary interface and
-    a suite of topically oriented modules -- e.g.
-    "Charmonizer/Probe/LargeFiles.h", "Charmonizer/Probe/Integers.h" -- do the
-    heavy lifting.  Each topical module exports 1 main function,
-    ModuleName_run(), which runs all the relevant compiler probes and appends
-    output to charmony.h.  As you run each module in turn, "charmony.h" gets
-    built up incrementally; it can be further customized by writing your own
-    content to it at any point.
-
-TESTING 
-
-    #include "Charmonizer/Test.h"
-    #include "Charmonizer/Test/Integers.h"
-    #include "Charmonizer/Test/Largefile.h"
-    #include "MyTest.h"
-
-    int main() {
-        int all_tests_pass = 0;
-
-        /* Set up. */
-        chaz_Test_init();
-        chaz_Integers_init_test();
-        chaz_LargeFiles_init_test();
-        MyTest_init_test();
-
-        /* Run all the tests */
-        all_tests_pass = chaz_Test_run_all_tests();
-
-        /* Tear down. */
-        chaz_Test_clean_up();
-
-        return all_tests_pass;
-    }
-
-    Charmonizer provides both a general test harness for writing your own
-    tests, and a corresponding test module for each probing module. The stock
-    tests can be found within "Charmonizer/Test" -- e.g. at
-    "Charmonizer/Test/Integers.h".  
-    
-    The stock tests require access to "charmony.h".  Not all tests will pass
-    in every environment, and the expectation is that you will append
-    charmony.h with ifdef tests as necessary to draw in supplementary code:
-
-        #ifndef HAS_DIRENT_H
-          #include "my/dirent.h"
-        #endif
-
-    Charmonizer restricts itself to working with what it finds, and
-    does not supply a library of compatibility functions.
-
-C NAMESPACE
-
-    The "charmony.h" header prepends a prefix onto most of the symbols it
-    exports: either "chy_" or "CHY_".  For public code, such as header files,
-    this helps avoid namespace collisions.  For private code, the prefixes can
-    be stripped via the CHY_USE_SHORT_NAMES symbol.
-
-        #define CHY_USE_SHORT_NAMES
-        #ifdef HAS_LONG_LONG   /* alias for CHY_HAS_LONG_LONG */
-
-FILESYSTEM NAMESPACE
-
-    Charmonizer creates a number of temporary files within the current working
-    directory while it runs.  These files all begin with "_charm".
-

http://git-wip-us.apache.org/repos/asf/lucy/blob/3dc812ab/charmonizer/buildbin/meld.pl
----------------------------------------------------------------------
diff --git a/charmonizer/buildbin/meld.pl b/charmonizer/buildbin/meld.pl
deleted file mode 100755
index 4f84721..0000000
--- a/charmonizer/buildbin/meld.pl
+++ /dev/null
@@ -1,207 +0,0 @@
-#!/usr/bin/perl
-
-# 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.
-
-use strict;
-use warnings;
-
-use Getopt::Long;
-use File::Spec::Functions qw( rel2abs catdir catfile updir );
-use FindBin qw( $Bin );
-use File::stat qw( stat );
-
-# Process command line arguments.
-my ( @probes, @user_files, @charm_files );
-my $outfile;
-GetOptions(
-    'probes:s' => \@probes,
-    'files=s'  => \@user_files,
-    'out=s'    => \$outfile,
-);
-my $usage = <<END_USAGE;
-Usage: 
-
-    meld.pl --files=FILES [--probes=PROBES] --out=OUTFILE
-
-    * probes -- A comma separated list of Charmonizer Probe names, e.g.
-      "Integers", "Integers,Floats,LargeFiles".  Defaults to all probes if not
-      supplied.
-    * files -- A comma separated list of files to be appended verbatim.  At
-      least one file must be present and it must define main().
-    * out -- The output file.
-
-END_USAGE
-die $usage unless @user_files;
-die $usage unless $outfile;
-$outfile    = rel2abs($outfile);
-@user_files = split( /,/, join( ',', @user_files ) );
-@probes     = split( /,/, join( ',', @probes ) );
-
-# Slurp all user files.
-my %user_file_content;
-for my $file (@user_files) {
-    $user_file_content{$file} = slurp($file);
-}
-
-# Make sure we are in the charmonizer dir.
-chdir( catdir( $Bin, updir() ) );
-
-# Default to including all Probes.
-if ( !@probes ) {
-    my $probe_dir = catdir(qw( src Charmonizer Probe ));
-    opendir( my $dh, $probe_dir ) or die "Can't opendir '$probe_dir': $!";
-    @probes = map { $_ =~ s/\.c$//; $_ } grep {/\.c$/} readdir $dh;
-}
-
-my @core = qw(
-    SharedLibrary
-    CFlags
-    Compiler
-    ConfWriter
-    ConfWriterC
-    ConfWriterPerl
-    ConfWriterPython
-    ConfWriterRuby
-    HeaderChecker
-    Make
-    OperatingSystem
-    Util
-);
-
-# Add Core headers.
-for ( 'Defines', @core ) {
-    push @charm_files, catfile( qw( src Charmonizer Core ), "$_.h" );
-}
-push @charm_files, catfile(qw( src Charmonizer Probe.h ));
-
-# Add specified Probe headers in lexically sorted order.
-for ( sort @probes ) {
-    push @charm_files, catfile( qw( src Charmonizer Probe ), "$_.h" );
-}
-
-# Add Core implementation files.
-for (@core) {
-    push @charm_files, catfile( qw( src Charmonizer Core ), "$_.c" );
-}
-push @charm_files, catfile(qw( src Charmonizer Probe.c ));
-
-# Add Probe implementation files in lexically sorted order.
-for ( sort @probes ) {
-    push @charm_files, catfile( qw( src Charmonizer Probe ), "$_.c" );
-}
-
-# Don't write out unless there has been an update.
-if ( -e $outfile ) {
-    my $outfile_mtime = stat($outfile)->mtime;
-    my $needs_update;
-    for my $dependency ( @charm_files, @user_files ) {
-        die "Can't find '$dependency'" unless -e $dependency;
-        if ( stat($dependency)->mtime > $outfile_mtime ) {
-            $needs_update = 1;
-            last;
-        }
-    }
-    if ($needs_update) {
-        unlink $outfile;
-    }
-    else {
-        exit;
-    }
-}
-
-# Start the composite.
-open( my $out_fh, '>', $outfile )
-    or die "Can't open '$outfile': $!";
-print $out_fh meld_start();
-
-# Process core files.
-for my $file (@charm_files) {
-    print $out_fh pare_charm_file($file);
-}
-
-# Process user specified files.
-for my $file (@user_files) {
-    my $content = $user_file_content{$file};
-
-    # Comment out pound-includes for files being inlined.
-    $content =~ s|^(#include "Charmonizer[^\n]+)\n|/* $1 */\n|msg;
-
-    print $out_fh qq|#line 1 "$file"\n|;
-    print $out_fh $content;
-}
-
-close $out_fh or die "Can't close '$outfile': $!";
-exit;
-
-sub pare_charm_file {
-    my $path    = shift;
-    my $content = slurp($path);
-    my $num_newlines = $content =~ tr/\n/\n/;
-
-    # Strip license header.
-    $content =~ s#/\* Licensed to the Apache.+?\*/\n+##s
-        or die "Couldn't find ASF license header in '$path'";
-
-    # Remove opening C++ guards (if this is a header).
-    $content =~ s/^#ifdef __cplusplus.*?#endif\n+//ms;
-
-    # Add a #line directive.
-    my $new_num_newlines = $content =~ tr/\n/\n/;
-    my $starting_line = 1 + $num_newlines - $new_num_newlines;
-    $content = qq|#line $starting_line "$path"\n$content|;
-
-    # Remove closing C++ guards (if this is a header).
-    $content =~ s/^#ifdef __cplusplus.*?#endif\n+//ms;
-
-    # Comment out pound-includes for files being inlined.
-    $content =~ s|^(#include "Charmonizer[^\n]+)\n|/* $1 */\n|msg;
-
-    return <<END_STUFF;
-/***************************************************************************/
-
-$content
-END_STUFF
-}
-
-sub slurp {
-    my $path = shift;
-    open( my $fh, '<', $path ) or die "Can't open '$path': $!";
-    return do { local $/; <$fh> };
-}
-
-sub meld_start {
-    return <<END_STUFF;
-/* This is an auto-generated file -- do not edit directly. */
-
-/* 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_STUFF
-}
-

http://git-wip-us.apache.org/repos/asf/lucy/blob/3dc812ab/charmonizer/charmonize.c
----------------------------------------------------------------------
diff --git a/charmonizer/charmonize.c b/charmonizer/charmonize.c
deleted file mode 100644
index b31ea6e..0000000
--- a/charmonizer/charmonize.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/* 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.
- */
-
-/* Charmonize.c -- Create Charmony.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "Charmonizer/Probe.h"
-#include "Charmonizer/Probe/AtomicOps.h"
-#include "Charmonizer/Probe/DirManip.h"
-#include "Charmonizer/Probe/Floats.h"
-#include "Charmonizer/Probe/FuncMacro.h"
-#include "Charmonizer/Probe/Headers.h"
-#include "Charmonizer/Probe/Integers.h"
-#include "Charmonizer/Probe/LargeFiles.h"
-#include "Charmonizer/Probe/Memory.h"
-#include "Charmonizer/Probe/SymbolVisibility.h"
-#include "Charmonizer/Probe/UnusedVars.h"
-#include "Charmonizer/Probe/VariadicMacros.h"
-#include "Charmonizer/Core/HeaderChecker.h"
-#include "Charmonizer/Core/ConfWriter.h"
-#include "Charmonizer/Core/ConfWriterC.h"
-#include "Charmonizer/Core/ConfWriterPerl.h"
-#include "Charmonizer/Core/ConfWriterRuby.h"
-
-#define MAX_CC_LEN 128
-#define MAX_FLAGS_LEN 2048
-
-struct CLIArgs {
-    char cc_command[MAX_CC_LEN + 1];
-    char cc_flags[MAX_FLAGS_LEN + 1];
-    int  enable_c;
-    int  enable_perl;
-    int  enable_ruby;
-};
-
-/* Parse command line arguments. */
-static void
-S_parse_arguments(int argc, char **argv, struct CLIArgs *args) {
-    int i;
-    int output_enabled = 0;
-
-    /* Parse most args. */
-    for (i = 1; i < argc; i++) {
-        char *arg = argv[i];
-        if (strcmp(arg, "--") == 0) {
-            /* From here on out, everything will be a compiler flag. */
-            i++;
-            break;
-        }
-        if (strcmp(arg, "--enable-c") == 0) {
-            args->enable_c = 1;
-            output_enabled = 1;
-        }
-        else if (strcmp(arg, "--enable-perl") == 0) {
-            args->enable_perl = 1;
-            output_enabled = 1;
-        }
-        else if (strcmp(arg, "--enable-ruby") == 0) {
-            args->enable_ruby = 1;
-            output_enabled = 1;
-        }
-        else if (memcmp(arg, "--cc=", 5) == 0) {
-            if (strlen(arg) > MAX_CC_LEN - 5) {
-                fprintf(stderr, "Exceeded max length for compiler command");
-                exit(1);
-            }
-            strcpy(args->cc_command, arg + 5);
-        }
-    }
-
-    /* Accumulate compiler flags. */
-    for (; i < argc; i++) {
-        char *arg = argv[i];
-        if (strlen(arg) + strlen(args->cc_flags) + 2 >= MAX_FLAGS_LEN) {
-            fprintf(stderr, "Exceeded max length for compiler flags");
-            exit(1);
-        }
-        strcat(args->cc_flags, " ");
-        strcat(args->cc_flags, arg);
-
-    }
-
-    /* Validate. */
-    if (!args->cc_command
-        || !strlen(args->cc_command)
-        || !output_enabled
-       ) {
-        fprintf(stderr,
-                "Usage: ./charmonize --cc=CC_COMMAND [--enable-c] "
-                "[--enable-perl] [--enable-ruby] -- CC_FLAGS\n");
-        exit(1);
-    }
-
-}
-
-int main(int argc, char **argv) {
-    /* Initialize. */
-    {
-        struct chaz_CLIArgs args;
-        int result = chaz_Probe_parse_cli_args(argc, argv, &args);
-        if (!result) {
-            chaz_Probe_die_usage();
-        }
-        chaz_Probe_init(&args);
-    }
-
-    /* Run probe modules. */
-    chaz_DirManip_run();
-    chaz_Headers_run();
-    chaz_AtomicOps_run();
-    chaz_FuncMacro_run();
-    chaz_Integers_run();
-    chaz_Floats_run();
-    chaz_LargeFiles_run();
-    chaz_Memory_run();
-    chaz_SymbolVisibility_run();
-    chaz_UnusedVars_run();
-    chaz_VariadicMacros_run();
-
-    /* Write custom postamble. */
-    chaz_ConfWriter_append_conf(
-        "#ifdef CHY_HAS_SYS_TYPES_H\n"
-        "  #include <sys/types.h>\n"
-        "#endif\n\n"
-    );
-    chaz_ConfWriter_append_conf(
-        "#ifdef CHY_HAS_ALLOCA_H\n"
-        "  #include <alloca.h>\n"
-        "#elif defined(CHY_HAS_MALLOC_H)\n"
-        "  #include <malloc.h>\n"
-        "#elif defined(CHY_ALLOCA_IN_STDLIB_H)\n"
-        "  #include <stdlib.h>\n"
-        "#endif\n\n"
-    );
-    chaz_ConfWriter_append_conf(
-        "#ifdef CHY_HAS_WINDOWS_H\n"
-        "  /* Target Windows XP. */\n"
-        "  #ifndef WINVER\n"
-        "    #define WINVER 0x0500\n"
-        "  #endif\n"
-        "  #ifndef _WIN32_WINNT\n"
-        "    #define _WIN32_WINNT 0x0500\n"
-        "  #endif\n"
-        "#endif\n\n"
-    );
-
-    /* Clean up. */
-    chaz_Probe_clean_up();
-
-    return 0;
-}
-
-

http://git-wip-us.apache.org/repos/asf/lucy/blob/3dc812ab/charmonizer/src/Charmonizer/Core/CFlags.c
----------------------------------------------------------------------
diff --git a/charmonizer/src/Charmonizer/Core/CFlags.c b/charmonizer/src/Charmonizer/Core/CFlags.c
deleted file mode 100644
index f526a7d..0000000
--- a/charmonizer/src/Charmonizer/Core/CFlags.c
+++ /dev/null
@@ -1,335 +0,0 @@
-/* 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.
- */
-
-#include <string.h>
-#include <stdlib.h>
-#include "Charmonizer/Core/CFlags.h"
-#include "Charmonizer/Core/Util.h"
-#include "Charmonizer/Core/OperatingSystem.h"
-#include "Charmonizer/Core/SharedLibrary.h"
-
-struct chaz_CFlags {
-    int   style;
-    char *string;
-};
-
-chaz_CFlags*
-chaz_CFlags_new(int style) {
-    chaz_CFlags *flags = (chaz_CFlags*)malloc(sizeof(chaz_CFlags));
-    flags->style  = style;
-    flags->string = chaz_Util_strdup("");
-    return flags;
-}
-
-void
-chaz_CFlags_destroy(chaz_CFlags *flags) {
-    free(flags->string);
-    free(flags);
-}
-
-const char*
-chaz_CFlags_get_string(chaz_CFlags *flags) {
-    return flags->string;
-}
-
-void
-chaz_CFlags_append(chaz_CFlags *flags, const char *string) {
-    char *new_string;
-    if (flags->string[0] == '\0') {
-        new_string = chaz_Util_strdup(string);
-    }
-    else {
-        new_string = chaz_Util_join(" ", flags->string, string, NULL);
-    }
-    free(flags->string);
-    flags->string = new_string;
-}
-
-void
-chaz_CFlags_clear(chaz_CFlags *flags) {
-    if (flags->string[0] != '\0') {
-        free(flags->string);
-        flags->string = chaz_Util_strdup("");
-    }
-}
-
-void
-chaz_CFlags_set_output_obj(chaz_CFlags *flags, const char *filename) {
-    const char *output;
-    char *string;
-    if (flags->style == CHAZ_CFLAGS_STYLE_MSVC) {
-        output = "/c /Fo";
-    }
-    else {
-        /* POSIX */
-        output = "-c -o ";
-    }
-    string = chaz_Util_join("", output, filename, NULL);
-    chaz_CFlags_append(flags, string);
-    free(string);
-}
-
-void
-chaz_CFlags_set_output_exe(chaz_CFlags *flags, const char *filename) {
-    const char *output;
-    char *string;
-    if (flags->style == CHAZ_CFLAGS_STYLE_MSVC) {
-        output = "/Fe";
-    }
-    else {
-        /* POSIX */
-        output = "-o ";
-    }
-    string = chaz_Util_join("", output, filename, NULL);
-    chaz_CFlags_append(flags, string);
-    free(string);
-}
-
-void
-chaz_CFlags_add_define(chaz_CFlags *flags, const char *name,
-                       const char *value) {
-    const char *define;
-    char *string;
-    if (flags->style == CHAZ_CFLAGS_STYLE_MSVC) {
-        define = "/D";
-    }
-    else {
-        /* POSIX */
-        define = "-D ";
-    }
-    if (value) {
-        string = chaz_Util_join("", define, name, "=", value, NULL);
-    }
-    else {
-        string = chaz_Util_join("", define, name, NULL);
-    }
-    chaz_CFlags_append(flags, string);
-    free(string);
-}
-
-void
-chaz_CFlags_add_include_dir(chaz_CFlags *flags, const char *dir) {
-    const char *include;
-    char *string;
-    if (flags->style == CHAZ_CFLAGS_STYLE_MSVC)  {
-        include = "/I ";
-    }
-    else {
-        /* POSIX */
-        include = "-I ";
-    }
-    string = chaz_Util_join("", include, dir, NULL);
-    chaz_CFlags_append(flags, string);
-    free(string);
-}
-
-void
-chaz_CFlags_enable_optimization(chaz_CFlags *flags) {
-    const char *string;
-    if (flags->style == CHAZ_CFLAGS_STYLE_MSVC) {
-        string = "/O2";
-    }
-    else if (flags->style == CHAZ_CFLAGS_STYLE_GNU) {
-        string = "-O2";
-    }
-    else {
-        /* POSIX */
-        string = "-O 1";
-    }
-    chaz_CFlags_append(flags, string);
-}
-
-void
-chaz_CFlags_enable_debugging(chaz_CFlags *flags) {
-    if (flags->style == CHAZ_CFLAGS_STYLE_GNU) {
-        chaz_CFlags_append(flags, "-g");
-    }
-}
-
-void
-chaz_CFlags_disable_strict_aliasing(chaz_CFlags *flags) {
-    if (flags->style == CHAZ_CFLAGS_STYLE_MSVC) {
-        return;
-    }
-    else if (flags->style == CHAZ_CFLAGS_STYLE_GNU) {
-        chaz_CFlags_append(flags, "-fno-strict-aliasing");
-    }
-    else {
-        chaz_Util_die("Don't know how to disable strict aliasing with '%s'",
-                      chaz_CC_get_cc());
-    }
-}
-
-void
-chaz_CFlags_set_warnings_as_errors(chaz_CFlags *flags) {
-    const char *string;
-    if (flags->style == CHAZ_CFLAGS_STYLE_MSVC) {
-        string = "/WX";
-    }
-    else if (flags->style == CHAZ_CFLAGS_STYLE_GNU) {
-        string = "-Werror";
-    }
-    else {
-        chaz_Util_die("Don't know how to set warnings as errors with '%s'",
-                      chaz_CC_get_cc());
-    }
-    chaz_CFlags_append(flags, string);
-}
-
-void
-chaz_CFlags_compile_shared_library(chaz_CFlags *flags) {
-    const char *string;
-    if (flags->style != CHAZ_CFLAGS_STYLE_GNU
-        || strcmp(chaz_OS_shared_lib_ext(), ".dll") == 0
-       ) {
-        return;
-    }
-    if (chaz_OS_is_darwin()) {
-        string = "-fno-common";
-    }
-    else {
-        string = "-fPIC";
-    }
-    chaz_CFlags_append(flags, string);
-}
-
-void
-chaz_CFlags_hide_symbols(chaz_CFlags *flags) {
-    if (flags->style == CHAZ_CFLAGS_STYLE_GNU
-        && strcmp(chaz_OS_shared_lib_ext(), ".dll") != 0) {
-        chaz_CFlags_append(flags, "-fvisibility=hidden");
-    }
-}
-
-void
-chaz_CFlags_link_shared_library(chaz_CFlags *flags) {
-    const char *string;
-    if (flags->style == CHAZ_CFLAGS_STYLE_MSVC) {
-        string = "/DLL";
-    }
-    else if (flags->style == CHAZ_CFLAGS_STYLE_GNU) {
-        if (strcmp(chaz_OS_shared_lib_ext(), ".dylib") == 0) {
-            string = "-dynamiclib";
-        }
-        else {
-            string = "-shared";
-        }
-    }
-    else {
-        chaz_Util_die("Don't know how to link a shared library with '%s'",
-                      chaz_CC_get_cc());
-    }
-    chaz_CFlags_append(flags, string);
-}
-
-void
-chaz_CFlags_set_shared_library_version(chaz_CFlags *flags,
-                                       chaz_SharedLib *lib) {
-    const char *shlib_ext = chaz_OS_shared_lib_ext();
-    char       *string;
-
-    if (flags->style != CHAZ_CFLAGS_STYLE_GNU
-        || strcmp(shlib_ext, ".dll") == 0) {
-        return;
-    }
-
-    if (strcmp(chaz_OS_shared_lib_ext(), ".dylib") == 0) {
-        const char *version = chaz_SharedLib_get_version(lib);
-        string = chaz_Util_join(" ", "-current_version", version, NULL);
-    }
-    else {
-        char *soname = chaz_SharedLib_major_version_filename(lib);
-        string = chaz_Util_join("", "-Wl,-soname,", soname, NULL);
-        free(soname);
-    }
-    chaz_CFlags_append(flags, string);
-    free(string);
-}
-
-void
-chaz_CFlags_set_link_output(chaz_CFlags *flags, const char *filename) {
-    const char *output;
-    char *string;
-    if (flags->style == CHAZ_CFLAGS_STYLE_MSVC) {
-        output = "/OUT:";
-    }
-    else {
-        output = "-o ";
-    }
-    string = chaz_Util_join("", output, filename, NULL);
-    chaz_CFlags_append(flags, string);
-    free(string);
-}
-
-void
-chaz_CFlags_add_library_path(chaz_CFlags *flags, const char *directory) {
-    const char *lib_path;
-    char *string;
-    if (flags->style == CHAZ_CFLAGS_STYLE_MSVC) {
-        if (strcmp(directory, ".") == 0) {
-            /* The MS linker searches the current directory by default. */
-            return;
-        }
-        else {
-            lib_path = "/LIBPATH:";
-        }
-    }
-    else {
-        lib_path = "-L ";
-    }
-    string = chaz_Util_join("", lib_path, directory, NULL);
-    chaz_CFlags_append(flags, string);
-    free(string);
-}
-
-void
-chaz_CFlags_add_library(chaz_CFlags *flags, chaz_SharedLib *lib) {
-    char *filename;
-    if (flags->style == CHAZ_CFLAGS_STYLE_MSVC) {
-        filename = chaz_SharedLib_implib_filename(lib);
-    }
-    else {
-        filename = chaz_SharedLib_filename(lib);
-    }
-    chaz_CFlags_append(flags, filename);
-    free(filename);
-}
-
-void
-chaz_CFlags_add_external_library(chaz_CFlags *flags, const char *library) {
-    char *string;
-    if (flags->style == CHAZ_CFLAGS_STYLE_MSVC) {
-        string = chaz_Util_join("", library, ".lib", NULL);
-    }
-    else {
-        string = chaz_Util_join(" ", "-l", library, NULL);
-    }
-    chaz_CFlags_append(flags, string);
-    free(string);
-}
-
-void
-chaz_CFlags_enable_code_coverage(chaz_CFlags *flags) {
-    if (flags->style == CHAZ_CFLAGS_STYLE_GNU) {
-        chaz_CFlags_append(flags, "--coverage");
-    }
-    else {
-        chaz_Util_die("Don't know how to enable code coverage with '%s'",
-                      chaz_CC_get_cc());
-    }
-}
-
-

http://git-wip-us.apache.org/repos/asf/lucy/blob/3dc812ab/charmonizer/src/Charmonizer/Core/CFlags.h
----------------------------------------------------------------------
diff --git a/charmonizer/src/Charmonizer/Core/CFlags.h b/charmonizer/src/Charmonizer/Core/CFlags.h
deleted file mode 100644
index cb9c75f..0000000
--- a/charmonizer/src/Charmonizer/Core/CFlags.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 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.
- */
-
-/* Charmonizer/Core/CFlags.h
- */
-
-#ifndef H_CHAZ_CFLAGS
-#define H_CHAZ_CFLAGS
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define CHAZ_CFLAGS_STYLE_POSIX  1
-#define CHAZ_CFLAGS_STYLE_GNU    2
-#define CHAZ_CFLAGS_STYLE_MSVC   3
-
-typedef struct chaz_CFlags chaz_CFlags;
-
-chaz_CFlags*
-chaz_CFlags_new(int style);
-
-void
-chaz_CFlags_destroy(chaz_CFlags *flags);
-
-const char*
-chaz_CFlags_get_string(chaz_CFlags *flags);
-
-void
-chaz_CFlags_append(chaz_CFlags *flags, const char *string);
-
-void
-chaz_CFlags_clear(chaz_CFlags *flags);
-
-void
-chaz_CFlags_set_output_obj(chaz_CFlags *flags, const char *filename);
-
-void
-chaz_CFlags_set_output_exe(chaz_CFlags *flags, const char *filename);
-
-void
-chaz_CFlags_add_define(chaz_CFlags *flags, const char *name,
-                       const char *value);
-
-void
-chaz_CFlags_add_include_dir(chaz_CFlags *flags, const char *dir);
-
-void
-chaz_CFlags_enable_optimization(chaz_CFlags *flags);
-
-void
-chaz_CFlags_disable_strict_aliasing(chaz_CFlags *flags);
-
-void
-chaz_CFlags_set_warnings_as_errors(chaz_CFlags *flags);
-
-void
-chaz_CFlags_compile_shared_library(chaz_CFlags *flags);
-
-void
-chaz_CFlags_hide_symbols(chaz_CFlags *flags);
-
-void
-chaz_CFlags_link_shared_library(chaz_CFlags *flags);
-
-void
-chaz_CFlags_set_shared_library_version(chaz_CFlags *flags,
-                                       chaz_SharedLib *lib);
-
-void
-chaz_CFlags_set_link_output(chaz_CFlags *flags, const char *filename);
-
-void
-chaz_CFlags_add_library_path(chaz_CFlags *flags, const char *directory);
-
-void
-chaz_CFlags_add_library(chaz_CFlags *flags, chaz_SharedLib *lib);
-
-void
-chaz_CFlags_add_external_library(chaz_CFlags *flags, const char *library);
-
-void
-chaz_CFlags_enable_code_coverage(chaz_CFlags *flags);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* H_CHAZ_CFLAGS */
-
-

http://git-wip-us.apache.org/repos/asf/lucy/blob/3dc812ab/charmonizer/src/Charmonizer/Core/Compiler.c
----------------------------------------------------------------------
diff --git a/charmonizer/src/Charmonizer/Core/Compiler.c b/charmonizer/src/Charmonizer/Core/Compiler.c
deleted file mode 100644
index 2ad4be8..0000000
--- a/charmonizer/src/Charmonizer/Core/Compiler.c
+++ /dev/null
@@ -1,369 +0,0 @@
-/* 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.
- */
-
-#include <string.h>
-#include <stdlib.h>
-#include "Charmonizer/Core/Util.h"
-#include "Charmonizer/Core/Compiler.h"
-#include "Charmonizer/Core/ConfWriter.h"
-#include "Charmonizer/Core/OperatingSystem.h"
-
-/* Detect macros which may help to identify some compilers.
- */
-static void
-chaz_CC_detect_known_compilers(void);
-
-/* Temporary files. */
-#define CHAZ_CC_TRY_SOURCE_PATH  "_charmonizer_try.c"
-#define CHAZ_CC_TRY_BASENAME     "_charmonizer_try"
-#define CHAZ_CC_TARGET_PATH      "_charmonizer_target"
-
-/* Static vars. */
-static struct {
-    char     *cc_command;
-    char     *cflags;
-    char     *try_exe_name;
-    char      obj_ext[10];
-    char      gcc_version_str[30];
-    int       cflags_style;
-    int       intval___GNUC__;
-    int       intval___GNUC_MINOR__;
-    int       intval___GNUC_PATCHLEVEL__;
-    int       intval__MSC_VER;
-    int       intval___clang__;
-    chaz_CFlags *extra_cflags;
-    chaz_CFlags *temp_cflags;
-} chaz_CC = {
-    NULL, NULL, NULL,
-    "", "",
-    0, 0, 0, 0, 0, 0,
-    NULL, NULL
-};
-
-void
-chaz_CC_init(const char *compiler_command, const char *compiler_flags) {
-    const char *code = "int main() { return 0; }\n";
-    int compile_succeeded = 0;
-
-    if (chaz_Util_verbosity) { printf("Creating compiler object...\n"); }
-
-    /* Assign, init. */
-    chaz_CC.cc_command   = chaz_Util_strdup(compiler_command);
-    chaz_CC.cflags       = chaz_Util_strdup(compiler_flags);
-    chaz_CC.extra_cflags = NULL;
-    chaz_CC.temp_cflags  = NULL;
-
-    /* Set names for the targets which we "try" to compile. */
-    chaz_CC.try_exe_name
-        = chaz_Util_join("", CHAZ_CC_TRY_BASENAME, chaz_OS_exe_ext(), NULL);
-
-    /* If we can't compile anything, game over. */
-    if (chaz_Util_verbosity) {
-        printf("Trying to compile a small test file...\n");
-    }
-    /* Try MSVC argument style. */
-    strcpy(chaz_CC.obj_ext, ".obj");
-    chaz_CC.cflags_style = CHAZ_CFLAGS_STYLE_MSVC;
-    compile_succeeded = chaz_CC_test_compile(code);
-    if (!compile_succeeded) {
-        /* Try POSIX argument style. */
-        strcpy(chaz_CC.obj_ext, ".o");
-        chaz_CC.cflags_style = CHAZ_CFLAGS_STYLE_POSIX;
-        compile_succeeded = chaz_CC_test_compile(code);
-    }
-    if (!compile_succeeded) {
-        chaz_Util_die("Failed to compile a small test file");
-    }
-
-    chaz_CC_detect_known_compilers();
-
-    if (chaz_CC.intval___GNUC__) {
-        chaz_CC.cflags_style = CHAZ_CFLAGS_STYLE_GNU;
-    }
-    else if (chaz_CC.intval__MSC_VER) {
-        chaz_CC.cflags_style = CHAZ_CFLAGS_STYLE_MSVC;
-    }
-    else {
-        chaz_CC.cflags_style = CHAZ_CFLAGS_STYLE_POSIX;
-    }
-    chaz_CC.extra_cflags = chaz_CFlags_new(chaz_CC.cflags_style);
-    chaz_CC.temp_cflags  = chaz_CFlags_new(chaz_CC.cflags_style);
-}
-
-static const char chaz_CC_detect_macro_code[] =
-    CHAZ_QUOTE(  #include <stdio.h>             )
-    CHAZ_QUOTE(  int main() {                   )
-    CHAZ_QUOTE(  #ifndef %s                     )
-    CHAZ_QUOTE(  #error "nope"                  )
-    CHAZ_QUOTE(  #endif                         )
-    CHAZ_QUOTE(      printf("%%d", %s);         )
-    CHAZ_QUOTE(      return 0;                  )
-    CHAZ_QUOTE(  }                              );
-
-static int
-chaz_CC_detect_macro(const char *macro) {
-    size_t size = sizeof(chaz_CC_detect_macro_code)
-                  + (strlen(macro) * 2)
-                  + 20;
-    char *code = (char*)malloc(size);
-    int retval = 0;
-    char *output;
-    size_t len;
-    sprintf(code, chaz_CC_detect_macro_code, macro, macro);
-    output = chaz_CC_capture_output(code, &len);
-    if (output) {
-        retval = atoi(output);
-        free(output);
-    }
-    free(code);
-    return retval;
-}
-
-static void
-chaz_CC_detect_known_compilers(void) {
-    chaz_CC.intval___GNUC__  = chaz_CC_detect_macro("__GNUC__");
-    if (chaz_CC.intval___GNUC__) {
-        chaz_CC.intval___GNUC_MINOR__
-            = chaz_CC_detect_macro("__GNUC_MINOR__");
-        chaz_CC.intval___GNUC_PATCHLEVEL__
-            = chaz_CC_detect_macro("__GNUC_PATCHLEVEL__");
-        sprintf(chaz_CC.gcc_version_str, "%d.%d.%d", chaz_CC.intval___GNUC__,
-                chaz_CC.intval___GNUC_MINOR__,
-                chaz_CC.intval___GNUC_PATCHLEVEL__);
-    }
-    chaz_CC.intval__MSC_VER  = chaz_CC_detect_macro("_MSC_VER");
-    chaz_CC.intval___clang__ = chaz_CC_detect_macro("__clang__");
-}
-
-void
-chaz_CC_clean_up(void) {
-    free(chaz_CC.cc_command);
-    free(chaz_CC.cflags);
-    free(chaz_CC.try_exe_name);
-    chaz_CFlags_destroy(chaz_CC.extra_cflags);
-    chaz_CFlags_destroy(chaz_CC.temp_cflags);
-}
-
-int
-chaz_CC_compile_exe(const char *source_path, const char *exe_name,
-                    const char *code) {
-    chaz_CFlags *local_cflags = chaz_CFlags_new(chaz_CC.cflags_style);
-    const char *extra_cflags_string = "";
-    const char *temp_cflags_string  = "";
-    const char *local_cflags_string;
-    char *exe_file = chaz_Util_join("", exe_name, chaz_OS_exe_ext(), NULL);
-    char *command;
-    int result;
-
-    /* Write the source file. */
-    chaz_Util_write_file(source_path, code);
-
-    /* Prepare and run the compiler command. */
-    if (chaz_CC.extra_cflags) {
-        extra_cflags_string = chaz_CFlags_get_string(chaz_CC.extra_cflags);
-    }
-    if (chaz_CC.temp_cflags) {
-        temp_cflags_string = chaz_CFlags_get_string(chaz_CC.temp_cflags);
-    }
-    chaz_CFlags_set_output_exe(local_cflags, exe_file);
-    local_cflags_string = chaz_CFlags_get_string(local_cflags);
-    command = chaz_Util_join(" ", chaz_CC.cc_command, chaz_CC.cflags,
-                             source_path, extra_cflags_string,
-                             temp_cflags_string, local_cflags_string, NULL);
-    if (chaz_Util_verbosity < 2) {
-        chaz_OS_run_quietly(command);
-    }
-    else {
-        system(command);
-    }
-
-    if (chaz_CC.intval__MSC_VER) {
-        /* Zap MSVC junk. */
-        size_t  junk_buf_size = strlen(exe_file) + 4;
-        char   *junk          = (char*)malloc(junk_buf_size);
-        sprintf(junk, "%s.obj", exe_name);
-        chaz_Util_remove_and_verify(junk);
-        sprintf(junk, "%s.ilk", exe_name);
-        chaz_Util_remove_and_verify(junk);
-        sprintf(junk, "%s.pdb", exe_name);
-        chaz_Util_remove_and_verify(junk);
-        free(junk);
-    }
-
-    /* See if compilation was successful.  Remove the source file. */
-    result = chaz_Util_can_open_file(exe_file);
-    if (!chaz_Util_remove_and_verify(source_path)) {
-        chaz_Util_die("Failed to remove '%s'", source_path);
-    }
-
-    chaz_CFlags_destroy(local_cflags);
-    free(command);
-    free(exe_file);
-    return result;
-}
-
-int
-chaz_CC_compile_obj(const char *source_path, const char *obj_name,
-                    const char *code) {
-    chaz_CFlags *local_cflags = chaz_CFlags_new(chaz_CC.cflags_style);
-    const char *extra_cflags_string = "";
-    const char *temp_cflags_string  = "";
-    const char *local_cflags_string;
-    char *obj_file = chaz_Util_join("", obj_name, chaz_CC.obj_ext, NULL);
-    char *command;
-    int result;
-
-    /* Write the source file. */
-    chaz_Util_write_file(source_path, code);
-
-    /* Prepare and run the compiler command. */
-    if (chaz_CC.extra_cflags) {
-        extra_cflags_string = chaz_CFlags_get_string(chaz_CC.extra_cflags);
-    }
-    if (chaz_CC.temp_cflags) {
-        temp_cflags_string = chaz_CFlags_get_string(chaz_CC.temp_cflags);
-    }
-    chaz_CFlags_set_output_obj(local_cflags, obj_file);
-    local_cflags_string = chaz_CFlags_get_string(local_cflags);
-    command = chaz_Util_join(" ", chaz_CC.cc_command, chaz_CC.cflags,
-                             source_path, extra_cflags_string,
-                             temp_cflags_string, local_cflags_string, NULL);
-    if (chaz_Util_verbosity < 2) {
-        chaz_OS_run_quietly(command);
-    }
-    else {
-        system(command);
-    }
-
-    /* See if compilation was successful.  Remove the source file. */
-    result = chaz_Util_can_open_file(obj_file);
-    if (!chaz_Util_remove_and_verify(source_path)) {
-        chaz_Util_die("Failed to remove '%s'", source_path);
-    }
-
-    chaz_CFlags_destroy(local_cflags);
-    free(command);
-    free(obj_file);
-    return result;
-}
-
-int
-chaz_CC_test_compile(const char *source) {
-    int compile_succeeded;
-    char *try_obj_name
-        = chaz_Util_join("", CHAZ_CC_TRY_BASENAME, chaz_CC.obj_ext, NULL);
-    if (!chaz_Util_remove_and_verify(try_obj_name)) {
-        chaz_Util_die("Failed to delete file '%s'", try_obj_name);
-    }
-    compile_succeeded = chaz_CC_compile_obj(CHAZ_CC_TRY_SOURCE_PATH,
-                                            CHAZ_CC_TRY_BASENAME, source);
-    chaz_Util_remove_and_verify(try_obj_name);
-    free(try_obj_name);
-    return compile_succeeded;
-}
-
-char*
-chaz_CC_capture_output(const char *source, size_t *output_len) {
-    char *captured_output = NULL;
-    int compile_succeeded;
-
-    /* Clear out previous versions and test to make sure removal worked. */
-    if (!chaz_Util_remove_and_verify(chaz_CC.try_exe_name)) {
-        chaz_Util_die("Failed to delete file '%s'", chaz_CC.try_exe_name);
-    }
-    if (!chaz_Util_remove_and_verify(CHAZ_CC_TARGET_PATH)) {
-        chaz_Util_die("Failed to delete file '%s'", CHAZ_CC_TARGET_PATH);
-    }
-
-    /* Attempt compilation; if successful, run app and slurp output. */
-    compile_succeeded = chaz_CC_compile_exe(CHAZ_CC_TRY_SOURCE_PATH,
-                                            CHAZ_CC_TRY_BASENAME, source);
-    if (compile_succeeded) {
-        chaz_OS_run_local_redirected(chaz_CC.try_exe_name,
-                                     CHAZ_CC_TARGET_PATH);
-        captured_output = chaz_Util_slurp_file(CHAZ_CC_TARGET_PATH,
-                                               output_len);
-    }
-    else {
-        *output_len = 0;
-    }
-
-    /* Remove all the files we just created. */
-    chaz_Util_remove_and_verify(CHAZ_CC_TRY_SOURCE_PATH);
-    chaz_Util_remove_and_verify(chaz_CC.try_exe_name);
-    chaz_Util_remove_and_verify(CHAZ_CC_TARGET_PATH);
-
-    return captured_output;
-}
-
-const char*
-chaz_CC_get_cc(void) {
-    return chaz_CC.cc_command;
-}
-
-const char*
-chaz_CC_get_cflags(void) {
-    return chaz_CC.cflags;
-}
-
-chaz_CFlags*
-chaz_CC_get_extra_cflags(void) {
-    return chaz_CC.extra_cflags;
-}
-
-chaz_CFlags*
-chaz_CC_get_temp_cflags(void) {
-    return chaz_CC.temp_cflags;
-}
-
-chaz_CFlags*
-chaz_CC_new_cflags(void) {
-    return chaz_CFlags_new(chaz_CC.cflags_style);
-}
-
-const char*
-chaz_CC_obj_ext(void) {
-    return chaz_CC.obj_ext;
-}
-
-int
-chaz_CC_gcc_version_num(void) {
-    return 10000 * chaz_CC.intval___GNUC__
-           + 100 * chaz_CC.intval___GNUC_MINOR__
-           + chaz_CC.intval___GNUC_PATCHLEVEL__;
-}
-
-const char*
-chaz_CC_gcc_version(void) {
-    return chaz_CC.intval___GNUC__ ? chaz_CC.gcc_version_str : NULL;
-}
-
-int
-chaz_CC_msvc_version_num(void) {
-    return chaz_CC.intval__MSC_VER;
-}
-
-const char*
-chaz_CC_link_command() {
-    if (chaz_CC.intval__MSC_VER) {
-        return "link";
-    }
-    else {
-        return chaz_CC.cc_command;
-    }
-}
-
-

http://git-wip-us.apache.org/repos/asf/lucy/blob/3dc812ab/charmonizer/src/Charmonizer/Core/Compiler.h
----------------------------------------------------------------------
diff --git a/charmonizer/src/Charmonizer/Core/Compiler.h b/charmonizer/src/Charmonizer/Core/Compiler.h
deleted file mode 100644
index 51ec01b..0000000
--- a/charmonizer/src/Charmonizer/Core/Compiler.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* 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.
- */
-
-/* Charmonizer/Core/Compiler.h
- */
-
-#ifndef H_CHAZ_COMPILER
-#define H_CHAZ_COMPILER
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stddef.h>
-#include "Charmonizer/Core/Defines.h"
-#include "Charmonizer/Core/CFlags.h"
-
-/* Attempt to compile and link an executable.  Return true if the executable
- * file exists after the attempt.
- */
-int
-chaz_CC_compile_exe(const char *source_path, const char *exe_path,
-                    const char *code);
-
-/* Attempt to compile an object file.  Return true if the object file
- * exists after the attempt.
- */
-int
-chaz_CC_compile_obj(const char *source_path, const char *obj_path,
-                    const char *code);
-
-/* Attempt to compile the supplied source code and return true if the
- * effort succeeds.
- */
-int
-chaz_CC_test_compile(const char *source);
-
-/* Attempt to compile the supplied source code.  If successful, capture the
- * output of the program and return a pointer to a newly allocated buffer.
- * If the compilation fails, return NULL.  The length of the captured
- * output will be placed into the integer pointed to by [output_len].
- */
-char*
-chaz_CC_capture_output(const char *source, size_t *output_len);
-
-/** Initialize the compiler environment.
- */
-void
-chaz_CC_init(const char *cc_command, const char *cflags);
-
-/* Clean up the environment.
- */
-void
-chaz_CC_clean_up(void);
-
-/* Accessor for the compiler executable's string representation.
- */
-const char*
-chaz_CC_get_cc(void);
-
-/* Accessor for `cflags`.
- */
-const char*
-chaz_CC_get_cflags(void);
-
-/* Accessor for `extra_cflags`.
- */
-chaz_CFlags*
-chaz_CC_get_extra_cflags(void);
-
-/* Accessor for `temp_cflags`.
- */
-chaz_CFlags*
-chaz_CC_get_temp_cflags(void);
-
-/* Return a new CFlags object.
- */
-chaz_CFlags*
-chaz_CC_new_cflags(void);
-
-/* Return the extension for a compiled object.
- */
-const char*
-chaz_CC_obj_ext(void);
-
-int
-chaz_CC_gcc_version_num(void);
-
-const char*
-chaz_CC_gcc_version(void);
-
-int
-chaz_CC_msvc_version_num(void);
-
-const char*
-chaz_CC_link_command(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* H_CHAZ_COMPILER */
-
-

http://git-wip-us.apache.org/repos/asf/lucy/blob/3dc812ab/charmonizer/src/Charmonizer/Core/ConfWriter.c
----------------------------------------------------------------------
diff --git a/charmonizer/src/Charmonizer/Core/ConfWriter.c b/charmonizer/src/Charmonizer/Core/ConfWriter.c
deleted file mode 100644
index b9217ff..0000000
--- a/charmonizer/src/Charmonizer/Core/ConfWriter.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/* 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.
- */
-
-#include "Charmonizer/Core/Util.h"
-#include "Charmonizer/Core/ConfWriter.h"
-#include <stdarg.h>
-#include <stdio.h>
-
-#define CW_MAX_WRITERS 10
-static struct {
-    chaz_ConfWriter *writers[CW_MAX_WRITERS];
-    size_t num_writers;
-} chaz_CW;
-
-void
-chaz_ConfWriter_init(void) {
-    chaz_CW.num_writers = 0;
-    return;
-}
-
-void
-chaz_ConfWriter_clean_up(void) {
-    size_t i;
-    for (i = 0; i < chaz_CW.num_writers; i++) {
-        chaz_CW.writers[i]->clean_up();
-    }
-}
-
-void
-chaz_ConfWriter_append_conf(const char *fmt, ...) {
-    va_list args;
-    size_t i;
-    
-    for (i = 0; i < chaz_CW.num_writers; i++) {
-        va_start(args, fmt);
-        chaz_CW.writers[i]->vappend_conf(fmt, args);
-        va_end(args);
-    }
-}
-
-void
-chaz_ConfWriter_add_def(const char *sym, const char *value) {
-    size_t i;
-    for (i = 0; i < chaz_CW.num_writers; i++) {
-        chaz_CW.writers[i]->add_def(sym, value);
-    }
-}
-
-void
-chaz_ConfWriter_add_global_def(const char *sym, const char *value) {
-    size_t i;
-    for (i = 0; i < chaz_CW.num_writers; i++) {
-        chaz_CW.writers[i]->add_global_def(sym, value);
-    }
-}
-
-void
-chaz_ConfWriter_add_typedef(const char *type, const char *alias) {
-    size_t i;
-    for (i = 0; i < chaz_CW.num_writers; i++) {
-        chaz_CW.writers[i]->add_typedef(type, alias);
-    }
-}
-
-void
-chaz_ConfWriter_add_global_typedef(const char *type, const char *alias) {
-    size_t i;
-    for (i = 0; i < chaz_CW.num_writers; i++) {
-        chaz_CW.writers[i]->add_global_typedef(type, alias);
-    }
-}
-
-void
-chaz_ConfWriter_add_sys_include(const char *header) {
-    size_t i;
-    for (i = 0; i < chaz_CW.num_writers; i++) {
-        chaz_CW.writers[i]->add_sys_include(header);
-    }
-}
-
-void
-chaz_ConfWriter_add_local_include(const char *header) {
-    size_t i;
-    for (i = 0; i < chaz_CW.num_writers; i++) {
-        chaz_CW.writers[i]->add_local_include(header);
-    }
-}
-
-void
-chaz_ConfWriter_start_module(const char *module_name) {
-    size_t i;
-    if (chaz_Util_verbosity > 0) {
-        printf("Running %s module...\n", module_name);
-    }
-    for (i = 0; i < chaz_CW.num_writers; i++) {
-        chaz_CW.writers[i]->start_module(module_name);
-    }
-}
-
-void
-chaz_ConfWriter_end_module(void) {
-    size_t i;
-    for (i = 0; i < chaz_CW.num_writers; i++) {
-        chaz_CW.writers[i]->end_module();
-    }
-}
-
-void
-chaz_ConfWriter_add_writer(chaz_ConfWriter *writer) {
-    chaz_CW.writers[chaz_CW.num_writers] = writer;
-    chaz_CW.num_writers++;
-}
-

http://git-wip-us.apache.org/repos/asf/lucy/blob/3dc812ab/charmonizer/src/Charmonizer/Core/ConfWriter.h
----------------------------------------------------------------------
diff --git a/charmonizer/src/Charmonizer/Core/ConfWriter.h b/charmonizer/src/Charmonizer/Core/ConfWriter.h
deleted file mode 100644
index 0f7a553..0000000
--- a/charmonizer/src/Charmonizer/Core/ConfWriter.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* 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.
- */
-
-/* Charmonizer/Core/ConfWriter.h -- Write to a config file.
- */
-
-#ifndef H_CHAZ_CONFWRITER
-#define H_CHAZ_CONFWRITER 1
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stddef.h>
-#include <stdarg.h>
-#include "Charmonizer/Core/Defines.h"
-
-struct chaz_ConfWriter;
-
-/* Initialize elements needed by ConfWriter.  Must be called before anything
- * else, but after os and compiler are initialized.
- */
-void
-chaz_ConfWriter_init(void);
-
-/* Close the include guard on charmony.h, then close the file.  Delete temp
- * files and perform any other needed cleanup.
- */
-void
-chaz_ConfWriter_clean_up(void);
-
-/* Print output to charmony.h.
- */
-void
-chaz_ConfWriter_append_conf(const char *fmt, ...);
-
-/* Add a pound-define.
- */
-void
-chaz_ConfWriter_add_def(const char *sym, const char *value);
-
-/* Add a globally scoped pound-define.
- */
-void
-chaz_ConfWriter_add_global_def(const char *sym, const char *value);
-
-/* Add a typedef.
- */
-void
-chaz_ConfWriter_add_typedef(const char *type, const char *alias);
-
-/* Add a globally scoped typedef.
- */
-void
-chaz_ConfWriter_add_global_typedef(const char *type, const char *alias);
-
-/* Pound-include a system header (within angle brackets).
- */
-void
-chaz_ConfWriter_add_sys_include(const char *header);
-
-/* Pound-include a locally created header (within quotes).
- */
-void
-chaz_ConfWriter_add_local_include(const char *header);
-
-/* Print a "chapter heading" comment in the conf file when starting a module.
- */
-void
-chaz_ConfWriter_start_module(const char *module_name);
-
-/* Leave a little whitespace at the end of each module.
- */
-void
-chaz_ConfWriter_end_module(void);
-
-void
-chaz_ConfWriter_add_writer(struct chaz_ConfWriter *writer);
-
-typedef void
-(*chaz_ConfWriter_clean_up_t)(void);
-typedef void
-(*chaz_ConfWriter_vappend_conf_t)(const char *fmt, va_list args); 
-typedef void
-(*chaz_ConfWriter_add_def_t)(const char *sym, const char *value);
-typedef void
-(*chaz_ConfWriter_add_global_def_t)(const char *sym, const char *value);
-typedef void
-(*chaz_ConfWriter_add_typedef_t)(const char *type, const char *alias);
-typedef void
-(*chaz_ConfWriter_add_global_typedef_t)(const char *type, const char *alias);
-typedef void
-(*chaz_ConfWriter_add_sys_include_t)(const char *header);
-typedef void
-(*chaz_ConfWriter_add_local_include_t)(const char *header);
-typedef void
-(*chaz_ConfWriter_start_module_t)(const char *module_name);
-typedef void
-(*chaz_ConfWriter_end_module_t)(void);
-typedef struct chaz_ConfWriter {
-    chaz_ConfWriter_clean_up_t           clean_up;
-    chaz_ConfWriter_vappend_conf_t       vappend_conf;
-    chaz_ConfWriter_add_def_t            add_def;
-    chaz_ConfWriter_add_global_def_t     add_global_def;
-    chaz_ConfWriter_add_typedef_t        add_typedef;
-    chaz_ConfWriter_add_global_typedef_t add_global_typedef;
-    chaz_ConfWriter_add_sys_include_t    add_sys_include;
-    chaz_ConfWriter_add_local_include_t  add_local_include;
-    chaz_ConfWriter_start_module_t       start_module;
-    chaz_ConfWriter_end_module_t         end_module;
-} chaz_ConfWriter;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* H_CHAZ_CONFWRITER */
-
-

http://git-wip-us.apache.org/repos/asf/lucy/blob/3dc812ab/charmonizer/src/Charmonizer/Core/ConfWriterC.c
----------------------------------------------------------------------
diff --git a/charmonizer/src/Charmonizer/Core/ConfWriterC.c b/charmonizer/src/Charmonizer/Core/ConfWriterC.c
deleted file mode 100644
index 1b0b7c4..0000000
--- a/charmonizer/src/Charmonizer/Core/ConfWriterC.c
+++ /dev/null
@@ -1,408 +0,0 @@
-/* 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.
- */
-
-#include "Charmonizer/Core/Util.h"
-#include "Charmonizer/Core/ConfWriter.h"
-#include "Charmonizer/Core/ConfWriterC.h"
-#include "Charmonizer/Core/OperatingSystem.h"
-#include "Charmonizer/Core/Compiler.h"
-#include <ctype.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-typedef enum chaz_ConfElemType {
-    CHAZ_CONFELEM_DEF,
-    CHAZ_CONFELEM_GLOBAL_DEF,
-    CHAZ_CONFELEM_TYPEDEF,
-    CHAZ_CONFELEM_GLOBAL_TYPEDEF,
-    CHAZ_CONFELEM_SYS_INCLUDE,
-    CHAZ_CONFELEM_LOCAL_INCLUDE
-} chaz_ConfElemType;
-
-typedef struct chaz_ConfElem {
-    char *str1;
-    char *str2;
-    chaz_ConfElemType type;
-} chaz_ConfElem;
-
-/* Static vars. */
-static struct {
-    FILE          *fh;
-    char          *MODULE_NAME;
-    chaz_ConfElem *defs;
-    size_t         def_cap;
-    size_t         def_count;
-} chaz_ConfWriterC = { NULL, NULL, 0, 0 };
-static chaz_ConfWriter CWC_conf_writer;
-
-/* Open the charmony.h file handle.  Print supplied text to it, if non-null.
- * Print an explanatory comment and open the include guard.
- */
-static void
-chaz_ConfWriterC_open_charmony_h(const char *charmony_start);
-
-/* Push a new elem onto the def list. */
-static void
-chaz_ConfWriterC_push_def_list_item(const char *str1, const char *str2,
-                     chaz_ConfElemType type);
-
-/* Free the def list. */
-static void
-chaz_ConfWriterC_clear_def_list(void);
-
-static void
-chaz_ConfWriterC_clean_up(void);
-static void
-chaz_ConfWriterC_vappend_conf(const char *fmt, va_list args);
-static void
-chaz_ConfWriterC_add_def(const char *sym, const char *value);
-static void
-chaz_ConfWriterC_add_global_def(const char *sym, const char *value);
-static void
-chaz_ConfWriterC_add_typedef(const char *type, const char *alias);
-static void
-chaz_ConfWriterC_add_global_typedef(const char *type, const char *alias);
-static void
-chaz_ConfWriterC_add_sys_include(const char *header);
-static void
-chaz_ConfWriterC_add_local_include(const char *header);
-static void
-chaz_ConfWriterC_start_module(const char *module_name);
-static void
-chaz_ConfWriterC_end_module(void);
-
-void
-chaz_ConfWriterC_enable(void) {
-    CWC_conf_writer.clean_up           = chaz_ConfWriterC_clean_up;
-    CWC_conf_writer.vappend_conf       = chaz_ConfWriterC_vappend_conf;
-    CWC_conf_writer.add_def            = chaz_ConfWriterC_add_def;
-    CWC_conf_writer.add_global_def     = chaz_ConfWriterC_add_global_def;
-    CWC_conf_writer.add_typedef        = chaz_ConfWriterC_add_typedef;
-    CWC_conf_writer.add_global_typedef = chaz_ConfWriterC_add_global_typedef;
-    CWC_conf_writer.add_sys_include    = chaz_ConfWriterC_add_sys_include;
-    CWC_conf_writer.add_local_include  = chaz_ConfWriterC_add_local_include;
-    CWC_conf_writer.start_module       = chaz_ConfWriterC_start_module;
-    CWC_conf_writer.end_module         = chaz_ConfWriterC_end_module;
-    chaz_ConfWriterC_open_charmony_h(NULL);
-    chaz_ConfWriter_add_writer(&CWC_conf_writer);
-    return;
-}
-
-static void
-chaz_ConfWriterC_open_charmony_h(const char *charmony_start) {
-    /* Open the filehandle. */
-    chaz_ConfWriterC.fh = fopen("charmony.h", "w+");
-    if (chaz_ConfWriterC.fh == NULL) {
-        chaz_Util_die("Can't open 'charmony.h': %s", strerror(errno));
-    }
-
-    /* Print supplied text (if any) along with warning, open include guard. */
-    if (charmony_start != NULL) {
-        fwrite(charmony_start, sizeof(char), strlen(charmony_start),
-               chaz_ConfWriterC.fh);
-    }
-    fprintf(chaz_ConfWriterC.fh,
-            "/* Header file auto-generated by Charmonizer. \n"
-            " * DO NOT EDIT THIS FILE!!\n"
-            " */\n\n"
-            "#ifndef H_CHARMONY\n"
-            "#define H_CHARMONY 1\n\n"
-           );
-}
-
-static void
-chaz_ConfWriterC_clean_up(void) {
-    /* Write the last bit of charmony.h and close. */
-    fprintf(chaz_ConfWriterC.fh, "#endif /* H_CHARMONY */\n\n");
-    if (fclose(chaz_ConfWriterC.fh)) {
-        chaz_Util_die("Couldn't close 'charmony.h': %s", strerror(errno));
-    }
-}
-
-static void
-chaz_ConfWriterC_vappend_conf(const char *fmt, va_list args) {
-    vfprintf(chaz_ConfWriterC.fh, fmt, args);
-}
-
-static int
-chaz_ConfWriterC_sym_is_uppercase(const char *sym) {
-    return isupper(sym[0]);
-}
-
-static char*
-chaz_ConfWriterC_uppercase_string(const char *src) {
-    char *retval = chaz_Util_strdup(src);
-    size_t i;
-    for (i = 0; retval[i]; ++i) {
-        retval[i] = toupper(retval[i]);
-    }
-    return retval;
-}
-
-static void
-chaz_ConfWriterC_add_def(const char *sym, const char *value) {
-    chaz_ConfWriterC_push_def_list_item(sym, value, CHAZ_CONFELEM_DEF);
-}
-
-static void
-chaz_ConfWriterC_append_def_to_conf(const char *sym, const char *value) {
-    if (value) {
-        if (chaz_ConfWriterC_sym_is_uppercase(sym)) {
-            fprintf(chaz_ConfWriterC.fh, "#define CHY_%s %s\n", sym, value);
-        }
-        else {
-            fprintf(chaz_ConfWriterC.fh, "#define chy_%s %s\n", sym, value);
-        }
-    }
-    else {
-        if (chaz_ConfWriterC_sym_is_uppercase(sym)) {
-            fprintf(chaz_ConfWriterC.fh, "#define CHY_%s\n", sym);
-        }
-        else {
-            fprintf(chaz_ConfWriterC.fh, "#define chy_%s\n", sym);
-        }
-    }
-}
-
-static void
-chaz_ConfWriterC_add_global_def(const char *sym, const char *value) {
-    chaz_ConfWriterC_push_def_list_item(sym, value, CHAZ_CONFELEM_GLOBAL_DEF);
-}
-
-static void
-chaz_ConfWriterC_append_global_def_to_conf(const char *sym,
-                                           const char *value) {
-    char *name_end = strchr(sym, '(');
-    if (name_end == NULL) {
-        if (strcmp(sym, value) == 0) { return; }
-        fprintf(chaz_ConfWriterC.fh, "#ifndef %s\n", sym);
-    }
-    else {
-        size_t  name_len = (size_t)(name_end - sym);
-        char   *name     = chaz_Util_strdup(sym);
-        name[name_len] = '\0';
-        fprintf(chaz_ConfWriterC.fh, "#ifndef %s\n", name);
-        free(name);
-    }
-    if (value) {
-        fprintf(chaz_ConfWriterC.fh, "  #define %s %s\n", sym, value);
-    }
-    else {
-        fprintf(chaz_ConfWriterC.fh, "  #define %s\n", sym);
-    }
-    fprintf(chaz_ConfWriterC.fh, "#endif\n");
-}
-
-static void
-chaz_ConfWriterC_add_typedef(const char *type, const char *alias) {
-    chaz_ConfWriterC_push_def_list_item(alias, type, CHAZ_CONFELEM_TYPEDEF);
-}
-
-static void
-chaz_ConfWriterC_append_typedef_to_conf(const char *type, const char *alias) {
-    if (chaz_ConfWriterC_sym_is_uppercase(alias)) {
-        fprintf(chaz_ConfWriterC.fh, "typedef %s CHY_%s;\n", type, alias);
-    }
-    else {
-        fprintf(chaz_ConfWriterC.fh, "typedef %s chy_%s;\n", type, alias);
-    }
-}
-
-static void
-chaz_ConfWriterC_add_global_typedef(const char *type, const char *alias) {
-    chaz_ConfWriterC_push_def_list_item(alias, type,
-            CHAZ_CONFELEM_GLOBAL_TYPEDEF);
-}
-
-static void
-chaz_ConfWriterC_append_global_typedef_to_conf(const char *type,
-                                               const char *alias) {
-    if (strcmp(type, alias) == 0) { return; }
-    fprintf(chaz_ConfWriterC.fh, "typedef %s %s;\n", type, alias);
-}
-
-static void
-chaz_ConfWriterC_add_sys_include(const char *header) {
-    chaz_ConfWriterC_push_def_list_item(header, NULL,
-                                        CHAZ_CONFELEM_SYS_INCLUDE);
-}
-
-static void
-chaz_ConfWriterC_append_sys_include_to_conf(const char *header) {
-    fprintf(chaz_ConfWriterC.fh, "#include <%s>\n", header);
-}
-
-static void
-chaz_ConfWriterC_add_local_include(const char *header) {
-    chaz_ConfWriterC_push_def_list_item(header, NULL,
-                                        CHAZ_CONFELEM_LOCAL_INCLUDE);
-}
-
-static void
-chaz_ConfWriterC_append_local_include_to_conf(const char *header) {
-    fprintf(chaz_ConfWriterC.fh, "#include \"%s\"\n", header);
-}
-
-static void
-chaz_ConfWriterC_start_module(const char *module_name) {
-    fprintf(chaz_ConfWriterC.fh, "\n/* %s */\n", module_name);
-    chaz_ConfWriterC.MODULE_NAME
-        = chaz_ConfWriterC_uppercase_string(module_name);
-}
-
-static void
-chaz_ConfWriterC_end_module(void) {
-    size_t num_globals = 0;
-    size_t i;
-    chaz_ConfElem *defs = chaz_ConfWriterC.defs;
-    for (i = 0; i < chaz_ConfWriterC.def_count; i++) {
-        switch (defs[i].type) {
-            case CHAZ_CONFELEM_GLOBAL_DEF:
-                ++num_globals;
-            /* fall through */
-            case CHAZ_CONFELEM_DEF:
-                chaz_ConfWriterC_append_def_to_conf(defs[i].str1,
-                                                    defs[i].str2);
-                break;
-            case CHAZ_CONFELEM_GLOBAL_TYPEDEF: {
-                char *sym = chaz_ConfWriterC_uppercase_string(defs[i].str1);
-                chaz_ConfWriterC_append_def_to_conf(sym, defs[i].str2);
-                free(sym);
-                ++num_globals;
-            }
-            /* fall through */
-            case CHAZ_CONFELEM_TYPEDEF:
-                chaz_ConfWriterC_append_typedef_to_conf(defs[i].str2,
-                                                        defs[i].str1);
-                break;
-            case CHAZ_CONFELEM_SYS_INCLUDE:
-                ++num_globals;
-                break;
-            case CHAZ_CONFELEM_LOCAL_INCLUDE:
-                chaz_ConfWriterC_append_local_include_to_conf(defs[i].str1);
-                break;
-            default:
-                chaz_Util_die("Internal error: bad element type %d",
-                              (int)defs[i].type);
-        }
-    }
-
-    /* Write out short names. */
-    fprintf(chaz_ConfWriterC.fh,
-        "\n#if defined(CHY_USE_SHORT_NAMES) "
-        "|| defined(CHAZ_USE_SHORT_NAMES)\n"
-    );
-    for (i = 0; i < chaz_ConfWriterC.def_count; i++) {
-        switch (defs[i].type) {
-            case CHAZ_CONFELEM_DEF:
-            case CHAZ_CONFELEM_TYPEDEF:
-                {
-                    const char *sym = defs[i].str1;
-                    const char *value = defs[i].str2;
-                    if (!value || strcmp(sym, value) != 0) {
-                        const char *prefix
-                            = chaz_ConfWriterC_sym_is_uppercase(sym)
-                              ? "CHY_" : "chy_";
-                        fprintf(chaz_ConfWriterC.fh, "  #define %s %s%s\n",
-                                sym, prefix, sym);
-                    }
-                }
-                break;
-            case CHAZ_CONFELEM_GLOBAL_DEF:
-            case CHAZ_CONFELEM_GLOBAL_TYPEDEF:
-            case CHAZ_CONFELEM_SYS_INCLUDE:
-            case CHAZ_CONFELEM_LOCAL_INCLUDE:
-                /* no-op */
-                break;
-            default:
-                chaz_Util_die("Internal error: bad element type %d",
-                              (int)defs[i].type);
-        }
-    }
-
-    fprintf(chaz_ConfWriterC.fh, "#endif /* USE_SHORT_NAMES */\n");
-
-    /* Write out global definitions and system includes. */
-    if (num_globals) {
-        fprintf(chaz_ConfWriterC.fh, "\n#ifdef CHY_EMPLOY_%s\n\n",
-                chaz_ConfWriterC.MODULE_NAME);
-        for (i = 0; i < chaz_ConfWriterC.def_count; i++) {
-            switch (defs[i].type) {
-                case CHAZ_CONFELEM_GLOBAL_DEF:
-                    chaz_ConfWriterC_append_global_def_to_conf(defs[i].str1,
-                                                               defs[i].str2);
-                    break;
-                case CHAZ_CONFELEM_GLOBAL_TYPEDEF:
-                    chaz_ConfWriterC_append_global_typedef_to_conf(
-                            defs[i].str2, defs[i].str1);
-                    break;
-                case CHAZ_CONFELEM_SYS_INCLUDE:
-                    chaz_ConfWriterC_append_sys_include_to_conf(defs[i].str1);
-                    break;
-                case CHAZ_CONFELEM_DEF:
-                case CHAZ_CONFELEM_TYPEDEF:
-                case CHAZ_CONFELEM_LOCAL_INCLUDE:
-                    /* no-op */
-                    break;
-                default:
-                    chaz_Util_die("Internal error: bad element type %d",
-                                  (int)defs[i].type);
-            }
-        }
-        fprintf(chaz_ConfWriterC.fh, "\n#endif /* EMPLOY_%s */\n",
-                chaz_ConfWriterC.MODULE_NAME);
-    }
-
-    fprintf(chaz_ConfWriterC.fh, "\n");
-
-    free(chaz_ConfWriterC.MODULE_NAME);
-    chaz_ConfWriterC_clear_def_list();
-}
-
-static void
-chaz_ConfWriterC_push_def_list_item(const char *str1, const char *str2,
-                     chaz_ConfElemType type) {
-    if (chaz_ConfWriterC.def_count >= chaz_ConfWriterC.def_cap) { 
-        size_t amount;
-        chaz_ConfWriterC.def_cap += 10;
-        amount = chaz_ConfWriterC.def_cap * sizeof(chaz_ConfElem);
-        chaz_ConfWriterC.defs
-            = (chaz_ConfElem*)realloc(chaz_ConfWriterC.defs, amount);
-    }
-    chaz_ConfWriterC.defs[chaz_ConfWriterC.def_count].str1
-        = str1 ? chaz_Util_strdup(str1) : NULL;
-    chaz_ConfWriterC.defs[chaz_ConfWriterC.def_count].str2
-        = str2 ? chaz_Util_strdup(str2) : NULL;
-    chaz_ConfWriterC.defs[chaz_ConfWriterC.def_count].type = type;
-    chaz_ConfWriterC.def_count++;
-}
-
-static void
-chaz_ConfWriterC_clear_def_list(void) {
-    size_t i;
-    for (i = 0; i < chaz_ConfWriterC.def_count; i++) {
-        free(chaz_ConfWriterC.defs[i].str1);
-        free(chaz_ConfWriterC.defs[i].str2);
-    }
-    free(chaz_ConfWriterC.defs);
-    chaz_ConfWriterC.defs      = NULL;
-    chaz_ConfWriterC.def_cap   = 0;
-    chaz_ConfWriterC.def_count = 0;
-}
-

http://git-wip-us.apache.org/repos/asf/lucy/blob/3dc812ab/charmonizer/src/Charmonizer/Core/ConfWriterC.h
----------------------------------------------------------------------
diff --git a/charmonizer/src/Charmonizer/Core/ConfWriterC.h b/charmonizer/src/Charmonizer/Core/ConfWriterC.h
deleted file mode 100644
index 63c1a26..0000000
--- a/charmonizer/src/Charmonizer/Core/ConfWriterC.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* 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.
- */
-
-/* Charmonizer/Core/ConfWriterC.h -- Write to a C header file.
- */
-
-#ifndef H_CHAZ_CONFWRITERC
-#define H_CHAZ_CONFWRITERC 1
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Enable writing config to a C header file.
- */
-void
-chaz_ConfWriterC_enable(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* H_CHAZ_CONFWRITERC */
-
-


Mime
View raw message