diff options
author | Gustavo Sverzut Barbieri <barbieri@gmail.com> | 2013-01-04 20:55:12 +0000 |
---|---|---|
committer | Gustavo Sverzut Barbieri <barbieri@gmail.com> | 2013-01-04 20:55:12 +0000 |
commit | 2b29626d8d5aa47119759d0ef1d0876674f06254 (patch) | |
tree | 13622da45e0f86f8fde5bc8d50e953e958495691 /src/static_libs | |
parent | 7abf31c88264c2a7692ce61c7985bc49e979163e (diff) | |
download | efl-2b29626d8d5aa47119759d0ef1d0876674f06254.tar.gz |
efl: fix make dist.
Carefully compared 'svn export' and 'make dist' results and couple of
files were missing.
Changes:
* Makefile.am: removed all .pc from EXTRA_DIST, we shouldn't
distribute them here as they will contain ./configure data such as
install location.
* src/Makefile.am: moved all if-endif to files, otherwise EXTRA_DIST
won't work properly. We must EXTRA_DIST outside of the if-endif
block.
* static_libs/liblinebreak: removed couple of unused files.
SVN revision: 82241
Diffstat (limited to 'src/static_libs')
-rw-r--r-- | src/static_libs/liblinebreak/LineBreak1.sed | 1 | ||||
-rw-r--r-- | src/static_libs/liblinebreak/LineBreak2.sed | 2 | ||||
-rw-r--r-- | src/static_libs/liblinebreak/filter_dup.c | 48 | ||||
-rwxr-xr-x | src/static_libs/liblinebreak/gen_linebreak_data.sh | 11 | ||||
-rwxr-xr-x | src/static_libs/liblinebreak/gen_wordbreak_data.sh | 25 | ||||
-rw-r--r-- | src/static_libs/liblinebreak/linebreakdata1.tmpl | 1 | ||||
-rw-r--r-- | src/static_libs/liblinebreak/linebreakdata2.tmpl | 7 | ||||
-rw-r--r-- | src/static_libs/liblinebreak/linebreakdata3.tmpl | 2 | ||||
-rwxr-xr-x | src/static_libs/liblinebreak/sort_numeric_hex.py | 6 |
9 files changed, 0 insertions, 103 deletions
diff --git a/src/static_libs/liblinebreak/LineBreak1.sed b/src/static_libs/liblinebreak/LineBreak1.sed deleted file mode 100644 index 1be9651f3f..0000000000 --- a/src/static_libs/liblinebreak/LineBreak1.sed +++ /dev/null @@ -1 +0,0 @@ -s/\(^[0-9A-F.]\{1,\};[A-Z][A-Z0-9]\) #.*/\1/p diff --git a/src/static_libs/liblinebreak/LineBreak2.sed b/src/static_libs/liblinebreak/LineBreak2.sed deleted file mode 100644 index 81659585ab..0000000000 --- a/src/static_libs/liblinebreak/LineBreak2.sed +++ /dev/null @@ -1,2 +0,0 @@ -s/^\([0-9A-F]\{1,\}\);/\1..\1;/ -s/^\([0-9A-F]\{1,\}\)\.\.\([0-9A-F]\{1,\}\);\([A-Z][A-Z0-9]\)/ { 0x\1, 0x\2, LBP_\3 },/ diff --git a/src/static_libs/liblinebreak/filter_dup.c b/src/static_libs/liblinebreak/filter_dup.c deleted file mode 100644 index 1d1d7936ab..0000000000 --- a/src/static_libs/liblinebreak/filter_dup.c +++ /dev/null @@ -1,48 +0,0 @@ -#include <stdio.h> -#include <string.h> - -int main() -{ - char s[80]; - char beg[16]; - char end[16]; - char prop[16]; - char lastbeg[16]; - char lastend[16]; - char lastprop[16]; - lastprop[0] = 0; - for (;;) - { - if (fgets(s, sizeof s, stdin) == NULL) - break; - if (strstr(s, "LBP_") == NULL || strstr(s, "LBP_Undef") != NULL) - { - if (lastprop[0]) - { - printf("\t{ %s %s %s },\n", lastbeg, lastend, lastprop); - lastprop[0] = 0; - } - printf("%s", s); - continue; - } - sscanf(s, "\t{ %s %s %s }", beg, end, prop); - /*printf("==>\t{ \"%s\" \"%s\" \"%s\" },\n", beg, end, prop);*/ - if (lastprop[0] && strcmp(lastprop, prop) != 0) - { - printf("\t{ %s %s %s },\n", lastbeg, lastend, lastprop); - lastprop[0] = 0; - } - if (lastprop[0] == 0) - { - strcpy(lastbeg, beg); - strcpy(lastprop, prop); - } - strcpy(lastend, end); - } - if (lastprop[0]) - { - printf("\t{ %s %s %s },\n", lastbeg, lastend, prop); - } - return 0; -} - diff --git a/src/static_libs/liblinebreak/gen_linebreak_data.sh b/src/static_libs/liblinebreak/gen_linebreak_data.sh deleted file mode 100755 index e396db26f4..0000000000 --- a/src/static_libs/liblinebreak/gen_linebreak_data.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -if [ ! -f "LineBreak.txt" ]; then - wget http://unicode.org/Public/UNIDATA/LineBreak.txt -fi - -sed -n -f LineBreak1.sed LineBreak.txt > tmp.txt -sed -f LineBreak2.sed tmp.txt | ./filter_dup > tmp.c -head -2 LineBreak.txt > tmp.txt -cat linebreakdata1.tmpl tmp.txt linebreakdata2.tmpl tmp.c linebreakdata3.tmpl > linebreakdata.c -rm tmp.txt tmp.c - diff --git a/src/static_libs/liblinebreak/gen_wordbreak_data.sh b/src/static_libs/liblinebreak/gen_wordbreak_data.sh deleted file mode 100755 index 7c84de22b6..0000000000 --- a/src/static_libs/liblinebreak/gen_wordbreak_data.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -FNAME="WordBreakProperty.txt"; -if [ ! -f ${FNAME} ]; then - wget http://www.unicode.org/Public/UNIDATA/auxiliary/WordBreakProperty.txt -fi - -# -sed -n 's/\(^[0-9A-F.]\+\)/\1/p' ${FNAME} > tmp.txt -sed -i 's/^\([0-9A-F]\+\)\s\+/\1..\1/' tmp.txt -sort --numeric-sort tmp.txt > tmp2.txt -./sort_numeric_hex.py tmp2.txt > tmp.txt -rm tmp2.txt -sed -i -n 's/^\([0-9A-F]\+\)..\([0-9A-F]\+\)\s*;\s*\([A-Za-z]\+\).*$/\t{0x\1, 0x\2, WBP_\3},/p' tmp.txt - -echo "/* The content of this file is generated from:" > wordbreakdata.x -head -2 ${FNAME} >> wordbreakdata.x -echo "*/" >> wordbreakdata.x -echo '#include "linebreak.h"' >> wordbreakdata.x -echo '#include "wordbreakdef.h"' >> wordbreakdata.x -echo "static struct WordBreakProperties wb_prop_default[] = {" >> wordbreakdata.x -cat tmp.txt >> wordbreakdata.x -echo " {0xFFFFFFFF, 0xFFFFFFFF, WBP_Undefined}" >> wordbreakdata.x -echo "};" >> wordbreakdata.x -rm tmp.txt - diff --git a/src/static_libs/liblinebreak/linebreakdata1.tmpl b/src/static_libs/liblinebreak/linebreakdata1.tmpl deleted file mode 100644 index df06125021..0000000000 --- a/src/static_libs/liblinebreak/linebreakdata1.tmpl +++ /dev/null @@ -1 +0,0 @@ -/* The content of this file is generated from: diff --git a/src/static_libs/liblinebreak/linebreakdata2.tmpl b/src/static_libs/liblinebreak/linebreakdata2.tmpl deleted file mode 100644 index 60d0d37758..0000000000 --- a/src/static_libs/liblinebreak/linebreakdata2.tmpl +++ /dev/null @@ -1,7 +0,0 @@ -*/ - -#include "linebreak.h" -#include "linebreakdef.h" - -/** Default line breaking properties as from the Unicode Web site. */ -struct LineBreakProperties lb_prop_default[] = { diff --git a/src/static_libs/liblinebreak/linebreakdata3.tmpl b/src/static_libs/liblinebreak/linebreakdata3.tmpl deleted file mode 100644 index a77017c0d7..0000000000 --- a/src/static_libs/liblinebreak/linebreakdata3.tmpl +++ /dev/null @@ -1,2 +0,0 @@ - { 0xFFFFFFFF, 0xFFFFFFFF, LBP_Undefined } -}; diff --git a/src/static_libs/liblinebreak/sort_numeric_hex.py b/src/static_libs/liblinebreak/sort_numeric_hex.py deleted file mode 100755 index a16d0f38c8..0000000000 --- a/src/static_libs/liblinebreak/sort_numeric_hex.py +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env python2 -import sys - -lines = open(sys.argv[1]).readlines() -lines_out = sorted(lines, key=lambda line: int(line.split("..")[0], 16)) -map(sys.stdout.write, lines_out) |