diff --git a/internal/compile.sh b/internal/compile.sh index 9e7a580..ceb3508 100755 --- a/internal/compile.sh +++ b/internal/compile.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2013 Google Inc. All Rights Reserved. +# Copyright 2014 Google Inc. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -24,8 +24,22 @@ g++ -O2 -m64 compact_lang_det_test.cc \ cld_generated_cjk_delta_bi_4.cc generated_distinct_bi_0.cc \ cld2_generated_quadchrome_2.cc cld2_generated_deltaoctachrome.cc \ cld2_generated_distinctoctachrome.cc cld_generated_score_quad_octa_2.cc \ - -o compact_lang_det_test_chrome -echo " compact_lang_det_test_chrome compiled" + -o compact_lang_det_test_chrome_2 +echo " compact_lang_det_test_chrome_2 compiled" + +g++ -O2 -m64 compact_lang_det_test.cc \ + cldutil.cc cldutil_shared.cc compact_lang_det.cc compact_lang_det_hint_code.cc \ + compact_lang_det_impl.cc debug.cc fixunicodevalue.cc \ + generated_entities.cc generated_language.cc generated_ulscript.cc \ + getonescriptspan.cc lang_script.cc offsetmap.cc scoreonescriptspan.cc \ + tote.cc utf8statetable.cc \ + cld_generated_cjk_uni_prop_80.cc cld2_generated_cjk_compatible.cc \ + cld_generated_cjk_delta_bi_4.cc generated_distinct_bi_0.cc \ + cld2_generated_quadchrome_16.cc cld2_generated_deltaoctachrome.cc \ + cld2_generated_distinctoctachrome.cc cld_generated_score_quad_octa_2.cc \ + -o compact_lang_det_test_chrome_16 +echo " compact_lang_det_test_chrome_16 compiled" + g++ -O2 -m64 cld2_unittest.cc \ cldutil.cc cldutil_shared.cc compact_lang_det.cc compact_lang_det_hint_code.cc \ @@ -37,8 +51,8 @@ g++ -O2 -m64 cld2_unittest.cc \ cld_generated_cjk_delta_bi_4.cc generated_distinct_bi_0.cc \ cld2_generated_quadchrome_2.cc cld2_generated_deltaoctachrome.cc \ cld2_generated_distinctoctachrome.cc cld_generated_score_quad_octa_2.cc \ - -o cld2_unittest -echo " cld2_unittest compiled" + -o cld2_unittest_chrome_2 +echo " cld2_unittest_chrome_2 compiled" g++ -O2 -m64 -Davoid_utf8_string_constants cld2_unittest.cc \ cldutil.cc cldutil_shared.cc compact_lang_det.cc compact_lang_det_hint_code.cc \ @@ -50,6 +64,9 @@ g++ -O2 -m64 -Davoid_utf8_string_constants cld2_unittest.cc \ cld_generated_cjk_delta_bi_4.cc generated_distinct_bi_0.cc \ cld2_generated_quadchrome_2.cc cld2_generated_deltaoctachrome.cc \ cld2_generated_distinctoctachrome.cc cld_generated_score_quad_octa_2.cc \ - -o cld2_unittest_avoid -echo " cld2_unittest_avoid compiled" + -o cld2_unittest_avoid_chrome_2 +echo " cld2_unittest_avoid_chrome_2 compiled" + + + diff --git a/internal/compile20141015.sh b/internal/compile20141015.sh deleted file mode 100755 index ceb3508..0000000 --- a/internal/compile20141015.sh +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/sh -# -# Copyright 2014 Google Inc. All Rights Reserved. -# -# 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. - -g++ -O2 -m64 compact_lang_det_test.cc \ - cldutil.cc cldutil_shared.cc compact_lang_det.cc compact_lang_det_hint_code.cc \ - compact_lang_det_impl.cc debug.cc fixunicodevalue.cc \ - generated_entities.cc generated_language.cc generated_ulscript.cc \ - getonescriptspan.cc lang_script.cc offsetmap.cc scoreonescriptspan.cc \ - tote.cc utf8statetable.cc \ - cld_generated_cjk_uni_prop_80.cc cld2_generated_cjk_compatible.cc \ - cld_generated_cjk_delta_bi_4.cc generated_distinct_bi_0.cc \ - cld2_generated_quadchrome_2.cc cld2_generated_deltaoctachrome.cc \ - cld2_generated_distinctoctachrome.cc cld_generated_score_quad_octa_2.cc \ - -o compact_lang_det_test_chrome_2 -echo " compact_lang_det_test_chrome_2 compiled" - -g++ -O2 -m64 compact_lang_det_test.cc \ - cldutil.cc cldutil_shared.cc compact_lang_det.cc compact_lang_det_hint_code.cc \ - compact_lang_det_impl.cc debug.cc fixunicodevalue.cc \ - generated_entities.cc generated_language.cc generated_ulscript.cc \ - getonescriptspan.cc lang_script.cc offsetmap.cc scoreonescriptspan.cc \ - tote.cc utf8statetable.cc \ - cld_generated_cjk_uni_prop_80.cc cld2_generated_cjk_compatible.cc \ - cld_generated_cjk_delta_bi_4.cc generated_distinct_bi_0.cc \ - cld2_generated_quadchrome_16.cc cld2_generated_deltaoctachrome.cc \ - cld2_generated_distinctoctachrome.cc cld_generated_score_quad_octa_2.cc \ - -o compact_lang_det_test_chrome_16 -echo " compact_lang_det_test_chrome_16 compiled" - - -g++ -O2 -m64 cld2_unittest.cc \ - cldutil.cc cldutil_shared.cc compact_lang_det.cc compact_lang_det_hint_code.cc \ - compact_lang_det_impl.cc debug.cc fixunicodevalue.cc \ - generated_entities.cc generated_language.cc generated_ulscript.cc \ - getonescriptspan.cc lang_script.cc offsetmap.cc scoreonescriptspan.cc \ - tote.cc utf8statetable.cc \ - cld_generated_cjk_uni_prop_80.cc cld2_generated_cjk_compatible.cc \ - cld_generated_cjk_delta_bi_4.cc generated_distinct_bi_0.cc \ - cld2_generated_quadchrome_2.cc cld2_generated_deltaoctachrome.cc \ - cld2_generated_distinctoctachrome.cc cld_generated_score_quad_octa_2.cc \ - -o cld2_unittest_chrome_2 -echo " cld2_unittest_chrome_2 compiled" - -g++ -O2 -m64 -Davoid_utf8_string_constants cld2_unittest.cc \ - cldutil.cc cldutil_shared.cc compact_lang_det.cc compact_lang_det_hint_code.cc \ - compact_lang_det_impl.cc debug.cc fixunicodevalue.cc \ - generated_entities.cc generated_language.cc generated_ulscript.cc \ - getonescriptspan.cc lang_script.cc offsetmap.cc scoreonescriptspan.cc \ - tote.cc utf8statetable.cc \ - cld_generated_cjk_uni_prop_80.cc cld2_generated_cjk_compatible.cc \ - cld_generated_cjk_delta_bi_4.cc generated_distinct_bi_0.cc \ - cld2_generated_quadchrome_2.cc cld2_generated_deltaoctachrome.cc \ - cld2_generated_distinctoctachrome.cc cld_generated_score_quad_octa_2.cc \ - -o cld2_unittest_avoid_chrome_2 -echo " cld2_unittest_avoid_chrome_2 compiled" - - - - diff --git a/internal/compile_and_test_all.sh b/internal/compile_and_test_all.sh index a1adc4f..afe0915 100755 --- a/internal/compile_and_test_all.sh +++ b/internal/compile_and_test_all.sh @@ -18,7 +18,7 @@ trap 'echo "FAILED!" && exit 1' INT TERM EXIT # ---------------------------------------------------------------------------- echo "--> [1 of 7] Invoking: compile.sh..." -./compile20141015.sh +./compile.sh echo "--> [2 of 7] Testing results of compile.sh..." echo "--> compact_lang_det_test_chrome_2... " echo "this is some english text" | ./compact_lang_det_test_chrome_2