diff options
| author | philip.liard@gmail.com <philip.liard@gmail.com@ee073f10-1060-11df-b6a4-87a95322a99c> | 2011-11-22 15:43:10 +0000 |
|---|---|---|
| committer | philip.liard@gmail.com <philip.liard@gmail.com@ee073f10-1060-11df-b6a4-87a95322a99c> | 2011-11-22 15:43:10 +0000 |
| commit | 49440cd9188fb430e310bc21a5c61bde765f0490 (patch) | |
| tree | 5bb3aff7167cd5920363510c478cf09e10447bf9 /tools | |
| parent | 94a488d48eacf4fc53ec575db0f1bb11112073cf (diff) | |
| download | android_external_libphonenumbergoogle-49440cd9188fb430e310bc21a5c61bde765f0490.tar.gz android_external_libphonenumbergoogle-49440cd9188fb430e310bc21a5c61bde765f0490.tar.bz2 android_external_libphonenumbergoogle-49440cd9188fb430e310bc21a5c61bde765f0490.zip | |
JAVA: Add Maven support for offline phone number geocoder.
This CL (depending on CL 5376090) adds the Maven support for the offline phone number geocoder.
All the geocoding-related code/data is moved to the new directory java/geocoder.
Additionally a pom.xml file is added to java/ and java/geocoder/.
The pom.xml file located in java/ is the parent pom file which contains the configuration (SCM, developers, encoding...) that applies to both the libphonenumber and geocoder modules.
The libphonenumber and geocoder Maven modules inherit from this parent pom file therefore they don't need to duplicate this configuration.
I also moved build.xml and release_notes.txt back to java/.
BUG=57
Review URL: http://codereview.appspot.com/5395054
git-svn-id: http://libphonenumber.googlecode.com/svn/trunk@391 ee073f10-1060-11df-b6a4-87a95322a99c
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/java/cpp-build/target/cpp-build-1.0-SNAPSHOT-jar-with-dependencies.jar | bin | 509746 -> 509745 bytes | |||
| -rw-r--r-- | tools/java/java-build/pom.xml | 9 | ||||
| -rw-r--r-- | tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar | bin | 708730 -> 299041 bytes | |||
| -rwxr-xr-x | tools/script/continuous-integration.sh | 4 |
4 files changed, 8 insertions, 5 deletions
diff --git a/tools/java/cpp-build/target/cpp-build-1.0-SNAPSHOT-jar-with-dependencies.jar b/tools/java/cpp-build/target/cpp-build-1.0-SNAPSHOT-jar-with-dependencies.jar Binary files differindex 5891512..bc97b55 100644 --- a/tools/java/cpp-build/target/cpp-build-1.0-SNAPSHOT-jar-with-dependencies.jar +++ b/tools/java/cpp-build/target/cpp-build-1.0-SNAPSHOT-jar-with-dependencies.jar diff --git a/tools/java/java-build/pom.xml b/tools/java/java-build/pom.xml index 24d707a..e5321c8 100644 --- a/tools/java/java-build/pom.xml +++ b/tools/java/java-build/pom.xml @@ -49,8 +49,6 @@ <target>1.5</target> </configuration> </plugin> - <!-- Add ../../../java/libphonenumber/src/ to make Phonemetadata.java available to the source - directories. --> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> @@ -64,8 +62,13 @@ </goals> <configuration> <sources> + <!-- Add ../../../java/libphonenumber/src/ to make Phonemetadata.java available to + the source directories. --> <source>../../../java/libphonenumber/src/</source> - <!-- Also add ../common/src/ which contains BuildMetadataFromXml.java --> + <!-- Add ../../../java/geocoder/src/ to make AreaCodeMap.java available to the + source directories. --> + <source>../../../java/geocoder/src/</source> + <!-- Add ../common/src/ which contains BuildMetadataFromXml.java --> <source>../common/src/</source> </sources> </configuration> diff --git a/tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar b/tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar Binary files differindex a6e6087..5808414 100644 --- a/tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar +++ b/tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar diff --git a/tools/script/continuous-integration.sh b/tools/script/continuous-integration.sh index 41e766d..0fb6741 100755 --- a/tools/script/continuous-integration.sh +++ b/tools/script/continuous-integration.sh @@ -81,10 +81,10 @@ test_cpp_version '-DUSE_RE2=ON' test_cpp_version '-DUSE_STD_MAP=ON' # Test Java version using Ant. -(cd java/libphonenumber && ant clean jar && ant junit) || exit $? +(cd java && ant clean jar && ant junit) || exit $? # Test Java version using Maven. -(cd java/libphonenumber && mvn clean package) || exit $? +(cd java && mvn clean package) || exit $? # Test build tools. (cd tools/java && mvn clean package) || exit $? |