CPP: Move non-base source code to src/phonenumbers/

cpp/CMakeLists.txt

@@ -132,14 +132,14 @@ set (
 )
 
 set (
-  PROTOBUF_OUTPUT "${CMAKE_SOURCE_DIR}/src/phonemetadata.pb.cc"
-                  "${CMAKE_SOURCE_DIR}/src/phonemetadata.pb.h"
-                  "${CMAKE_SOURCE_DIR}/src/phonenumber.pb.cc"
-                  "${CMAKE_SOURCE_DIR}/src/phonenumber.pb.h"
+  PROTOBUF_OUTPUT "${CMAKE_SOURCE_DIR}/src/phonenumbers/phonemetadata.pb.cc"
+                  "${CMAKE_SOURCE_DIR}/src/phonenumbers/phonemetadata.pb.h"
+                  "${CMAKE_SOURCE_DIR}/src/phonenumbers/phonenumber.pb.cc"
+                  "${CMAKE_SOURCE_DIR}/src/phonenumbers/phonenumber.pb.h"
 )
 
 add_custom_command (
-  COMMAND ${PROTOC_BIN} --cpp_out=${CMAKE_SOURCE_DIR}/src
+  COMMAND ${PROTOC_BIN} --cpp_out=${CMAKE_SOURCE_DIR}/src/phonenumbers/
     --proto_path=${RESOURCES_DIR} ${PROTOBUF_SOURCES}
 
   OUTPUT ${PROTOBUF_OUTPUT}
@@ -156,25 +156,25 @@ add_custom_target (
 set (
   SOURCES
   "src/base/string_piece.cc"
-  "src/default_logger.cc"
-  "src/logger.cc"
-  "src/metadata.h"          # Generated by build tools.
-  "src/phonemetadata.pb.cc" # Generated by Protocol Buffers.
-  "src/phonenumber.cc"
-  "src/phonenumber.pb.cc"   # Generated by Protocol Buffers.
-  "src/phonenumberutil.cc"
-  "src/regexp_cache.cc"
-  "src/stringutil.cc"
-  "src/utf/rune.c"
-  "src/utf/unicodetext.cc"
-  "src/utf/unilib.cc"
+  "src/phonenumbers/default_logger.cc"
+  "src/phonenumbers/logger.cc"
+  "src/phonenumbers/metadata.h"          # Generated by build tools.
+  "src/phonenumbers/phonemetadata.pb.cc" # Generated by Protocol Buffers.
+  "src/phonenumbers/phonenumber.cc"
+  "src/phonenumbers/phonenumber.pb.cc"   # Generated by Protocol Buffers.
+  "src/phonenumbers/phonenumberutil.cc"
+  "src/phonenumbers/regexp_cache.cc"
+  "src/phonenumbers/stringutil.cc"
+  "src/phonenumbers/utf/rune.c"
+  "src/phonenumbers/utf/unicodetext.cc"
+  "src/phonenumbers/utf/unilib.cc"
 )
 
 # Add regexp engine sources. ICU is used by default.
 if (${USE_RE2} STREQUAL "ON")
-  list (APPEND SOURCES "src/regexp_adapter_re2.cc")
+  list (APPEND SOURCES "src/phonenumbers/regexp_adapter_re2.cc")
 else ()
-  list (APPEND SOURCES "src/regexp_adapter_icu.cc")
+  list (APPEND SOURCES "src/phonenumbers/regexp_adapter_icu.cc")
 endif ()
 
 # Library sources excluding the metadata files, since special metadata is used
@@ -188,7 +188,7 @@ set (TESTING_LIBRARY_SOURCES ${SOURCES})
 function (add_metadata_gen_target TARGET_NAME
                                   XML_FILE
                                   METADATA_TYPE)
-  set (METADATA_SOURCE_DIR "${CMAKE_SOURCE_DIR}/src")
+  set (METADATA_SOURCE_DIR "${CMAKE_SOURCE_DIR}/src/phonenumbers")
   set (GEN_OUTPUT "${METADATA_SOURCE_DIR}/${METADATA_TYPE}.cc"
                   "${METADATA_SOURCE_DIR}/metadata.h")
   set (JAR_PATH "${CMAKE_SOURCE_DIR}/../tools/java/cpp-build/target")
@@ -196,8 +196,8 @@ function (add_metadata_gen_target TARGET_NAME
 
   add_custom_command (
     COMMAND ${JAVA_BIN} -jar
-      ${JAR_PATH} BuildMetadataCppFromXml ${XML_FILE} ${CMAKE_SOURCE_DIR}/src
-      ${METADATA_TYPE}
+      ${JAR_PATH} BuildMetadataCppFromXml ${XML_FILE}
+      ${CMAKE_SOURCE_DIR}/src/phonenumbers ${METADATA_TYPE}
 
     OUTPUT ${GEN_OUTPUT}
     DEPENDS ${XML_FILE}
@@ -217,7 +217,7 @@ if (${USE_LITE_METADATA} STREQUAL "ON")
     "${RESOURCES_DIR}/PhoneNumberMetaData.xml"
     "lite_metadata"
   )
-  list (APPEND SOURCES "src/lite_metadata.cc")
+  list (APPEND SOURCES "src/phonenumbers/lite_metadata.cc")
 else ()
   # Add the metadata generation target.
   set (METADATA_TARGET "generate-metadata")
@@ -226,7 +226,7 @@ else ()
     "${RESOURCES_DIR}/PhoneNumberMetaData.xml"
     "metadata"
   )
-  list (APPEND SOURCES "src/metadata.cc")
+  list (APPEND SOURCES "src/phonenumbers/metadata.cc")
 endif ()
 
 # Add the test metadata generation target.
@@ -236,7 +236,7 @@ add_metadata_gen_target (
   "${RESOURCES_DIR}/PhoneNumberMetaDataForTesting.xml"
   "test_metadata"
 )
-list (APPEND TESTING_LIBRARY_SOURCES "src/test_metadata.cc")
+list (APPEND TESTING_LIBRARY_SOURCES "src/phonenumbers/test_metadata.cc")
 add_definitions ("-Wall -Werror")
 
 include_directories ("src")
@@ -288,13 +288,13 @@ target_link_libraries (phonenumber_testing ${LIBRARY_DEPS})
 add_dependencies (phonenumber_testing generate-sources ${TEST_METADATA_TARGET})
 
 set (TEST_SOURCES
-  "src/logger_test.cc"
-  "src/phonenumberutil_test.cc"
-  "src/regexp_adapter_test.cc"
-  "src/regexp_cache_test.cc"
-  "src/run_tests.cc"
-  "src/stringutil_test.cc"
-  "src/utf/unicodetext_test.cc"
+  "src/phonenumbers/logger_test.cc"
+  "src/phonenumbers/phonenumberutil_test.cc"
+  "src/phonenumbers/regexp_adapter_test.cc"
+  "src/phonenumbers/regexp_cache_test.cc"
+  "src/phonenumbers/run_tests.cc"
+  "src/phonenumbers/stringutil_test.cc"
+  "src/phonenumbers/utf/unicodetext_test.cc"
 )
 
 # Build the testing binary.
@@ -306,9 +306,9 @@ target_link_libraries (
 
 # Install rules.
 install (FILES
-  "src/logger.h"
-  "src/phonenumber.pb.h"
-  "src/phonenumberutil.h"
+  "src/phonenumbers/logger.h"
+  "src/phonenumbers/phonenumber.pb.h"
+  "src/phonenumbers/phonenumberutil.h"
   DESTINATION include/phonenumbers/
 )
 
@@ -316,10 +316,10 @@ install (FILES
   "src/base/basictypes.h"
   "src/base/scoped_ptr.h"
   "src/base/singleton.h"
-  DESTINATION include/phonenumbers/base/
+  DESTINATION include/base/
 )
 install (FILES src/base/synchronization/lock.h
-         DESTINATION include/phonenumbers/base/synchronization)
+         DESTINATION include/base/synchronization)
 
 install (TARGETS phonenumber LIBRARY DESTINATION lib/ ARCHIVE DESTINATION lib/)
 

cpp/src/build/build_config.h

@@ -1,45 +0,0 @@
-#ifndef I18N_PHONENUMBERS_CONFIG_H_
-# define I18N_PHONENUMBERS_CONFIG_H_
-
-# ifdef __x86_64__
-
-// Needed by atomicops
-#   define ARCH_CPU_64_BITS
-
-# endif
-
-#ifdef __APPLE__
-
-# ifdef __GNUC__
-#  ifndef COMPILER_GCC
-#     define COMPILER_GCC
-#  endif
-# endif
-
-# if defined(__i386__) || defined(__x86_64__)
-#   ifndef ARCH_CPU_X86_FAMILY
-#     define ARCH_CPU_X86_FAMILY
-#   endif
-# endif
-
-# ifdef __arm__
-#   ifndef ARCH_CPU_ARM_FAMILY
-#     define ARCH_CPU_ARM_FAMILY
-#   endif
-# endif
-
-# ifndef OS_MACOSX
-#   define OS_MACOSX
-# endif
-
-# ifndef OS_POSIX
-#   define OS_POSIX
-# endif
-
-# ifndef USE_TR1_UNORDERED_MAP
-#   define USE_TR1_UNORDERED_MAP
-# endif
-
-#endif
-
-#endif

cpp/src/metadata.h

@@ -1,28 +0,0 @@
-/*
- *  Copyright (C) 2011 Google Inc.
- *
- *  Licensed 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.
- */
-#ifndef I18N_PHONENUMBERS_METADATA_H_
-#define I18N_PHONENUMBERS_METADATA_H_
-
-namespace i18n {
-namespace phonenumbers {
-
-int metadata_size();
-const void* metadata_get();
-
-}  // namespace phonenumbers
-}  // namespace i18n
-
-#endif  // I18N_PHONENUMBERS_METADATA_H_

cpp/src/phonenumbers/metadata.h

@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2011 Google Inc.
+ *
+ * Licensed 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.
+ */
+#ifndef I18N_PHONENUMBERS_METADATA_H_
+#define I18N_PHONENUMBERS_METADATA_H_
+
+namespace i18n {
+namespace phonenumbers {
+
+int metadata_size();
+const void* metadata_get();
+
+}  // namespace phonenumbers
+}  // namespace i18n
+
+#endif  // I18N_PHONENUMBERS_METADATA_H_

tools/java/cpp-build/src/com/google/i18n/phonenumbers/tools/BuildMetadataCppFromXml.java

@@ -180,7 +180,7 @@ public class BuildMetadataCppFromXml extends Command {
   private void emitImplementation() throws IOException {
     final PrintWriter pw = new PrintWriter(implFileOutputStream);
     pw.write(CopyrightNotice.TEXT);
-    pw.println("#include \"metadata.h\"");
+    pw.println("#include \"phonenumbers/metadata.h\"");
     pw.println();
 
     emitNamespacesBeginning(pw);