Download as
Browse Code »

Commit d146e8c6a8a2cd0f904be78ec9a8f74f360c7186

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

Updating windows builds.

Showing 2 changed files with 32 additions and 10 deletions   Show diff stats
win/pack.sh
  Diff comments   View file @d146e8c
... ... @@ -5,7 +5,7 @@ LIBRARY_NAME="lib3270"
5 5 CORE_LIBRARIES="lib3270 libv3270"
6 6 PACKAGE_PLUGINS="ipc"
7 7 PACKAGE_LANGUAGE_BINDINGS="hllapi"
8   -TARGET_ARCHS="x86_32 x86_64"
  8 +TARGET_ARCHS="x86_64"
9 9 GIT_URL="https://github.com/PerryWerneck"
10 10  
11 11 PROJECTDIR=$(dirname $(dirname $(readlink -f ${0})))
... ... @@ -81,6 +81,8 @@ configure()
81 81 done
82 82 fi
83 83  
  84 + echo -e "\e]2;Creating configuration\a"
  85 + echo "Creating configuration"
84 86 for DIR in $(find ${WORKDIR}/sources -maxdepth 1 -type d)
85 87 do
86 88 echo ${DIR}
... ... @@ -159,6 +161,7 @@ buildLibrary()
159 161 LDFLAGS="-L${WORKDIR}/build/${ARCH}" \
160 162 --host=${host} \
161 163 --prefix=${prefix} \
  164 + --with-product-name="${PRODUCT_NAME}" \
162 165 --bindir=${WORKDIR}/build/${ARCH} \
163 166 --libdir=${WORKDIR}/build/${ARCH} \
164 167 --localedir=${WORKDIR}/build/${ARCH}/locale \
... ... @@ -168,8 +171,6 @@ buildLibrary()
168 171 --datarootdir=${WORKDIR}/build/${ARCH}
169 172 fi
170 173  
171   - /bin/bash
172   -
173 174 if [ "$?" != "0" ]; then
174 175 failed "Can't configure ${1}"
175 176 fi
... ... @@ -362,12 +363,19 @@ makeInstaller()
362 363 {
363 364 NSIS_ARGS="-DWITHGTK"
364 365  
  366 + if [ ! -z ${PACKAGE_PLUGINS} ]; then
  367 + NSIS_ARGS="${NSIS_ARGS} -DWITHPLUGINS"
  368 + fi
  369 +
  370 + if [ ! -z ${PACKAGE_LANGUAGE_BINDINGS} ]; then
  371 + NSIS_ARGS="${NSIS_ARGS} -DWITHLANGUAGE"
  372 + fi
  373 +
365 374 for ARG in $(echo ${PACKAGE_PLUGINS} | tr "[:lower:]" "[:upper:]") $(echo ${PACKAGE_LANGUAGE_BINDINGS} | tr "[:lower:]" "[:upper:]")
366 375 do
367 376 NSIS_ARGS="${NSIS_ARGS} -DWITH${ARG}"
368 377 done
369 378  
370   -
371 379 for ARCH in ${TARGET_ARCHS}
372 380 do
373 381  
... ...
win/pw3270.nsi.in
  Diff comments   View file @d146e8c
... ... @@ -134,8 +134,10 @@ SubSection "@PACKAGE@" SecMain
134 134  
135 135 sectionEnd
136 136  
  137 +!ifdef WITHPLUGINS
137 138 SubSection "Plugins" SecPLugin
138 139  
  140 +!ifdef WITHIPC
139 141 Section /o "Remote control" IPCPlugin
140 142  
141 143 setOutPath $INSTDIR
... ... @@ -143,15 +145,19 @@ SubSection "@PACKAGE@" SecMain
143 145 ${DisableX64FSRedirection}
144 146 CreateDirectory "$INSTDIR\plugins"
145 147  
146   - file "/oname=$INSTDIR\plugins\ipc3270c.dll" "pw3270-plugins\ipcserver.dll"
  148 + file "/oname=$INSTDIR\plugins\ipcserver.dll" "pw3270-plugins\ipcserver.dll"
147 149  
148 150 sectionEnd
  151 +!endif
149 152  
150 153 SubSectionEnd
  154 +!endif
151 155  
  156 +!ifdef WITHLANGUAGE
152 157 SubSection "Language bindins" Languages
153 158  
154   - Section /o "HLLAPI" HLLAPIPlugin
  159 +!ifdef WITHHLLAPI
  160 + Section /o "HLLAPI" HLLAPIBinding
155 161  
156 162 setOutPath $INSTDIR
157 163  
... ... @@ -159,8 +165,10 @@ SubSection "@PACKAGE@" SecMain
159 165 file "/oname=$SYSDIR\libhllapi.dll" "libhllapi.dll"
160 166  
161 167 sectionEnd
  168 +!endif
162 169  
163 170 SubSectionEnd
  171 +!endif
164 172  
165 173 SubSection "Menus, Keypads & Toolbars" SecMenu
166 174  
... ... @@ -236,6 +244,8 @@ Function .onInit
236 244  
237 245 #---[ Check HLLAPI Command line option ]-------------------------------------------------------------
238 246  
  247 +!ifdef WITHHLLAPI
  248 +
239 249 Push $0
240 250  
241 251 ${GetParameters} $R0
... ... @@ -244,24 +254,28 @@ Function .onInit
244 254  
245 255 ${if} $0 == "NO"
246 256  
247   - SectionGetFlags ${HLLAPIPlugin} $0
  257 + SectionGetFlags ${HLLAPIBinding} $0
248 258 IntOp $0 $0 & ${SECTION_OFF}
249   - SectionSetFlags ${HLLAPIPlugin} $0
  259 + SectionSetFlags ${HLLAPIBinding} $0
250 260  
251 261 ${else}
252 262  
253   - SectionGetFlags ${HLLAPIPlugin} $0
  263 + SectionGetFlags ${HLLAPIBinding} $0
254 264 IntOp $0 $0 | ${SF_SELECTED}
255   - SectionSetFlags ${HLLAPIPlugin} $0
  265 + SectionSetFlags ${HLLAPIBinding} $0
256 266  
  267 +!ifdef WITHIPC
257 268 SectionGetFlags ${IPCPlugin} $0
258 269 IntOp $0 $0 | ${SF_SELECTED}
259 270 SectionSetFlags ${IPCPlugin} $0
  271 +!endif
260 272  
261 273 ${EndIf}
262 274  
263 275 Pop $0
264 276  
  277 +!endif
  278 +
265 279 !ifdef WITHGTK
266 280  
267 281 #---[ Verifica se precisa instalar GTK ]-------------------------------------------------------------
... ...