Download as
Browse Code »

Commit 5f11358cdde1f0f74e500294f75000915baa7c4c

Authored by Perry Werneck
1 parent 1d93890b
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Atualizando empacotamento windows.

Showing 5 changed files with 263 additions and 360 deletions   Show diff stats
@@ -389,6 +389,7 @@ AC_CONFIG_FILES(sdk/pw3270.pc) @@ -389,6 +389,7 @@ AC_CONFIG_FILES(sdk/pw3270.pc)
389 AC_CONFIG_FILES(sdk/Makefile) 389 AC_CONFIG_FILES(sdk/Makefile)
390 390
391 AC_CONFIG_FILES(Makefile) 391 AC_CONFIG_FILES(Makefile)
  392 +AC_CONFIG_FILES(versions)
392 393
393 dnl --------------------------------------------------------------------------- 394 dnl ---------------------------------------------------------------------------
394 dnl Output the generated config.status script. 395 dnl Output the generated config.status script.
locale/pw3270.pot
  Diff comments   View file @5f11358
@@ -9,7 +9,7 @@ msgstr "" @@ -9,7 +9,7 @@ msgstr ""
9 "#-#-#-#-# lib3270.pot (PACKAGE VERSION) #-#-#-#-#\n" 9 "#-#-#-#-# lib3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
10 "Project-Id-Version: PACKAGE VERSION\n" 10 "Project-Id-Version: PACKAGE VERSION\n"
11 "Report-Msgid-Bugs-To: \n" 11 "Report-Msgid-Bugs-To: \n"
12 -"POT-Creation-Date: 2017-01-31 17:38-0200\n" 12 +"POT-Creation-Date: 2017-02-01 09:23-0200\n"
13 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 13 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
14 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 14 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
15 "Language-Team: LANGUAGE <LL@li.org>\n" 15 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,7 +20,7 @@ msgstr &quot;&quot; @@ -20,7 +20,7 @@ msgstr &quot;&quot;
20 "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n" 20 "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
21 "Project-Id-Version: PACKAGE VERSION\n" 21 "Project-Id-Version: PACKAGE VERSION\n"
22 "Report-Msgid-Bugs-To: \n" 22 "Report-Msgid-Bugs-To: \n"
23 -"POT-Creation-Date: 2017-01-31 17:38-0200\n" 23 +"POT-Creation-Date: 2017-02-01 09:23-0200\n"
24 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 24 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
25 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 25 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
26 "Language-Team: LANGUAGE <LL@li.org>\n" 26 "Language-Team: LANGUAGE <LL@li.org>\n"
  1 +PACKAGE=@PACKAGE@
  2 +PACKAGE_NAME=@PACKAGE_NAME@
1 PACKAGE_VERSION=@PACKAGE_VERSION@ 3 PACKAGE_VERSION=@PACKAGE_VERSION@
2 -PACKAGE_REVISION=@PACKAGE_REVISION@  
3 -PACKAGE_SOURCE=@PACKAGE_SOURCE@  
4 -PACKAGE_LEVEL=@PACKAGE_LEVEL@  
5 GTK_MODVERSION=@GTK_MODVERSION@ 4 GTK_MODVERSION=@GTK_MODVERSION@
6 host_cpu=@host_cpu@ 5 host_cpu=@host_cpu@
7 6
win/pack.sh 0 → 100755
  Diff comments   View file @5f11358
