Download as
Browse Code »

Commit 3b3672bdeb5bff591875b049e59b162bdc54b89d

Authored by Perry Werneck
1 parent 7ec5f39f
Exists in master and in 2 other branches develop, script-support

Fixing windows build.

Showing 2 changed files with 29 additions and 14 deletions   Show diff stats
win/pack.sh
  Diff comments   View file @3b3672b
... ... @@ -456,7 +456,6 @@ buildApplication()
456 456  
457 457 fi
458 458  
459   -
460 459 if [ "$?" != "0" ]; then
461 460 failed "Can't configure ${1}"
462 461 fi
... ... @@ -488,7 +487,10 @@ buildApplication()
488 487 failed "Can't copy ${NSI}"
489 488 fi
490 489 done
491   -
  490 +
  491 + #
  492 + # Make runtime
  493 + #
492 494 if [ -e ./win/makeruntime.sh ]; then
493 495 cp "./win/makeruntime.sh" "${WORKDIR}/build/${ARCH}/${1}-makeruntime.sh"
494 496 if [ "$?" != "0" ]; then
... ... @@ -499,14 +501,12 @@ buildApplication()
499 501 if [ -e branding/${PRODUCT_NAME}.svg ]; then
500 502 convert -density 384 -background transparent branding/${PRODUCT_NAME}.svg -define icon:auto-resize -colors 256 ${WORKDIR}/build/${ARCH}/${PRODUCT_NAME}.ico
501 503 if [ "$?" != "0" ]; then
502   - cleanup
503   - exit -1
  504 + failed "Can't convert ${PRODUCT_NAME}.svg to icon"
504 505 fi
505 506 elif [ -e branding/${1}.svg ]; then
506 507 convert -density 384 -background transparent branding/${1}.svg -define icon:auto-resize -colors 256 ${WORKDIR}/build/${ARCH}/${PRODUCT_NAME}.ico
507 508 if [ "$?" != "0" ]; then
508   - cleanup
509   - exit -1
  509 + failed "Can't convert ${1}.svg to icon"
