Download as
Browse Code »

Commit d93691c55848ee638608af1ac4939c4c5ebf5ad9

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

Fixing windows build.

Showing 2 changed files with 6 additions and 4 deletions   Show diff stats
win/pack.sh
  Diff comments   View file @d93691c
... ... @@ -395,7 +395,7 @@ makeInstaller()
395 395 NSIS_ARGS="${NSIS_ARGS} -DWITHCERTS"
396 396  
397 397 mkdir -p ${WORKDIR}/build/${ARCH}/sslcerts
398   - cp -rv ${CERTS_DIR} ${WORKDIR}/build/${ARCH}/sslcerts
  398 + cp -rv ${CERTS_DIR}/* ${WORKDIR}/build/${ARCH}/sslcerts
399 399 if [ "$?" != "0" ]; then
400 400 failed "Can't copy certs"
401 401 fi
... ... @@ -434,6 +434,8 @@ makeInstaller()
434 434 if [ "$?" != "0" ]; then
435 435 echo makensis ${NSIS_ARGS} ${NSI}
436 436 failed "Error building ${NSI}"
  437 + cd ${WORKDIR}/build/${ARCH}
  438 + /bin/bash
437 439 fi
438 440  
439 441 echo "TARCH="[${TARCH}]" ARCH=[${ARCH}]"
... ...
win/pw3270.nsi.in
  Diff comments   View file @d93691c
... ... @@ -79,8 +79,8 @@ SubSection "@PACKAGE@" SecMain
79 79 file "/oname=$INSTDIR\@PACKAGE@.dll" "@PACKAGE@.dll"
80 80  
81 81 # Configuration files
82   - file "/oname=$INSTDIR\@PACKAGE@-logo.png" "@PRODUCT_NAME@\@PACKAGE@-logo.png"
83   - file "/oname=$INSTDIR\@PACKAGE@.png" "@PRODUCT_NAME@\@PACKAGE@.png"
  82 + file "/oname=$INSTDIR\@PRODUCT_NAME@-logo.png" "@PRODUCT_NAME@\@PRODUCT_NAME@-logo.png"
  83 + file "/oname=$INSTDIR\@PRODUCT_NAME@.png" "@PRODUCT_NAME@\@PRODUCT_NAME@.png"
84 84 file "/oname=$INSTDIR\colors.conf" "@PRODUCT_NAME@\colors.conf"
85 85  
86 86 # Documentation files
... ... @@ -96,7 +96,7 @@ SubSection "@PACKAGE@" SecMain
96 96 file "/oname=$INSTDIR\ui\00default.xml" "@PRODUCT_NAME@\ui\00default.xml"
97 97  
98 98 # Charset definition files
99   - CreateDirectory "$INSTDIR\charsets"
  99 + CreateDirectory "$INSTDIR\remap"
100 100 file "/oname=$INSTDIR\remap\bracket.xml" "@PRODUCT_NAME@\remap\bracket.xml"
101 101  
102 102 # Locale files
... ...