Download as
Browse Code »

Commit 2776e27faaf7cc74afeecb020f074441cee5adf1

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

Adding SDK to windows installation package.

Showing 2 changed files with 30 additions and 26 deletions   Show diff stats
@@ -511,7 +511,7 @@ makeRuntime() @@ -511,7 +511,7 @@ makeRuntime()
511 # 511 #
512 makeInstaller() 512 makeInstaller()
513 { 513 {
514 - NSIS_ARGS="-DWITHGTK -DWITHIPC -DWITHPLUGINS" 514 + NSIS_ARGS="-DWITHGTK -DWITHIPC -DWITHPLUGINS -DWITHSDK"
515 515
516 if [ -d ${CERTS_DIR} ]; then 516 if [ -d ${CERTS_DIR} ]; then
517 NSIS_ARGS="${NSIS_ARGS} -DWITHCERTS" 517 NSIS_ARGS="${NSIS_ARGS} -DWITHCERTS"
win/pw3270.nsi.in
  Diff comments   View file @2776e27
@@ -163,15 +163,13 @@ SubSection "@PRODUCT_NAME@" SecMain @@ -163,15 +163,13 @@ SubSection "@PRODUCT_NAME@" SecMain
163 !ifdef WITHLIBHLLAPI 163 !ifdef WITHLIBHLLAPI
164 Section /o "HLLAPI" HLLAPIBinding 164 Section /o "HLLAPI" HLLAPIBinding
165 165
166 - setOutPath $INSTDIR  
167 -  
168 ${DisableX64FSRedirection} 166 ${DisableX64FSRedirection}
169 file "/oname=$SYSDIR\hllapi.dll" "libhllapi.dll" 167 file "/oname=$SYSDIR\hllapi.dll" "libhllapi.dll"
170 168
171 # Install with "lib" prefix for compatibility. 169 # Install with "lib" prefix for compatibility.
172 file "/oname=$SYSDIR\libhllapi.dll" "libhllapi.dll" 170 file "/oname=$SYSDIR\libhllapi.dll" "libhllapi.dll"
173 171
174 - sectionEnd 172 + SectionEnd
175 !endif 173 !endif
176 174
177 !ifdef WITHMONO-TN3270 175 !ifdef WITHMONO-TN3270
@@ -184,7 +182,7 @@ SubSection "@PRODUCT_NAME@" SecMain @@ -184,7 +182,7 @@ SubSection "@PRODUCT_NAME@" SecMain
184 file "/oname=$INSTDIR\dotnet\tn3270.xml" "mono/gapi-2.0/tn3270/tn3270.xml" 182 file "/oname=$INSTDIR\dotnet\tn3270.xml" "mono/gapi-2.0/tn3270/tn3270.xml"
185 file "/oname=$SYSDIR\mono-tn3270.dll" "mono-tn3270.dll" 183 file "/oname=$SYSDIR\mono-tn3270.dll" "mono-tn3270.dll"
186 184
187 - sectionEnd 185 + SectionEnd
188 !endif 186 !endif
189 187
190 SubSectionEnd 188 SubSectionEnd
@@ -194,46 +192,52 @@ SubSection "@PRODUCT_NAME@" SecMain @@ -194,46 +192,52 @@ SubSection "@PRODUCT_NAME@" SecMain
194 192
195 Section "Keypad" KeypadMenu 193 Section "Keypad" KeypadMenu
196 file "/oname=$INSTDIR\ui\10keypad.xml" "@PRODUCT_NAME@\ui\10keypad.xml" 194 file "/oname=$INSTDIR\ui\10keypad.xml" "@PRODUCT_NAME@\ui\10keypad.xml"
197 - sectionEnd 195 + SectionEnd
198 196
199 Section "Functions" FunctionsMenu 197 Section "Functions" FunctionsMenu
200 file "/oname=$INSTDIR\ui\10functions.xml" "@PRODUCT_NAME@\ui\10functions.xml" 198 file "/oname=$INSTDIR\ui\10functions.xml" "@PRODUCT_NAME@\ui\10functions.xml"
201 - sectionEnd 199 + SectionEnd
202 200
203 Section /o "View trace Menu" TraceMenu 201 Section /o "View trace Menu" TraceMenu
204 file "/oname=$INSTDIR\ui\98trace.xml" "@PRODUCT_NAME@\ui\98trace.xml" 202 file "/oname=$INSTDIR\ui\98trace.xml" "@PRODUCT_NAME@\ui\98trace.xml"
205 - sectionEnd 203 + SectionEnd
206 204
207 Section /o "Application debug" DBGMenu 205 Section /o "Application debug" DBGMenu
208 file "/oname=$INSTDIR\ui\99debug.xml" "@PRODUCT_NAME@\ui\99debug.xml" 206 file "/oname=$INSTDIR\ui\99debug.xml" "@PRODUCT_NAME@\ui\99debug.xml"
209 - sectionEnd 207 + SectionEnd
210 208
211 SubSectionEnd 209 SubSectionEnd
212 210
  211 +!ifdef WITHSDK
  212 + Section /o "Software Development Kit" SDK
213 213
214 -SubSectionEnd 214 + setOutPath $INSTDIR\sdk\include
  215 + file /r "include\*.*"
  216 +
  217 + CreateDirectory "$INSTDIR\sdk"
  218 + CreateDirectory "$INSTDIR\sdk\def"
  219 + CreateDirectory "$INSTDIR\sdk\lib"
215 220
216 -Section "Software Development Kit" SDK 221 + file "/oname=$INSTDIR\sdk\def\lib3270.def" "@PRODUCT_NAME@\def\lib3270.def"
  222 + file "/oname=$INSTDIR\sdk\lib\lib3270.lib" "lib@LIBRARY_NAME@.lib"
  223 + file "/oname=$INSTDIR\sdk\lib\lib3270.dll.a" "lib@LIBRARY_NAME@.dll.a"
  224 + file "/oname=$INSTDIR\sdk\lib\lib3270.delayed.a" "lib@LIBRARY_NAME@.delayed.a"
  225 + file "/oname=$INSTDIR\sdk\lib\lib3270.static.a" "lib@LIBRARY_NAME@.static.a"
217 226
218 - setOutPath $INSTDIR/sdk  
219 - file /r "include\*.*" 227 + file "/oname=$INSTDIR\sdk\def\libv3270.def" "@PRODUCT_NAME@\def\libv3270.def"
  228 + file "/oname=$INSTDIR\sdk\lib\libv3270.lib" "libv3270.lib"
  229 + file "/oname=$INSTDIR\sdk\lib\libv3270.dll.a" "libv3270.dll.a"
220 230
221 - file "/oname=$INSTDIR\sdk\def\lib3270.def" "@PRODUCT_NAME@\def\lib3270.def"  
222 - file "/oname=$INSTDIR\sdk\lib\lib3270.lib" "lib3270.lib"  
223 - file "/oname=$INSTDIR\sdk\lib\lib3270.dll.a" "lib3270.dll.a"  
224 - file "/oname=$INSTDIR\sdk\lib\lib3270.delayed.a" "lib3270.delayed.a"  
225 - file "/oname=$INSTDIR\sdk\lib\lib3270.static.a" "lib3270.static.a" 231 + file "/oname=$INSTDIR\sdk\def\libipc3270.def" "@PRODUCT_NAME@\def\libipc3270.def"
  232 + file "/oname=$INSTDIR\sdk\lib\libipc3270.lib" "libipc3270.lib"
  233 + file "/oname=$INSTDIR\sdk\lib\libipc3270.dll.a" "libipc3270.dll.a"
  234 + file "/oname=$INSTDIR\sdk\lib\libipc3270.static.a" "libipc3270.static.a"
226 235
227 - file "/oname=$INSTDIR\sdk\def\libv3270.def" "@PRODUCT_NAME@\def\libv3270.def"  
228 - file "/oname=$INSTDIR\sdk\lib\libv3270.lib" "libv3270.lib"  
229 - file "/oname=$INSTDIR\sdk\lib\libv3270.dll.a" "libv3270.dll.a" 236 + SectionEnd
  237 +!endif
230 238
231 - file "/oname=$INSTDIR\sdk\def\libipc3270.def" "@PRODUCT_NAME@\def\libipc3270.def"  
232 - file "/oname=$INSTDIR\sdk\lib\libipc3270.lib" "libipc3270.lib"  
233 - file "/oname=$INSTDIR\sdk\lib\libipc3270.dll.a" "libipc3270.dll.a"  
234 - file "/oname=$INSTDIR\sdk\lib\libipc3270.static.a" "libipc3270.static.a" 239 +SubSectionEnd
235 240
236 -SectionEnd  
237 241
238 !ifdef WITHGTK 242 !ifdef WITHGTK
239 Section /o "GTK+ Runtime" SecGTK 243 Section /o "GTK+ Runtime" SecGTK