Download as
Browse Code »

Commit 58cf0b6c55e22504bf0ee01b7e2a429c70b7de07

Authored by perry.werneck@gmail.com
1 parent 9c1b8a6a
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Acertando empacotamento windows

Showing 4 changed files with 4 additions and 290 deletions   Show diff stats
configure.ac
  Diff comments   View file @58cf0b6
... ... @@ -552,7 +552,6 @@ AC_CONFIG_FILES([
552 552 lib3270.pc
553 553 pw3270.pc
554 554 pw3270.spec
555   - pw3270.nsi
556 555 pw3270-i686.nsi
557 556 pw3270-x86_64.nsi
558 557 src/include/rules.mak
... ...
po/pt_BR.po
  Diff comments   View file @58cf0b6
... ... @@ -5,7 +5,7 @@ msgid ""
5 5 msgstr ""
6 6 "Project-Id-Version: pw3270 5.0\n"
7 7 "Report-Msgid-Bugs-To: \n"
8   -"POT-Creation-Date: 2013-06-28 16:57-0300\n"
  8 +"POT-Creation-Date: 2013-07-01 07:45-0300\n"
9 9 "PO-Revision-Date: 2013-05-08 14:30-0300\n"
10 10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11 11 "Language-Team: Português <>\n"
... ...
pw3270.nsi.in
View file @9c1b8a6
... ... @@ -1,285 +0,0 @@
1   -!include "MUI2.nsh"
2   -
3   -Name "@PACKAGE@"
4   -Caption "@PACKAGE@ - 3270 Emulator for windows/gtk"
5   -outfile "@PACKAGE@-@PACKAGE_VERSION@.@PACKAGE_LEVEL@-gtk-@GTK_MODVERSION@-@host_cpu@-install.exe"
6   -XPStyle on
7   -
8   -# define the directory to install to
9   -installDir $PROGRAMFILES\@PACKAGE@
10   -
11   -#define the installer icon
12   -!define MUI_ICON "src\pw3270\@PACKAGE@.ico"
13   -!define MUI_UNICON "src\pw3270\@PACKAGE@.ico"
14   -icon "src\pw3270\@PACKAGE@.ico"
15   -
16   -# Get installation folder from registry if available
17   -InstallDirRegKey HKLM "Software\@PACKAGE@" "InstallLocation"
18   -
19   -RequestExecutionLevel admin
20   -
21   -# Properties
22   -VIProductVersion "@PACKAGE_VERSION@.@PACKAGE_LEVEL@.@PACKAGE_REVISION@"
23   -VIAddVersionKey "ProductName" "@PACKAGE@"
24   -VIAddVersionKey "FileDescription" "3270 Emulator for windows/gtk"
25   -VIAddVersionKey "FileVersion" "@PACKAGE_REVISION@"
26   -VIAddVersionKey "LegalCopyright" "GPL-2.0"
27   -
28   -# Interface
29   -
30   -!define MUI_ABORTWARNING
31   -# !insertmacro MUI_PAGE_WELCOME
32   -!insertmacro MUI_PAGE_LICENSE "LICENSE"
33   -!insertmacro MUI_PAGE_COMPONENTS
34   -!insertmacro MUI_PAGE_DIRECTORY
35   -!insertmacro MUI_PAGE_INSTFILES
36   -
37   -# !insertmacro MUI_UNPAGE_WELCOME
38   -!insertmacro MUI_UNPAGE_CONFIRM
39   -!insertmacro MUI_UNPAGE_INSTFILES
40   -# !insertmacro MUI_UNPAGE_FINISH
41   -
42   -# Languages
43   -!insertmacro MUI_LANGUAGE "English"
44   -
45   -# Section scripts
46   -!include Sections.nsh
47   -
48   -# default section
49   -SubSection "@PACKAGE@" SecMain
50   -
51   - Section "Core" SecCore
52   -
53   - # define the output path for this file
54   - setOutPath $INSTDIR
55   - SetShellVarContext all
56   -
57   - createShortCut "$SMPROGRAMS\@PACKAGE@.lnk" "$INSTDIR\@PACKAGE@.exe"
58   - createShortCut "$DESKTOP\@PACKAGE@.lnk" "$INSTDIR\@PACKAGE@.exe"
59   -
60   - # Binary files
61   - file "/oname=$INSTDIR\@PACKAGE@.exe" ".bin\Release\@PACKAGE@.exe"
62   - file "/oname=$INSTDIR\@PACKAGE@.ico" "src\pw3270\@PACKAGE@.ico"
63   - file "/oname=$INSTDIR\lib3270.dll.@PACKAGE_VERSION@" ".bin\Release\lib3270.dll.@PACKAGE_VERSION@"
64   - file "/oname=$INSTDIR\pw3270.dll.@PACKAGE_VERSION@" ".bin\Release\pw3270.dll.@PACKAGE_VERSION@"
65   -
66   - # Configuration files
67   - file "/oname=$INSTDIR\@PACKAGE@-logo.png" "src\pw3270\@PACKAGE@-logo.png"
68   - file "/oname=$INSTDIR\@PACKAGE@.png" "src\pw3270\@PACKAGE@.png"
69   - file "/oname=$INSTDIR\colors.conf" "colors.conf"
70   -
71   - # Documentation files
72   - file "/oname=$INSTDIR\ChangeLog" "ChangeLog"
73   - file "/oname=$INSTDIR\AUTHORS" "AUTHORS"
74   - file "/oname=$INSTDIR\LICENSE" "LICENSE"
75   -
76   - # Misc folders
77   - CreateDirectory "$INSTDIR\certs"
78   - CreateDirectory "$INSTDIR\plugins"
79   -
80   - # UI definition files
81   - CreateDirectory "$INSTDIR\ui"
82   -
83   - file "/oname=$INSTDIR\ui\00default.xml" "ui\00default.xml"
84   - file "/oname=$INSTDIR\ui\10keypad.xml" "ui\10keypad.xml"
85   -
86   - # Locale files
87   - CreateDirectory "$INSTDIR\@localedir@\pt_BR\LC_MESSAGES"
88   - file "/oname=$INSTDIR\@localedir@\pt_BR\LC_MESSAGES\@PACKAGE@.mo" ".bin\Release\@localedir@\pt_BR\LC_MESSAGES\@PACKAGE@.mo"
89   -
90   - # Save DataDir
91   - WriteRegStr HKLM "Software\@PACKAGE@" \
92   - "datadir" $INSTDIR
93   -
94   - # define uninstaller name
95   - writeUninstaller $INSTDIR\uninstall.exe
96   -
97   - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \
98   - "DisplayName" "@PACKAGE@ - 3270 emulator for windows/gtk"
99   - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \
100   - "DisplayIcon" "$INSTDIR\@PACKAGE@.ico"
101   - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \
102   - "DisplayVersion" "@PACKAGE_VERSION@ (Rev: @PACKAGE_REVISION@)"
103   -
104   - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \
105   - "UninstallString" "$INSTDIR\uninstall.exe"
106   - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \
107   - "InstallLocation" "$INSTDIR"
108   - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \
109   - "NoModify" "1"
110   - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \
111   - "NoRepair" "1"
112   -
113   - # Save instalation dir
114   - WriteRegStr HKCU "Software\@PACKAGE@" "" $INSTDIR
115   -
116   - sectionEnd
117   -
118   - SubSection "Plugins" SecPLugin
119   -
120   - Section /o "HLLAPI" HLLAPIPlugin
121   - setOutPath $INSTDIR
122   -
123   - CreateDirectory "$INSTDIR\plugins"
124   - file "/oname=$INSTDIR\plugins\hllapi.dll" ".bin\Release\plugins\hllapi.dll"
125   - file "/oname=$SYSDIR\libhllapi.dll" ".bin\Release\libhllapi.dll"
126   -
127   - sectionEnd
128   -
129   -#
130   -# Section /o "Rexx" RexxPlugin
131   -# setOutPath $INSTDIR
132   -#
133   -# CreateDirectory "$INSTDIR"
134   -# file src\plugins\rexx\rx3270.cls
135   -#
136   -# CreateDirectory "$INSTDIR\plugins"
137   -# file "/oname=$INSTDIR\plugins\rx3270.dll" ".bin\Release\plugins\rx3270.dll"
138   -# file "/oname=$INSTDIR\ui\rexx.xml" ui\rexx.xml
139   -#
140   -# sectionEnd
141   -#
142   - SubSectionEnd
143   -
144   -SubSectionEnd
145   -
146   -Section /o "GTK @GTK_MODVERSION@ Runtime" SecGTK
147   -
148   - setOutPath $INSTDIR
149   - file /r ".bin\gtkruntime\*.*"
150   -
151   -SectionEnd
152   -
153   -Section /o "Software Development Kit" SecSDK
154   -
155   - CreateDirectory "$INSTDIR\sdk"
156   - CreateDirectory "$INSTDIR\sdk\include"
157   - CreateDirectory "$INSTDIR\sdk\include\lib3270"
158   - CreateDirectory "$INSTDIR\sdk\include\pw3270"
159   -
160   - file "/oname=$INSTDIR\sdk\include\lib3270.h" "src\include\lib3270.h"
161   - file "/oname=$INSTDIR\sdk\include\pw3270.h" "src\include\pw3270.h"
162   - file "/oname=$INSTDIR\sdk\include\pw3270\v3270.h" "src\include\pw3270\v3270.h"
163   - file "/oname=$INSTDIR\sdk\include\pw3270\hllapi.h" "src\include\pw3270\hllapi.h"
164   -
165   - file "/oname=$INSTDIR\sdk\include\lib3270\config.h" "src\include\lib3270\config.h"
166   - file "/oname=$INSTDIR\sdk\include\lib3270\rules.mak" "src\include\rules.mak"
167   -
168   - file "/oname=$INSTDIR\sdk\sample\Makefile" "src\sample\Makefile"
169   - file "/oname=$INSTDIR\sdk\sample\connect.c" "src\sample\connect.c"
170   -
171   - file "/oname=$INSTDIR\sdk\lib3270.def" ".bin\Release\lib3270.dll.@PACKAGE_VERSION@.def"
172   - file "/oname=$INSTDIR\sdk\pw3270.def" ".bin\Release\pw3270.dll.@PACKAGE_VERSION@.def"
173   - file "/oname=$INSTDIR\sdk\libhllapi.def" ".bin\Release\libhllapi.dll.def"
174   -
175   -SectionEnd
176   -
177   -# create a section to define what the uninstaller does.
178   -# the section will always be named "Uninstall"
179   -section "Uninstall"
180   -
181   - # Always delete uninstaller first
182   - delete $INSTDIR\uninstaller.exe
183   -
184   - # Set SMPROGRAMS and DESKTOP path
185   - SetShellVarContext all
186   -
187   - # now delete installed files
188   - delete $INSTDIR\@PACKAGE@.exe
189   -
190   - delete $SMPROGRAMS\@PACKAGE@.lnk
191   - delete $DESKTOP\@PACKAGE@.lnk
192   -
193   - RMDir /r "$INSTDIR\locale"
194   - RMDir /r "$INSTDIR\share"
195   - RMDir /r "$INSTDIR\etc"
196   - RMDir /r "$INSTDIR\plugins"
197   - RMDir /r "$INSTDIR\sdk"
198   - RMDir /r "$INSTDIR\gtk2-runtime"
199   -
200   - # Delete all files
201   - delete "$INSTDIR\*.dll"
202   -
203   - # Remove registry
204   - DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@"
205   - DeleteRegKey HKLM "Software\@PACKAGE@"
206   -
207   - # Delete System libraries
208   - delete $SYSDIR\libhllapi.dll
209   -
210   - # Delete extension libraries
211   -# delete $PROGRAMFILES\ooRexx\rx3270.dll
212   -
213   - RMDir /r "$INSTDIR"
214   -
215   -sectionEnd
216   -
217   -Function .onInit
218   -
219   -#FindProcDLL::FindProc "@PACKAGE@.exe"
220   -#IntCmp $R0 1 0 notRunning
221   -#
222   -# MessageBox MB_OK|MB_ICONEXCLAMATION "@PACKAGE@ is running. Please close it first" /SD IDOK
223   -# Abort
224   -#
225   -#notRunning:
226   -
227   -#IfFileExists $PROGRAMFILES\ooRexx\rexx.exe RexxOK RexxNOK
228   -#
229   -#RexxOK:
230   -# SectionGetFlags "${RexxPlugin}" $0
231   -# IntOp $0 $0 | ${SF_SELECTED}
232   -# SectionSetFlags "${RexxPlugin}" $0
233   -#
234   -# SectionGetFlags "${SecRexxLib}" $0
235   -# IntOp $0 $0 | ${SF_SELECTED}
236   -# SectionSetFlags "${SecRexxLib}" $0
237   -#
238   -#goto PastRexxCheck
239   -#
240   -#RexxNOK:
241   -# SectionGetFlags "${RexxPlugin}" $0
242   -# IntOp $0 $0 | ${SF_RO}
243   -# SectionSetFlags "${RexxPlugin}" $0
244   -#
245   -# SectionGetFlags "${SecRexxLib}" $0
246   -# IntOp $0 $0 | ${SF_RO}
247   -# SectionSetFlags "${SecRexxLib}" $0
248   -#
249   -#PastRexxCheck:
250   -
251   - ReadRegStr $4 HKLM "Software\GTK2-Runtime" "DllPath"
252   -
253   - # remove trailing back slash
254   - Push $4
255   - Exch $EXEDIR
256   - Exch $EXEDIR
257   - Pop $4
258   -
259   - # if Gtk runtime DLL path exists gtk runtime is already installed.
260   - IfFileExists $4 gtkOK gtkNOK
261   -
262   -gtkOK:
263   -
264   - SectionGetFlags "${SecGTK}" $0
265   - IntOp $0 $0 & ${SECTION_OFF}
266   - SectionSetFlags "${SecGTK}" $0
267   -
268   -goto PastGTKCheck
269   -
270   -gtkNOK:
271   -
272   - SectionGetFlags "${SecGTK}" $0
273   - IntOp $0 $0 | ${SF_SELECTED}
274   - SectionSetFlags "${SecGTK}" $0
275   -
276   -goto PastGTKCheck
277   -
278   -
279   -
280   -PastGTKCheck:
281   -
282   -
283   -FunctionEnd
284   -
285   -
src/plugins/rx3270/Makefile.in
  Diff comments   View file @58cf0b6
... ... @@ -47,7 +47,7 @@ include ../../include/plugin.mak
47 47  
48 48 #---[ Debug Targets ]----------------------------------------------------------
49 49  
50   -$(BINDBG)/$(PLUGIN_NAME): $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJDBG)/$(SRC).o) $(BINDBG)$(DLL_NAME).$(VERSION)
  50 +$(BINDBG)/$(PLUGIN_NAME): $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJDBG)/$(SRC).o) $(BINDBG)$(DLL_NAME)
