Download as
Browse Code »

Commit 519b361d15a3487ac40272e11327c241a619bbb9

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

Ajustes para empacotamento windows.

Showing 6 changed files with 236 additions and 48 deletions   Show diff stats
configure.ac
  Diff comments   View file @519b361
... ... @@ -93,8 +93,21 @@ case "$host" in
93 93 LIBS="$LIBS -lws2_32 -lwtsapi32 -lintl -lcomdlg32"
94 94  
95 95 AC_CONFIG_FILES(win/makegtkruntime.sh)
  96 + AC_CONFIG_FILES(win/pw3270.nsi)
96 97  
97 98 PLUGINS="$PLUGINS hllapi"
  99 +
  100 + if test "$host_cpu" = "x86_64"; then
  101 + app_cv_programfiles="PROGRAMFILES64"
  102 + app_cv_winarch="64"
  103 + else
  104 + app_cv_programfiles="PROGRAMFILES"
  105 + app_cv_winarch="32"
  106 + fi
  107 +
  108 + AC_SUBST(PROGRAMFILES,$app_cv_programfiles)
  109 + AC_SUBST(WINARCH,$app_cv_winarch)
  110 +
98 111 ;;
99 112  
100 113 *-apple-*)
... ...
locale/pw3270.pot
  Diff comments   View file @519b361
... ... @@ -9,7 +9,7 @@ msgstr ""
9 9 "#-#-#-#-# lib3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
10 10 "Project-Id-Version: PACKAGE VERSION\n"
11 11 "Report-Msgid-Bugs-To: \n"
12   -"POT-Creation-Date: 2017-01-25 11:42-0200\n"
  12 +"POT-Creation-Date: 2017-01-31 16:23-0200\n"
13 13 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
14 14 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
15 15 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -20,7 +20,7 @@ msgstr &quot;&quot;
20 20 "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
21 21 "Project-Id-Version: PACKAGE VERSION\n"
22 22 "Report-Msgid-Bugs-To: \n"
23   -"POT-Creation-Date: 2017-01-25 11:47-0200\n"
  23 +"POT-Creation-Date: 2017-01-31 16:23-0200\n"
24 24 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
25 25 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
26 26 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -39,17 +39,6 @@ msgstr &quot;&quot;
39 39 "MIME-Version: 1.0\n"
40 40 "Content-Type: text/plain; charset=CHARSET\n"
41 41 "Content-Transfer-Encoding: 8bit\n"
42   -"#-#-#-#-# dbus3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
43   -"Project-Id-Version: PACKAGE VERSION\n"
44   -"Report-Msgid-Bugs-To: \n"
45   -"POT-Creation-Date: 2017-01-25 11:42-0200\n"
46   -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
47   -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
48   -"Language-Team: LANGUAGE <LL@li.org>\n"
49   -"Language: \n"
50   -"MIME-Version: 1.0\n"
51   -"Content-Type: text/plain; charset=CHARSET\n"
52   -"Content-Transfer-Encoding: 8bit\n"
53 42  
54 43 #: window.c:329
55 44 #, c-format
... ... @@ -435,10 +424,6 @@ msgstr &quot;&quot;
435 424 msgid "Can't connect to %s:%s"
436 425 msgstr ""
437 426  
438   -#: main.c:70
439   -msgid "Can't connect to DBUS server"
440   -msgstr ""
441   -
442 427 #: selection.c:425
443 428 #, c-format
444 429 msgid "Can't convert line %d from %s to %s"
... ... @@ -453,10 +438,6 @@ msgstr &quot;&quot;
453 438 msgid "Can't determine value for environment variable \"%s\" "
454 439 msgstr ""
455 440  
456   -#: main.c:115
457   -msgid "Can't get DBUS object name"
458   -msgstr ""
459   -
460 441 #: ft.c:413
461 442 msgid "Can't get file size"
462 443 msgstr ""
... ... @@ -666,10 +647,6 @@ msgstr &quot;&quot;
666 647 msgid "Connect on startup"
667 648 msgstr ""
668 649  
669   -#: gobject.c:205
670   -msgid "Connecting to host"
671   -msgstr ""
672   -
673 650 #: connect.c:200 connect.c:296 connect.c:305 connect.c:367 connect.c:382
674 651 #: connect.c:398 connect.c:412 connect.c:432 connect.c:446 connect.c:462
675 652 #: connect.c:557
... ... @@ -1380,7 +1357,7 @@ msgstr &quot;&quot;
1380 1357 msgid "Port or service name (empty for \"telnet\")."
1381 1358 msgstr ""
1382 1359  
1383   -#: set.c:178
  1360 +#: set.c:176
