Commit cd66a2adf214c3b8bb48f104fd1641f2ebef3025
1 parent
73409a6e
Exists in
master
and in
5 other branches
Atualizando processo de empacotamento.
Showing
5 changed files
with
119 additions
and
92 deletions
Show diff stats
configure.ac
@@ -165,6 +165,11 @@ dnl --------------------------------------------------------------------------- | @@ -165,6 +165,11 @@ dnl --------------------------------------------------------------------------- | ||
165 | dnl Version info | 165 | dnl Version info |
166 | dnl --------------------------------------------------------------------------- | 166 | dnl --------------------------------------------------------------------------- |
167 | 167 | ||
168 | +AC_ARG_WITH([revision], [AS_HELP_STRING([--with-revision], [Set revision])], [ app_cv_revision="$withval" ],[ app_cv_revision="`date +%Y%m%d`" ]) | ||
169 | + | ||
170 | +AC_DEFINE_UNQUOTED(PACKAGE_REVISION, $app_cv_revision) | ||
171 | +AC_SUBST(PACKAGE_REVISION,$app_cv_revision) | ||
172 | + | ||
168 | app_vrs_major=$(echo $VERSION | cut -d. -f1) | 173 | app_vrs_major=$(echo $VERSION | cut -d. -f1) |
169 | app_vrs_minor=$(echo $VERSION | cut -d. -f2) | 174 | app_vrs_minor=$(echo $VERSION | cut -d. -f2) |
170 | 175 |
locale/pw3270.pot
@@ -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-02-01 14:51-0200\n" | 12 | +"POT-Creation-Date: 2017-02-02 10:40-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 "" | @@ -20,7 +20,7 @@ msgstr "" | ||
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-02-01 14:51-0200\n" | 23 | +"POT-Creation-Date: 2017-02-02 10:40-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" |
src/pw3270/dialog.c
@@ -510,7 +510,7 @@ | @@ -510,7 +510,7 @@ | ||
510 | g_free(text); | 510 | g_free(text); |
511 | 511 | ||
512 | #ifdef PACKAGE_REVISION | 512 | #ifdef PACKAGE_REVISION |
513 | - text = g_strdup_printf(_("Version %s - Revision %s"),PACKAGE_VERSION,PACKAGE_REVISION); | 513 | + text = g_strdup_printf(_("Version %s - Revision %s"),PACKAGE_VERSION,G_STRINGIFY(PACKAGE_REVISION)); |
514 | #else | 514 | #else |
515 | text = g_strdup_printf(_("Version %s - Revision %08lx"),PACKAGE_VERSION,BUILD_DATE); | 515 | text = g_strdup_printf(_("Version %s - Revision %08lx"),PACKAGE_VERSION,BUILD_DATE); |
516 | #endif // PACKAGE_REVISION | 516 | #endif // PACKAGE_REVISION |
win/pack.sh
@@ -8,7 +8,6 @@ cleanup() | @@ -8,7 +8,6 @@ cleanup() | ||
8 | # | 8 | # |
9 | cd ${myDIR} | 9 | cd ${myDIR} |
10 | rm -fr ${TEMPDIR} | 10 | rm -fr ${TEMPDIR} |
11 | - rm -fr ${RUNTIMEDIR} | ||
12 | exit -1 | 11 | exit -1 |
13 | } | 12 | } |
14 | 13 | ||
@@ -76,24 +75,47 @@ build() | @@ -76,24 +75,47 @@ build() | ||
76 | 75 | ||
77 | rm -f ./win/*.exe | 76 | rm -f ./win/*.exe |
78 | 77 | ||
79 | - makensis ./win/pw3270.nsi | ||
80 | - if [ "$?" != "0" ]; then | ||
81 | - failed "Erro ao gerar instalador sem runtime" | 78 | + mkdir -p ${DESTDIR}/${PACKAGE_NAME}/${1} |
79 | + | ||
80 | + if [ "${RUNTIME}" == "1" ]; then | ||
81 | + | ||
82 | + makensis ./win/${PACKAGE}.nsi | ||
83 | + if [ "$?" != "0" ]; then | ||
84 | + failed "Erro ao gerar instalador sem gtk" | ||
85 | + fi | ||
86 | + | ||
87 | + mv -f ./win/${PACKAGE}-${PACKAGE_VERSION}-requires-gtk-${GTK_MODVERSION}-${host_cpu}.exe \ | ||
88 | + ${DESTDIR}/${PACKAGE_NAME}/${1} | ||
89 | + | ||
90 | + if [ "$?" != "0" ]; then | ||
91 | + failed "Erro ao copiar instalador sem gtk para ${1}" | ||
92 | + fi | ||
93 | + | ||
82 | fi | 94 | fi |
83 | 95 | ||
84 | if [ "${COMPLETE}" == "1" ]; then | 96 | if [ "${COMPLETE}" == "1" ]; then |
97 | + | ||
85 | chmod +x ./win/makegtkruntime.sh | 98 | chmod +x ./win/makegtkruntime.sh |
86 | ./win/makegtkruntime.sh | 99 | ./win/makegtkruntime.sh |
87 | - makensis -DWITHGTK ./win/pw3270.nsi | 100 | + |
101 | + makensis -DWITHGTK ./win/${PACKAGE}.nsi | ||
88 | if [ "$?" != "0" ]; then | 102 | if [ "$?" != "0" ]; then |
89 | failed "Erro ao gerar instalador com runtime" | 103 | failed "Erro ao gerar instalador com runtime" |
90 | fi | 104 | fi |
91 | - fi | ||
92 | 105 | ||
93 | - mkdir -p ${DESTDIR}/${PACKAGE_NAME}/${1} | ||
94 | - mv -f ./win/*.exe ${DESTDIR}/${PACKAGE_NAME}/${1} | ||
95 | - if [ "$?" != "0" ]; then | ||
96 | - failed "Erro ao copiar pacotes de instalação" | 106 | + mv -f ./win/${PACKAGE}-${PACKAGE_VERSION}-gtk-${GTK_MODVERSION}-${host_cpu}.exe \ |
107 | + ${DESTDIR}/${PACKAGE_NAME}/${1} | ||
108 | + | ||
109 | + if [ "$?" != "0" ]; then | ||
110 | + failed "Erro ao copiar instalador completo para ${1}" | ||
111 | + fi | ||
112 | + | ||
113 | + ln -sf ${1}/${PACKAGE}-${PACKAGE_VERSION}-gtk-${GTK_MODVERSION}-${host_cpu}.exe \ | ||
114 | + ${DESTDIR}/${PACKAGE_NAME}/${PACKAGE}-latest-${host_cpu}.exe | ||
115 | + | ||
116 | + if [ "$?" != "0" ]; then | ||
117 | + failed "Erro ao criar link para ${1}" | ||
118 | + fi | ||
97 | fi | 119 | fi |
98 | 120 | ||
99 | make clean | 121 | make clean |
@@ -131,9 +153,11 @@ do | @@ -131,9 +153,11 @@ do | ||
131 | 153 | ||
132 | FULL) | 154 | FULL) |
133 | COMPLETE=1 | 155 | COMPLETE=1 |
156 | + RUNTIME=1 | ||
134 | ;; | 157 | ;; |
135 | 158 | ||
136 | RT) | 159 | RT) |
160 | + COMPLETE=0 | ||
137 | RUNTIME=1 | 161 | RUNTIME=1 |
138 | ;; | 162 | ;; |
139 | 163 | ||
@@ -169,88 +193,86 @@ fi | @@ -169,88 +193,86 @@ fi | ||
169 | 193 | ||
170 | # Gera pacotes | 194 | # Gera pacotes |
171 | for i in ${ARCHS}; do | 195 | for i in ${ARCHS}; do |
172 | - | ||
173 | build "${i}" | 196 | build "${i}" |
174 | - | ||
175 | done | 197 | done |
176 | 198 | ||
177 | -if [ "${RUNTIME}" == "1" ]; then | ||
178 | - | ||
179 | - echo -e "\e]2;Baixando runtime\a" | ||
180 | - | ||
181 | - # | ||
182 | - # Puxo scripts de construção do GTK direto da sourceforge. | ||
183 | - # | ||
184 | - cd ${RUNTIMEDIR} | ||
185 | - git clone http://git.code.sf.net/p/gtk3win/code . | ||
186 | - if [ "$?" != "0" ]; then | ||
187 | - exit -1 | ||
188 | - fi | ||
189 | - | ||
190 | - for i in ${ARCHS}; do | ||
191 | - | ||
192 | - echo -e "\e]2;gtk-runtime-${i}\a" | ||
193 | - | ||
194 | - case ${i} in | ||
195 | - x86_32) | ||
196 | - host_cpu=i686 | ||
197 | - ./win32.sh | ||
198 | - if [ "$?" != "0" ]; then | ||
199 | - exit -1 | ||
200 | - fi | ||
201 | - ;; | ||
202 | - | ||
203 | - x86_64) | ||
204 | - host_cpu=x86_64 | ||
205 | - ./win64.sh | ||
206 | - if [ "$?" != "0" ]; then | ||
207 | - exit -1 | ||
208 | - fi | ||
209 | - ;; | ||
210 | - | ||
211 | - *) | ||
212 | - echo "Arquitetura desconhecida ${i}" | ||
213 | - exit -1 | ||
214 | - | ||
215 | - esac | ||
216 | - | ||
217 | - rm -f gtk-runtime-*-${host_cpu}.exe | ||
218 | - | ||
219 | - | ||
220 | - chmod +x ./makeruntime.sh | ||
221 | - | ||
222 | - ./makeruntime.sh | ||
223 | - if [ "$?" != "0" ]; then | ||
224 | - exit -1 | ||
225 | - fi | ||
226 | - | ||
227 | - # Copia o pacote gerado | ||
228 | - FILENAME=$(find . -maxdepth 1 -name "gtk-runtime-*-${host_cpu}.exe" | head --lines 1) | ||
229 | - | ||
230 | - mkdir -p ${DESTDIR}/${host_cpu} | ||
231 | - | ||
232 | - mv gtk-runtime-*-${host_cpu}.exe ${DESTDIR}/${host_cpu} | ||
233 | - if [ "$?" != "0" ]; then | ||
234 | - failed "Erro ao copiar instalador" | ||
235 | - fi | ||
236 | - | ||
237 | - ln -sf $(basename ${FILENAME}) "${DESTDIR}/${host_cpu}/gtk-runtime-latest-${host_cpu}.exe" | ||
238 | - if [ "$?" != "0" ]; then | ||
239 | - failed "Erro ao criar o link simbólico" | ||
240 | - fi | ||
241 | - | ||
242 | - done | ||
243 | - | ||
244 | -fi | 199 | +#if [ "${RUNTIME}" == "1" ]; then |
200 | +# | ||
201 | +# echo -e "\e]2;Baixando runtime\a" | ||
202 | +# | ||
203 | +# mkdir -p ${TEMPDIR}/runtime | ||
204 | +# cd ${TEMPDIR}/runtime | ||
205 | +# | ||
206 | +# # | ||
207 | +# # Puxo scripts de construção do GTK direto da sourceforge. | ||
208 | +# # | ||
209 | +# git clone http://git.code.sf.net/p/gtk3win/code . | ||
210 | +# if [ "$?" != "0" ]; then | ||
211 | +# echo "Erro ao baixar fontes do runtime" | ||
212 | +# exit -1 | ||
213 | +# fi | ||
214 | +# | ||
215 | +# for i in ${ARCHS}; do | ||
216 | +# | ||
217 | +# echo -e "\e]2;gtk-runtime-${i}\a" | ||
218 | +# | ||
219 | +# case ${i} in | ||
220 | +# x86_32) | ||
221 | +# host_cpu=i686 | ||
222 | +# ./win32.sh | ||
223 | +# if [ "$?" != "0" ]; then | ||
224 | +# exit -1 | ||
225 | +# fi | ||
226 | +# ;; | ||
227 | +# | ||
228 | +# x86_64) | ||
229 | +# host_cpu=x86_64 | ||
230 | +# ./win64.sh | ||
231 | +# if [ "$?" != "0" ]; then | ||
232 | +# exit -1 | ||
233 | +# fi | ||
234 | +# ;; | ||
235 | +# | ||
236 | +# *) | ||
237 | +# echo "Arquitetura desconhecida ${i}" | ||
238 | +# exit -1 | ||
239 | +# | ||
240 | +# esac | ||
241 | +# | ||
242 | +# chmod +x ./win/makeruntime.sh | ||
243 | +# | ||
244 | +# ./win/makeruntime.sh | ||
245 | +# if [ "$?" != "0" ]; then | ||
246 | +# exit -1 | ||
247 | +# fi | ||
248 | +# | ||
249 | +# # Copia o pacote gerado | ||
250 | +# FILENAME=$(find . -maxdepth 1 -name "gtk-runtime-*-${host_cpu}.exe" | head --lines 1) | ||
251 | +# | ||
252 | +# mkdir -p ${DESTDIR}/${host_cpu} | ||
253 | +# | ||
254 | +# mv gtk-runtime-*-${host_cpu}.exe ${DESTDIR}/${host_cpu} | ||
255 | +# if [ "$?" != "0" ]; then | ||
256 | +# failed "Erro ao copiar instalador" | ||
257 | +# fi | ||
258 | +# | ||
259 | +# ln -sf $(basename ${FILENAME}) "${DESTDIR}/${host_cpu}/gtk-runtime-latest-${host_cpu}.exe" | ||
260 | +# if [ "$?" != "0" ]; then | ||
261 | +# failed "Erro ao criar o link simbólico" | ||
262 | +# fi | ||
263 | +# | ||
264 | +# done | ||
265 | +# | ||
266 | +#fi | ||
245 | 267 | ||
246 | -cd $myDIR | 268 | +cd $(dirname $myDIR) |
247 | rm -fr ${TEMPDIR} | 269 | rm -fr ${TEMPDIR} |
248 | -rm -fr ${RUNTIMEDIR} | ||
249 | 270 | ||
250 | # Gera pacotes para envio ao SPB | 271 | # Gera pacotes para envio ao SPB |
251 | -#zip -9 -r -j ${DESTDIR}/${PACKAGE}-latest.zip \ | ||
252 | -# ${DESTDIR}/${PACKAGE}/x86_32/${PACKAGE_NAME}-with-gtk-latest-i686.exe \ | ||
253 | -# ${DESTDIR}/${PACKAGE}/x86_64/${PACKAGE_NAME}-with-gtk-latest-x86_64.exe | 272 | +zip -9 -r -j \ |
273 | + ${DESTDIR}/${PACKAGE}-latest.zip \ | ||
274 | + $(readlink -f ${DESTDIR}/${PACKAGE}/${PACKAGE}-latest-i686.exe) \ | ||
275 | + $(readlink -f ${DESTDIR}/${PACKAGE}/${PACKAGE}-latest-x86_64.exe) | ||
254 | 276 | ||
255 | echo -e "\e]2;Success!\a" | 277 | echo -e "\e]2;Success!\a" |
256 | 278 |
win/pw3270.nsi.in
@@ -3,7 +3,7 @@ | @@ -3,7 +3,7 @@ | ||
3 | !include "FileFunc.nsh" | 3 | !include "FileFunc.nsh" |
4 | 4 | ||
5 | Name "@PACKAGE@" | 5 | Name "@PACKAGE@" |
6 | -Caption "@PACKAGE@ - 3270 Emulator for windows/gtk" | 6 | +Caption "@PACKAGE@ - @PACKAGE_DESCRIPTION@" |
7 | !ifdef WITHGTK | 7 | !ifdef WITHGTK |
8 | outfile "@PACKAGE@-@PACKAGE_VERSION@-gtk-@GTK_MODVERSION@-@host_cpu@.exe" | 8 | outfile "@PACKAGE@-@PACKAGE_VERSION@-gtk-@GTK_MODVERSION@-@host_cpu@.exe" |
9 | !else | 9 | !else |
@@ -12,7 +12,7 @@ outfile "@PACKAGE@-@PACKAGE_VERSION@-requires-gtk-@GTK_MODVERSION@-@host_cpu@.ex | @@ -12,7 +12,7 @@ outfile "@PACKAGE@-@PACKAGE_VERSION@-requires-gtk-@GTK_MODVERSION@-@host_cpu@.ex | ||
12 | 12 | ||
13 | XPStyle on | 13 | XPStyle on |
14 | 14 | ||
15 | -installDir "$@PROGRAMFILES@\pw3270" | 15 | +installDir "$@PROGRAMFILES@\@PACKAGE@" |
16 | 16 | ||
17 | #define the installer icon | 17 | #define the installer icon |
18 | !define MUI_ICON "@PACKAGE@.ico" | 18 | !define MUI_ICON "@PACKAGE@.ico" |
@@ -27,7 +27,7 @@ RequestExecutionLevel admin | @@ -27,7 +27,7 @@ RequestExecutionLevel admin | ||
27 | # Properties | 27 | # Properties |
28 | VIProductVersion "@PACKAGE_VERSION@.0.0" | 28 | VIProductVersion "@PACKAGE_VERSION@.0.0" |
29 | VIAddVersionKey "ProductName" "@PACKAGE@" | 29 | VIAddVersionKey "ProductName" "@PACKAGE@" |
30 | -VIAddVersionKey "FileDescription" "3270 Emulator for windows/gtk" | 30 | +VIAddVersionKey "FileDescription" "@PACKAGE_DESCRIPTION@" |
31 | VIAddVersionKey "FileVersion" "@PACKAGE_VERSION@" | 31 | VIAddVersionKey "FileVersion" "@PACKAGE_VERSION@" |
32 | VIAddVersionKey "LegalCopyright" "GPL-2.0" | 32 | VIAddVersionKey "LegalCopyright" "GPL-2.0" |
33 | 33 | ||
@@ -106,7 +106,7 @@ SubSection "@PACKAGE@" SecMain | @@ -106,7 +106,7 @@ SubSection "@PACKAGE@" SecMain | ||
106 | writeUninstaller $INSTDIR\uninstall.exe | 106 | writeUninstaller $INSTDIR\uninstall.exe |
107 | 107 | ||
108 | WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \ | 108 | WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \ |
109 | - "DisplayName" "@PACKAGE@ - 3270 emulator for windows/gtk" | 109 | + "DisplayName" "@PACKAGE@ - @PACKAGE_DESCRIPTION@" |
110 | WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \ | 110 | WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \ |
111 | "DisplayIcon" "$INSTDIR\@PACKAGE@.ico" | 111 | "DisplayIcon" "$INSTDIR\@PACKAGE@.ico" |
112 | WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \ | 112 | WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \ |