[adonthell-wastesedge-commits] master f96eb4f: ADDED codesign steps to installer creation

[Kai Sterker]

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

    ADDED codesign steps to installer creation
    REMOVED more obsolete files
---
 .gitignore        |    1 +
 Makefile.am       |    4 +-
 win32/PLAYING.txt |   72 -----------------------
 win32/README.txt  |  169 -----------------------------------------------------
 win32/make_msi.sh |   12 ++++
 5 files changed, 15 insertions(+), 243 deletions(-)

diff --git a/.gitignore b/.gitignore
index c441ba9..9dc53fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@ __pycache__
 *.gmo
 *.pyc
 *.AppImage
+win32/wastesedge-*.msi
diff --git a/Makefile.am b/Makefile.am
index 20c7fde..dc8c24f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,8 +11,8 @@ dist_man_MANS = adonthell-wastesedge.6
 
 EXTRA_DIST = config.rpath mkinstalldirs PLAYING autogen.sh ABOUT-NLS \
        wastesedge.spec.in wastesedge.spec wastesedge.desktop.in \
-       win32/COPYING win32/PLAYING.txt win32/make_msi.sh win32/README.txt \
-       win32/wastesedge.ico win32/icon32.bmp win32/wastesedge-x64.wxs \
+       win32/COPYING win32/make_msi.sh \
+       win32/wastesedge.ico win32/icon32.bmp win32/wastesedge.wxs \
        osx/Copying.html osx/Install.html osx/Playing.html osx/ReadMe.html \
        osx/adonthell.icns make_linux_appimg.sh make_osx_bundle.sh \
        make_windows_pkg.sh