1384 1361 msgid "Preparing"
1385 1362 msgstr ""
1386 1363  
... ... @@ -1884,11 +1861,6 @@ msgstr &quot;&quot;
1884 1861 msgid "Starting"
1885 1862 msgstr ""
1886 1863  
1887   -#: gobject.c:193
1888   -#, c-format
1889   -msgid "State %04d can't accept requests"
1890   -msgstr ""
1891   -
1892 1864 #: security.c:237
1893 1865 msgid "Subject issuer mismatch"
1894 1866 msgstr ""
... ... @@ -2320,11 +2292,6 @@ msgstr &quot;&quot;
2320 2292 msgid "Unexpected or unknown security status"
2321 2293 msgstr ""
2322 2294  
2323   -#: gobject.c:208
2324   -#, c-format
2325   -msgid "Unexpected state %04d"
2326   -msgstr ""
2327   -
2328 2295 #: actions.c:391
2329 2296 #, c-format
2330 2297 msgid "Unexpected target \"%s\""
... ...
src/pw3270/pw3270.ico
View file @5dfad5a
No preview for this file type
win/makegtkruntime.sh.in
  Diff comments   View file @519b361
... ... @@ -135,10 +135,6 @@ libcrypto-*.dll
135 135 libssl-*.dll
136 136 libharfbuzz-0.dll
137 137 libstdc++-6.dll
138   -icule53.dll
139   -icuuc53.dll
140   -icudata53.dll
141   -libgraphite2.dll
142 138 librsvg-*.dll
143 139 libepoxy-*.dll
144 140 gspawn-win*-helper-console.exe
... ... @@ -182,15 +178,15 @@ if [ &quot;$?&quot; != 0 ]; then
182 178 exit -1
183 179 fi
184 180  
185   -if [ ! -e $GTK_PREFIX/share/glib-2.0/schemas/gschemas.compiled ]; then
186   - glib-compile-schemas $GTK_PREFIX/share/glib-2.0/schemas
187   -fi
  181 +#if [ ! -e $GTK_PREFIX/share/glib-2.0/schemas/gschemas.compiled ]; then
  182 +# glib-compile-schemas $GTK_PREFIX/share/glib-2.0/schemas
  183 +#fi
188 184  
189   -cp $GTK_PREFIX/share/glib-2.0/schemas/gschemas.compiled $TARGET_PATH/share/glib-2.0/schemas/gschemas.compiled
190   -if [ "$?" != 0 ]; then
191   - echo "Can´t copy gshemas.compiled"
192   - exit -1
193   -fi
  185 +#cp $GTK_PREFIX/share/glib-2.0/schemas/gschemas.compiled $TARGET_PATH/share/glib-2.0/schemas/gschemas.compiled
  186 +#if [ "$?" != 0 ]; then
  187 +# echo "Can´t copy gshemas.compiled"
  188 +# exit -1
  189 +#fi
194 190  
195 191 # Copia Adwaita
196 192 CopyGTK3Theme "Adwaita"
... ...
win/pw3270.ico 0 → 100644
View file @519b361
No preview for this file type
win/pw3270.nsi.in 0 → 100644
  Diff comments   View file @519b361