51 51 @echo " CCLD `basename $@`"
52 52 @$(MKDIR) `dirname $@`
53 53 @$(CXX) $(DLL_FLAGS) @LDSOFLAGS@ @DBGRPATH@ $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(PW3270_LIBS)
... ... @@ -59,7 +59,7 @@ $(BINDBG)$(DLL_NAME).$(VERSION): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJ
59 59  
60 60 #---[ Release Targets ]--------------------------------------------------------
61 61  
62   -$(BINRLS)/$(PLUGIN_NAME): $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/$(SRC).o) $(BINRLS)$(DLL_NAME).$(VERSION)
  62 +$(BINRLS)/$(PLUGIN_NAME): $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/$(SRC).o) $(BINRLS)$(DLL_NAME)
63 63 @echo " CCLD `basename $@`"
64 64 @$(MKDIR) `dirname $@`
65 65 $(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) @RLS_LDFLAGS@ -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(PW3270_LIBS)
... ... @@ -70,7 +70,7 @@ $(BINRLS)$(DLL_NAME).$(VERSION): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJ
70 70 $(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) @RLS_LDFLAGS@ -o $@ $^ $(LIBS) $(LIB3270_LIBS)
71 71  
72 72 install:
73   - @$(MKDIR) $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-plugins
  73 + @$(MKDIR) $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-plugin
74 74 @$(INSTALL_PROGRAM) $(BINRLS)/$(PLUGIN_NAME) $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-plugins
75 75  
76 76 @$(MKDIR) $(DESTDIR)$(REXXLIBDIR)
... ...