Merge branch 'development'

README.md

@@ -2,20 +2,5 @@
 
 Valkyrie GM for Fantasy Flight Board Games
 
-Inlcudes editor for user built scenarios/quests.
-
-Download here:
-https://github.com/NPBruce/valkyrie/releases
-
-Currently supports:
-* Descent: Journeys in the Dark (Second Edition) which requires Descent: Road to Legend to be installed.  One quest included.
-* Mansions of Madness Second Edition which requires the Mansions of Madness app to be installed.
-
-FFG apps can be downloaded from steam:
-
-* __Descent: Road to Legend:__ http://store.steampowered.com/app/477200/
-* __Mansions of Madness:__ http://store.steampowered.com/app/478980/
-
-# NOTE
-This is being made obsolete, in future please use this link:
+Information:
 https://github.com/NPBruce/valkyrie/wiki

build.bat

@@ -47,16 +47,6 @@ rem duplicate licence to macos/linux
 xcopy /I /E /Y build\batch build\batchMac\Valkyrie.app
 xcopy /I /E /Y build\batch build\batchLinux\valkyrie-linux-%version%
 
-rem copy content from source to win release
-xcopy /E /Y content build\batch\valkyrie_Data\content
-rem remove imported content
-rmdir /s /q build\batch\valkyrie_Data\content\D2E\ffg
-rmdir /s /q build\batch\valkyrie_Data\content\MoM\ffg
-rem copy content from win to macos
-xcopy /I /E /Y build\batch\valkyrie_Data build\batchMac\Valkyrie.app\Contents
-rem copy content from win to linux
-xcopy /I /E /Y build\batch\valkyrie_Data build\batchLinux\valkyrie-linux-%version%\valkyrie_Data
-
 rem copy over windows build
 xcopy /E /Y build\win build\batch
 rem copy over macos build
@@ -65,15 +55,12 @@ rem copy over linux build
 xcopy /E /Y build\linux build\batchLinux\valkyrie-linux-%version%
 
 rem delete previous build
-del build\valkyrie-win-%version%.zip
+del build\valkyrie-windows-%version%.exe
 del build\valkyrie-macos-%version%.zip
 del build\valkyrie-linux-%version%.tar.gz
 
-rem create windows zip
-cd build\batch
-"C:\Program Files\7-Zip\7z.exe" a ..\valkyrie-win-%version%.zip * -r
 rem create macos zip
-cd ..\batchMac
+cd build\batchMac
 "C:\Program Files\7-Zip\7z.exe" a ..\valkyrie-macos-%version%.zip * -r
 rem create linux tar ball
 cd ..\batchLinux
@@ -82,3 +69,12 @@ cd ..
 "C:\Program Files\7-Zip\7z.exe" a valkyrie-linux-%version%.tar.gz valkyrie-linux-%version%.tar
 del valkyrie-linux-%version%.tar
 cd ..
+
+set /a num=%version:~-1% 2>nul
+
+if "%num%"=="%version:~-1%" (
+    "C:\Program Files (x86)\NSIS\makensis" /DVERSION=%version% valkyrie.nsi
+    goto :EOF
+)
+
+"C:\Program Files (x86)\NSIS\makensis" /DVERSION=%version% /DPRERELEASE valkyrie.nsi