Download as
Browse Code »

Commit cdb1d9df05f4f96285d9626bfdae95671da340ea

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

Working on windows package.

Showing 2 changed files with 22 additions and 4 deletions   Show diff stats
win/makeruntime.sh.in
  Diff comments   View file @cdb1d9d
... ... @@ -285,7 +285,7 @@ do
285 285 value=${tmp##*=}
286 286  
287 287 case "$parameter" in
288   - PATH)
  288 + OUTPUT-DIR)
289 289 TARGET=$value
290 290 ;;
291 291  
... ... @@ -325,6 +325,4 @@ copy_theme "Adwaita"
325 325 #echo "Optimizing..."
326 326 #find ${TARGET} -iname *.png -exec optipng -o7 -quiet {} \; 2>&1 > /dev/null
327 327  
328   -
329   -
330 328 echo "Runtime ok"
... ...
win/pack.sh
  Diff comments   View file @cdb1d9d
... ... @@ -304,7 +304,7 @@ makeRuntime()
304 304 chmod +x ${SCRIPT}
305 305  
306 306 cd ${WORKDIR}/build/${ARCH}
307   - ${SCRIPT} --output-dir="${WORKDIR}/build/${ARCH}/runtime" --bindir="${WORKDIR}/build/${ARCH}"
  307 + ${SCRIPT} --output-dir="${WORKDIR}/build/${ARCH}/runtime" --bindir="${WORKDIR}/build/${ARCH}"
308 308 if [ "$?" != "0" ]; then
309 309 failed "Error on ${SCRIPT}"
310 310 fi
... ... @@ -319,6 +319,13 @@ makeRuntime()
319 319 #
320 320 makeInstaller()
321 321 {
  322 + NSIS_ARGS="-DWITHGTK"
  323 +
  324 + for ARG in $(echo ${PACKAGE_PLUGINS} | tr "[:lower:]" "[:upper:]") $(echo ${PACKAGE_LANGUAGE_BINDINGS} | tr "[:lower:]" "[:upper:]")
  325 + do
  326 + NSIS_ARGS="${NSIS_ARGS} -DWITH${ARG}"
  327 + done
  328 +
322 329  
323 330 for ARCH in ${TARGET_ARCHS}
324 331 do
... ... @@ -327,9 +334,16 @@ makeInstaller()
327 334 echo "Creating installer for ${ARCH}"
328 335  
329 336 cd ${WORKDIR}/build/${ARCH}
  337 +
  338 + echo makensis ${NSIS_ARGS} ./pw3270.nsi
330 339 /bin/bash
331 340  
332 341  
  342 + mv -f *.exe ${PROJECTDIR}
  343 + if [ "$?" != "0" ]; then
  344 + failed "Can't copy installer to ${PROJECTDIR}"
  345 + fi
  346 +
333 347 done
334 348  
335 349 }
... ... @@ -360,6 +374,12 @@ do
360 374 fi
361 375  
362 376 ;;
  377 +
  378 + CONFIG)
  379 + . ${value}
  380 + ;;
  381 +
  382 +
363 383 HELP)
364 384 echo "${0} [options]"
365 385 echo ""
... ...