Download as
Browse Code »

Commit e2821682fbb82d8f4d70bb17a81464bbd40642d8

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

IPC3270 is now a core library on windows package script.

Showing 2 changed files with 3 additions and 18 deletions   Show diff stats
win/pack.sh
  Diff comments   View file @e282168
... ... @@ -28,8 +28,8 @@
28 28  
29 29 PRODUCT_NAME="pw3270"
30 30 LIBRARY_NAME="lib3270"
31   -CORE_LIBRARIES="lib3270 libv3270"
32   -PACKAGE_PLUGINS="ipc"
  31 +CORE_LIBRARIES="lib3270 libv3270 libipc3270"
  32 +PACKAGE_PLUGINS=""
33 33 PACKAGE_LANGUAGE_BINDINGS="hllapi mono"
34 34 TARGET_ARCHS="x86_64 x86_32"
35 35 GIT_URL="https://github.com/PerryWerneck"
... ... @@ -503,16 +503,10 @@ makeRuntime()
503 503 #
504 504 makeInstaller()
505 505 {
506   - NSIS_ARGS="-DWITHGTK"
  506 + NSIS_ARGS="-DWITHGTK -DWITHIPC -DWITHPLUGINS"
507 507  
508 508 if [ -d ${CERTS_DIR} ]; then
509   -
510 509 NSIS_ARGS="${NSIS_ARGS} -DWITHCERTS"
511   -
512   - fi
513   -
514   - if [ ! -z "${PACKAGE_PLUGINS}" ]; then
515   - NSIS_ARGS="${NSIS_ARGS} -DWITHPLUGINS"
516 510 fi
517 511  
518 512 if [ ! -z "${PACKAGE_LANGUAGE_BINDINGS}" ]; then
... ...
win/pw3270.nsi.in
  Diff comments   View file @e282168
... ... @@ -81,7 +81,6 @@ SubSection "@PRODUCT_NAME@" SecMain
81 81 file "/oname=$INSTDIR\@PACKAGE@.dll" "@PACKAGE@.dll"
82 82 file "/oname=$SYSDIR\libipc3270.dll" "libipc3270.dll"
83 83  
84   -
85 84 # Configuration files
86 85 file "/oname=$INSTDIR\@PRODUCT_NAME@-logo.png" "@PRODUCT_NAME@\@PRODUCT_NAME@-logo.png"
87 86 file "/oname=$INSTDIR\@PRODUCT_NAME@.png" "@PRODUCT_NAME@\@PRODUCT_NAME@.png"
... ... @@ -143,10 +142,8 @@ SubSection "@PRODUCT_NAME@" SecMain
143 142 sectionEnd
144 143 !endif
145 144  
146   -!ifdef WITHPLUGINS
147 145 SubSection "Plugins" SecPLugin
148 146  
149   -!ifdef WITHIPC
150 147 Section /o "Remote control" IPCPlugin
151 148  
152 149 setOutPath $INSTDIR
... ... @@ -157,10 +154,8 @@ SubSection "@PRODUCT_NAME@" SecMain
157 154 file "/oname=$INSTDIR\plugins\ipcserver.dll" "@PRODUCT_NAME@-plugins\ipcserver.dll"
158 155  
159 156 sectionEnd
160   -!endif
161 157  
162 158 SubSectionEnd
163   -!endif
164 159  
165 160 !ifdef WITHLANGUAGE
166 161 SubSection "Language bindins" Languages
... ... @@ -296,11 +291,9 @@ Function .onInit
296 291 IntOp $0 $0 | ${SF_SELECTED}
297 292 SectionSetFlags ${DOTNET} $0
298 293  
299   -!ifdef WITHIPC
300 294 SectionGetFlags ${IPCPlugin} $0
301 295 IntOp $0 $0 | ${SF_SELECTED}
302 296 SectionSetFlags ${IPCPlugin} $0
303   -!endif
304 297  
305 298 ${EndIf}
306 299  
... ... @@ -329,11 +322,9 @@ Function .onInit
329 322 IntOp $0 $0 | ${SF_SELECTED}
330 323 SectionSetFlags ${HLLAPIBinding} $0
331 324  
332   -!ifdef WITHIPC
333 325 SectionGetFlags ${IPCPlugin} $0
334 326 IntOp $0 $0 | ${SF_SELECTED}
335 327 SectionSetFlags ${IPCPlugin} $0
336   -!endif
337 328  
338 329 ${EndIf}
339 330  
... ...