... ... @@ -0,0 +1,212 @@
  1 +!include "MUI2.nsh"
  2 +!include x64.nsh
  3 +!include "FileFunc.nsh"
  4 +
  5 +Name "@PACKAGE@"
  6 +Caption "@PACKAGE@ - 3270 Emulator for windows/gtk"
  7 +!ifdef WITHGTK
  8 +outfile "@PACKAGE@-@PACKAGE_VERSION@-gtk-@GTK_MODVERSION@-@host_cpu@.exe"
  9 +!else
  10 +outfile "@PACKAGE@-@PACKAGE_VERSION@-requires-gtk-@GTK_MODVERSION@-@host_cpu@.exe"
  11 +!endif
  12 +
  13 +XPStyle on
  14 +
  15 +installDir "$@PROGRAMFILES@\pw3270"
  16 +
  17 +#define the installer icon
  18 +!define MUI_ICON "@PACKAGE@.ico"
  19 +!define MUI_UNICON "@PACKAGE@.ico"
  20 +icon "@PACKAGE@.ico"
  21 +
  22 +# Get installation folder from registry if available
  23 +InstallDirRegKey HKLM "Software\@PACKAGE@" "InstallLocation"
  24 +
  25 +RequestExecutionLevel admin
  26 +
  27 +# Properties
  28 +VIProductVersion "@PACKAGE_VERSION@.0.0"
  29 +VIAddVersionKey "ProductName" "@PACKAGE@"
  30 +VIAddVersionKey "FileDescription" "3270 Emulator for windows/gtk"
  31 +VIAddVersionKey "FileVersion" "@PACKAGE_VERSION@"
  32 +VIAddVersionKey "LegalCopyright" "GPL-2.0"
  33 +
  34 +# Interface
  35 +
  36 +!define MUI_ABORTWARNING
  37 +# !insertmacro MUI_PAGE_WELCOME
  38 +!insertmacro MUI_PAGE_LICENSE "../LICENSE"
  39 +!insertmacro MUI_PAGE_COMPONENTS
  40 +!insertmacro MUI_PAGE_DIRECTORY
  41 +!insertmacro MUI_PAGE_INSTFILES
  42 +
  43 +# !insertmacro MUI_UNPAGE_WELCOME
  44 +!insertmacro MUI_UNPAGE_CONFIRM
  45 +!insertmacro MUI_UNPAGE_INSTFILES
  46 +# !insertmacro MUI_UNPAGE_FINISH
  47 +
  48 +# Languages
  49 +!insertmacro MUI_LANGUAGE "English"
  50 +
  51 +# Section scripts
  52 +!include Sections.nsh
  53 +
  54 +# default section
  55 +SubSection "@PACKAGE@" SecMain
  56 +
  57 + Section "Core" SecCore
  58 +
  59 + SetRegView @WINARCH@
  60 + ${DisableX64FSRedirection}
  61 +
  62 + # define the output path for this file
  63 + setOutPath $INSTDIR
  64 + SetShellVarContext all
  65 +
  66 + createShortCut "$SMPROGRAMS\@PACKAGE@.lnk" "$INSTDIR\@PACKAGE@.exe"
  67 + createShortCut "$DESKTOP\@PACKAGE@.lnk" "$INSTDIR\@PACKAGE@.exe"
  68 +
  69 + # Binary files
  70 + file "/oname=$INSTDIR\@PACKAGE@.exe" "..\.bin\Release\@PACKAGE@.exe"
  71 + file "/oname=$INSTDIR\@PACKAGE@.ico" "@PACKAGE@.ico"
  72 + file "/oname=$INSTDIR\lib3270.dll.@PACKAGE_VERSION@" "..\.bin\Release\lib3270.dll.@PACKAGE_VERSION@"
  73 + file "/oname=$INSTDIR\pw3270.dll.@PACKAGE_VERSION@" "..\.bin\Release\pw3270.dll.@PACKAGE_VERSION@"
  74 +
  75 + # Configuration files
  76 + #file "/oname=$INSTDIR\@PACKAGE@-logo.png" "..\src\pw3270\@PACKAGE@-logo.png"
  77 + #file "/oname=$INSTDIR\@PACKAGE@.png" "..\src\pw3270\@PACKAGE@.png"
  78 + file "/oname=$INSTDIR\colors.conf" "..\conf\colors.conf"
  79 +
  80 + # Documentation files
  81 + #file "/oname=$INSTDIR\ChangeLog" "..\ChangeLog"
  82 + file "/oname=$INSTDIR\AUTHORS" "..\AUTHORS"
  83 + file "/oname=$INSTDIR\LICENSE" "..\LICENSE"
  84 +
  85 + # Misc folders
  86 + CreateDirectory "$INSTDIR\certs"
  87 + CreateDirectory "$INSTDIR\plugins"
  88 +
  89 + # UI definition files
  90 + CreateDirectory "$INSTDIR\ui"
  91 +
  92 + file "/oname=$INSTDIR\ui\00default.xml" "..\ui\00default.xml"
  93 +
  94 + # Locale files
  95 + #CreateDirectory "$INSTDIR\@localedir@\pt_BR\LC_MESSAGES"
  96 + #file "/oname=$INSTDIR\@localedir@\pt_BR\LC_MESSAGES\@PACKAGE@.mo" "..\.bin\Release\@localedir@\pt_BR\LC_MESSAGES\@PACKAGE@.mo"
  97 +
  98 + # Save DataDir
  99 + SetRegView 64
  100 + WriteRegStr HKLM "Software\@PACKAGE@" "datadir" "$INSTDIR"
  101 + WriteRegStr HKLM "Software\@PACKAGE@" "appName" "$INSTDIR\@PACKAGE@.exe"
  102 +
  103 + # define uninstaller name
  104 + SetRegView 32
  105 +
  106 + writeUninstaller $INSTDIR\uninstall.exe
  107 +
  108 + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \
  109 + "DisplayName" "@PACKAGE@ - 3270 emulator for windows/gtk"
  110 + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \
  111 + "DisplayIcon" "$INSTDIR\@PACKAGE@.ico"
  112 + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \
  113 + "DisplayVersion" "@PACKAGE_VERSION@"
  114 +
  115 + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \
  116 + "UninstallString" "$INSTDIR\uninstall.exe"
  117 + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \
  118 + "InstallLocation" "$INSTDIR"
  119 + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \
  120 + "NoModify" "1"
  121 + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \
  122 + "NoRepair" "1"
  123 +
  124 + # Save instalation dir
  125 + WriteRegStr HKCU "Software\@PACKAGE@" "" $INSTDIR
  126 +
  127 + sectionEnd
  128 +
  129 + SubSection "Plugins" SecPLugin
  130 +
  131 + Section /o "HLLAPI" HLLAPIPlugin
  132 + setOutPath $INSTDIR
  133 +
  134 + CreateDirectory "$INSTDIR\plugins"
  135 + file "/oname=$INSTDIR\plugins\hllapi.dll" "..\.bin\Release\plugins\hllapi.dll"
  136 + file "/oname=$SYSDIR\libhllapi.dll" "..\.bin\Release\libhllapi.dll.@PACKAGE_VERSION@"
  137 +
  138 + sectionEnd
  139 +
  140 +
  141 + SubSectionEnd
  142 +
  143 + SubSection "Menus, Keypads & Toolbars" SecMenu
  144 +
  145 + Section "Keypad" KeypadMenu
  146 + file "/oname=$INSTDIR\ui\10keypad.xml" "..\ui\10keypad.xml"
  147 + sectionEnd
  148 +
  149 + Section "Functions" FunctionsMenu
  150 + file "/oname=$INSTDIR\ui\10functions.xml" "..\ui\10functions.xml"
  151 + sectionEnd
  152 +
  153 + Section /o "View trace Menu" TraceMenu
  154 + file "/oname=$INSTDIR\ui\98trace.xml" "..\ui\98trace.xml"
  155 + sectionEnd
  156 +
  157 + Section /o "Application debug" DBGMenu
  158 + file "/oname=$INSTDIR\ui\99debug.xml" "..\ui\99debug.xml"
  159 + sectionEnd
  160 +
  161 + SubSectionEnd
  162 +
  163 +SubSectionEnd
  164 +
  165 +!ifdef WITHGTK
  166 +Section /o "GTK+ Runtime" SecGTK
  167 +
  168 + setOutPath $INSTDIR
  169 + file /r "..\.bin\gtkruntime\*.*"
  170 +
  171 +SectionEnd
  172 +!endif
  173 +
  174 +Section "Uninstall"
  175 +
  176 +SectionEnd
  177 +
  178 +Function .onInit
  179 +
  180 +SetRegView @WINARCH@
  181 +
  182 +ReadRegStr $4 HKLM "Software\gtkwin\@GTK_MODVERSION@" "path"
  183 +
  184 +${if} $4 == ""
  185 +
  186 + SectionGetFlags "SecGTK" $0
  187 + IntOp $0 $0 | ${SF_SELECTED}
  188 + SectionSetFlags "SecGTK" $0
  189 +
  190 +${Else}
  191 +
  192 + ${if} ${FileExists} `$4\*.*`
  193 +
  194 + SectionGetFlags "SecGTK" $0
  195 + IntOp $0 $0 & ${SECTION_OFF}
  196 + SectionSetFlags "SecGTK" $0
  197 +
  198 + ${Else}
  199 +
  200 + SectionGetFlags "SecGTK" $0
  201 + IntOp $0 $0 | ${SF_SELECTED}
  202 + SectionSetFlags "SecGTK" $0
  203 +
  204 + ${EndIf}
  205 +
  206 +${EndIf}
  207 +
  208 +
  209 +FunctionEnd
  210 +
  211 +
  212 +
... ...