diff options
author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-02-08 16:56:10 +0100 |
---|---|---|
committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-02-08 16:56:10 +0100 |
commit | 0362c6eb271f15b461038ff475c8520b609cf61d (patch) | |
tree | ee668b4227e63f4141739210aafb596458fbceef | |
parent | 1c334779e728cfa04e1402b1e6a858fbe70e59ec (diff) | |
download | toolchain_jack-0362c6eb271f15b461038ff475c8520b609cf61d.zip toolchain_jack-0362c6eb271f15b461038ff475c8520b609cf61d.tar.gz toolchain_jack-0362c6eb271f15b461038ff475c8520b609cf61d.tar.bz2 |
remove prebuilt antlr and use antlr from Debian instead
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
-rw-r--r-- | antlr/Android.mk | 24 | ||||
-rw-r--r-- | antlr/LICENSE | 26 | ||||
-rw-r--r-- | antlr/MODULE_LICENSE_BSD | 0 | ||||
-rw-r--r-- | antlr/PREBUILT | 2 | ||||
-rw-r--r-- | antlr/README.android | 5 | ||||
-rw-r--r-- | antlr/antlr-3.4-complete.jar | bin | 2388361 -> 0 bytes | |||
-rw-r--r-- | build.xml | 29 |
7 files changed, 5 insertions, 81 deletions
diff --git a/antlr/Android.mk b/antlr/Android.mk deleted file mode 100644 index ad94a05..0000000 --- a/antlr/Android.mk +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (C) 2014 The Android Open Source Project -# -# 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. - -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := optional - -LOCAL_PREBUILT_JAVA_LIBRARIES := \ - antlr-jack:antlr-3.4-complete$(COMMON_JAVA_PACKAGE_SUFFIX) - -include $(BUILD_HOST_PREBUILT) diff --git a/antlr/LICENSE b/antlr/LICENSE deleted file mode 100644 index e1cc972..0000000 --- a/antlr/LICENSE +++ /dev/null @@ -1,26 +0,0 @@ -[The "BSD license"] -Copyright (c) 201 Terence Parr -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - 3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/antlr/MODULE_LICENSE_BSD b/antlr/MODULE_LICENSE_BSD deleted file mode 100644 index e69de29..0000000 --- a/antlr/MODULE_LICENSE_BSD +++ /dev/null diff --git a/antlr/PREBUILT b/antlr/PREBUILT deleted file mode 100644 index 26e9370..0000000 --- a/antlr/PREBUILT +++ /dev/null @@ -1,2 +0,0 @@ -The objects in this prebuilt directory are coming from -http://www.antlr.org/download/antlr-3.4-complete.jar
\ No newline at end of file diff --git a/antlr/README.android b/antlr/README.android deleted file mode 100644 index dcc4c71..0000000 --- a/antlr/README.android +++ /dev/null @@ -1,5 +0,0 @@ -URL: https://github.com/antlr/website-antlr3/blob/gh-pages/download/antlr-3.4-complete.jar -Tag: antlr-3.4 -License: BSD -Description: ANTLR (ANother Tool for Language Recognition) is a powerful parser generator for reading, processing, executing, or translating structured text or binary files. -Local Modifications: None. diff --git a/antlr/antlr-3.4-complete.jar b/antlr/antlr-3.4-complete.jar Binary files differdeleted file mode 100644 index 9c985c7..0000000 --- a/antlr/antlr-3.4-complete.jar +++ /dev/null @@ -39,7 +39,6 @@ jackunittests-lib-clean, jackunittests-clean, jack-tests-clean, - antlr-clean, args4j-lib-clean, dx-lib-clean, ecj-clean, @@ -74,7 +73,6 @@ <property name="jack-launcher.dir" value="${jack-project.dir}/jack-launcher" /> <property name="jack-server.dir" value="${jack-project.dir}/jack-server" /> <property name="jack-tests.dir" value="${jack-project.dir}/jack-tests" /> - <property name="antlr.dir" value="${jack-project.dir}/antlr"/> <property name="args4j.dir" value="${jack-project.dir}/args4j"/> <property name="ddm-lib.dir" value="${jack-project.dir}/ddmlib"/> <property name="dx.dir" value="${jack-project.dir}/dx"/> @@ -209,7 +207,7 @@ </target> <target name="jack-lib-compile-step1" - depends="jack-copy-libs,sched-build,antlr,sched-build-lib,allocation-lib, + depends="jack-copy-libs,sched-build,sched-build-lib,allocation-lib, dx-lib,freemarker-lib,maths-lib,sched-lib,watchmaker-lib"> <!-- project layout --> <!-- avoid incremental compilation with annotation processor --> @@ -238,7 +236,6 @@ <copy todir="${jack.tools.dir}" flatten="true"> <filelist dir="/" > <file name="${sched-build.dist.dir}/${sched-build.execname}" /> - <file name="${antlr.dist.dir}/${antlr.execname}" /> </filelist> </copy> </target> @@ -259,22 +256,22 @@ depends="jack-lib-compile-step1,jack-lib-generate-proguard-parser-check" unless="jack-lib.uptodate.proguardparser"> <!-- generate ProGuard parser --> - <java jar="${jack.tools.dir}/${antlr.execname}" fork="true" failonerror="true"> + <exec executable="antlr3" failonerror="true"> <arg line="-fo" /> <arg line="${jack.dir}/src/com/android/jack/shrob/proguard"/> <arg line="${jack.dir}/src/com/android/jack/shrob/proguard/Proguard.g"/> - </java> + </exec> </target> <target name="jack-lib-generate-preprocessor-parser" depends="jack-lib-compile-step1,jack-lib-generate-preprocessor-parser-check" unless="jack-lib.uptodate.preprocessorparser"> <!-- generate PreProcessor parser --> - <java jar="${jack.tools.dir}/${antlr.execname}" fork="true" failonerror="true"> + <exec executable="antlr3" failonerror="true"> <arg line="-fo" /> <arg line="${jack.dir}/src/com/android/jack/preprocessor"/> <arg line="${jack.dir}/src/com/android/jack/preprocessor/PreProcessor.g"/> - </java> + </exec> </target> <target name="jack-lib-compile-step2" @@ -833,22 +830,6 @@ <!-- ******************* --> - <!-- antlr --> - <!-- ******************* --> - <property name="antlr.dist.dir" value="${build-top.dir}/antlr/dist" /> - <property name="antlr.execname" value="antlr.jar"/> - - <target name="antlr-clean"> - <delete dir="${antlr.dist.dir}"/> - </target> - - <target name="antlr"> - <mkdir dir="${antlr.dist.dir}"/> - <copy file="${antlr.dir}/antlr-3.4-complete.jar" tofile="${antlr.dist.dir}/${antlr.execname}"/> - </target> - - - <!-- ******************* --> <!-- args4j-lib --> <!-- ******************* --> <property name="args4j.build.dir" value="${build-top.dir}/args4j/build"/> |