From 5623112ad78a4428ff84f6cd1dd090095f670556 Mon Sep 17 00:00:00 2001 From: perry.werneck@gmail.com Date: Wed, 17 Jul 2013 11:59:16 +0000 Subject: [PATCH] Instalador windows 64 bits passa a detectar o gtk-runtime pré instalado --- po/pt_BR.po | 2 +- pw3270-x86_64.nsi.in | 41 ++++++++++++++++++++++++++++++----------- 2 files changed, 31 insertions(+), 12 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 1d924be..6111c88 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: 2013-07-11 09:37-0300\n" +"POT-Creation-Date: 2013-07-17 08:29-0300\n" "PO-Revision-Date: 2013-07-03 10:51-0300\n" "Last-Translator: Perry Werneck \n" "Language-Team: Português \n" diff --git a/pw3270-x86_64.nsi.in b/pw3270-x86_64.nsi.in index 6749cc9..b3ae519 100644 --- a/pw3270-x86_64.nsi.in +++ b/pw3270-x86_64.nsi.in @@ -160,17 +160,26 @@ Section /o "Software Development Kit" SecSDK CreateDirectory "$INSTDIR\sdk\include" CreateDirectory "$INSTDIR\sdk\include\lib3270" CreateDirectory "$INSTDIR\sdk\include\pw3270" + CreateDirectory "$INSTDIR\sdk\sample" + CreateDirectory "$INSTDIR\sdk\sample\classlib" - file "/oname=$INSTDIR\sdk\include\lib3270.h" "src\include\lib3270.h" - file "/oname=$INSTDIR\sdk\include\pw3270.h" "src\include\pw3270.h" - file "/oname=$INSTDIR\sdk\include\pw3270\v3270.h" "src\include\pw3270\v3270.h" - file "/oname=$INSTDIR\sdk\include\pw3270\hllapi.h" "src\include\pw3270\hllapi.h" + setOutPath $INSTDIR\sdk\include + file "src\include\lib3270.h" + file "src\include\pw3270.h" + file "src\include\pw3270\v3270.h" + file "src\include\pw3270\hllapi.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" + setOutPath $INSTDIR\sdk\include\lib3270 + file "src\include\lib3270\config.h" + file "src\include\rules.mak" - file "/oname=$INSTDIR\sdk\sample\Makefile" "src\sample\Makefile" - file "/oname=$INSTDIR\sdk\sample\connect.c" "src\sample\connect.c" + setOutPath $INSTDIR\sdk\sample\connect + file "src\sample\Makefile" + file "src\sample\connect.c" + + setOutPath $INSTDIR\sdk\sample\classlib + file "src\classlib\*.cc" + file "src\include\pw3270\class.h" SectionEnd @@ -220,15 +229,25 @@ sectionEnd Function .onInit -IfFileExists $PROGRAMFILES64\ooRexx\rexx.exe EnableRexx RexxSET +SetRegView 64 + +${if} ${FileExists} `$PROGRAMFILES64\ooRexx\rexx.exe` -EnableRexx: SectionGetFlags "${RexxPlugin}" $0 IntOp $0 $0 | ${SF_SELECTED} SectionSetFlags "${RexxPlugin}" $0 -RexxSET: +${EndIf} + +ReadRegStr $4 HKLM "Software\gtk3win\@GTK_MODVERSION@" "path" + +${if} ${FileExists} `$4\*.*` + + SectionGetFlags "${SecGTK}" $0 + IntOp $0 $0 & ${SECTION_OFF} + SectionSetFlags "${SecGTK}" $0 +${EndIf} FunctionEnd -- libgit2 0.21.2