From 64fb14385b2a75180cd7ccf7280b68d5e417ab18 Mon Sep 17 00:00:00 2001 From: perry.werneck@gmail.com Date: Mon, 30 Jul 2012 12:57:50 +0000 Subject: [PATCH] Iniciando implementação do empacotamento windows na versão 5 --- Makefile.in | 4 ++-- autogen.sh | 4 ++++ configure.ac | 7 +++++++ po/pt_BR.po | 74 +++++++++++++++++++++++++++++++++++++------------------------------------- pw3270.nsi.in | 268 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ pw3270.spec.in | 2 +- src/pw3270/pw3270.ico | Bin 0 -> 32236 bytes src/tools/Makefile.in | 2 +- 8 files changed, 320 insertions(+), 41 deletions(-) create mode 100644 pw3270.nsi.in create mode 100644 src/pw3270/pw3270.ico diff --git a/Makefile.in b/Makefile.in index f965104..d590883 100644 --- a/Makefile.in +++ b/Makefile.in @@ -126,7 +126,7 @@ src/tools/%@EXEEXT@: src/tools/%.c all: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) locale filelist -Release: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) +Release: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) locale $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT): src/pw3270/* $(BINDIR)/Release/lib/@DLLPREFIX@3270@DLLEXT@ $(DEPENDS) @$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 ../../$(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) @@ -242,7 +242,7 @@ install-app: install-locale install-lib: @$(MAKE) BINRLS="../../.bin/Release/lib" -C src/lib3270 install -locale: $(foreach SRC, $(basename $(LANG_FILES)), $(SRC).po) +locale: $(foreach MO, $(basename $(LANG_FILES)), $(BINDIR)/Release/$(localedir)/$(notdir $(MO))/LC_MESSAGES/$(PACKAGE_NAME).mo) install-locale: $(foreach MO, $(basename $(LANG_FILES)), $(BINDIR)/Release/$(localedir)/$(notdir $(MO))/LC_MESSAGES/$(PACKAGE_NAME).mo) @echo -e $(foreach MO, $(notdir $(basename $(LANG_FILES))), mkdir -p $(DESTDIR)/$(localedir)/$(MO)/LC_MESSAGES\\n$(INSTALL_DATA) $(BINDIR)/Release/$(localedir)/$(MO)/LC_MESSAGES/$(PACKAGE_NAME).mo $(DESTDIR)/$(localedir)/$(MO)/LC_MESSAGES/$(PACKAGE_NAME).mo \\n ) | $(SHELL) diff --git a/autogen.sh b/autogen.sh index bd9d754..e851783 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,5 +1,7 @@ #!/bin/bash +APPLEVEL="0" + test -n "$srcdir" || srcdir=`dirname "$0"` test -n "$srcdir" || srcdir=. @@ -44,9 +46,11 @@ fi echo "PACKAGE_REVISION=$PACKAGE_REVISION" > $srcdir/revision echo "PACKAGE_SOURCE=$PACKAGE_SOURCE" >> $srcdir/revision +echo "PACKAGE_LEVEL=$APPLEVEL" >> $srcdir/revision echo "m4_define([SVN_REVISION], $PACKAGE_REVISION)" > $srcdir/revision.m4 echo "m4_define([SVN_URL], $PACKAGE_SOURCE)" >> $srcdir/revision.m4 +echo "m4_define([APP_LEVEL], $APPLEVEL)" >> $srcdir/revision.m4 aclocal if test $? != 0 ; then diff --git a/configure.ac b/configure.ac index 9ee19af..cc57792 100644 --- a/configure.ac +++ b/configure.ac @@ -68,6 +68,9 @@ AC_SUBST(REXXC) AC_PATH_TOOL([VALGRIND], [valgrind], [no]) AC_PATH_TOOL([REXXCONFIG], [oorexx-config], [no]) +AC_PATH_TOOL([MAKENSIS], [makensis], [no]) +AC_PATH_TOOL([WINDRES], [windres], [no]) + AC_CHECK_PROGS(GZIP,[gzip],no) export GZIP; if test $GZIP = "no" ; then @@ -87,6 +90,9 @@ AC_SUBST(PACKAGE_REVISION,"SVN_REVISION") AC_DEFINE(PACKAGE_SOURCE,"SVN_URL") AC_SUBST(PACKAGE_SOURCE,"SVN_URL") +AC_DEFINE(PACKAGE_LEVEL,"APP_LEVEL") +AC_SUBST(PACKAGE_LEVEL,"APP_LEVEL") + #--[ Set host based options ]--------------------------------------------------------------------------------------------------------------------------------- DLL_CFLAGS="" @@ -275,6 +281,7 @@ AC_CONFIG_FILES([ lib3270.pc pw3270.pc pw3270.spec + pw3270.nsi src/include/rules.mak src/lib3270/Makefile src/lib3270/mkversion.sh diff --git a/po/pt_BR.po b/po/pt_BR.po index c3bba5b..68c6ae5 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: pw3270 5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-20 09:28-0300\n" +"POT-Creation-Date: 2012-07-30 09:30-0300\n" "PO-Revision-Date: 2012-06-21 11:08-0300\n" "Last-Translator: Perry Werneck \n" "Language-Team: Português do Brasil <>\n" @@ -23,7 +23,7 @@ msgstr "" msgid "%s: unknown family %d" msgstr "%s: Familia %d é inválida" -#: telnet.c:1083 +#: telnet.c:1092 #, c-format msgid "%s:%d" msgstr "%s:%d" @@ -36,7 +36,7 @@ msgstr "Erro 3270" msgid "3270 Warning" msgstr "Alerta 3270" -#: telnet.c:3312 +#: telnet.c:3345 #, c-format msgid "" "Connection state: %s\n" @@ -61,7 +61,7 @@ msgstr "Aviso sonoro" msgid "Auto-Reconnect" msgstr "Reconectar automaticamente" -#: telnet.c:418 +#: telnet.c:414 msgid "Bad winsock version" msgstr "Versão winsock inválida" @@ -77,11 +77,11 @@ msgstr "Cursor piscante" msgid "Bold" msgstr "Negrito" -#: telnet.c:2037 +#: telnet.c:2071 msgid "Broken pipe" msgstr "Broken pipe" -#: telnet.c:700 +#: telnet.c:698 #, c-format msgid "Can't connect to %s:%d" msgstr "Não foi possível conectar a %s:%d" @@ -98,11 +98,11 @@ msgstr "Não foi possível obter o tamanho do arquivo" msgid "Can't open local file" msgstr "Não foi possível abrir arquivo local" -#: telnet.c:839 +#: telnet.c:837 msgid "Can't set SSL socket file descriptor" msgstr "Não foi possível definir o descritor de socket SSL" -#: telnet.c:419 +#: telnet.c:415 #, c-format msgid "Can't use winsock version %d.%d" msgstr "Não é possível usar a Winsock versão %d.%d" @@ -111,7 +111,7 @@ msgstr "Não é possível usar a Winsock versão %d.%d" msgid "Cancelled by user" msgstr "Cancelado pelo usuário" -#: telnet.c:734 +#: telnet.c:732 msgid "Cannot create socket handle" msgstr "Não foi possível criar um manipulador de socket" @@ -136,11 +136,11 @@ msgstr "Completo" msgid "Connect on startup" msgstr "Conectar ao iniciar" -#: telnet.c:839 telnet.c:857 +#: telnet.c:837 telnet.c:855 msgid "Connection failed" msgstr "Conexão falhou" -#: telnet.c:2041 +#: telnet.c:2075 #, fuzzy msgid "Connection reset by peer" msgstr "Ação falhou" @@ -177,7 +177,7 @@ msgstr "Debug" msgid "Debug window updates" msgstr "Mostrar atualizações de janela" -#: telnet.c:1692 +#: telnet.c:1726 msgid "Device type rejected" msgstr "Tipo de dispositivo rejeitado" @@ -185,7 +185,7 @@ msgstr "Tipo de dispositivo rejeitado" msgid "Disconnected from host" msgstr "Desconectado do servidor" -#: telnet.c:1285 +#: telnet.c:1306 msgid "EOR received when not in 3270 mode, ignored." msgstr "EOR recebido fora do modo 3270, ignorado." @@ -257,11 +257,11 @@ msgstr "Ajuda" msgid "Host disconnected, transfer cancelled" msgstr "Servidor desconectou, transferência cancelada" -#: telnet.c:1680 +#: telnet.c:1714 msgid "Host rejected device type or request type" msgstr "Host rejected device type or request type" -#: telnet.c:1690 +#: telnet.c:1724 msgid "Host rejected resource(s)" msgstr "Host rejected resource(s)" @@ -310,11 +310,11 @@ msgstr "Múltiplos nomes de porta" msgid "Must specify port for telnet proxy" msgstr "Proxy telnet precisa de porta" -#: telnet.c:448 telnet.c:704 +#: telnet.c:444 telnet.c:702 msgid "Network error" msgstr "Erro de rede" -#: telnet.c:406 telnet.c:417 telnet.c:733 telnet.c:744 +#: telnet.c:402 telnet.c:413 telnet.c:731 telnet.c:742 msgid "Network startup error" msgstr "Erro ao iniciar a rede" @@ -383,15 +383,15 @@ msgstr "Reselecionar" msgid "Return" msgstr "Return" -#: telnet.c:3310 +#: telnet.c:3343 msgid "SSL Connect error" msgstr "Erro na conexão SSL" -#: telnet.c:1066 +#: telnet.c:1075 msgid "SSL Error" msgstr "Erro SSL" -#: telnet.c:1066 +#: telnet.c:1075 msgid "SSL Read error" msgstr "Erro de leitura SSL" @@ -399,11 +399,11 @@ msgstr "Erro de leitura SSL" msgid "SSL error" msgstr "Erro SSL" -#: telnet.c:857 +#: telnet.c:855 msgid "SSL negotiation failed" msgstr "Negociação SSL falhou" -#: telnet.c:2027 +#: telnet.c:2061 #, fuzzy, c-format msgid "" "SSL_write:\n" @@ -474,11 +474,11 @@ msgstr "Mostrar padrão de teste" msgid "Smart paste" msgstr "Colar inteligente" -#: telnet.c:1087 +#: telnet.c:1096 msgid "Socket read error" msgstr "Erro ao ler dados da rede" -#: telnet.c:2048 +#: telnet.c:2082 msgid "Socket write error" msgstr "Erro ao enviar dados para a rede" @@ -544,7 +544,7 @@ msgstr "Não foi possível enviar a requisição de transferência de arquivo" msgid "Unexpected error" msgstr "Erro inesperado" -#: kybd.c:329 +#: kybd.c:339 #, c-format msgid "Unexpected type %d in typeahead queue" msgstr "Tipo inesperado %d na fila de teclado" @@ -553,12 +553,12 @@ msgstr "Tipo inesperado %d na fila de teclado" msgid "Unknown FT control code from host" msgstr "Servidor enviou código de controle FT desconhecido" -#: kybd.c:2844 +#: kybd.c:2339 #, c-format msgid "Unknown PA key %d" msgstr "PA %d desconhecida" -#: kybd.c:2856 +#: kybd.c:2351 #, c-format msgid "Unknown PF key %d" msgstr "PF %d desconhecida" @@ -576,19 +576,19 @@ msgstr "" "Servidor desconhecido:\n" "%s" -#: telnet.c:577 +#: telnet.c:573 #, c-format msgid "Unknown passthru host: %s" msgstr "" "Servidor \"passthru\" desconhecido:\n" "%s" -#: telnet.c:606 resolver.c:147 +#: telnet.c:602 resolver.c:147 #, c-format msgid "Unknown port number or service: %s" msgstr "Número de porta ou serviço desconhecido: %s" -#: telnet.c:562 +#: telnet.c:558 msgid "Unsupported passthru host session" msgstr "Unsupported passthru host session" @@ -604,11 +604,11 @@ msgstr "Usar teclas +/- para navegar por campos" msgid "View Field Delimiters" msgstr "View Field Delimiters" -#: telnet.c:745 +#: telnet.c:743 msgid "WSAEventSelect failed" msgstr "WSAEventSelect falhou" -#: telnet.c:407 +#: telnet.c:403 msgid "WSAStartup failed" msgstr "WSAStartup falhou" @@ -652,26 +652,26 @@ msgstr "Opções" msgid "_View" msgstr "_Exibir" -#: telnet.c:3175 telnet.c:3186 +#: telnet.c:3208 telnet.c:3219 #, c-format msgid "fcntl(%s)" msgstr "fcntl(%s)" -#: telnet.c:3165 +#: telnet.c:3198 #, c-format msgid "ioctl(%s)" msgstr "ioctl(%s)" -#: telnet.c:655 telnet.c:661 telnet.c:668 +#: telnet.c:653 telnet.c:659 telnet.c:666 #, c-format msgid "setsockopt(%s)" msgstr "setsockopt(%s)" -#: telnet.c:648 +#: telnet.c:646 msgid "socket" msgstr "socket" -#: telnet.c:1062 +#: telnet.c:1071 msgid "unknown error" msgstr "Erro desconhecido" diff --git a/pw3270.nsi.in b/pw3270.nsi.in new file mode 100644 index 0000000..a42799e --- /dev/null +++ b/pw3270.nsi.in @@ -0,0 +1,268 @@ +!include "MUI2.nsh" + +Name "@PACKAGE@" +Caption "@PACKAGE@ - 3270 Emulator for windows/gtk" +outfile "@PACKAGE@-@PACKAGE_VERSION@.@PACKAGE_LEVEL@-@host_cpu@-install.exe" +XPStyle on + +# define the directory to install to +installDir $PROGRAMFILES\@PACKAGE@ + +#define the installer icon +!define MUI_ICON "src\pw3270\@PACKAGE@.ico" +!define MUI_UNICON "src\pw3270\@PACKAGE@.ico" +icon "src\pw3270\@PACKAGE@.ico" + +# Get installation folder from registry if available +InstallDirRegKey HKCU "Software\@PACKAGE@" "datadir" + +RequestExecutionLevel admin + +# Properties +VIProductVersion "@PACKAGE_VERSION@.@PACKAGE_LEVEL@.0" +VIAddVersionKey "ProductName" "@PACKAGE@" +VIAddVersionKey "FileDescription" "3270 Emulator for windows/gtk" +VIAddVersionKey "FileVersion" "@PACKAGE_REVISION@" +VIAddVersionKey "LegalCopyright" "GPL" + +# Interface + +!define MUI_ABORTWARNING +# !insertmacro MUI_PAGE_WELCOME +!insertmacro MUI_PAGE_LICENSE "LICENSE" +!insertmacro MUI_PAGE_COMPONENTS +!insertmacro MUI_PAGE_DIRECTORY +!insertmacro MUI_PAGE_INSTFILES + +# !insertmacro MUI_UNPAGE_WELCOME +!insertmacro MUI_UNPAGE_CONFIRM +!insertmacro MUI_UNPAGE_INSTFILES +# !insertmacro MUI_UNPAGE_FINISH + +# Languages +!insertmacro MUI_LANGUAGE "English" + +# Section scripts +!include Sections.nsh + +# default section +SubSection "@PACKAGE@" SecMain + + Section "Core" SecCore + + # define the output path for this file + setOutPath $INSTDIR + SetShellVarContext all + + createShortCut "$SMPROGRAMS\@PACKAGE@.lnk" "$INSTDIR\@PACKAGE@.exe" + createShortCut "$DESKTOP\@PACKAGE@.lnk" "$INSTDIR\@PACKAGE@.exe" + + # Binary files + file "/oname=$INSTDIR\@PACKAGE@.exe" ".bin\Release\@PACKAGE@.exe" + file "/oname=$INSTDIR\@PACKAGE@.ico" "src\pw3270\@PACKAGE@.ico" + + # Configuration files + file "/oname=$INSTDIR\@PACKAGE@.png" "src/pw3270/@PACKAGE@.png" + file "/oname=$INSTDIR\colors.conf" "colors.conf" + + # Documentation files + file "/oname=$INSTDIR\ChangeLog" "ChangeLog" + file "/oname=$INSTDIR\AUTHORS" "AUTHORS" + file "/oname=$INSTDIR\LICENSE" "LICENSE" + + # UI definition files + CreateDirectory "$INSTDIR\ui" + + file "/oname=$INSTDIR\ui\00default.xml" "ui\00default.xml" + + # Locale files + CreateDirectory "$INSTDIR\@localedir@\pt_BR\LC_MESSAGES" + file "/oname=$INSTDIR\@localedir@\pt_BR\LC_MESSAGES\@PACKAGE@.mo" ".bin\Release\usr\local\share\locale\pt_BR\LC_MESSAGES\@PACKAGE@.mo" + + # define uninstaller name + writeUninstaller $INSTDIR\uninstall.exe + + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \ + "DisplayName" "@PACKAGE@ - 3270 emulator for windows/gtk" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \ + "DisplayIcon" "$INSTDIR\@PACKAGE@.ico" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \ + "DisplayVersion" "@PACKAGE_VERSION@ (Rev: @PACKAGE_REVISION@)" + + + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \ + "UninstallString" "$INSTDIR\uninstall.exe" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \ + "InstallLocation" "$INSTDIR" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \ + "NoModify" "1" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \ + "NoRepair" "1" + + # Save instalation dir + WriteRegStr HKCU "Software\@PACKAGE@" "" $INSTDIR + + # Main library + file "/oname=$SYSDIR\lib3270.dll" ".bin\Release\lib\lib3270.dll" + file "/oname=$SYSDIR\libpw3270.dll" ".bin\Release\lib\libpw3270.dll" + + sectionEnd + +# +# SubSection "Plugins" SecPLugin +# +# Section /o "Rexx" RexxPlugin +# setOutPath $INSTDIR +# +# CreateDirectory "$INSTDIR" +# file src\plugins\rexx\rx3270.cls +# +# CreateDirectory "$INSTDIR\plugins" +# file "/oname=$INSTDIR\plugins\rx3270.dll" ".bin\Release\plugins\rx3270.dll" +# file "/oname=$INSTDIR\ui\rexx.xml" ui\rexx.xml +# +# sectionEnd +# +SubSectionEnd + +# +#Section /o "GTK+ Runtime" SecGTK +# +# setOutPath $INSTDIR +# file /r ".bin\gtkruntime\*.*" +# +#SectionEnd +# + +Section /o "Software Development Kit" SecSDK + + CreateDirectory "$INSTDIR\sdk" + CreateDirectory "$INSTDIR\sdk\include" + CreateDirectory "$INSTDIR\sdk\include\lib3270" + + file "/oname=$INSTDIR\sdk\include\lib3270.h" "src\include\lib3270.h" + file "/oname=$INSTDIR\sdk\include\lib3270\config.h" "src\include\lib3270\config.h" + file "/oname=$INSTDIR\sdk\include\lib3270\rules.mak" "src\include\rules.mak" + + file "/oname=$INSTDIR\sdk\include\lib3270\config.h" "src\include\lib3270\config.h" + file "/oname=$INSTDIR\sdk\include\lib3270\macros.h" "src\include\lib3270\macros.h" + file "/oname=$INSTDIR\sdk\include\lib3270\selection.h" "src\include\lib3270\selection.h" + file "/oname=$INSTDIR\sdk\include\lib3270\v3270.h" "src\include\lib3270\v3270.h" + file "/oname=$INSTDIR\sdk\include\lib3270\actions.h" "src\include\lib3270\actions.h" + file "/oname=$INSTDIR\sdk\include\lib3270\html.h" "src\include\lib3270\html.h" + file "/oname=$INSTDIR\sdk\include\lib3270\log.h" "src\include\lib3270\log.h" + file "/oname=$INSTDIR\sdk\include\lib3270\popup.h" "src\include\lib3270\popup.h" + file "/oname=$INSTDIR\sdk\include\lib3270\session.h" "src\include\lib3270\session.h" + file "/oname=$INSTDIR\sdk\include\lib3270\trace.h" "src\include\lib3270\trace.h" + +SectionEnd + +# create a section to define what the uninstaller does. +# the section will always be named "Uninstall" +section "Uninstall" + + # Always delete uninstaller first + delete $INSTDIR\uninstaller.exe + + # Set SMPROGRAMS and DESKTOP path + SetShellVarContext all + + # now delete installed files + delete $INSTDIR\@PACKAGE@.exe + + delete $SMPROGRAMS\@PACKAGE@.lnk + delete $DESKTOP\@PACKAGE@.lnk + + RMDir /r "$INSTDIR\locale" + RMDir /r "$INSTDIR\share" + RMDir /r "$INSTDIR\etc" + RMDir /r "$INSTDIR\plugins" + RMDir /r "$INSTDIR\sdk" + RMDir /r "$INSTDIR\gtk2-runtime" + + # Delete all files + delete "$INSTDIR\*.dll" + + # Remove registry + DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" + + # Delete System libraries + delete $SYSDIR\lib3270.dll + delete $SYSDIR\libpw3270.dll + + # Delete extension libraries +# delete $PROGRAMFILES\ooRexx\rx3270.dll + + RMDir /r "$INSTDIR" + +sectionEnd + +Function .onInit + +#FindProcDLL::FindProc "@PACKAGE@.exe" +#IntCmp $R0 1 0 notRunning +# +# MessageBox MB_OK|MB_ICONEXCLAMATION "@PACKAGE@ is running. Please close it first" /SD IDOK +# Abort +# +#notRunning: + +IfFileExists $PROGRAMFILES\ooRexx\rexx.exe RexxOK RexxNOK + +RexxOK: + SectionGetFlags "${RexxPlugin}" $0 + IntOp $0 $0 | ${SF_SELECTED} + SectionSetFlags "${RexxPlugin}" $0 + + SectionGetFlags "${SecRexxLib}" $0 + IntOp $0 $0 | ${SF_SELECTED} + SectionSetFlags "${SecRexxLib}" $0 + +goto PastRexxCheck + +RexxNOK: + SectionGetFlags "${RexxPlugin}" $0 + IntOp $0 $0 | ${SF_RO} + SectionSetFlags "${RexxPlugin}" $0 + + SectionGetFlags "${SecRexxLib}" $0 + IntOp $0 $0 | ${SF_RO} + SectionSetFlags "${SecRexxLib}" $0 + +PastRexxCheck: + + ReadRegStr $4 HKLM "Software\GTK2-Runtime" "DllPath" + + # remove trailing back slash + Push $4 + Exch $EXEDIR + Exch $EXEDIR + Pop $4 + + # if Gtk runtime DLL path exists gtk runtime is already installed. + IfFileExists $4 gtkOK gtkNOK + +gtkOK: + + SectionGetFlags "${SecGTK}" $0 + IntOp $0 $0 & ${SECTION_OFF} + SectionSetFlags "${SecGTK}" $0 + +goto PastGTKCheck + +gtkNOK: + + SectionGetFlags "${SecGTK}" $0 + IntOp $0 $0 | ${SF_SELECTED} + SectionSetFlags "${SecGTK}" $0 + +goto PastGTKCheck + + + +PastGTKCheck: + + +FunctionEnd + + diff --git a/pw3270.spec.in b/pw3270.spec.in index 2e47c54..5c37d27 100644 --- a/pw3270.spec.in +++ b/pw3270.spec.in @@ -29,7 +29,7 @@ #---[ Check for distro ]---------------------------------------------------------------------------------------------- -%define _rel 0 +%define _rel @PACKAGE_LEVEL@ %define _release %{_rel} %define _distro Linux diff --git a/src/pw3270/pw3270.ico b/src/pw3270/pw3270.ico new file mode 100644 index 0000000..6ec7e93 Binary files /dev/null and b/src/pw3270/pw3270.ico differ diff --git a/src/tools/Makefile.in b/src/tools/Makefile.in index 55890df..42db019 100644 --- a/src/tools/Makefile.in +++ b/src/tools/Makefile.in @@ -50,7 +50,7 @@ all: xml2pot$(EXEEXT) xml2pot$(EXEEXT): xml2pot.c Makefile @echo " CCLD `basename $@`" - @$(HOST_CC) $(GTK_CFLAGS) -g -o $@ xml2pot.c $(GTK_LIBS) + @$(HOST_CC) `pkg-config --cflags gtk+-2.0` -g -o $@ xml2pot.c `pkg-config --libs gtk+-2.0` clean: @rm -f *.$(OBJEXT) -- libgit2 0.21.2