510 510 fi
511 511 fi
512 512  
... ... @@ -543,6 +543,15 @@ makeRuntime()
543 543  
544 544 rm -fr ${WORKDIR}/build/${ARCH}/runtime
545 545 mkdir -p ${WORKDIR}/build/${ARCH}/runtime
  546 + mkdir -p ${WORKDIR}/build/${ARCH}/runtime//share/glib-2.0/schemas
  547 +
  548 + cp \
  549 + ${WORKDIR}/build/${ARCH}/share/glib-2.0/schemas/*.gschema.xml \
  550 + ${WORKDIR}/build/${ARCH}/runtime/share/glib-2.0/schemas
  551 +
  552 + if [ "$?" != "0" ]; then
  553 + failed "Error on schema copy"
  554 + fi
546 555  
547 556 for SCRIPT in ${WORKDIR}/build/${ARCH}/*-makeruntime.sh
548 557 do
... ... @@ -556,7 +565,7 @@ makeRuntime()
556 565 done
557 566  
558 567 done
559   -
  568 +
560 569 }
561 570  
562 571 #
... ... @@ -711,6 +720,8 @@ makeInstaller()
711 720  
712 721 fi
713 722  
  723 + /bin/bash
  724 +
714 725 for NSI in *.nsi
715 726 do
716 727 makensis ${NSIS_ARGS} ${NSI}
... ...
win/pw3270.nsi.in
  Diff comments   View file @3b3672b
... ... @@ -119,12 +119,17 @@ SubSection "@PRODUCT_NAME@" SecMain
119 119 file "/oname=$INSTDIR\@PRODUCT_NAME@-logo.svg" "share\@PRODUCT_NAME@\@PRODUCT_NAME@-logo.svg"
120 120 file "/oname=$INSTDIR\@PRODUCT_NAME@.svg" "share\@PRODUCT_NAME@\@PRODUCT_NAME@.svg"
121 121  
  122 + # Schema
  123 + CreateDirectory "$INSTDIR\schemas"
  124 + file "/oname=$INSTDIR\schemas\@PRODUCT_NAME@-application.gschema.xml" "share\glib-2.0\schemas\pw3270-application.gschema.xml"
  125 + file "/oname=$INSTDIR\schemas\@PRODUCT_NAME@-window.gschema.xml" "share\glib-2.0\schemas\pw3270-window.gschema.xml"
  126 +
122 127 # Configuration files
123   - file "/oname=$INSTDIR\colors.conf" "share\@PRODUCT_NAME@\colors.conf"
  128 + file "/oname=$INSTDIR\colors.conf" "share\@PRODUCT_NAME@\colors.conf"
124 129  
125 130 # Documentation files
126   - file "/oname=$INSTDIR\AUTHORS" "AUTHORS"
127   - file "/oname=$INSTDIR\LICENSE" "LICENSE"
  131 + file "/oname=$INSTDIR\AUTHORS" "AUTHORS"
  132 + file "/oname=$INSTDIR\LICENSE" "LICENSE"
128 133  
129 134 # Misc folders
130 135 CreateDirectory "$INSTDIR\certs"
... ... @@ -176,7 +181,7 @@ SubSection "@PRODUCT_NAME@" SecMain
176 181 "PackageVersion" "@PACKAGE_VERSION@"
177 182  
178 183 # Required for IPC Library.
179   - WriteRegStr HKLM "Software\@PRODUCT_NAME@" "InstallLocation" "$INSTDIR"
  184 + WriteRegStr HKLM "Software\@PRODUCT_NAME@" "InstallLocation" "$INSTDIR"
180 185  
181 186 # Customized options
182 187 WriteRegDWORD HKLM "Software\@PRODUCT_NAME@\toggles" "autoconnect" 0x00000001
... ... @@ -207,8 +212,8 @@ SubSection "@PRODUCT_NAME@" SecMain
207 212 WriteRegDWORD HKLM "Software\@PRODUCT_NAME@\toggles" "nettrace" 0x00000000
208 213 WriteRegDWORD HKLM "Software\@PRODUCT_NAME@\toggles" "ssltrace" 0x00000000
209 214  
210   - WriteRegStr HKLM "Software\@PRODUCT_NAME@" "font-family" "Lucida Console"
211   - WriteRegStr HKLM "Software\@PRODUCT_NAME@" "colors" "rgb(24,24,24);rgb(79,156,254);rgb(237,74,70);rgb(235,110,183);rgb(131,199,70);rgb(86,216,201);rgb(239,197,65);rgb(222,222,222);rgb(59,59,59);rgb(54,142,171);rgb(250,145,83);rgb(165,128,226);rgb(112,180,51);rgb(65,199,185);rgb(219,179,45);rgb(119,119,119);rgb(131,199,70);rgb(237,74,70);rgb(65,199,185);rgb(250,145,83);rgb(37,37,37);rgb(222,222,222);rgb(222,222,222);rgb(24,24,24);rgb(222,222,222);rgb(79,156,254);rgb(131,199,70);rgb(239,197,65);rgb(239,197,65)"
  215 + WriteRegStr HKLM "Software\@PRODUCT_NAME@" "font-family" "Lucida Console"
  216 + WriteRegStr HKLM "Software\@PRODUCT_NAME@" "colors" "rgb(24,24,24);rgb(79,156,254);rgb(237,74,70);rgb(235,110,183);rgb(131,199,70);rgb(86,216,201);rgb(239,197,65);rgb(222,222,222);rgb(59,59,59);rgb(54,142,171);rgb(250,145,83);rgb(165,128,226);rgb(112,180,51);rgb(65,199,185);rgb(219,179,45);rgb(119,119,119);rgb(131,199,70);rgb(237,74,70);rgb(65,199,185);rgb(250,145,83);rgb(37,37,37);rgb(222,222,222);rgb(222,222,222);rgb(24,24,24);rgb(222,222,222);rgb(79,156,254);rgb(131,199,70);rgb(239,197,65);rgb(239,197,65)"
212 217  
213 218 sectionEnd
214 219  
... ... @@ -351,7 +356,6 @@ Section "Uninstall"
351 356 RMDir /r "$INSTDIR\sdk"
352 357 RMDir /r "$INSTDIR\gtk2-runtime"
353 358  
354   -
355 359 # Delete all files
356 360 delete "$INSTDIR\*.dll"
357 361  
... ...