Download as
Browse Code »

Commit 06504ae34d47668c22d902b01fffa6c33d59bbd8

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

Atualizando empacotamento windows.

Showing 3 changed files with 21 additions and 3 deletions   Show diff stats
src/objects/settings/gsettings.c
  Diff comments   View file @06504ae
@@ -99,7 +99,7 @@ @@ -99,7 +99,7 @@
99 99
100 } else { 100 } else {
101 101
102 - g_message("Loading '%s' from default path","gschemas.compiled"); 102 + g_message("Can't find '%s' loading from default path",filename);
103 settings = g_settings_new(schema_id); 103 settings = g_settings_new(schema_id);
104 104
105 } 105 }
@@ -460,6 +460,24 @@ buildApplication() @@ -460,6 +460,24 @@ buildApplication()
460 failed "Can't configure ${1}" 460 failed "Can't configure ${1}"
461 fi 461 fi
462 462
  463 + if [ ! -e "branding/${PRODUCT_NAME}.svg" ]; then
  464 +
  465 + if [ -e "${PROJECTDIR}/${PRODUCT_NAME}.svg" ]; then
  466 + echo "Getting icon from ${PROJECTDIR}/${PRODUCT_NAME}.svg"
  467 + ln -s "$(readlink -f "${PROJECTDIR}/${PRODUCT_NAME}.svg")" "branding/${PRODUCT_NAME}.svg"
  468 +
  469 + elif [ -e "${PROJECTDIR}/branding/${PRODUCT_NAME}.svg" ]; then
  470 + echo "Getting icon from ${PROJECTDIR}/branding/${PRODUCT_NAME}.svg"
  471 + ln -s "$(readlink -f "${PROJECTDIR}/branding/${PRODUCT_NAME}.svg")" "branding/${PRODUCT_NAME}.svg"
  472 +
  473 + else
  474 + echo "Using default icon"
  475 + ln -s "pw3270.svg" "branding/${PRODUCT_NAME}.svg"
  476 +
  477 + fi
  478 +
  479 + fi
  480 +
463 make all 481 make all
464 if [ "$?" != "0" ]; then 482 if [ "$?" != "0" ]; then
465 failed "Can't buid ${1}" 483 failed "Can't buid ${1}"
win/pw3270.nsi.in
  Diff comments   View file @06504ae
@@ -121,8 +121,8 @@ SubSection "@PRODUCT_NAME@" SecMain @@ -121,8 +121,8 @@ SubSection "@PRODUCT_NAME@" SecMain
121 121
122 # Schema 122 # Schema
123 CreateDirectory "$INSTDIR\schemas" 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" 124 + file "/oname=$INSTDIR\schemas\@PRODUCT_NAME@-application.gschema.xml" "share\glib-2.0\schemas\@PRODUCT_NAME@-application.gschema.xml"
  125 + file "/oname=$INSTDIR\schemas\@PRODUCT_NAME@-window.gschema.xml" "share\glib-2.0\schemas\@PRODUCT_NAME@-window.gschema.xml"
126 126
127 file "/oname=$INSTDIR\gschemas.compiled" "runtime/share/glib-2.0/schemas/gschemas.compiled" 127 file "/oname=$INSTDIR\gschemas.compiled" "runtime/share/glib-2.0/schemas/gschemas.compiled"
128 128