From f23bb2390d1c26739060dc17d230f801c81996ba Mon Sep 17 00:00:00 2001
From: Ivan Mahonin <bh@icystar.com>
Date: Apr 07 2017 09:28:59 +0000
Subject: Fix opentoonz-nsis


---

diff --git a/docker-builder-data/build/script/packet/opentoonz-master.sh b/docker-builder-data/build/script/packet/opentoonz-master.sh
index 7f72a7c..03ee978 100644
--- a/docker-builder-data/build/script/packet/opentoonz-master.sh
+++ b/docker-builder-data/build/script/packet/opentoonz-master.sh
@@ -77,16 +77,19 @@ pkinstall() {
     if [ "$PLATFORM" = "win" ]; then
         local TARGET="$INSTALL_PACKET_DIR/bin/"
         local LOCAL_DIR="/usr/$HOST/sys-root/mingw/bin/"
-        cp $LOCAL_DIR/libgcc*.dll        "$TARGET" || return 1
-        cp $LOCAL_DIR/libgfortran*.dll   "$TARGET" || return 1
-        cp $LOCAL_DIR/libquadmath*.dll   "$TARGET" || return 1
-        cp $LOCAL_DIR/libstdc*.dll       "$TARGET" || return 1
-        cp $LOCAL_DIR/libwinpthread*.dll "$TARGET" || return 1
-        cp $LOCAL_DIR/zlib*.dll          "$TARGET" || return 1
-        cp $LOCAL_DIR/libgettextlib*.dll "$TARGET" || return 1
-        cp $LOCAL_DIR/libintl*.dll       "$TARGET" || return 1
-        cp $LOCAL_DIR/iconv*.dll         "$TARGET" || return 1
-        cp $LOCAL_DIR/libtermcap*.dll    "$TARGET" || return 1
+        cp "$LOCAL_DIR"/libgcc*.dll        "$TARGET" || return 1
+        cp "$LOCAL_DIR"/libgfortran*.dll   "$TARGET" || return 1
+        cp "$LOCAL_DIR"/libquadmath*.dll   "$TARGET" || return 1
+        cp "$LOCAL_DIR"/libstdc*.dll       "$TARGET" || return 1
+        cp "$LOCAL_DIR"/libwinpthread*.dll "$TARGET" || return 1
+        cp "$LOCAL_DIR"/zlib*.dll          "$TARGET" || return 1
+        cp "$LOCAL_DIR"/libgettextlib*.dll "$TARGET" || return 1
+        cp "$LOCAL_DIR"/libintl*.dll       "$TARGET" || return 1
+        cp "$LOCAL_DIR"/iconv*.dll         "$TARGET" || return 1
+        cp "$LOCAL_DIR"/libtermcap*.dll    "$TARGET" || return 1
+
+        # add icon
+        cp "$BUILD_PACKET_DIR/$PK_DIRNAME/toonz/sources/toonz/toonz.ico" "$TARGET" || return 1
     else
         local TARGET="$INSTALL_PACKET_DIR/lib/"
         copy_system_lib libudev          "$TARGET" || return 1
diff --git a/docker-builder-data/build/script/packet/opentoonz-nsis.files/opentoonz.nsi b/docker-builder-data/build/script/packet/opentoonz-nsis.files/opentoonz.nsi
index 95e87dd..d97cbed 100644
--- a/docker-builder-data/build/script/packet/opentoonz-nsis.files/opentoonz.nsi
+++ b/docker-builder-data/build/script/packet/opentoonz-nsis.files/opentoonz.nsi
@@ -13,6 +13,7 @@
 ;   PK_VERSION      - X.X                      - first two numbers of version
 ;   PK_VERSION_FULL - X.X.X-xxxxx-xxxxx        - full version, without spaces 
 ;   PK_EXECUTABLE   - xxx\XxxxXxxx-xxx_xxx.exe - subpath to executable file 
+;   PK_ICON         - xxx\XxxxXxxx-xxx_xxx.ico - subpath to icon file (may be *.exe)
 
 !include "config.nsh"
 
@@ -122,7 +123,7 @@ Section "Start Menu Shortcuts"
   SetShellVarContext All
   CreateDirectory "$SMPROGRAMS\${PK_NAME_FULL}"
   CreateShortCut "$SMPROGRAMS\${PK_NAME_FULL}\Uninstall ${PK_NAME_FULL}.lnk" "$INSTDIR\uninstall-${PK_NAME}.exe" "" "$INSTDIR\uninstall-${PK_NAME}.exe" 0
-  CreateShortCut "$SMPROGRAMS\${PK_NAME_FULL}\${PK_NAME_FULL}.lnk" "$INSTDIR\${PK_EXECUTABLE}" "" "$INSTDIR\${PK_EXECUTABLE}" 0
+  CreateShortCut "$SMPROGRAMS\${PK_NAME_FULL}\${PK_NAME_FULL}.lnk" "$INSTDIR\${PK_EXECUTABLE}" "" "$INSTDIR\${PK_ICON}" 0
 SectionEnd
 
 ;--------------------------------
diff --git a/docker-builder-data/build/script/packet/opentoonz-nsis.sh b/docker-builder-data/build/script/packet/opentoonz-nsis.sh
index 9246084..dd39745 100644
--- a/docker-builder-data/build/script/packet/opentoonz-nsis.sh
+++ b/docker-builder-data/build/script/packet/opentoonz-nsis.sh
@@ -60,7 +60,8 @@ pkinstall_release() {
 !define PK_ARCH         "$ARCH"
 !define PK_VERSION      "${LOCAL_VERSION2}"
 !define PK_VERSION_FULL "${LOCAL_VERSION}-${LOCAL_COMMIT:0:5}" 
-!define PK_EXECUTABLE   "bin\\\${PK_NAME}_\${LOCAL_VERSION2}.exe" 
+!define PK_EXECUTABLE   "bin\\\${PK_NAME}_${LOCAL_VERSION2}.exe" 
+!define PK_ICON         "bin\\toonz.ico" 
 EOF
 
     # let's go