@@ -0,0 +1,258 @@ @@ -0,0 +1,258 @@
  1 +#!/bin/bash
  2 +myDIR=$(dirname $(readlink -f $0))
  3 +
  4 +cleanup()
  5 +{
  6 + #
  7 + # Apaga diretorio temporário caso o script seja interrompido
  8 + #
  9 + cd ${myDIR}
  10 + rm -fr ${TEMPDIR}
  11 + rm -fr ${RUNTIMEDIR}
  12 + exit -1
  13 +}
  14 +
  15 +failed()
  16 +{
  17 + echo -e "\e]2;Failed!\a"
  18 + echo $1
  19 + cleanup
  20 +}
  21 +
  22 +
  23 +#
  24 +# Gera pacote windows
  25 +#
  26 +# $1 = Arquitetura (x86_32/x86_64)
  27 +#
  28 +build()
  29 +{
  30 + cd $(dirname $myDIR)
  31 + echo -e "\e]2;${1}\a"
  32 +
  33 + case ${1} in
  34 + x86_32)
  35 + host=i686-w64-mingw32
  36 + host_cpu=i686
  37 + prefix=/usr/i686-w64-mingw32/sys-root/mingw
  38 + tools=i686-w64-mingw32
  39 + ;;
  40 +
  41 + x86_64)
  42 + host=x86_64-w64-mingw32
  43 + host_cpu=x86_64
  44 + prefix=/usr/x86_64-w64-mingw32/sys-root/mingw
  45 + tools=x86_64-w64-mingw32
  46 + ;;
  47 +
  48 + *)
  49 + failed "Arquitetura desconhecida: ${1}"
  50 +
  51 + esac
  52 +
  53 + export HOST_CC=/usr/bin/gcc
  54 + export cache=${1}.cache
  55 +
  56 + ./configure \
  57 + --host=${host} \
  58 + --prefix=${prefix} \
  59 + --libdir=${prefix}/lib
  60 +
  61 + if [ "$?" != "0" ]; then
  62 + failed "Erro ao configurar"
  63 + fi
  64 +
  65 + . ./versions
  66 + echo -e "\e]2;${PACKAGE_NAME} - ${1}\a"
  67 +
  68 + make clean
  69 + rm -f *.exe
  70 +
  71 + make all
  72 + if [ "$?" != "0" ]; then
  73 + failed "Erro ao compilar fontes"
  74 + fi
  75 +
  76 + rm -f ./win/*.exe
  77 +
  78 + makensis ./win/pw3270.nsi
  79 + if [ "$?" != "0" ]; then
  80 + failed "Erro ao gerar instalador sem runtime"
  81 + fi
  82 +
  83 + if [ "${COMPLETE}" == "1" ]; then
  84 + chmod +x ./win/makegtkruntime.sh
  85 + ./win/makegtkruntime.sh
  86 + makensis -DWITHGTK ./win/pw3270.nsi
  87 + if [ "$?" != "0" ]; then
  88 + failed "Erro ao gerar instalador com runtime"
  89 + fi
  90 + fi
  91 +
  92 + mkdir -p ${DESTDIR}/${PACKAGE_NAME}/${1}
  93 + mv -f ./win/*.exe ${DESTDIR}/${PACKAGE_NAME}/${1}
  94 + if [ "$?" != "0" ]; then
  95 + failed "Erro ao copiar pacotes de instalação"
  96 + fi
  97 +
  98 + make clean
  99 + rm -fr .bin
  100 +
  101 +}
  102 +
  103 +TEMPDIR=$(mktemp -d)
  104 +ARCHS="x86_32 x86_64"
  105 +DESTDIR=${HOME}/public_html/win
  106 +RUNTIME=0
  107 +COMPLETE=0
  108 +
  109 +rm -f ${myDIR}/*.exe \
  110 + ${myDIR}/*.zip
  111 +
  112 +trap cleanup INT
  113 +
  114 +until [ -z "$1" ]
  115 +do
  116 + if [ ${1:0:2} = '--' ]; then
  117 + tmp=${1:2}
  118 + parameter=${tmp%%=*}
  119 + parameter=$(echo $parameter | tr "[:lower:]" "[:upper:]")
  120 +
  121 + case $parameter in
  122 +
  123 + 32)
  124 + ARCHS="x86_32"
  125 + ;;
  126 +
  127 + 64)
  128 + ARCHS="x86_64"
  129 + ;;
  130 +
  131 + FULL)
  132 + COMPLETE=1
  133 + ;;
  134 +
  135 + RT)
  136 + RUNTIME=1
  137 + ;;
  138 +
  139 + OUT)
  140 + DESTDIR=$value
  141 + ;;
  142 +
  143 + ARCH)
  144 + value=${tmp##*=}
  145 + ARCHS=$value
  146 + ;;
  147 +
  148 + *)
  149 + value=${tmp##*=}
  150 + eval $parameter=$value
  151 + esac
  152 +
  153 + fi
  154 +
  155 + shift
  156 +done
  157 +
  158 +# Configura
  159 +aclocal
  160 +if [ "$?" != "0" ]; then
  161 + exit -1
  162 +fi
  163 +
  164 +autoconf
  165 +if [ "$?" != "0" ]; then
  166 + exit -1
  167 +fi
  168 +
  169 +# Gera pacotes
  170 +for i in ${ARCHS}; do
  171 +
  172 + build "${i}"
  173 +
  174 +done
  175 +
  176 +if [ "${RUNTIME}" == "1" ]; then
  177 +
  178 + echo -e "\e]2;Baixando runtime\a"
  179 +
  180 + #
  181 + # Puxo scripts de construção do GTK direto da sourceforge.
  182 + #
  183 + cd ${RUNTIMEDIR}
  184 + git clone http://git.code.sf.net/p/gtk3win/code .
  185 + if [ "$?" != "0" ]; then
  186 + exit -1
  187 + fi
  188 +
  189 + for i in ${ARCHS}; do
  190 +
  191 + echo -e "\e]2;gtk-runtime-${i}\a"
  192 +
  193 + case ${i} in
  194 + x86_32)
  195 + host_cpu=i686
  196 + ./win32.sh
  197 + if [ "$?" != "0" ]; then
  198 + exit -1
  199 + fi
  200 + ;;
  201 +
  202 + x86_64)
  203 + host_cpu=x86_64
  204 + ./win64.sh
  205 + if [ "$?" != "0" ]; then
  206 + exit -1
  207 + fi
  208 + ;;
  209 +
  210 + *)
  211 + echo "Arquitetura desconhecida ${i}"
  212 + exit -1
  213 +
  214 + esac
  215 +
  216 + rm -f gtk-runtime-*-${host_cpu}.exe
  217 +
  218 +
  219 + chmod +x ./makeruntime.sh
  220 +
  221 + ./makeruntime.sh
  222 + if [ "$?" != "0" ]; then
  223 + exit -1
  224 + fi
  225 +
  226 + # Copia o pacote gerado
  227 + FILENAME=$(find . -maxdepth 1 -name "gtk-runtime-*-${host_cpu}.exe" | head --lines 1)
  228 +
  229 + mkdir -p ${DESTDIR}/${host_cpu}
  230 +
  231 + mv gtk-runtime-*-${host_cpu}.exe ${DESTDIR}/${host_cpu}
  232 + if [ "$?" != "0" ]; then
  233 + failed "Erro ao copiar instalador"
  234 + fi
  235 +
  236 + ln -sf $(basename ${FILENAME}) "${DESTDIR}/${host_cpu}/gtk-runtime-latest-${host_cpu}.exe"
  237 + if [ "$?" != "0" ]; then
  238 + failed "Erro ao criar o link simbólico"
  239 + fi
  240 +
  241 + done
  242 +
  243 +fi
  244 +
  245 +cd $myDIR
  246 +rm -fr ${TEMPDIR}
  247 +rm -fr ${RUNTIMEDIR}
  248 +
  249 +# Gera pacotes para envio ao SPB
  250 +#zip -9 -r -j ${DESTDIR}/${PACKAGE}-latest.zip \
  251 +# ${DESTDIR}/${PACKAGE}/x86_32/${PACKAGE_NAME}-with-gtk-latest-i686.exe \
  252 +# ${DESTDIR}/${PACKAGE}/x86_64/${PACKAGE_NAME}-with-gtk-latest-x86_64.exe
  253 +
  254 +echo -e "\e]2;Success!\a"
  255 +
  256 +
  257 +
  258 +
win/winpacket.sh
View file @1d93890
@@ -1,355 +0,0 @@ @@ -1,355 +0,0 @@
1 -#!/bin/bash  
2 -  
3 -PACKAGE_NAME="pw3270"  
4 -  
5 -cleanup()  
6 -{  
7 - #  
8 - # Apaga diretorio temporário caso o script seja interrompido  
9 - #  
10 - cd ${myDIR}  
11 - rm -fr ${TEMPDIR}  
12 - rm -fr ${RUNTIMEDIR}  
13 - exit -1  
14 -}  
15 -  
16 -failed()  
17 -{  
18 - echo -e "\e]2;Failed!\a"  
19 - echo $1  
20 - cleanup  
21 -}  
22 -  
23 -#  
24 -# Copia pacote gerado  
25 -#  
26 -# $1 = Arquitetura (i686/x86_64)  
27 -# $2 = Tipo do link  
28 -#  
29 -CopyPacket()  
30 -{  
31 - #  
32 - # Primeiro move a versão baseada no runtime  
33 - #  
34 - FILENAME=$(find nsi -maxdepth 1 -name "${PACKAGE_NAME}-*-requires-gtk-*-${1}.exe" | head --lines 1)  
35 -  
36 - if [ ! -z ${FILENAME} ]; then  
37 -  
38 - mkdir -p ${DESTDIR}/${1}  
39 -  
40 - echo "Copiando ${FILENAME} para ${DESTDIR}/${1}"  
41 -  
42 - mv "${FILENAME}" "${DESTDIR}/${1}"  
43 - if [ "$?" != "0" ]; then  
44 - echo "src=${FILENAME}"  
45 - echo "dst=${DESTDIR}/${1}"  
46 - failed "Erro ao copiar instalador sem o runtime"  
47 - fi  
48 -  
49 - #  
50 - # Cria link do pacote sem GTK para "latest"  
51 - #  
52 - ln -sf $(basename ${FILENAME}) ${DESTDIR}/${1}/${PACKAGE_NAME}-without-gtk-${2}-${1}.exe  
53 - if [ "$?" != "0" ]; then  
54 - failed "Erro ao criar o link simbólico"  
55 - fi  
56 -  
57 -  
58 - fi  
59 -  
60 - #  
61 - # Depois copia o pacote completo  
62 - #  
63 - FILENAME=$(find nsi -maxdepth 1 -name "${PACKAGE_NAME}-*-gtk-*-${1}.exe" | head --lines 1)  
64 -  
65 - if [ ! -z ${FILENAME} ]; then  
66 -  
67 - mkdir -p ${DESTDIR}/${1}  
68 -  
69 - echo "Copiando ${FILENAME} para ${DESTDIR}/${1}"  
70 -  
71 - mv "${FILENAME}" "${DESTDIR}/${1}"  
72 - if [ "$?" != "0" ]; then  
73 - echo "src=${FILENAME}"  
74 - echo "dst=${DESTDIR}/${1}"  
75 - failed "Erro ao copiar instalador completo"  
76 - fi  
77 -  
78 - #  
79 - # Cria link do pacote completo para "latest"  
80 - #  
81 - ln -sf $(basename ${FILENAME}) ${DESTDIR}/${1}/${PACKAGE_NAME}-with-gtk-${2}-${1}.exe  
82 - if [ "$?" != "0" ]; then  
83 - failed "Erro ao criar o link simbólico"  
84 - fi  
85 -  
86 - fi  
87 -  
88 -}  
89 -  
90 -  
91 -#  
92 -# Gera pacote windows  
93 -#  
94 -# $1 = Arquitetura (x86_32/x86_64)  
95 -#  
96 -build()  
97 -{  
98 - echo -e "\e]2;${PACKAGE_NAME}-${1}\a"  
99 -  
100 - case ${1} in  
101 - x86_32)  
102 - host=i686-w64-mingw32  
103 - host_cpu=i686  
104 - prefix=/usr/i686-w64-mingw32/sys-root/mingw  
105 - tools=i686-w64-mingw32  
106 - ;;  
107 -  
108 - x86_64)  
109 - host=x86_64-w64-mingw32  
110 - host_cpu=x86_64  
111 - prefix=/usr/x86_64-w64-mingw32/sys-root/mingw  
112 - tools=x86_64-w64-mingw32  
113 - ;;  
114 -  
115 -  
116 - *)  
117 - failed "Arquitetura desconhecida: ${1}"  
118 -  
119 - esac  
120 -  
121 - # Detecto argumentos  
122 - ARGS=""  
123 -  
124 - REXXCONFIG=$(which ${tools}-oorexx-config)  
125 - if [ -z ${REXXCONFIG} ]; then  
126 - echo "Desabilitando suporte ooRexx"  
127 - ARGS="${ARGS} --disable-rexx"  
128 - fi  
129 -  
130 - ./configure \  
131 - --cache-file=.${1}.cache \  
132 - --host=${host} \  
133 - --prefix=${prefix} \  
134 - --disable-python \  
135 - ${ARGS}  
136 -  
137 - if [ "$?" != "0" ]; then  
138 - failed "Erro ao configurar"  
139 - fi  
140 -  
141 - make clean  
142 - rm -f *.exe  
143 -  
144 - make -C nsi ${PACKAGE_NAME}-${host_cpu}.nsi  
145 - if [ "$?" != "0" ]; then  
146 - failed "Erro ao gerar script de empacotamento windows"  
147 - fi  
148 -  
149 - make Release  
150 - if [ "$?" != "0" ]; then  
151 - failed "Erro ao compilar fontes"  
152 - fi  
153 -  
154 - ln -sf .${prefix}/share/locale .bin/Release/locale  
155 - if [ "$?" != "0" ]; then  
156 - failed "Erro ao criar link para traduções"  
157 - fi  
158 -  
159 - if [ "${COMPLETE}" != "0" ]; then  
160 -  
161 - # Gera pacote completo  
162 -  
163 - chmod +x makegtkruntime.sh  
164 - ./makegtkruntime.sh  
165 - if [ "$?" != "0" ]; then  
166 - failed "Erro ao construir runtime gtk"  
167 - fi  
168 -  
169 - echo -e "\e]2;${PACKAGE_NAME}-install-${host_cpu}.exe\a"  
170 - make -C nsi package  
171 - if [ "$?" != "0" ]; then  
172 - failed "Erro ao gerar pacote windows"  
173 - fi  
174 -  
175 - fi  
176 -  
177 - if [ "${RUNTIME}" != "0" ]; then  
178 -  
179 - make -C nsi package-no-gtk  
180 - if [ "$?" != "0" ]; then  
181 - failed "Erro ao gerar pacote windows"  
182 - fi  
183 -  
184 - fi  
185 -  
186 - CopyPacket ${host_cpu} "latest"  
187 -  
188 - make clean  
189 - rm -f *.exe  
190 -  
191 -}  
192 -  
193 -myDIR=$(readlink -f $(dirname $0))  
194 -TEMPDIR=$(mktemp -d)  
195 -DESTDIR=${HOME}/public_html/win  
196 -RUNTIMEDIR=$(mktemp -d)  
197 -ARCHS="x86_32 x86_64"  
198 -RUNTIME=1  
199 -COMPLETE=1  
200 -  
201 -find . -exec touch {} \;  
202 -  
203 -trap cleanup INT  
204 -  
205 -until [ -z "$1" ]  
206 -do  
207 - if [ ${1:0:2} = '--' ]; then  
208 - tmp=${1:2}  
209 - parameter=${tmp%%=*}  
210 - parameter=$(echo $parameter | tr "[:lower:]" "[:upper:]")  
211 -  
212 - case $parameter in  
213 -  
214 - 32)  
215 - ARCHS="x86_32"  
216 - ;;  
217 -  
218 - 64)  
219 - ARCHS="x86_64"  
220 - ;;  
221 -  
222 - FULL)  
223 - RUNTIME=0  
224 - COMPLETE=1  
225 - ;;  
226 -  
227 - RT)  
228 - RUNTIME=1  
229 - COMPLETE=0  
230 - ;;  
231 -  
232 - NAME)  
233 - PACKAGE_NAME=$value  
234 - ;;  
235 -  
236 - OUT)  
237 - DESTDIR=$value  
238 - ;;  
239 -  
240 - ARCH)  
241 - value=${tmp##*=}  
242 - ARCHS=$value  
243 - ;;  
244 -  
245 - *)  
246 - value=${tmp##*=}  
247 - eval $parameter=$value  
248 - esac  
249 -  
250 - fi  
251 -  
252 - shift  
253 -done  
254 -  
255 -# Configura  
256 -aclocal  
257 -if [ "$?" != "0" ]; then  
258 - exit -1  
259 -fi  
260 -  
261 -autoconf  
262 -if [ "$?" != "0" ]; then  
263 - exit -1  
264 -fi  
265 -  
266 -# Gera pacotes  
267 -for i in ${ARCHS}; do  
268 -  
269 - build "${i}"  
270 -  
271 -done  
272 -  
273 -if [ "${RUNTIME}" == "1" ]; then  
274 -  
275 - echo -e "\e]2;Baixando runtime\a"  
276 -  
277 - #  
278 - # Puxo scripts de construção do GTK direto da sourceforge.  
279 - #  
280 - cd ${RUNTIMEDIR}  
281 - git clone http://git.code.sf.net/p/gtk3win/code .  
282 - if [ "$?" != "0" ]; then  
283 - exit -1  
284 - fi  
285 -  
286 - for i in ${ARCHS}; do  
287 -  
288 - echo -e "\e]2;gtk-runtime-${i}\a"  
289 -  
290 - case ${i} in  
291 - x86_32)  
292 - host_cpu=i686  
293 - ./win32.sh  
294 - if [ "$?" != "0" ]; then  
295 - exit -1  
296 - fi  
297 - ;;  
298 -  
299 - x86_64)  
300 - host_cpu=x86_64  
301 - ./win64.sh  
302 - if [ "$?" != "0" ]; then  
303 - exit -1  
304 - fi  
305 - ;;  
306 -  
307 - *)  
308 - echo "Arquitetura desconhecida ${i}"  
309 - exit -1  
310 -  
311 - esac  
312 -  
313 - rm -f gtk-runtime-*-${host_cpu}.exe  
314 -  
315 -  
316 - chmod +x ./makeruntime.sh  
317 -  
318 - ./makeruntime.sh  
319 - if [ "$?" != "0" ]; then  
320 - exit -1  
321 - fi  
322 -  
323 - # Copia o pacote gerado  
324 - FILENAME=$(find . -maxdepth 1 -name "gtk-runtime-*-${host_cpu}.exe" | head --lines 1)  
325 -  
326 - mkdir -p ${DESTDIR}/${host_cpu}  
327 -  
328 - mv gtk-runtime-*-${host_cpu}.exe ${DESTDIR}/${host_cpu}  
329 - if [ "$?" != "0" ]; then  
330 - failed "Erro ao copiar instalador"  
331 - fi  
332 -  
333 - ln -sf $(basename ${FILENAME}) "${DESTDIR}/${host_cpu}/gtk-runtime-latest-${host_cpu}.exe"  
334 - if [ "$?" != "0" ]; then  
335 - failed "Erro ao criar o link simbólico"  
336 - fi  
337 -  
338 - done  
339 -  
340 -fi  
341 -  
342 -cd $myDIR  
343 -rm -fr ${TEMPDIR}  
344 -rm -fr ${RUNTIMEDIR}  
345 -  
346 -# Gera pacotes para envio ao SPB  
347 -zip -9 -r -j ${HOME}/public_html/win/${PACKAGE_NAME}-latest.zip \  
348 - ${HOME}/public_html/win/x86_32/${PACKAGE_NAME}-with-gtk-latest-i686.exe \  
349 - ${HOME}/public_html/win/x86_64/${PACKAGE_NAME}-with-gtk-latest-x86_64.exe  
350 -  
351 -echo -e "\e]2;Success!\a"  
352 -  
353 -  
354 -  
355 -