Download as
Browse Code »

Commit ec31f2ddba8c215ae4a2e58231b05b4ece10e223

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

Fixing windows build.

Showing 2 changed files with 20 additions and 9 deletions   Show diff stats
@@ -422,6 +422,12 @@ buildApplication() @@ -422,6 +422,12 @@ buildApplication()
422 fi 422 fi
423 done 423 done
424 424
  425 + if [ "${BUILD_UNSTABLE}" == "1" ]; then
  426 + APP_OPTIONS="--enable-unstable"
  427 + else
  428 + APP_OPTIONS=""
  429 + fi
  430 +
425 if [ -x ${PROJECTDIR}/win/configure.${1} ]; then 431 if [ -x ${PROJECTDIR}/win/configure.${1} ]; then
426 432
427 host="${host}" \ 433 host="${host}" \
@@ -443,7 +449,8 @@ buildApplication() @@ -443,7 +449,8 @@ buildApplication()
443 --includedir=${WORKDIR}/build/${ARCH}/include \ 449 --includedir=${WORKDIR}/build/${ARCH}/include \
444 --sysconfdir=${WORKDIR}/build/${ARCH}/etc \ 450 --sysconfdir=${WORKDIR}/build/${ARCH}/etc \
445 --datadir=${WORKDIR}/build/${ARCH}/share \ 451 --datadir=${WORKDIR}/build/${ARCH}/share \
446 - --datarootdir=${WORKDIR}/build/${ARCH}/share 452 + --datarootdir=${WORKDIR}/build/${ARCH}/share \
  453 + ${APP_OPTIONS}
447 454
448 fi 455 fi
449 456
win/pw3270.nsi.in
  Diff comments   View file @ec31f2d
@@ -108,10 +108,19 @@ SubSection "@PRODUCT_NAME@" SecMain @@ -108,10 +108,19 @@ SubSection "@PRODUCT_NAME@" SecMain
108 108
109 # Register file association 109 # Register file association
110 110
  111 + # icons & logos
  112 + CreateDirectory "$INSTDIR\icons"
  113 + file "/oname=$INSTDIR\icons\gtk-connect-symbolic.svg" "share\@PRODUCT_NAME@\icons\gtk-connect-symbolic.svg"
  114 + file "/oname=$INSTDIR\icons\gtk-disconnect-symbolic.svg" "share\@PRODUCT_NAME@\icons\gtk-disconnect-symbolic.svg"
  115 + file "/oname=$INSTDIR\icons\connect-symbolic.svg" "share\@PRODUCT_NAME@\icons\connect-symbolic.svg"
  116 + file "/oname=$INSTDIR\icons\disconnect-symbolic.svg" "share\@PRODUCT_NAME@\icons\disconnect-symbolic.svg"
  117 + file "/oname=$INSTDIR\icons\@PRODUCT_NAME@.svg" "share\@PRODUCT_NAME@\@PRODUCT_NAME@.svg"
  118 +
  119 + file "/oname=$INSTDIR\@PRODUCT_NAME@-logo.svg" "share\@PRODUCT_NAME@\@PRODUCT_NAME@-logo.svg"
  120 + file "/oname=$INSTDIR\@PRODUCT_NAME@.svg" "share\@PRODUCT_NAME@\@PRODUCT_NAME@.svg"
  121 +
111 # Configuration files 122 # Configuration files
112 - file "/oname=$INSTDIR\@PRODUCT_NAME@-logo.png" "share\@PRODUCT_NAME@\@PRODUCT_NAME@-logo.png"  
113 - file "/oname=$INSTDIR\@PRODUCT_NAME@.png" "share\@PRODUCT_NAME@\@PRODUCT_NAME@.png"  
114 - file "/oname=$INSTDIR\colors.conf" "share\@PRODUCT_NAME@\colors.conf" 123 + file "/oname=$INSTDIR\colors.conf" "share\@PRODUCT_NAME@\colors.conf"
115 124
116 # Documentation files 125 # Documentation files
117 file "/oname=$INSTDIR\AUTHORS" "AUTHORS" 126 file "/oname=$INSTDIR\AUTHORS" "AUTHORS"
@@ -137,11 +146,6 @@ SubSection "@PRODUCT_NAME@" SecMain @@ -137,11 +146,6 @@ SubSection "@PRODUCT_NAME@" SecMain
137 file "/oname=$INSTDIR\locale\pt_BR\LC_MESSAGES\lib@LIBRARY_NAME@.mo" "share\locale\pt_BR\LC_MESSAGES\lib@LIBRARY_NAME@.mo" 146 file "/oname=$INSTDIR\locale\pt_BR\LC_MESSAGES\lib@LIBRARY_NAME@.mo" "share\locale\pt_BR\LC_MESSAGES\lib@LIBRARY_NAME@.mo"
138 file "/oname=$INSTDIR\locale\pt_BR\LC_MESSAGES\libv3270.mo" "share\locale\pt_BR\LC_MESSAGES\libv3270.mo" 147 file "/oname=$INSTDIR\locale\pt_BR\LC_MESSAGES\libv3270.mo" "share\locale\pt_BR\LC_MESSAGES\libv3270.mo"
139 148
140 - # Customized icons  
141 - CreateDirectory "$INSTDIR\icons"  
142 - file "/oname=$INSTDIR\icons\gtk-connect-symbolic.svg" "share\@PRODUCT_NAME@\icons\gtk-connect-symbolic.svg"  
143 - file "/oname=$INSTDIR\icons\gtk-disconnect-symbolic.svg" "share\@PRODUCT_NAME@\icons\gtk-disconnect-symbolic.svg"  
144 -  
145 # define uninstaller name 149 # define uninstaller name
146 SetRegView 32 150 SetRegView 32
147 151