Commit 05b2041e30f6f0d01abf3275f9e228ed4195523a
1 parent
a6c9d8c1
Exists in
master
and in
5 other branches
Atualizando gerador de runtime
Showing
1 changed file
with
44 additions
and
28 deletions
Show diff stats
makegtkruntime.sh.in
... | ... | @@ -9,30 +9,41 @@ TARGET_PATH=".bin/gtkruntime" |
9 | 9 | rm -fr "$TARGET_PATH/*" |
10 | 10 | mkdir -p "$TARGET_PATH" |
11 | 11 | |
12 | +copyFile() { | |
13 | + | |
14 | + GTKPATH=$(find "$GTK_PREFIX/bin" -name "$1") | |
15 | + SYSPATH=$(find "/bin" -name "$1") | |
16 | + | |
17 | + if [ ! -z "$GTKPATH" ]; then | |
18 | + echo "$GTKPATH ..." | |
19 | + cp $GTKPATH "$TARGET_PATH" | |
20 | + if [ "$?" != "0" ]; then | |
21 | + echo "Can´t copy $GTKPATH" | |
22 | + return 1 | |
23 | + fi | |
24 | + elif [ ! -z "$SYSPATH" ]; then | |
25 | + echo "$SYSPATH ..." | |
26 | + cp $SYSPATH "$TARGET_PATH" | |
27 | + if [ "$?" != "0" ]; then | |
28 | + echo "Can´t copy $SYSPATH" | |
29 | + return 1 | |
30 | + fi | |
31 | + | |
32 | + else | |
33 | + echo "Can´t find $1" | |
34 | + return 1 | |
35 | + fi | |
36 | + | |
37 | + return 0 | |
38 | +} | |
39 | + | |
12 | 40 | copyFiles() { |
13 | 41 | |
14 | 42 | while read FILE |
15 | 43 | do |
16 | - GTKPATH=$(find "$GTK_PREFIX/bin" -name "$FILE") | |
17 | - SYSPATH=$(find "/bin" -name "$FILE") | |
18 | - | |
19 | - if [ ! -z "$GTKPATH" ]; then | |
20 | - echo "$GTKPATH ..." | |
21 | - cp $GTKPATH "$TARGET_PATH" | |
22 | - if [ "$?" != "0" ]; then | |
23 | - echo "Can´t copy $GTKPATH" | |
24 | - exit -1 | |
25 | - fi | |
26 | - elif [ ! -z "$SYSPATH" ]; then | |
27 | - echo "$SYSPATH ..." | |
28 | - cp $SYSPATH "$TARGET_PATH" | |
29 | - if [ "$?" != "0" ]; then | |
30 | - echo "Can´t copy $SYSPATH" | |
31 | - exit -1 | |
32 | - fi | |
33 | - | |
34 | - else | |
35 | - echo "Can´t find $FILE" | |
44 | + copyFile "$FILE" | |
45 | + if [ "$?" != "0" ]; then | |
46 | + exit -1 | |
36 | 47 | fi |
37 | 48 | done < $1 |
38 | 49 | rm -f $1 |
... | ... | @@ -78,7 +89,7 @@ libfreetype-6*.dll |
78 | 89 | zlib1.dll |
79 | 90 | libxml2-*.dll |
80 | 91 | libpixman-1*.dll |
81 | -libpng15-*.dll | |
92 | +libpng*.dll | |
82 | 93 | libgdk_pixbuf*.dll |
83 | 94 | libgio-*.dll |
84 | 95 | libjasper-*.dll |
... | ... | @@ -92,20 +103,22 @@ libpangowin32-1*.dll |
92 | 103 | libatk-*.dll |
93 | 104 | libcrypto-*.dll |
94 | 105 | libssl-*.dll |
95 | -libgcc_s_sjlj-1.dll | |
96 | -libgcc_s_seh-1.dll | |
97 | 106 | libharfbuzz-0.dll |
98 | -icule51.dll | |
99 | -icuuc51.dll | |
100 | -icudata51.dll | |
101 | 107 | libstdc++-6.dll |
108 | +icule53.dll | |
109 | +icuuc53.dll | |
110 | +icudata53.dll | |
102 | 111 | libgraphite2.dll |
103 | -gspawn-win32-helper-console.exe | |
104 | -gspawn-win32-helper.exe | |
112 | +gspawn-win*-helper-console.exe | |
113 | +gspawn-win*-helper.exe | |
105 | 114 | gdk-pixbuf-query-loaders.exe |
106 | 115 | EOF |
107 | 116 | copyFiles $TEMPFILE |
108 | 117 | |
118 | +# Copy optional files | |
119 | +copyFile libgcc_s_sjlj-1.dll | |
120 | +copyFile libgcc_s_seh-1.dll | |
121 | + | |
109 | 122 | # Build locale dirs |
110 | 123 | cat > $TEMPFILE << EOF |
111 | 124 | atk10.mo |
... | ... | @@ -247,3 +260,6 @@ if [ "$GTK_VERSION" == "gtk+-3.0" ]; then |
247 | 260 | else |
248 | 261 | gtk2 |
249 | 262 | fi |
263 | + | |
264 | +echo $0 Complete | |
265 | + | ... | ... |