Download as
Browse Code »

Commit 6719e7698d623bfacd381578cea34c2d88f0045b

Authored by Perry Werneck
1 parent 5e5746fe
Exists in develop

Updating windows bundler.

Showing 2 changed files with 26 additions and 23 deletions   Show diff stats
win/bundle.common
  Diff comments   View file @6719e76
@@ -332,6 +332,7 @@ make_nsis() { @@ -332,6 +332,7 @@ make_nsis() {
332 -DWITHIPC \ 332 -DWITHIPC \
333 -DWITHPLUGINS \ 333 -DWITHPLUGINS \
334 -DWITHSDK \ 334 -DWITHSDK \
  335 + -DPKGDIR=${buildroot}${MINGW_PREFIX} \
335 ${buildroot}${MINGW_PREFIX}/${PACKAGE_NAME}.nsi 336 ${buildroot}${MINGW_PREFIX}/${PACKAGE_NAME}.nsi
336 if [ "$?" != "0" ]; then 337 if [ "$?" != "0" ]; then
337 echo "Cant build nsis script" 338 echo "Cant build nsis script"
@@ -357,7 +358,7 @@ make_nsis() { @@ -357,7 +358,7 @@ make_nsis() {
357 358
358 install_license() { 359 install_license() {
359 mkdir -p "${buildroot}${MINGW_PREFIX}/usr/share/${PACKAGE_NAME}" 360 mkdir -p "${buildroot}${MINGW_PREFIX}/usr/share/${PACKAGE_NAME}"
360 - cp "${srcdir}/LICENSE" "${buildroot}${MINGW_PREFIX}/share/${PACKAGE_NAME}" 361 + cp "${srcdir}/LICENSE" "${buildroot}${MINGW_PREFIX}/usr/share/${PACKAGE_NAME}"
361 if [ "$?" != "0" ]; then 362 if [ "$?" != "0" ]; then
362 echo "Cant copy LICENSE" 363 echo "Cant copy LICENSE"
363 exit -1 364 exit -1
@@ -369,14 +370,33 @@ install_runtime() { @@ -369,14 +370,33 @@ install_runtime() {
369 install_locale 370 install_locale
370 } 371 }
371 372
372 -make_packages() { 373 +build_package() {
373 374
374 - mkdir -p "${buildroot}${MINGW_PREFIX}/nsi"  
375 - cp "${srcdir}/win/${PACKAGE_NAME}.nsi" "${buildroot}${MINGW_PREFIX}/${PACKAGE_NAME}.nsi" 375 + # Build
  376 + make -C "${srcdir}" all
376 if [ "$?" != "0" ]; then 377 if [ "$?" != "0" ]; then
377 - echo "Cant copy nsis script"  
378 - fi 378 + echo "Build failed"
  379 + exit -1
  380 + fi
379 381
  382 + make -C "${srcdir}" "DESTDIR=${buildroot}" install
  383 + if [ "$?" != "0" ]; then
  384 + echo "Install failed"
  385 + exit -1
  386 + fi
  387 +
  388 +}
  389 +
  390 +make_packages() {
  391 +
  392 + if [ -e "${srcdir}/win/${PACKAGE_NAME}.nsi" ]; then
  393 + mkdir -p "${buildroot}${MINGW_PREFIX}/nsi"
  394 + cp "${srcdir}/win/${PACKAGE_NAME}.nsi" "${buildroot}${MINGW_PREFIX}/${PACKAGE_NAME}.nsi"
  395 + if [ "$?" != "0" ]; then
  396 + echo "Cant copy nsis script"
  397 + fi
  398 + fi
  399 +
380 argument "zip" > /dev/null 400 argument "zip" > /dev/null
381 if [ "$?" == "0" ]; then 401 if [ "$?" == "0" ]; then
382 make_zip 402 make_zip
win/bundle.cross
  Diff comments   View file @6719e76
@@ -76,23 +76,6 @@ install_prereqs() { @@ -76,23 +76,6 @@ install_prereqs() {
76 done 76 done
77 } 77 }
78 78
79 -build_package() {  
80 -  
81 - # Build  
82 - make -C "${srcdir}" all  
83 - if [ "$?" != "0" ]; then  
84 - echo "Build failed"  
85 - exit -1  
86 - fi  
87 -  
88 - make -C "${srcdir}" "DESTDIR=${buildroot}" install  
89 - if [ "$?" != "0" ]; then  
90 - echo "Install failed"  
91 - exit -1  
92 - fi  
93 -  
94 -}  
95 -  
96 argument "install-requires" > /dev/null 79 argument "install-requires" > /dev/null
97 if [ "$?" == "0" ]; then 80 if [ "$?" == "0" ]; then
98 install_prereqs 81 install_prereqs