diff --git a/win32/PLAYING.txt b/win32/PLAYING.txt
deleted file mode 100644
index c0e7bd1..0000000
--- a/win32/PLAYING.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-How to play this game!
-======================
-
-Dunno what you're supposed to do in "Adonthell - Waste's Edge"?
-Well, you've come to the right place to find out!
-
-
-Aim of the game
-===============
-
-As a loyal servant of the elven Lady Silverhair, you arrive at the remote
-trading post of Waste's Edge, where she is engaged in negotiations with the
-dwarish merchant Bjarn Fingolson. But not all is well at Waste's Edge, and
-soon you are confronted with circumstances that are about to destroy your
-mistress' high reputation. And you are the only one to avert this ...
-
-Remember this game is a demo of what we can do so far. There is no fighting
-or collecting items yet (this will appear in future releases) so you must
-solve this quest by exploring the Redwyne Inn where everyone is staying and 
-talking to the people you meet there.
-
-The story is explained in more detail in the intro sequence so DON'T skip 
-it the first time you play :P
-
-
-Controls
-========
-
-Arrow keys:     - Choosing options in the game menus
-                - Moving you chracter around the map
-                - Choosing responses during dialoges
-
-Space/Enter:    - Selecting an option in the game menus
-                - Talking to a character (when you are facing them)
-                           - Selecting a response during dialogues
-                           - Examining items in and round the inn (only works
-                             in some places!)
-
-Page Up/Down:   - Scrolling up/down in dialogues/windows
-
-Escape          - Skipping cutscenes (like the intro)
-                - Bringing up the game menu
-                - Closing (some) windows
-
-(there are also one or two other 'cheat' controls - but we
-never told you that! :P)
-
-
-How to tell us what a great job we did
-======================================
-
-Seriously though, we'd like to hear what you think of Adonthell. Ideas and
-(constructive) criticism are more than welcome. To make life easier for us
-and to ensure that we read what you have to say we'd appreciate it if you'd
-post your comments to one of the following places depending on what it is:
-
-General Comments / Reviews  -   www.happypenguin.org/show?Adonthell
-
-Ideas / Improvements        -   address@hidden
-
-Technical Issues / Bugs     -   savannah.gnu.org/projects/adonthell
-
-And for any player related chat ("how do I get into Bjarn's room?") or any
-other stuff us developers don't necessarily have to see go to our message 
-board at:
-
-http://www.3dforums.com/?action=forumpage&loc=49&forum_id=158
-
-
-
-Cheers!
-Enjoy Adonthell!
diff --git a/win32/README.txt b/win32/README.txt
deleted file mode 100644
index 7e0ab96..0000000
--- a/win32/README.txt
+++ /dev/null
@@ -1,169 +0,0 @@
-
-
-                       Adonthell - Waste's Edge 0.3.4 
-                           
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    COPYING file for more details.
-
-
-Synopsis:
-=========
-
-Below you will find a description of Adonthell's configuration options, 
-release notes and contact informations. If you need help with playing
-Adonthell - Waste's Edge, please refer to the PLAYING file.
-
-
-Philosophy:
-===========
-
-Adonthell was (and still is) primarily developed for GNU/Linux, but runs
-on many UNiX flavours and various hardware platforms. This is the first 
-official release for Windows.
-  
-Adonthell is free software, which means its source code is available for
-everybody to modify and distribute, as long as those modifications are
-open to everybody as well. See the COPYING files for the exact terms and
-conditions.
-
-In turn, Adonthell itself depends on various projects that are sharing 
-the same philosophy, like SDL, Ogg Vorbis, Python and SWIG to name just
-a few. Without these fundamental works of dozens of developers, we
-wouldn't be where we are today. 
-
-The same is true for the many individuals that contributed bugfixes or
-larger portions of the code. Something that would be unthinkable with
-closed source software.
-
-In brief: "Use the Source, Luke!"
-
-
-Configuring Adonthell:
-======================
-
-To bring up and edit the configuration file (adonthell.ini), use the
-"Edit Configuration" link in the "Adonthell - Waste's Edge" program 
-group. You will have to restart the game before your changes can take 
-place.
-
-The available options and what they do are:
-
-- Screen-mode
-  Whether Adonthell should run fullscreen or in windowed mode 
-  0 = Windowed mode, 1 = Fullscreen mode
-  
-- Double-size
-  Whether resolution should be scaled to 640x480 or not
-  0 = disable, 1 = enable
-  
-  Enabling double-size mode significantly increases CPU usage. On
-  old hardware you should consider turning this option off and run
-  Adonthell in fullscreen mode instead.
-
-- Language [locale]
-  Specifies which language to use. As long as this option is unset,
-  the language is determined by one of the following environment
-  variables: LANG, LC_ALL or LC_MESSAGES. Once the option is set,
-  it overrides any environment variable.
-  
-  Of course, the game you run has to provide the translation you 
-  chose here, otherwise you'll get the default (i.e. English) text.
-
-  With Waste's Edge 0.3.4 comes a Dutch translation (nl_NL).
-  Others might become available later.
-
-- Font [font.ttf]
-  Chose a true type font to use for displaying text. 
-  
-  If the default font doesn't suit you, or if it does not contain
-  the glyphs required by the Language you selected, you can specify
-  a different font here. Either enter an absolute path to a font
-  file in true type format or enter the font name and copy the font
-  into <gamedatadir>/gfx/window/font/ .
-
-- Quick-load
-  Whether the last saved game should be automatically continued at
-  startup. Only works if at least one saved game exists.
-  0 = disable, 1 = enable
-
-- Audio-channels
-  Whether sound should be mono or stereo
-  0 = Mono, 1 = Stereo
-
-- Audio-resolution
-  Whether audio output should be 8 or 16 bit
-  0 = 8 bit, 1 = 16 bit
-
-- Audio-sample-rate
-  0 = 11025 Hz, 1 = 22050 Hz, 2 = 44100 Hz
-
-- Audio-volume
-  The mixer setting, 0 - 100 %
-  
-  (Note that a value of 0 will turn audio completely off)
-
-
-Release Notes:
-==============
-
-The main purpose of this release is to attract new programmers, 
-artists and writers in order to shorten the time until the next 
-version.  So if you have experience in C++ (and optionally Python), 
-or if you are good at computer graphics or writing we would like to
-hear from you.  Please have a look at our developer's corner
-  
-  http://adonthell.linuxgames.com/development/
-
-for further details.
-
-Adonthell - Waste's Edge, or v0.3 for short is no complete RPG.
-As the v0.3 implies, the engine is far from being finished, although
-it should be free of severe bugs.  Missing features include combat, 
-items and magic.  But you can interact with NPCs and the game world, 
-and the internals enable us to create a basic plot, so v0.3 is actually
-playable!
-
-You're greatly invited to report us bugs, problems, or anything you
-think we should know. Any feedback is appreciated, so don't hesitate!
-
-
-Contact:
-========
-
-You can reach us in various ways:
-
-Email:         address@hidden
-Mailing list:  address@hidden
-Web site:      http://adonthell.linuxgames.com
-Tech support:  http://savannah.gnu.org/support/?group_id=702
-
-There is a Message Board for user to user discussion at
-    http://www.3dforums.com/?action=forumpage&loc=49&forum_id=158
-
-If you want to rate or comment on Adonthell, feel free to do so at
-    http://www.happypenguin.org/show?Adonthell
-    http://www.freshmeat.net/projects/adonthell
-
-
-Reporting Bugs:
-===============
-
-We hope you'll never have to, but if you discover a problem, we
-would like to hear about it. In that case, the files stdout.txt and
-stderr.txt might contain further details to locate the source of
-error. Please use the Development mailing list to contact us
-(address@hidden). Information on this and 
-other mailing lists are available at 
-
-    http://adonthell.linuxgames.com/contact/mailinglist.shtml
-
-
-Thank you for trying this software.
-- The Adonthell team.
diff --git a/win32/make_msi.sh b/win32/make_msi.sh
index dadf97a..4349f61 100755
--- a/win32/make_msi.sh
+++ b/win32/make_msi.sh
@@ -45,6 +45,12 @@ fi
 # -- get adonthell version
 adonthell_ver=`$1/bin/$adonthell_exe -v`
 
+# -- codesign Adonthell exe
+if [ -x "$(command -v signtool)" ]; then
+  echo "Codesigning $adonthell_exe"
+  MSYS2_ARG_CONV_EXCL=/t signtool.exe sign /t 
http://timestamp.comodoca.com/authenticode $1/bin/$adonthell_exe
+fi
+
 echo "Creating wastesedge-$adonthell_ver-$arch.msi"
 
 # -- clean up any __pycache__ directories before collecting package contents
@@ -68,6 +74,12 @@ if [ $? -ne 0 ]; then
    exit 1
 fi
 
+# -- codesign installer
+if [ -x "$(command -v signtool)" ]; then
+  echo "Codesigning wastesedge-$adonthell_ver-$arch.msi"
+  MSYS2_ARG_CONV_EXCL=/t signtool.exe sign /t 
http://timestamp.comodoca.com/authenticode wastesedge-$adonthell_ver-$arch.msi
+fi
+
 # -- cleanup
 rm wastesedge-$adonthell_ver-$arch.wixpdb
 rm wastesedge.wixobj