[adonthell-wastesedge-commits] master d1164d8 21/21: UPDATED windows package and installer scripts

[Kai Sterker]

branch: master
commit d1164d83e20f6aed0a5fc1cd670624ea6487b51e
Author: Kai Sterker <address@hidden>
Commit: Kai Sterker <address@hidden>

    UPDATED windows package and installer scripts
---
 make_bundle.sh           |    2 +-
 make_windows_pkg.sh      |    6 +++++-
 win32/wastesedge-x64.wxs |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/make_bundle.sh b/make_bundle.sh
index cf14ddb..4d3a08e 100755
--- a/make_bundle.sh
+++ b/make_bundle.sh
@@ -33,7 +33,7 @@ fi
 
 # -- build wastesedge
 echo "Configuring $appname. This may take a while ..."
-./configure --with-adonthell-binary=$APP --disable-pyc --bindir=$prefix/MacOS 
--datadir=/tmp > /dev/null
+./configure --with-adonthell-binary=$APP --disable-pyc --bindir=$prefix/MacOS 
--mandir=/tmp --datadir=/tmp > /dev/null
 if [ $? -ne 0 ]; then
    exit 1
 fi
diff --git a/make_windows_pkg.sh b/make_windows_pkg.sh
index 118f8e5..022fa89 100755
--- a/make_windows_pkg.sh
+++ b/make_windows_pkg.sh
@@ -33,7 +33,7 @@ fi
 
 # -- build wastesedge
 echo "Configuring $appname. This may take a while ..."
-./configure --with-adonthell-binary=$APP --disable-pyc --bindir=$prefix/ 
--datadir=/tmp > /dev/null
+./configure --with-adonthell-binary=$APP --disable-pyc --bindir=$prefix/ 
--mandir=/tmp --datadir=/tmp > /dev/null
 if [ $? -ne 0 ]; then
    exit 1
 fi
@@ -54,6 +54,10 @@ fi
 cp win32/wastesedge.ico $prefix/bin/
 cp win32/icon32.bmp $prefix/games/wastesedge/gfx/
 
+# -- copy licence information
+cp win32/COPYING $prefix/COPYING.txt
+cp gfx/window/font/LICENSE.txt 
$prefix/games/wastesedge/gfx/window/font/LICENSE.txt
+
 # -- optionally add icon to adonthell.exe
 #    requires rcedit to be in PATH: https://github.com/atom/rcedit/releases/
 #    The alternative would be to add the icon when compiling adonthell
diff --git a/win32/wastesedge-x64.wxs b/win32/wastesedge-x64.wxs
index 6fd64d8..52ea0d7 100644
--- a/win32/wastesedge-x64.wxs
+++ b/win32/wastesedge-x64.wxs
@@ -97,7 +97,7 @@
                                Control="Finish" 
                                Order="1" 
                                Event="DoAction" 
-                               
Value="StartAppOnExit">WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT</Publish>
+                               
Value="StartAppOnExit">WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT AND NOT 
Installed</Publish>
                </UI>
                <CustomAction Id="StartAppOnExit" Directory="INSTALLDIR" 
ExeCommand="[INSTALLDIR]bin\adonthell-0.3.exe wastesedge" Execute="immediate" 
Impersonate="yes" Return="asyncNoWait" />
        </Product>