Update mkfinal script to build ZIPed releases.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@646 67173fc5-114c-0410-ac8e-9d2fd5bffc1f

packaging/windows-innosetup/script.iss

@@ -50,8 +50,11 @@ Source: "vcredist_x64.exe"; DestDir: "{app}\stub\"; Check: IsWin64
 ; Common stuff
 Source: "..\..\CREDITS"; DestDir: "{app}"
 Source: "..\..\LICENSE"; DestDir: "{app}"
+Source: "..\..\README"; DestDir: "{app}"
 Source: "WEB"; DestDir: "{app}"
 
+Source: "..\..\scripts\*"; DestDir: "{app}\scripts"; Flags: recursesubdirs
+
 ; x86 binaries
 Source: "..\..\bin\assimp_release-dll_Win32\Assimp32.dll"; DestDir: "{app}\bin\x86"
 Source: "..\..\bin\assimpview_release-dll_Win32\assimp_view.exe"; DestDir: "{app}\bin\x86"; Components: tools
@@ -85,6 +88,7 @@ Source: "..\..\port\PyAssimp\*"; DestDir: "{app}\port\Python"; Excludes: "*.pyc,
 
 ; Test repository
 Source: "..\..\test\models\*"; DestDir: "{app}\test\models"; Flags: recursesubdirs; Components: test
+Source: "..\..\test\regression\*"; DestDir: "{app}\test\regression"; Flags: recursesubdirs; Components: test
 
 ; Source Code & Workspaces
 ;Source: "..\..\code\*"; Excludes: "*.o"; DestDir: "{app}\code"; Flags: recursesubdirs; Components: wsource

packaging/windows-mkzip/mkfinal.bat

@@ -23,6 +23,8 @@ rem
 rem   -doxygen.exe (Doxygen client)
 rem    Download from www.doxygen.com
 rem
+rem   -svn client
+rem
 rem NOTES:
 rem   ./bin must not have any local modifications
 rem
@@ -47,11 +49,16 @@ SET /p REVISIONBASE= < tmpfile.txt
 DEL /q tmpfile.txt
 cd ..\packaging\windows-mkzip
 
-SET VERSIONBASE=1.0.%REVISIONBASE%
+SET VERSIONBASE=1.1.%REVISIONBASE%
 
 SET OUT_SDK=assimp--%VERSIONBASE%-sdk
 SET OUT_BIN=assimp--%VERSIONBASE%-bin
 
+SET BINCFG_x86=release-dll_win32
+SET BINCFG_x64=release-dll_x64
+
+SET BINCFG_x86_DEBUG=debug-dll_win32
+SET BINCFG_x64_DEBUG=debug-dll_x64
 
 rem -----------------------------------------------------
 rem Delete previous output directories
@@ -69,9 +76,6 @@ rem -----------------------------------------------------
 rem Copy all executables to 'final-bin'
 rem -----------------------------------------------------
 
-SET BINCFG_x86=release-dll_win32
-SET BINCFG_x64=release-dll_x64
-
 copy /Y ..\..\bin\assimpview_%BINCFG_x86%\assimp_view.exe "final\%OUT_BIN%\x86\assimp_view.exe"
 copy /Y ..\..\bin\assimpview_%BINCFG_x64%\assimp_view.exe "final\%OUT_BIN%\x64\assimp_view.exe"
 
@@ -96,8 +100,6 @@ rem that is nto yet ready to be published.
 rem -----------------------------------------------------
 
 svn export .\..\..\  final\%OUT_SDK%
-rem RD  /s /q final\%OUT_SDK%\packaging
-
 
 rem Copy doc to a suitable place
 move final\%OUT_SDK%\doc\AssimpDoc_Html\AssimpDoc.chm final\%OUT_SDK%\Documentation.chm
@@ -112,6 +114,37 @@ rem Insert 'dummy' files into empty folders
 echo. > final\%OUT_SDK%\lib\dummy
 echo. > final\%OUT_SDK%\obj\dummy
 
+rem Remove WIP ports and language bindings
+RD  /s /q final\%OUT_SDK%\port\Assimp.NET
+RD  /s /q final\%OUT_SDK%\port\jAssimp
+RD  /s /q final\%OUT_SDK%\port\BrainFuckAssimp
+RD  /s /q final\%OUT_SDK%\port\swig
+
+rem Also, repackaging is not a must-have feature
+RD  /s /q final\%OUT_SDK%\packaging
+
+rem Copy prebuilt libs
+mkdir "final\%OUT_SDK%\lib\assimp_%BINCFG_x86%"
+mkdir "final\%OUT_SDK%\lib\assimp_%BINCFG_x64%"
+mkdir "final\%OUT_SDK%\lib\assimp_%BINCFG_x86_DEBUG%"
+mkdir "final\%OUT_SDK%\lib\assimp_%BINCFG_x64_DEBUG%"
+
+copy /Y ..\..\lib\assimp_%BINCFG_x86%\assimp.lib    "final\%OUT_SDK%\lib\assimp_%BINCFG_x86%"
+copy /Y ..\..\lib\assimp_%BINCFG_x64%\assimp.lib    "final\%OUT_SDK%\lib\assimp_%BINCFG_x64%\"
+copy /Y ..\..\lib\assimp_%BINCFG_x86%\assimp.lib    "final\%OUT_SDK%\lib\assimp_%BINCFG_x86_DEBUG%\"
+copy /Y ..\..\lib\assimp_%BINCFG_x64%\assimp.lib    "final\%OUT_SDK%\lib\assimp_%BINCFG_x64_DEBUG%\"
+
+rem Copy prebuilt DLLs
+mkdir "final\%OUT_SDK%\bin\assimp_%BINCFG_x86%"
+mkdir "final\%OUT_SDK%\bin\assimp_%BINCFG_x64%"
+mkdir "final\%OUT_SDK%\bin\assimp_%BINCFG_x86_DEBUG%"
+mkdir "final\%OUT_SDK%\bin\assimp_%BINCFG_x64_DEBUG%"
+
+copy /Y ..\..\bin\assimp_%BINCFG_x86%\Assimp32.dll    "final\%OUT_SDK%\bin\assimp_%BINCFG_x86%\"
+copy /Y ..\..\bin\assimp_%BINCFG_x64%\Assimp64.dll    "final\%OUT_SDK%\bin\assimp_%BINCFG_x64%\"
+copy /Y ..\..\bin\assimp_%BINCFG_x86_DEBUG%\Assimp32d.dll    "final\%OUT_SDK%\bin\assimp_%BINCFG_x86_DEBUG%\"
+copy /Y ..\..\bin\assimp_%BINCFG_x64_DEBUG%\Assimp64d.dll    "final\%OUT_SDK%\bin\assimp_%BINCFG_x64_DEBUG%\"
+
 rem -----------------------------------------------------
 rem Make final-bin.zip and final-sdk.zip
 rem -----------------------------------------------------