- update setup scripts.

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

packaging/windows-innosetup/howto-build-setup.txt

@@ -2,7 +2,7 @@
 How to build the Assimp installer using Inno Setup
 
 
-1) Get MS VC 2005 SP1 redist packages for x86 and amd64 (currently http://www.microsoft.com/downloads/details.aspx?familyid=200b2fd9-ae1a-4a14-984d-389c36f85647&displaylang=en, http://www.microsoft.com/downloads/details.aspx?familyid=EB4EBE2D-33C0-4A47-9DD4-B9A6D7BD44DA&displaylang=en) and copy 'em right here.
+1) Get MS VC 2008 SP1 redist packages for x86 and amd64 and copy 'em right here.
 
 vcredist_x86.exe
 vcredist_x64.exe

packaging/windows-innosetup/script.iss

@@ -38,8 +38,8 @@ Name: "assimp_net"; Description: "C#/.NET Bindings"; Types: full
 ;Name: "vc9"; Description: "VC9 project files"; Types: full
 
 [Run]
-Filename: "{app}\stub\vcredist_x86.exe"; StatusMsg: "Installing VS2005 SP1 redistributable package (32 Bit)"; Check: not IsWin64
-Filename: "{app}\stub\vcredist_x64.exe"; StatusMsg: "Installing VS2005 SP1 redistributable package (64 Bit)"; Check: IsWin64
+Filename: "{app}\stub\vcredist_x86.exe"; StatusMsg: "Installing VS2008 SP1 redistributable package (32 Bit)"; Check: not IsWin64
+Filename: "{app}\stub\vcredist_x64.exe"; StatusMsg: "Installing VS2008 SP1 redistributable package (64 Bit)"; Check: IsWin64
 
 [Files]
 
@@ -88,7 +88,6 @@ Source: "..\..\include\*"; DestDir: "{app}\include"; Flags: recursesubdirs
 
 ; dAssimp
 Source: "..\..\port\dAssimp\*"; DestDir: "{app}\port\D"; Flags: recursesubdirs; Components: dassimp
-Source: "..\..\port\swig\*"; DestDir: "{app}\port\D_SwigExperimental"; Flags: recursesubdirs; Components: dassimp
 
 ; Assimp.NET
 Source: "..\..\port\Assimp.NET\*"; DestDir: "{app}\port\C#"; Flags: recursesubdirs; Components: assimp_net

packaging/windows-innosetup/script_vieweronly.iss

@@ -20,8 +20,8 @@ ArchitecturesInstallIn64BitMode=x64
 
 
 [Run]
-Filename: "{app}\stub\vcredist_x86.exe"; StatusMsg: "Installing VS2005 SP1 redistributable package (32 Bit)"; Check: not IsWin64
-Filename: "{app}\stub\vcredist_x64.exe"; StatusMsg: "Installing VS2005 SP1 redistributable package (64 Bit)"; Check: IsWin64
+Filename: "{app}\stub\vcredist_x86.exe"; StatusMsg: "Installing VS2008 SP1 redistributable package (32 Bit)"; Check: not IsWin64
+Filename: "{app}\stub\vcredist_x64.exe"; StatusMsg: "Installing VS2008 SP1 redistributable package (64 Bit)"; Check: IsWin64
 
 [Files]
 

packaging/windows-mkzip/mkfinal.bat

@@ -121,6 +121,9 @@ rem Insert 'dummy' files into empty folders
 echo. > final\%OUT_SDK%\lib\dummy
 echo. > final\%OUT_SDK%\obj\dummy
 
+
+RD  /s /q final\%OUT_SDK%\port\swig
+
 rem Also, repackaging is not a must-have feature
 RD  /s /q final\%OUT_SDK%\packaging
 

revision.h

@@ -1 +1 @@
-#define SVNRevision  842 
+#define SVNRevision  854