Download as
Browse Code »

Commit 2a6021518812b3068413e290630c57b4334b7e94

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

Updating windows package.

Showing 2 changed files with 14 additions and 14 deletions   Show diff stats
win/pack.sh
  Diff comments   View file @2a60215
... ... @@ -30,7 +30,7 @@ PRODUCT_NAME="pw3270"
30 30 LIBRARY_NAME="lib3270"
31 31 CORE_LIBRARIES="lib3270 libv3270 libipc3270"
32 32 PACKAGE_PLUGINS=""
33   -PACKAGE_LANGUAGE_BINDINGS="hllapi mono"
  33 +PACKAGE_EXTRAS="libhllapi mono-tn3270"
34 34 TARGET_ARCHS="x86_64 x86_32"
35 35 GIT_URL="https://github.com/PerryWerneck"
36 36  
... ... @@ -229,10 +229,10 @@ buildLibrary()
229 229 #
230 230 # Build language binding
231 231 #
232   -buildLanguageBinding()
  232 +buildExtraPackage()
233 233 {
234 234  
235   - echo "Building language binding ${1}"
  235 + echo "Building ${1}"
236 236  
237 237 for ARCH in ${TARGET_ARCHS}
238 238 do
... ... @@ -509,11 +509,11 @@ makeInstaller()
509 509 NSIS_ARGS="${NSIS_ARGS} -DWITHCERTS"
510 510 fi
511 511  
512   - if [ ! -z "${PACKAGE_LANGUAGE_BINDINGS}" ]; then
513   - NSIS_ARGS="${NSIS_ARGS} -DWITHLANGUAGE"
  512 + if [ ! -z "${PACKAGE_EXTRAS}" ]; then
  513 + NSIS_ARGS="${NSIS_ARGS} -DWITHEXTRAS"
514 514 fi
515 515  
516   - for ARG in $(echo ${PACKAGE_PLUGINS} | tr "[:lower:]" "[:upper:]") $(echo ${PACKAGE_LANGUAGE_BINDINGS} | tr "[:lower:]" "[:upper:]")
  516 + for ARG in $(echo ${PACKAGE_PLUGINS} | tr "[:lower:]" "[:upper:]") $(echo ${PACKAGE_EXTRAS} | tr "[:lower:]" "[:upper:]")
517 517 do
518 518 NSIS_ARGS="${NSIS_ARGS} -DWITH${ARG}"
519 519 done
... ... @@ -716,9 +716,9 @@ do
716 716 prepare pw3270-plugin-${src}
717 717 done
718 718  
719   -for src in ${PACKAGE_LANGUAGE_BINDINGS}
  719 +for src in ${PACKAGE_EXTRAS}
720 720 do
721   - prepare lib3270-${src}-bindings
  721 + prepare ${src}
722 722 done
723 723  
724 724 #
... ... @@ -738,9 +738,9 @@ do
738 738 buildLibrary pw3270-plugin-${src}
739 739 done
740 740  
741   -for src in ${PACKAGE_LANGUAGE_BINDINGS}
  741 +for src in ${PACKAGE_EXTRAS}
742 742 do
743   - buildLanguageBinding lib3270-${src}-bindings
  743 + buildExtraPackage ${src}
744 744 done
745 745  
746 746 #
... ...
win/pw3270.nsi.in
  Diff comments   View file @2a60215
... ... @@ -157,10 +157,10 @@ SubSection "@PRODUCT_NAME@" SecMain
157 157  
158 158 SubSectionEnd
159 159  
160   -!ifdef WITHLANGUAGE
161   - SubSection "Language bindins" Languages
  160 +!ifdef WITHEXTRAS
  161 + SubSection "Extra modules" Languages
162 162  
163   -!ifdef WITHHLLAPI
  163 +!ifdef WITHLIBHLLAPI
164 164 Section /o "HLLAPI" HLLAPIBinding
165 165  
166 166 setOutPath $INSTDIR
... ... @@ -174,7 +174,7 @@ SubSection "@PRODUCT_NAME@" SecMain
174 174 sectionEnd
175 175 !endif
176 176  
177   -!ifdef WITHMONO
  177 +!ifdef WITHMONO-TN3270
178 178 Section /o ".NET" DOTNET
179 179  
180 180 ${DisableX64FSRedirection}
... ...